Unverified Commit 2af27d61 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

pypy: Use hash everywhere

Fixes the build after cpython switched to hash.
parent 94d78e46
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
, pkgsTargetTarget
, sourceVersion
, pythonVersion
, sha256
, hash
, passthruFun
, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
}:
@@ -46,7 +46,7 @@ in with passthru; stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2";
    inherit sha256;
    inherit hash;
  };

  nativeBuildInputs = [ pkg-config ];
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
, packageOverrides ? (self: super: {})
, sourceVersion
, pythonVersion
, sha256
, hash
, passthruFun
}:

@@ -60,7 +60,7 @@ in with passthru; stdenv.mkDerivation {

  src = fetchurl {
    url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
    inherit sha256;
    inherit hash;
  };

  buildInputs = [
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
, packageOverrides ? (self: super: {})
, sourceVersion
, pythonVersion
, sha256
, hash
, passthruFun
}:

@@ -60,7 +60,7 @@ in with passthru; stdenv.mkDerivation {

  src = fetchurl {
    url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
    inherit sha256;
    inherit hash;
  };

  buildInputs = [