public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into python-unstable

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-04-04 12:59:12 +02:00
committed by GitHub
parent a55da781d7 397730e0f4
commit 1e7ed8b2f3
113 changed files with 2724 additions and 3555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/math/ginac/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python }:
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }:
stdenv.mkDerivation rec {
name = "ginac-1.8.0";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ] ++ lib.optional stdenv.isDarwin gmp;
nativeBuildInputs = [ pkg-config python ];
nativeBuildInputs = [ pkg-config python3 ];
strictDeps = true;
preConfigure = "patchShebangs ginsh";
pkgs/applications/science/math/gurobi/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, python }:
{ stdenv, lib, fetchurl, autoPatchelfHook, python2 }:
let
majorVersion = "8.1";
@@ -14,7 +14,9 @@ in stdenv.mkDerivation rec {
sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64";
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ (python.withPackages (ps: [ ps.gurobipy ])) ];
buildInputs = [ (python2.withPackages (ps: [ ps.gurobipy ])) ];
strictDeps = true;
buildPhase = ''
cd src/build