diff options
| author | Peter Simons <simons@cryp.to> | 2019-10-02 22:15:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 22:15:48 +0200 |
| commit | 31714a442d64ad634b9b116a91c86a3d913235bd (patch) | |
| tree | ee4561c4e119e44a0b5ec3270fce6f3da0cf66b6 /pkgs/development/haskell-modules | |
| parent | 4537d0de341f631aea4efc6eb4aa69ca409090d3 (diff) | |
| parent | d6f1e7056067d4df513a0d1fbb1c2220ee080aa2 (diff) | |
| download | nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.tar nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.tar.gz nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.tar.bz2 nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.tar.lz nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.tar.xz nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.tar.zst nixlib-31714a442d64ad634b9b116a91c86a3d913235bd.zip | |
Merge pull request #70192 from obsidiansystems/call-hackage-cross
haskell: Speed up cross callHackage by using native source
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index a4c040673487..cd9a101d3c5d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -122,9 +122,9 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; - in pkgs.buildPackages.stdenv.mkDerivation { + in buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ]; + nativeBuildInputs = [ buildPackages.cabal2nix ]; preferLocalBuild = true; allowSubstitutes = false; phases = ["installPhase"]; @@ -137,7 +137,7 @@ let ''; }; - all-cabal-hashes-component = name: version: pkgs.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' + all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} mkdir -p $out mv */${name}/${version}/${name}.{json,cabal} $out |