From 5638dd55e32a5aac41cc9cf06c3f399faf337b2f Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 12 Aug 2019 04:52:14 -0700 Subject: [PATCH] pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1 --- .../interpreters/python/default.nix | 24 +++++++++---------- .../interpreters/python/pypy/prebuilt.nix | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b3b506783cd2..5d699fb764da 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -143,26 +143,26 @@ in { # Not included at top-level self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64 pythonVersion = "2.7"; inherit passthruFun; ncurses = ncurses5; }; - pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { - # Not included at top-level - self = pythonInterpreters.pypy35_prebuilt; + pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy36_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 - pythonVersion = "3.5"; + sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64 + pythonVersion = "3.6"; inherit passthruFun; ncurses = ncurses5; }; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1ac779ed25e3..af933f0a4bd0 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; @@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +}