Merge pull request #218436 from mweinelt/pypy-use-hash

pypy: Use hash everywhere
This commit is contained in:
Jörg Thalheim 2023-02-26 19:46:14 +01:00 committed by GitHub
commit 9c2d391f0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -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 ];

View File

@ -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 = [

View File

@ -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 = [