38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
|
|
index 6e341278b6e..e162785016f 100644
|
|
--- a/pkgs/development/haskell-modules/configuration-nix.nix
|
|
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
|
|
@@ -154,12 +154,6 @@ self: super: builtins.intersectAttrs super {
|
|
# Add necessary reference to gtk3 package
|
|
gi-dbusmenugtk3 = addPkgconfigDepend pkgs.gtk3 super.gi-dbusmenugtk3;
|
|
|
|
- hs-mesos = overrideCabal (drv: {
|
|
- # Pass _only_ mesos; the correct protobuf is propagated.
|
|
- extraLibraries = [ pkgs.mesos ];
|
|
- preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal";
|
|
- }) super.hs-mesos;
|
|
-
|
|
# These packages try to access the network.
|
|
amqp = dontCheck super.amqp;
|
|
amqp-conduit = dontCheck super.amqp-conduit;
|
|
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
|
|
index fa99c0eead8..ba00fb189ad 100644
|
|
--- a/pkgs/top-level/packages-config.nix
|
|
+++ b/pkgs/top-level/packages-config.nix
|
|
@@ -30,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.
|