Merge staging-next into staging

8 files changed, 31 insertions, 54 deletions

diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index 374d3e112ca1..cc7f213b88b6 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -1,24 +1,17 @@
-{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick,
+{ stdenv, python3Packages, fetchFromGitHub, feh, libxslt,
   gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
 
-python36Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "wpgtk";
-  version = "5.7.4";
+  version = "5.8.6";
 
   src = fetchFromGitHub {
     owner = "deviantfero";
     repo = "wpgtk";
     rev = "${version}";
-    sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726";
+    sha256 = "1i29zdmgm8knp6mmz3nfl0dwn3vd2wcvf5vn0gg8sv2wjgk3i10y";
   };
 
-  pythonPath = [
-    python36Packages.pygobject3
-    python36Packages.pillow
-    pywal
-    imagemagick
-  ];
-
   buildInputs = [
     wrapGAppsHook
     gtk3
@@ -27,11 +20,20 @@ python36Packages.buildPythonApplication rec {
     libxslt
   ];
 
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    pillow
+    pywal
+  ];
+
   # The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise
   preBuild = ''
       export HOME=$(pwd)
   '';
 
+  # No test exist
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Template based wallpaper/colorscheme generator and manager";
     longDescription = ''
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index fce1ff75cfad..759e2606e198 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bacula-9.2.2";
+  name = "bacula-9.4.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/bacula/${name}.tar.gz";
-    sha256 = "0bi2jwvgs2ppdvksx41z69b5r5qr39kasxcgyhd08d6i8z89j87h";
+    sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index 956b0039489d..b477ad8deace 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.22";
+  name = "mtools-4.0.23";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "08shiy9am4x65yg8l5mplj8jrvsimzbaf2id8cmfc02b00i0yb35";
+    sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix
deleted file mode 100644
index 4d493bdd73eb..000000000000
--- a/pkgs/tools/graphics/pywal/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, python3Packages, imagemagick, feh }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "pywal";
-  version = "3.2.1";
-
-  src = python3Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic";
-  };
-
-  # necessary for imagemagick to be found during tests
-  buildInputs = [ imagemagick ];
-
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ];
-
-  preCheck = ''
-    mkdir tmp
-    HOME=$PWD/tmp
-  '';
-
-  meta = with lib; {
-    description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3.";
-    homepage = https://github.com/dylanaraps/pywal;
-    license = licenses.mit;
-    maintainers = with maintainers; [ Fresheyeball ];
-  };
-}
diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix
index f18874e4f44a..00b04c2112f4 100644
--- a/pkgs/tools/misc/doitlive/default.nix
+++ b/pkgs/tools/misc/doitlive/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "doitlive";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0yabw2gqsjdivivlwsc2q7p3qq72cccx3xzfc1a4gd8d74f84nrw";
+    sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526";
   };
 
   propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ];
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index 1fa1531d1837..a37626c14dac 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -5,21 +5,22 @@
 
 stdenv.mkDerivation rec {
   name = "ip2unix-${version}";
-  version = "1.2.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
     rev = "v${version}";
-    sha256 = "0blrhcmska06ydkl15jjgblygkwrimdnbaq3hhifgmffymfk2652";
+    sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk";
   };
 
   nativeBuildInputs = [
     meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
     libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout
+    systemd
   ];
 
-  buildInputs = [ libyamlcpp systemd ];
+  buildInputs = [ libyamlcpp ];
 
   doCheck = true;
 
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 562f92121d66..116337e067ec 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-release-${version}";
-  version = "0.10.0";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
     rev = "${version}";
-    sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0";
+    sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc";
   };
 
-  cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5";
+  cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq";
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
   meta = with stdenv.lib; {
     description = ''Cargo subcommand "release": everything about releasing a rust crate'';
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index dd2340668c49..8fe8ac836ba9 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.12.1";
+  version = "3.12.2";
 
   src = fetchFromGitHub {
-    sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d";
+    sha256 = "021z0r6m5nyi37045ycjpw0lawvw70w4pjl56cj1mwz99pq1qqns";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";