From dcfb0363957378148c30f1c5f33b4994c52da5ae Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 19 Nov 2024 23:59:46 +0100 Subject: [PATCH 1/3] python312Packages.gurobipy: 11.0.3 -> 12.0.0 --- .../python-modules/gurobipy/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index fe25ace59a5f..f4f5aae68df4 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -17,14 +17,14 @@ let }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp311-aarch64-darwin = "sha256-E4tL6PtC1JS4SEvUz6meoeUR6IYM2xFxNJ9PzgbZqgE="; - cp311-aarch64-linux = "sha256-hMWOFkyQ/B3ovAqsitJagrSp0webUGRzWCLOz1UrGyY="; + cp311-aarch64-darwin = "sha256-KRC3fY7KUVCfI4u+TQQjgqLLIEunkzgIZxiuTol2/50="; + cp311-aarch64-linux = "sha256-/DiS49iND4oB2nXxL3QCPTmO9Zmp4a3WbtdjE3M+MPs="; cp311-x86_64-darwin = cp311-aarch64-darwin; - cp311-x86_64-linux = "sha256-2O7Vykgx0fELCM1wH3VIOyeBBzR1DUFKWzy25LpMF/M="; - cp312-aarch64-darwin = "sha256-BXAJeUaVEa7fy00BNsFhB30IU5O2pEnJjp/3gYdHJ5w="; - cp312-aarch64-linux = "sha256-t1KopNiYo8xZsGcKpEne6OIVnU9CDzADO6+W8Uo2UW0="; + cp311-x86_64-linux = "sha256-oI+0Kl58sCzbmTwTgci4xaO67tyt1W5yiNhFile4FEI="; + cp312-aarch64-darwin = "sha256-tcNcuYGmFScBaFUyTgVMrkc0lnhdtX8Ggr1W1YSpbu4="; + cp312-aarch64-linux = "sha256-+Ch951NcO5yX9KqHFpadcDAqlyvQnp07b71yZsoOq3I="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-0IppqYhLLHq4Q8mWe0R3DBfHOsVybbeoeUroXXwfxEY="; + cp312-x86_64-linux = "sha256-kLukle+yXP9aOCYViv974pY30ugKzMOompjLhjCFYQY="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -32,7 +32,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "11.0.3"; + version = "12.0.0"; inherit format; src = fetchPypi { From 54b5b8b06b87d931fbbaca410b6034e0e374d5a1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 20 Nov 2024 00:02:07 +0100 Subject: [PATCH 2/3] gurobi: reformat --- pkgs/by-name/gu/gurobi/package.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gu/gurobi/package.nix b/pkgs/by-name/gu/gurobi/package.nix index eff61579a5f9..0a6374907e57 100644 --- a/pkgs/by-name/gu/gurobi/package.nix +++ b/pkgs/by-name/gu/gurobi/package.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, python3 }: +{ + stdenv, + lib, + fetchurl, + autoPatchelfHook, + python3, +}: stdenv.mkDerivation rec { pname = "gurobi"; @@ -9,10 +15,17 @@ stdenv.mkDerivation rec { hash = "sha256-gqLIZxwjS7qp3GTaIrGVGr9BxiBH/fdwBOZfJKkd/RM="; }; - sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; + sourceRoot = "gurobi${builtins.replaceStrings [ "." ] [ "" ] version}/linux64"; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ (python3.withPackages (ps: [ ps.gurobipy ])) ]; + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + (python3.withPackages (ps: [ + ps.gurobipy + ])) + ]; strictDeps = true; From 41cbe1fe27244a26567012f9aa367ff8c16f113e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 20 Nov 2024 00:15:07 +0100 Subject: [PATCH 3/3] gurobi: 11.0.3 -> 12.0.0 --- pkgs/by-name/gu/gurobi/package.nix | 38 +++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gu/gurobi/package.nix b/pkgs/by-name/gu/gurobi/package.nix index 0a6374907e57..4d7afdb86083 100644 --- a/pkgs/by-name/gu/gurobi/package.nix +++ b/pkgs/by-name/gu/gurobi/package.nix @@ -6,16 +6,29 @@ python3, }: +let + platform = + { + aarch64-linux = "armlinux64"; + x86_64-linux = "linux64"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation rec { pname = "gurobi"; - version = "11.0.3"; + version = "12.0.0"; src = fetchurl { - url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - hash = "sha256-gqLIZxwjS7qp3GTaIrGVGr9BxiBH/fdwBOZfJKkd/RM="; + url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_${platform}.tar.gz"; + hash = + { + aarch64-linux = "sha256-jhICy/CGahb6eMPkvg+jKIjskS+N3zM8KVYdBXlk74Y="; + x86_64-linux = "sha256-or3Jwda/jrTlUaGErxzo17BDXqjn0ZoBfMfVP9Xv2hI="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - sourceRoot = "gurobi${builtins.replaceStrings [ "." ] [ "" ] version}/linux64"; + sourceRoot = "gurobi${builtins.replaceStrings [ "." ] [ "" ] version}/${platform}"; nativeBuildInputs = [ autoPatchelfHook @@ -32,6 +45,8 @@ stdenv.mkDerivation rec { makeFlags = [ "--directory=src/build" ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp bin/* $out/bin/ rm $out/bin/gurobi.sh @@ -52,19 +67,24 @@ stdenv.mkDerivation rec { mkdir -p $out/share/java ln -s $out/lib/gurobi.jar $out/share/java/ ln -s $out/lib/gurobi-javadoc.jar $out/share/java/ + + runHook postInstall ''; passthru.libSuffix = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor version); - meta = with lib; { + meta = { description = "Optimization solver for mathematical programming"; homepage = "https://www.gurobi.com"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ wegank ]; + license = lib.licenses.unfree; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ wegank ]; }; }