Merge master into staging-next

2020-11-16 09:01:53 +01:00
parent da6239dab3 300846f3c9
commit 986c2d36da
169 changed files with 2938 additions and 1614 deletions
--- a/pkgs/tools/X11/hsetroot/default.nix
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -1,36 +1,40 @@
-{ stdenv, fetchurl, autoconf, automake, imlib2, libtool, libX11, pkgconfig, xorgproto }:
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+, imlib2
+, libX11
+, libXinerama
+}:

 stdenv.mkDerivation rec {
  pname = "hsetroot";
-  version = "1.0.2";
+  version = "1.0.5";

-  # The primary download site seems to no longer exist; use Gentoo's mirror for now.
-  src = fetchurl {
-    url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-${version}.tar.gz";
-    sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7";
+  src = fetchFromGitHub {
+    owner = "himdel";
+    repo = "hsetroot";
+    rev = version;
+    sha256 = "1jbk5hlxm48zmjzkaq5946s58rqwg1v1ds2sdyd2ba029hmvr722";
  };

-  # See https://bugs.gentoo.org/show_bug.cgi?id=504056
-  underlinkingPatch = fetchurl {
-    url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch";
-    name = "hsetroot-1.0.2-underlinking.patch";
-    sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x";
-  };
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    imlib2
+    libX11
+    libXinerama
+  ];

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake imlib2 libtool libX11 xorgproto ];
+  makeFlags = [ "PREFIX=$(out)" ];

-  patches = [ underlinkingPatch ];
-
-  patchFlags = [ "-p0" ];
-
-  preConfigure = "./autogen.sh";
+  preInstall = ''
+    mkdir -p "$out/bin"
+  '';

  meta = with stdenv.lib; {
    description = "Allows you to compose wallpapers ('root pixmaps') for X";
-    homepage = "https://thegraveyard.org/hsetroot.html";
+    homepage = "https://github.com/himdel/hsetroot";
    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.henrytill ];
+    maintainers = with maintainers; [ henrytill shamilton ];
    platforms = platforms.unix;
  };
 }
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/pkgs/tools/admin/awsweeper/default.nix
@@ -1,29 +1,25 @@
-{ lib, buildGoModule, fetchurl, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:

 buildGoModule rec {
  pname = "awsweeper";
-  version = "0.7.0";
-
-  # Requires go generate to be run with mockgen, but doesn't check in the results.
-  patches = fetchurl {
-    url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch";
-    sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl";
-  };
+  version = "0.10.2";

  src = fetchFromGitHub {
-    owner = "cloudetc";
+    owner = "jckuester";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28";
+    sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5";
  };

-  vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp";
+  vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ];

  doCheck = false;

  meta = with lib; {
    description = "A tool to clean out your AWS account";
-    homepage = "https://github.com/cloudetc/awsweeper/";
+    homepage = "https://github.com/jckuester/awsweeper";
    license = licenses.mpl20;
    maintainers = [ maintainers.marsam ];
  };
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -18,13 +18,13 @@ let
 in
 buildGoPackage rec {
  pname = "lxd";
-  version = "4.7";
+  version = "4.8";

  goPackagePath = "github.com/lxc/lxd";

  src = fetchurl {
    url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1v95cnbs54gzyhzflwb8x0ykja202nll5p48l2nra7cpdsk4a5q1";
+    sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy";
  };

  postPatch = ''
--- a/pkgs/tools/archivers/arc_unpacker/default.nix
+++ b/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, boost, libpng, libjpeg, zlib
+, openssl, libwebp, catch }:
+
+stdenv.mkDerivation rec {
+  pname = "arc_unpacker-unstable";
+  version = "2019-01-28";
+
+  src = fetchFromGitHub {
+    owner = "vn-tools";
+    repo = "arc_unpacker";
+    # Since the latest release (0.11) doesn't build, we've opened an upstream
+    # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
+    # a new release is upcoming
+    rev = "b9843a13e2b67a618020fc12918aa8d7697ddfd5";
+    sha256 = "0wpl30569cip3im40p3n22s11x0172a3axnzwmax62aqlf8kdy14";
+  };
+
+  nativeBuildInputs = [ cmake makeWrapper catch ];
+  buildInputs = [ boost libpng libjpeg zlib openssl libwebp ];
+
+  postPatch = ''
+    cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h
+  '';
+
+  checkPhase = ''
+    pushd ..
+    ./build/run_tests
+    popd
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker
+    cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker
+    cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker
+    cp -r ../etc $out/libexec/arc_unpacker
+    makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A tool to extract files from visual novel archives";
+    homepage = "https://github.com/vn-tools/arc_unpacker";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ midchildan ];
+  };
+}
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -8,12 +8,12 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  version = "2.6.12";
+  version = "2.6.13";
  pname = "dar";

  src = fetchurl {
    url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
-    sha256 = "0jwgaim2p93skdpjwiz5qgibd3j9965ycqn47wrrjlcvzk93mvyk";
+    sha256 = "15yhpzyzw7h7d74xxh104cnbh19639yxx0502xz85fazwpwrzsiz";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "wal-g";
-  version = "0.2.17";
+  version = "0.2.18";

  src = fetchFromGitHub {
    owner = "wal-g";
    repo = "wal-g";
    rev = "v${version}";
-    sha256 = "0r6vy2b3xqwa22286srwngk63sq4aza6aj7brwc130vypcps7svp";
+    sha256 = "1clsh42sgfrzyg3vr215wrpi93cb8y8ky3cb1v2l6cs4psh3py1q";
  };

-  vendorSha256 = "0r73l4kxzldca1vg5mshq6iqsxcrndcbmbp3d7i9pxyb2kig8gv5";
+  vendorSha256 = "1ax8niw4zfwvh5ikxnkbsjc9fdz1lziqlwig9nwrhzfp45ysbakh";

  buildInputs = [ brotli ];

--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
    ethon (0.12.0)
      ffi (>= 1.3.0)
    ffi (1.13.1)
-    html-proofer (3.16.0)
+    html-proofer (3.17.0)
      addressable (~> 2.3)
      mercenary (~> 0.3)
      nokogumbo (~> 2.0)
@@ -20,7 +20,7 @@ GEM
      mini_portile2 (~> 2.4.0)
    nokogumbo (2.0.2)
      nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.19.2)
