Merge pull request #117570 from FRidh/python2alias

Python: be explicit on whether it is python2 or python3 that is used
This commit is contained in:
Frederik Rietdijk
2021-03-25 13:26:35 +01:00
committed by GitHub
70 changed files with 260 additions and 170 deletions

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python, runtimeShell }:
{ lib, stdenv, fetchurl, python3, runtimeShell }:
stdenv.mkDerivation {
name = "cmdstan-2.17.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
doCheck = true;
checkInputs = [ python ];
checkInputs = [ python3 ];
checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368
installPhase = ''

View File

@@ -1,7 +1,9 @@
{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
, pythonSupport ? false, python, swig
, pythonSupport ? false, python ? null, swig
}:
assert pythonSupport -> python != null;
stdenv.mkDerivation rec {
pname = "dtc";
version = "1.6.0";