From 1030f5772d4b9af7ee6e164bad539d70a9b56da9 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Mon, 6 Dec 2021 19:37:42 -0500 Subject: [PATCH] julia: switch from python2 to python3 Julia does not actually require python2; it just requires any version of python [that is equal to or greater than 2.7](https://github.com/JuliaLang/julia/blob/master/doc/src/devdocs/build/build.md#required-build-tools-and-external-libraries). This changes the python dependency from python2 to python3. I have verified that julia-1.0 builds with this change. julia-1.5 is marked as broken in nixpkgs, so I have not tested it (but I would be very surprised if this change broke it further). Motivated by #148779 --- pkgs/development/compilers/julia/1.0.nix | 4 ++-- pkgs/development/compilers/julia/1.5.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 4f05329f595a..28500815639a 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, fetchurl, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, gfortran, m4, makeWrapper, patchelf, perl, which, python3 , cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { sha256 = src_sha256; }; - nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python3 which ]; # cmake is only used to build the bundled deps dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index 06c0e2a30e8c..3421af681a25 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake +, gfortran, m4, makeWrapper, patchelf, perl, which, python3, cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib # standard library dependencies @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python3 which cmake ]; makeFlags = let