+    parallel (1.20.0)
    public_suffix (4.0.6)
    rainbow (3.0.0)
    typhoeus (1.4.0)
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "18s8l3nys0lvdkqpfg3c1rd84c5j4dmlx503wnksw9skbzn7l93m";
+      sha256 = "0vjy9r9lwr0rfxxadj4rfkl94b2rz6avgq4h54g6b7x1jmx6b3sd";
      type = "gem";
    };
-    version = "3.16.0";
+    version = "3.17.0";
  };
  mercenary = {
    groups = ["default"];
@@ -89,10 +89,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
+      sha256 = "1wci3dimgrap91nw5vnq4qa2vfmxga27m6sfmn8caskhzwxwv1dg";
      type = "gem";
    };
-    version = "1.19.2";
+    version = "1.20.0";
  };
  public_suffix = {
    groups = ["default"];
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -2,13 +2,13 @@

 buildGoPackage rec {
  pname = "lazydocker";
-  version = "0.9";
+  version = "0.10";

  src = fetchFromGitHub {
    owner = "jesseduffield";
    repo = "lazydocker";
    rev = "v${version}";
-    sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy";
+    sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8";
  };

  goPackagePath = "github.com/jesseduffield/lazydocker";
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, python3 }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, python3
+}:

 stdenv.mkDerivation rec {
  version = "1.5";
@@ -9,7 +13,26 @@ stdenv.mkDerivation rec {
    sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
  };

-  buildInputs = [ python3 ];
+  buildInputs = [
+    (python3.withPackages (p: [ p.distro ]))
+  ];
+
+  patchFlags = [ "-p0" ];
+
+  patches = [
+    # Required to allow pastebinit 1.5 to run on Python 3.8
+    (fetchpatch {
+      name = "use-distro-module.patch";
+      url = "https://bazaar.launchpad.net/~arnouten/pastebinit/python38/diff/264?context=3";
+      sha256 = "1gp5inp4xald65xbb7fc5aqq5s2fhw464niwjjja9anqyp3zhawj";
+    })
+    # Required because pastebin.com now redirects http requests to https
+    (fetchpatch {
+      name = "pastebin-com-https.patch";
+      url = "https://bazaar.launchpad.net/~arnouten/pastebinit/pastebin-com-https/diff/264?context=3";
+      sha256 = "0hxhhfcai0mll8qfyhdl3slmbf34ynb759b648x63274m9nd2kji";
+    })
+  ];

  installPhase = ''
    mkdir -p $out/bin
@@ -22,7 +45,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    homepage = "https://launchpad.net/pastebinit";
    description = "A software that lets you send anything you want directly to a pastebin from the command line";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = with maintainers; [ lethalman raboof ];
    license = licenses.gpl2;
    platforms = platforms.linux;
  };
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,7 +1,7 @@
 { useLua ? !stdenv.isDarwin
 , usePcre ? true
 , withPrometheusExporter ? true
-, stdenv, lib, fetchurl
+, stdenv, lib, fetchurl, nixosTests
 , openssl, zlib
 , lua5_3 ? null, pcre ? null, systemd ? null
 }:
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;

 stdenv.mkDerivation rec {
  pname = "haproxy";
-  version = "2.2.4";
+  version = "2.3.0";

  src = fetchurl {
    url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "1qhvaixns0xgxgd095kvqid0pi6jxsld9ghvnr60khwdzzadk947";
+    sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8";
  };

  buildInputs = [ openssl zlib ]
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  passthru.tests.haproxy = nixosTests.haproxy;
+
  meta = with lib; {
    description = "Reliable, high performance TCP/HTTP load balancer";
    longDescription = ''
--- a/pkgs/tools/networking/wavemon/default.nix
+++ b/pkgs/tools/networking/wavemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:

 stdenv.mkDerivation rec {
-  version = "0.9.1";
+  version = "0.9.2";
  baseName = "wavemon";
  name = "${baseName}-${version}";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    owner = "uoaerg";
    repo = "wavemon";
    rev = "v${version}";
-    sha256 = "109ycwnjjqc2vpnd8b86njfifczlxglnyv4rh2qmbn2i5nw2wryg";
+    sha256 = "0y984wm03lzqf7bk06a07mw7d1fzjsp9x7zxcvlx4xqmv7wlgb29";
  };

  meta = with stdenv.lib; {