diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-10-01 12:35:51 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-10-01 12:46:50 -0400 |
commit | d6f1e7056067d4df513a0d1fbb1c2220ee080aa2 (patch) | |
tree | a70a4f23cc3d81f1fae1480516c51b047c8c3da2 /pkgs/development/haskell-modules/make-package-set.nix | |
parent | 8a18c9f26148d1bcfcd9ba711d56e8bdb80899a1 (diff) | |
download | nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.tar nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.tar.gz nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.tar.bz2 nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.tar.lz nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.tar.xz nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.tar.zst nixpkgs-d6f1e7056067d4df513a0d1fbb1c2220ee080aa2.zip |
haskell: Speed up cross callHackage by using native source
The extract of code from hackage is the same on all platforms.
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-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 a4c04067348..cd9a101d3c5 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 |