Merge staging-next-21.05 into staging-21.05

nixos/tests/all-tests.nix

@@ -124,6 +124,7 @@ in
   fcitx = handleTest ./fcitx {};
   ferm = handleTest ./ferm.nix {};
   firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
+  firefox-esr    = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
   firefox-esr-78 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-78; };
   firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; };
   firejail = handleTest ./firejail.nix {};

pkgs/development/compilers/go/1.15.nix

@@ -50,11 +50,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.15.14";
+  version = "1.15.15";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "sha256-YKSlxI1j0KE+yohJAJtiRin/QpyLxdGmqMPE2p805wo=";
+    sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w=";
   };
 
   # perl is used for testing go vet

pkgs/development/compilers/go/1.16.nix

@@ -50,11 +50,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.16.6";
+  version = "1.16.7";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "sha256-o6XUvEAbUdsGXk+TtSM0ek00OuDAsIplw0I7BaE4A30=";
+    sha256 = "sha256-Gp8olNPYeHKfcEUHLzC+zr4kNSTPL85OCnskix4GVKw=";
   };
 
   # perl is used for testing go vet

pkgs/servers/gpsd/default.nix

@@ -1,40 +1,71 @@
-{ stdenv, lib ,fetchurl, scons, pkg-config, dbus, ncurses
+{ stdenv
-, libusb1, docbook_xml_dtd_412, docbook_xsl, bc
+, lib
+, fetchurl
+
+# nativeBuildInputs
+, scons
+, pkg-config
+
+# buildInputs
+, dbus
+, libusb1
+, ncurses
+, pps-tools
+, python3Packages
 
 # optional deps for GUI packages
 , guiSupport ? true
-, dbus-glib ? null, libX11 ? null, libXt ? null, libXpm ? null, libXaw ? null, libXext ? null
+, dbus-glib ? null
-, gobject-introspection ? null, pango ? null, gdk-pixbuf ? null, atk ? null, wrapGAppsHook ? null
+, libX11 ? null
+, libXt ? null
+, libXpm ? null
+, libXaw ? null
+, libXext ? null
+, gobject-introspection ? null
+, pango ? null
+, gdk-pixbuf ? null
+, atk ? null
+, wrapGAppsHook ? null
 
-, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
+, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
-, pps-tools
-, python3Packages
 }:
 
-
 stdenv.mkDerivation rec {
   pname = "gpsd";
-  version = "3.22";
+  version = "3.23";
 
   src = fetchurl {
     url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "18rplv1cd76ndb2wc91jarjmfm2nk508pykv1hir79bqbwmdygvq";
+    sha256 = "sha256-UiwjYqfrLXrDfqoVBPEq3tHDc0eah7oGzGeVl0tWe7w=";
   };
 
+  # TODO: render & install HTML documentation using asciidoctor
   nativeBuildInputs = [
-    scons pkg-config docbook_xml_dtd_412 docbook_xsl xmlto bc
+    pkg-config
-    python3Packages.python
     python3Packages.wrapPython
-  ]
+    scons
-  ++ lib.optionals guiSupport [ wrapGAppsHook gobject-introspection ];
+  ] ++ lib.optionals guiSupport [
+    gobject-introspection
+    wrapGAppsHook
+  ];
 
   buildInputs = [
-    python3Packages.python dbus ncurses
+    dbus
-    libxslt libusb1 pps-tools
+    libusb1
-  ]
+    ncurses
-  ++ lib.optionals guiSupport [
+    pps-tools
-    dbus-glib libX11 libXt libXpm libXaw libXext
+    python3Packages.python
-    gobject-introspection pango gdk-pixbuf atk
+  ] ++ lib.optionals guiSupport [
+    atk
+    dbus-glib
+    gdk-pixbuf
+    gobject-introspection
+    libX11
+    libXaw
+    libXext
+    libXpm
+    libXt
+    pango
   ];
 
   pythonPath = lib.optionals guiSupport [
@@ -46,8 +77,6 @@ stdenv.mkDerivation rec {
     ./sconstruct-env-fixes.patch
   ];
 
-  # - leapfetch=no disables going online at build time to fetch leap-seconds
-  #   info. See <gpsd-src>/build.txt for more info.
   preBuild = ''
     patchShebangs .
     sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript
@@ -57,6 +86,8 @@ stdenv.mkDerivation rec {
     sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages"
   '';
 
+  # - leapfetch=no disables going online at build time to fetch leap-seconds
+  #   info. See <gpsd-src>/build.txt for more info.
   sconsFlags = [
     "leapfetch=no"
     "gpsd_user=${gpsdUser}"
@@ -73,6 +104,7 @@ stdenv.mkDerivation rec {
   preInstall = ''
     mkdir -p "$out/lib/udev/rules.d"
   '';
+
   installTargets = [ "install" "udev-install" ];
 
   # remove binaries for x-less install because xgps sconsflag is partially broken
@@ -103,7 +135,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://gpsd.gitlab.io/gpsd/index.html";
     changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS";
-    license = licenses.bsd3;
+    license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor rasendubi ];
   };