diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2023-12-15 14:36:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 14:36:15 +0100 |
| commit | 5a0a700663ad3af0d4ea9f98fcb385d98f454744 (patch) | |
| tree | e61f36b33ba0f6cec347845db2ac378bf372a58b /pkgs/development/haskell-modules | |
| parent | 0d7a228f8e3d2796beb1f33011918930c021b5cc (diff) | |
| parent | d412d72d693d6387ee0935ad43822fa17664b266 (diff) | |
Merge pull request #269356 from amjoseph-nixpkgs/pr/release-outpaths-
Ensure all jobset attributes evaluate, and check that in CT
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7bc1fa0f7e83..e766203bd1f0 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -18,7 +18,8 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; + inherit stdenv haskellLib ghc extensible-self all-cabal-hashes; + buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; }; }; platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [ diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index c39c934bed64..294ca295f22b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -614,7 +614,7 @@ in package-set { inherit pkgs lib callPackage; } self // { Type: [str] -> drv -> drv */ generateOptparseApplicativeCompletions = - self.callPackage ( + (self.callPackage ( { stdenv }: commands: @@ -623,7 +623,7 @@ in package-set { inherit pkgs lib callPackage; } self // { if stdenv.buildPlatform.canExecute stdenv.hostPlatform then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands else pkg - ) { }; + ) { }) // { __attrsFailEvaluation = true; }; /* Modify given Haskell package to force GHC to employ the LLVM |