diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-29 09:13:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-29 09:13:21 +0300 |
| commit | 626401c783dd4b687e3627b19078c0f4ff4f6467 (patch) | |
| tree | 87ec984336c515bbe5545b999029b0d64aae79d4 | |
| parent | 8667b0cb36e80cf4cb9625de32cee7f80750940d (diff) | |
| parent | 8da8071e37a392a1548f3ad503f3ca8092b855dd (diff) | |
Merge pull request #220832 from wegank/glucose-bump
glucose: 4.1 -> 4.2.1
| -rw-r--r-- | pkgs/applications/science/logic/glucose/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index 5a0873b53f048..512f0414f1c69 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -1,26 +1,29 @@ { lib , stdenv , fetchurl +, unzip , zlib , enableUnfree ? false }: stdenv.mkDerivation rec { pname = "glucose" + lib.optionalString enableUnfree "-syrup"; - version = "4.1"; + version = "4.2.1"; src = fetchurl { - url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz"; - hash = "sha256-Uaoc8b7SsU8VQ7CZ6FpW3RqSvjfm4+sMSh/Yg9XMUCk="; + url = "https://www.labri.fr/perso/lsimon/downloads/softwares/glucose-${version}.zip"; + hash = "sha256-J0J9EKC/4cCiZr/y4lz+Hm7OcmJmMIIWzQ+4c+KhqXg="; }; - sourceRoot = "glucose-syrup-${version}/${if enableUnfree then "parallel" else "simp"}"; + sourceRoot = "glucose-${version}/sources/${if enableUnfree then "parallel" else "simp"}"; postPatch = '' substituteInPlace Main.cc \ --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" ''; + nativeBuildInputs = [ unzip ]; + buildInputs = [ zlib ]; makeFlags = [ "r" ]; |