diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-02-22 17:34:08 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-02-22 17:34:08 -0500 |
commit | 196682b1755abab6adef36666cc045f5dbb63281 (patch) | |
tree | 7717a0e33aa8ac66fa115c2e6ce862a86c7b43ab /pkgs/development/haskell-modules/make-package-set.nix | |
parent | 1c07ee79255bb3fe8a7eb382cd5a8348e0b85893 (diff) | |
parent | 2fea715779b23c03ba13096824e9084a933f5cc8 (diff) | |
download | nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.tar nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.tar.gz nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.tar.bz2 nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.tar.lz nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.tar.xz nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.tar.zst nixpkgs-196682b1755abab6adef36666cc045f5dbb63281.zip |
Merge remote-tracking branch 'upstream/master' into work-on-multi-shellFor
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b99ac9cbab9..17fb1ab8ae8 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"]; @@ -133,11 +133,11 @@ let installPhase = '' export HOME="$TMP" mkdir -p "$out" - cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; - 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 @@ -181,7 +181,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # '... foo = self.callHackage "foo" "1.5.3" {}; ...' callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); - # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage + # callHackageDirect + # :: { pkg :: Text, ver :: Text, sha256 :: Text } + # -> AttrSet + # -> HaskellPackage # # This function does not depend on all-cabal-hashes and therefore will work # for any version that has been released on hackage as opposed to only |