From 069cdfff08e9541c20b25d88e0d176e097223b70 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 25 Jun 2018 12:53:52 +0000 Subject: [staging] perl524: 5.24.3 -> 5.24.4 --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 4d6f426fae43..9c79e6c439ca 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -193,8 +193,8 @@ in rec { }; perl524 = common { - version = "5.24.3"; - sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; + version = "5.24.4"; + sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz"; }; perl526 = common { -- cgit 1.4.1 From 3c43bb787128199a89c140c033b7bce24c3426dd Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 25 Jun 2018 13:23:33 +0000 Subject: perl526: 5.26.1 -> 5.26.2 --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 9c79e6c439ca..b132154ed579 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -198,7 +198,7 @@ in rec { }; perl526 = common { - version = "5.26.1"; - sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7"; + version = "5.26.2"; + sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"; }; } -- cgit 1.4.1 From 3fb3031f936d106c44be7daf2cb1d54b84009f8c Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 27 Jun 2018 13:37:36 +0000 Subject: [staging] always expose perl.version (#42644) always expose perl.version (currently it is only visible if (stdenv.buildPlatform != stdenv.hostPlatform)) --- pkgs/development/interpreters/perl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index b132154ed579..cdbf2bdeeadd 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -23,6 +23,8 @@ let libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; common = { version, sha256 }: stdenv.mkDerivation (rec { + inherit version; + name = "perl-${version}"; src = fetchurlBoot { @@ -179,8 +181,6 @@ let configurePlatforms = [ "build" "host" "target" ]; - inherit version; - # TODO merge setup hooks setupHook = ./setup-hook-cross.sh; }); @@ -194,7 +194,7 @@ in rec { perl524 = common { version = "5.24.4"; - sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz"; + sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz"; }; perl526 = common { -- cgit 1.4.1 From 78e05215a738068d642127986e9fb43ef43f8343 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 28 Jun 2018 08:25:50 +0200 Subject: python36: 3.6.5 -> 3.6.6 --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 5ee5c9179534..00b3a7f22c2c 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "5"; + minorVersion = "6"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l"; + sha256 = "0vz1wqg50zq6g15givdx1s2rq5752y5g2f1978bs6wvf8mfw36yp"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; -- cgit 1.4.1 From 29c3f32841d1fe5421f4d3360480a1c1331e1e9e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 3 Jul 2018 13:28:23 -0400 Subject: python36: fix on darwin Fixes: 78e05215a7 ('python36: 3.6.5 -> 3.6.6') --- pkgs/development/interpreters/python/cpython/3.6/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index c5fc3e8eb712..9ea0876b1ce6 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -85,9 +85,8 @@ in stdenv.mkDerivation { # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. (fetchpatch { - url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch"; - sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8"; - extraPrefix = ""; + url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; + sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; }) ]; -- cgit 1.4.1 From ea08cf9e6c0d77c08dfc557b61270a9559f8eddc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 3 Jul 2018 13:29:07 -0400 Subject: python37: apply distutils patch --- .../development/interpreters/python/cpython/3.7/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index 410d07ebc61c..329851b5d650 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -39,6 +39,8 @@ let ++ optionals x11Support [ tcl tk libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + in stdenv.mkDerivation { name = "python3-${version}"; pythonVersion = majorVersion; @@ -63,6 +65,15 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ] ++ optionals hasDistutilsCxxPatch [ + # Fix for http://bugs.python.org/issue1222585 + # Upstream distutils is calling C compiler to compile C++ code, which + # only works for GCC and Apple Clang. This makes distutils to call C++ + # compiler when needed. + (fetchpatch { + url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; + sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; + }) ]; postPatch = '' @@ -147,7 +158,7 @@ in stdenv.mkDerivation { passthru = let pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; in rec { - inherit libPrefix sitePackages x11Support; + inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; -- cgit 1.4.1