mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
Merge pull request #218436 from mweinelt/pypy-use-hash
pypy: Use hash everywhere
This commit is contained in:
commit
9c2d391f0d
@ -12,7 +12,7 @@
|
|||||||
, pkgsTargetTarget
|
, pkgsTargetTarget
|
||||||
, sourceVersion
|
, sourceVersion
|
||||||
, pythonVersion
|
, pythonVersion
|
||||||
, sha256
|
, hash
|
||||||
, passthruFun
|
, passthruFun
|
||||||
, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
|
, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
|
||||||
}:
|
}:
|
||||||
@ -46,7 +46,7 @@ in with passthru; stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2";
|
url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2";
|
||||||
inherit sha256;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
, packageOverrides ? (self: super: {})
|
, packageOverrides ? (self: super: {})
|
||||||
, sourceVersion
|
, sourceVersion
|
||||||
, pythonVersion
|
, pythonVersion
|
||||||
, sha256
|
, hash
|
||||||
, passthruFun
|
, passthruFun
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ in with passthru; stdenv.mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||||
inherit sha256;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
, packageOverrides ? (self: super: {})
|
, packageOverrides ? (self: super: {})
|
||||||
, sourceVersion
|
, sourceVersion
|
||||||
, pythonVersion
|
, pythonVersion
|
||||||
, sha256
|
, hash
|
||||||
, passthruFun
|
, passthruFun
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ in with passthru; stdenv.mkDerivation {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||||
inherit sha256;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
Loading…
Reference in New Issue
Block a user