diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 87d9f8f36324..249816cc49c4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -171,7 +171,7 @@ self: super: { ]; # lens >= 5.1 supports 9.2.1 - lens = super.lens_5_1; + lens = doDistribute self.lens_5_1; # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 alex = dontCheck super.alex; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4eebc684860d..88b53f6b636a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -304,27 +304,29 @@ let # Test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC. # Use integer-simple to avoid GMP linking problems (LGPL) - pkgsStatic.haskell.packages = + pkgsStatic = removePlatforms [ "aarch64-linux" # times out on Hydra "x86_64-darwin" # TODO: reenable when static libiconv works on darwin ] { - integer-simple.ghc8107 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8107) + haskellPackages = { + inherit (packagePlatforms pkgs.pkgsStatic.haskellPackages) hello lens random QuickCheck + cabal2nix ; }; - native-bignum.ghc902 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc902) + haskell.packages.native-bignum.ghc922 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc922) hello lens random QuickCheck + cabal2nix ; }; }; @@ -449,12 +451,8 @@ let ]; }; constituents = accumulateDerivations [ - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random - jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.hello - jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.lens - jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.random + jobs.pkgsStatic.haskellPackages + jobs.pkgsStatic.haskell.packages.native-bignum.ghc922 ]; }; }