glucose, glucose-syrup: 4.0 -> 4.1

Changed files
+12 -11
pkgs
applications
science
logic
+6 -4
pkgs/applications/science/logic/glucose/default.nix
···
{ 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; {
+6 -7
pkgs/applications/science/logic/glucose/syrup.nix
···
-
{ 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; {