cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

julia: switch from python2 to python3

Browse source 
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
This commit is contained in:
Jim Garrison 2021-12-06 19:37:42 -05:00
parent ebf4c2441a
commit 1030f5772d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/julia/1.0.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchpatch, fetchurl, fetchzip { lib, stdenv, fetchpatch, fetchurl, fetchzip
# build tools # build tools
, gfortran, m4, makeWrapper, patchelf, perl, which, python2 , gfortran, m4, makeWrapper, patchelf, perl, which, python3
, cmake , cmake
# libjulia dependencies # libjulia dependencies
, libunwind, readline, utf8proc, zlib , libunwind, readline, utf8proc, zlib
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
sha256 = src_sha256; 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 # cmake is only used to build the bundled deps
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;

4
pkgs/development/compilers/julia/1.5.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchzip { lib, stdenv, fetchzip
# build tools # build tools
, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake , gfortran, m4, makeWrapper, patchelf, perl, which, python3, cmake
# libjulia dependencies # libjulia dependencies
, libunwind, readline, utf8proc, zlib , libunwind, readline, utf8proc, zlib
# standard library dependencies # standard library dependencies
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
zlib zlib
] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; ] ++ 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 = makeFlags =
let let