Skip to content

Commit

Permalink
Merge pull request NixOS#275128 from Atemu/cleanup/packages-config
Browse files Browse the repository at this point in the history
Revert "packages-config.nix: ignore haskellPackages.hs-mesos"
  • Loading branch information
ncfavier authored Dec 21, 2023
2 parents 55d199f + 21b6bf5 commit dd60e62
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions pkgs/top-level/packages-config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
fdbPackages
fusePackages
gns3Packages
haskellPackages
idrisPackages
nodePackages
nodePackages_latest
Expand All @@ -29,15 +30,6 @@
zeroadPackages
;

haskellPackages = super.haskellPackages // {
# mesos, which this depends on, has been removed from nixpkgs. We are keeping
# the error message for now, so users will get an error message they can make
# sense of, but need to work around it here.
# TODO(@sternenseemann): remove this after branch-off of 22.05, along with the
# override in configuration-nix.nix
hs-mesos = null;
};

# Make sure haskell.compiler is included, so alternative GHC versions show up,
# but don't add haskell.packages.* since they contain the same packages (at
# least by name) as haskellPackages.
Expand Down

0 comments on commit dd60e62

Please sign in to comment.