Merge branch 'master' into staging

* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...

2 files changed, 33 insertions, 27 deletions

diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index d7f54b430f31..80c9ce3d432d 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,32 +1,35 @@
-{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile-lib }:
+{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "g-wrap-1.9.15";
+  name = "${pname}-${version}";
+  pname = "g-wrap";
+  version = "1.9.15";
+
   src = fetchurl {
-    url = "mirror://savannah/g-wrap/${name}.tar.gz";
+    url = "mirror://savannah/${pname}/${name}.tar.gz";
     sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  # Note: Glib support is optional, but it's quite useful (e.g., it's
-  # used by Guile-GNOME).
+  # Note: Glib support is optional, but it's quite useful (e.g., it's used by
+  # Guile-GNOME).
   buildInputs = [ guile glib guile-lib ];
 
   propagatedBuildInputs = [ libffi ];
 
   doCheck = true;
 
-  meta = {
-    description = "G-Wrap, a wrapper generator for Guile";
+  meta = with stdenv.lib; {
+    description = "A wrapper generator for Guile";
     longDescription = ''
-      G-Wrap is a tool (and Guile library) for generating function
-      wrappers for inter-language calls.  It currently only supports
-      generating Guile wrappers for C functions.
+      G-Wrap is a tool (and Guile library) for generating function wrappers for
+      inter-language calls.  It currently only supports generating Guile
+      wrappers for C functions.
     '';
-    homepage = http://www.nongnu.org/g-wrap/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.taktoa ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://www.nongnu.org/g-wrap/";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index 7ca54365be5b..19441c540179 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -1,27 +1,30 @@
-{stdenv, fetchurl, guile}:
+{ stdenv, fetchurl, guile }:
 
 stdenv.mkDerivation rec {
-  name = "guile-lint-14";
+  name = "guile-lint-${version}";
+  version = "14";
+
   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 ];
 
   unpackPhase = ''tar xjvf "$src" && sourceRoot="$PWD/${name}"'';
-  patchPhase = ''
-    cat guile-lint.in |						\
-    sed 's|^exec guile|exec $\{GUILE:-${guile}/bin/guile}|g' > ,,tmp &&	\
-    mv ,,tmp guile-lint.in
+
+  prePatch = ''
+    substituteInPlace guile-lint.in --replace \
+      "exec guile" "exec ${guile}/bin/guile"
   '';
 
   doCheck = true;
 
-  meta = {
-    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;
+  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 = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vyp ];
+    platforms = platforms.all;
   };
 }