alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #149177 from garrison/julia-python3

Browse source 
julia: switch from python2 to python3
This commit is contained in:
7c6f434c 2021-12-07 16:59:14 +00:00 committed by GitHub
parent 0c85a55759 1030f5772d
commit 71dfb6b33a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
# 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;

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

@ -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