diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index 5b318be1664..a0035f96539 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "glucose-${version}"; - version = "4.0"; + version = "4.1"; src = fetchurl { - url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz"; - sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld"; + url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz"; + sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji"; }; buildInputs = [ zlib ]; - sourceRoot = "glucose-syrup/simp"; + sourceRoot = "glucose-syrup-${version}/simp"; makeFlags = [ "r" ]; installPhase = '' install -Dm0755 glucose_release $out/bin/glucose + mkdir -p "$out/share/doc/${name}/" + install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix index 7604ebc1a3d..fd59a53fd2a 100644 --- a/pkgs/applications/science/logic/glucose/syrup.nix +++ b/pkgs/applications/science/logic/glucose/syrup.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, glucose }: stdenv.mkDerivation rec { name = "glucose-syrup-${version}"; - version = "4.0"; + version = glucose.version; - src = fetchurl { - url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz"; - sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld"; - }; + src = glucose.src; buildInputs = [ zlib ]; - sourceRoot = "glucose-syrup/parallel"; + sourceRoot = "glucose-syrup-${version}/parallel"; makeFlags = [ "r" ]; installPhase = '' install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup + mkdir -p "$out/share/doc/${name}/" + install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/" ''; meta = with stdenv.lib; {