From 2af27d6143a0dbaa076519fbc866fb7e5a5dcc91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 26 Feb 2023 13:11:30 +0000 Subject: [PATCH] pypy: Use hash everywhere Fixes the build after cpython switched to hash. --- pkgs/development/interpreters/python/pypy/default.nix | 4 ++-- pkgs/development/interpreters/python/pypy/prebuilt.nix | 4 ++-- pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b7597a9925b6..eb16bddf16fc 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -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 ]; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 9b3baf84848b..69508742148b 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -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 = [ diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index ddf3963060d1..c4b676271673 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -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 = [