gurobipy: fix eval

This commit is contained in:
Orivej Desh 2017-12-09 22:41:18 +00:00
parent 8e2f912b65
commit b687ffa0d2
3 changed files with 11 additions and 13 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, xar, cpio, cctools, insert_dylib }: { stdenv, fetchurl, python, xar, cpio, cctools, insert_dylib }:
assert python.isPy27 && python.ucsEncoding == 2; assert python.pkgs.isPy27 && python.ucsEncoding == 2;
stdenv.mkDerivation stdenv.mkDerivation
{ name = "gurobipy-7.0.2"; { name = "gurobipy-7.0.2";
src = fetchurl src = fetchurl

View File

@ -1,12 +1,10 @@
{ stdenv, fetchurl, python }: { stdenv, fetchurl, python }:
assert python.isPy27; assert python.pkgs.isPy27;
let utf = if python.ucsEncoding == 2 let utf =
then "16" if python.ucsEncoding == 2 then "16"
else if python.ucsEncoding == 4 else if python.ucsEncoding == 4 then "32"
then "32" else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; in stdenv.mkDerivation
in
stdenv.mkDerivation
{ name = "gurobipy-7.0.2"; { name = "gurobipy-7.0.2";
src = fetchurl src = fetchurl
{ url = "http://packages.gurobi.com/7.0/gurobi7.0.2_linux64.tar.gz"; { url = "http://packages.gurobi.com/7.0/gurobi7.0.2_linux64.tar.gz";

View File

@ -5631,11 +5631,11 @@ in {
}; };
gurobipy = if stdenv.system == "x86_64-darwin" gurobipy = if stdenv.system == "x86_64-darwin"
then callPackage ../development/python-modules/gurobipy/darwin.nix then callPackage ../development/python-modules/gurobipy/darwin.nix {
{ inherit (pkgs.darwin) cctools insert_dylib; inherit (pkgs.darwin) cctools insert_dylib;
} }
else if stdenv.system == "x86_64-linux" else if stdenv.system == "x86_64-linux"
then callPackage ../development/python-modules/gurobipy/linux.nix {} then callPackage ../development/python-modules/gurobipy/linux.nix {}
else throw "gurobipy not yet supported on ${stdenv.system}"; else throw "gurobipy not yet supported on ${stdenv.system}";
helper = buildPythonPackage rec { helper = buildPythonPackage rec {