Unverified Commit 9c2d391f authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

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

pypy: Use hash everywhere
parents 6fe8d82c 2af27d61

pkgs/development/interpreters/python/pypy/default.nix

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

pkgs/development/interpreters/python/pypy/prebuilt.nix

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

pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix

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