From 56ab381973aa112d697847700269530ead137e20 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 20:59:56 +1000 Subject: [PATCH 01/12] guileLint: rename to guile-lint --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4fafdfb726c..343e10f55be 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -69,6 +69,7 @@ mapAliases (rec { guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 guile_lib = guile-lib; # added 2017-09-24 + guileLint = guile-lint; # added 2017-09-27 guile_ncurses = guile-ncurses; # added 2017-09-24 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72ddcb185e0..5b41d7845ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7187,7 +7187,7 @@ with pkgs; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; - guileLint = callPackage ../development/tools/guile/guile-lint { }; + guile-lint = callPackage ../development/tools/guile/guile-lint { }; gwrap = callPackage ../development/tools/guile/g-wrap { }; From fd0375830562aa41f0a9429e72f42ba9bbe0ac89 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:18:02 +1000 Subject: [PATCH 02/12] guile-lint: fix build by building with guile 1.8 [1] gives us the indication that guile-lint should be used with guile-1.8. [1]: https://www.gnu.org/software/guile/libraries/ --- pkgs/development/tools/guile/guile-lint/default.nix | 1 - pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 7ca54365be5..156def09187 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; homepage = http://user42.tuxfamily.org/guile-lint/index.html; license = "GPL"; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b41d7845ed..d46681b05a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7187,7 +7187,9 @@ with pkgs; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; - guile-lint = callPackage ../development/tools/guile/guile-lint { }; + guile-lint = callPackage ../development/tools/guile/guile-lint { + guile = guile_1_8; + }; gwrap = callPackage ../development/tools/guile/g-wrap { }; From 14befbf78d34b0d3ea251a2d0bcbc1665c10f2fa Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:27:26 +1000 Subject: [PATCH 03/12] guile-lint: code formatting nits --- .../tools/guile/guile-lint/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 156def09187..66891dea62a 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,15 +1,20 @@ -{stdenv, fetchurl, guile}: +{ stdenv, fetchurl, guile }: + +let + name = "guile-lint-${version}"; + version = "14"; +in stdenv.mkDerivation { + inherit name; -stdenv.mkDerivation rec { - name = "guile-lint-14"; src = fetchurl { - url = "http://download.tuxfamily.org/user42/" + name + ".tar.bz2"; + url = "http://download.tuxfamily.org/user42/${name}.tar.bz2"; sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; }; buildInputs = [ guile ]; unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; + patchPhase = '' cat guile-lint.in | \ sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ @@ -20,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; - homepage = http://user42.tuxfamily.org/guile-lint/index.html; + homepage = "http://user42.tuxfamily.org/guile-lint/index.html"; license = "GPL"; }; } From f311898f671fde65af97a1c1e6eb138a55d7e033 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:28:07 +1000 Subject: [PATCH 04/12] guile-lint: remove package name prefix from meta.description --- pkgs/development/tools/guile/guile-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 66891dea62a..177e78f6555 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { doCheck = true; meta = { - description = "Guile-Lint checks syntax and semantics in a Guile program or module"; + description = "Checks syntax and semantics in a Guile program or module"; homepage = "http://user42.tuxfamily.org/guile-lint/index.html"; license = "GPL"; }; From 727fa0d81d9bba2329c032937d66af76750279ed Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:28:35 +1000 Subject: [PATCH 05/12] guile-lint: use https version of homepage --- pkgs/development/tools/guile/guile-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 177e78f6555..a2e4fd923f9 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { meta = { description = "Checks syntax and semantics in a Guile program or module"; - homepage = "http://user42.tuxfamily.org/guile-lint/index.html"; + homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = "GPL"; }; } From 5352a105f7189638a02ea918ddd807774f3b95bf Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:30:16 +1000 Subject: [PATCH 06/12] guile-lint: use correct license value, "GPL" -> gpl3Plus --- pkgs/development/tools/guile/guile-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index a2e4fd923f9..40aabaa04ec 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -23,9 +23,9 @@ in stdenv.mkDerivation { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; - license = "GPL"; + license = licenses.gpl3Plus; }; } From a4601f9f40498f24bcfff7448d68ed512de5a048 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:32:03 +1000 Subject: [PATCH 07/12] guile-lint: add meta.platforms, with the same value as for guile --- pkgs/development/tools/guile/guile-lint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 40aabaa04ec..219c1a40194 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -27,5 +27,6 @@ in stdenv.mkDerivation { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = licenses.gpl3Plus; + platforms = platforms.all; }; } From 3748013d226764ef974f2ec8cf6eadc15d5d1f22 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:33:01 +1000 Subject: [PATCH 08/12] guile-lint: add vyp as maintainer --- pkgs/development/tools/guile/guile-lint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 219c1a40194..91a7f73434e 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -27,6 +27,7 @@ in stdenv.mkDerivation { description = "Checks syntax and semantics in a Guile program or module"; homepage = "https://user42.tuxfamily.org/guile-lint/index.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ vyp ]; platforms = platforms.all; }; } From e7e52d4b83aafa62cae374a4f2d7bed7abdc9946 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:36:12 +1000 Subject: [PATCH 09/12] guile-lint: use https src url --- pkgs/development/tools/guile/guile-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 91a7f73434e..68173083c1d 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -7,8 +7,8 @@ in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download.tuxfamily.org/user42/${name}.tar.bz2"; - sha256 = "5bfcf7a623338b2ef81ac097e3e136eaf32856dd0730b7eeaff3161067b5d0be"; + url = "https://download.tuxfamily.org/user42/${name}.tar.bz2"; + sha256 = "1gnhnmki05pkmzpbfc07vmb2iwza6vhy75y03bw2x2rk4fkggz2v"; }; buildInputs = [ guile ]; From ea4adc5f5fa083b108591b425acf81f32c5fe1a2 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:42:16 +1000 Subject: [PATCH 10/12] guile-lint: patchPhase -> prePatch --- pkgs/development/tools/guile/guile-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 68173083c1d..07eb4779960 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; - patchPhase = '' + prePatch = '' cat guile-lint.in | \ sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ mv ,,tmp guile-lint.in From 89238b8628a94b78e0f046c856008b17af020b34 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 27 Sep 2017 23:48:42 +1000 Subject: [PATCH 11/12] guile-lint: use substituteInPlace instead of sed for prePatch --- pkgs/development/tools/guile/guile-lint/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 07eb4779960..543e30cca7b 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -16,9 +16,8 @@ in stdenv.mkDerivation { unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"''; prePatch = '' - cat guile-lint.in | \ - sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp && \ - mv ,,tmp guile-lint.in + substituteInPlace guile-lint.in --replace \ + "exec guile" "exec ${guile}/bin/guile" ''; doCheck = true; From 262b1cb40147a97e431c84994382a8b03741cece Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 20:51:20 +1000 Subject: [PATCH 12/12] guile-lint: set version in mkDerivation --- pkgs/development/tools/guile/guile-lint/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 543e30cca7b..19441c54017 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -1,10 +1,8 @@ { stdenv, fetchurl, guile }: -let +stdenv.mkDerivation rec { name = "guile-lint-${version}"; version = "14"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { url = "https://download.tuxfamily.org/user42/${name}.tar.bz2";