diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/glpk | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glpk')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glpk/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glpk/default.nix b/nixpkgs/pkgs/development/libraries/glpk/default.nix index a46c84844e89..e8b01d6d2e7d 100644 --- a/nixpkgs/pkgs/development/libraries/glpk/default.nix +++ b/nixpkgs/pkgs/development/libraries/glpk/default.nix @@ -14,12 +14,12 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { - version = "4.65"; + version = "5.0"; pname = "glpk"; src = fetchurl { url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; - sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; + sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU="; }; buildInputs = @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/20710#comment:18 (fetchpatch { name = "error_recovery.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266"; + sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) ]; @@ -72,7 +72,8 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/glpk/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjg ] ++ teams.sage.members; + maintainers = with maintainers; [ ] ++ teams.sage.members; + mainProgram = "glpsol"; platforms = platforms.all; }; } |