mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
gurobipy: fix eval
This commit is contained in:
parent
8e2f912b65
commit
b687ffa0d2
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, python, xar, cpio, cctools, insert_dylib }:
|
||||
assert python.isPy27 && python.ucsEncoding == 2;
|
||||
assert python.pkgs.isPy27 && python.ucsEncoding == 2;
|
||||
stdenv.mkDerivation
|
||||
{ name = "gurobipy-7.0.2";
|
||||
src = fetchurl
|
||||
|
@ -1,12 +1,10 @@
|
||||
{ stdenv, fetchurl, python }:
|
||||
assert python.isPy27;
|
||||
let utf = if python.ucsEncoding == 2
|
||||
then "16"
|
||||
else if python.ucsEncoding == 4
|
||||
then "32"
|
||||
assert python.pkgs.isPy27;
|
||||
let utf =
|
||||
if python.ucsEncoding == 2 then "16"
|
||||
else if python.ucsEncoding == 4 then "32"
|
||||
else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
|
||||
in
|
||||
stdenv.mkDerivation
|
||||
in stdenv.mkDerivation
|
||||
{ name = "gurobipy-7.0.2";
|
||||
src = fetchurl
|
||||
{ url = "http://packages.gurobi.com/7.0/gurobi7.0.2_linux64.tar.gz";
|
||||
|
@ -5631,8 +5631,8 @@ in {
|
||||
};
|
||||
|
||||
gurobipy = if stdenv.system == "x86_64-darwin"
|
||||
then callPackage ../development/python-modules/gurobipy/darwin.nix
|
||||
{ inherit (pkgs.darwin) cctools insert_dylib;
|
||||
then callPackage ../development/python-modules/gurobipy/darwin.nix {
|
||||
inherit (pkgs.darwin) cctools insert_dylib;
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux"
|
||||
then callPackage ../development/python-modules/gurobipy/linux.nix {}
|
||||
|
Loading…
Reference in New Issue
Block a user