Merge staging-next into staging

pkgs/applications/misc/gallery-dl/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7gslntYAjH2nSyVKjofC2utjpzQo3aNVD1w5StHk288=";
+    sha256 = "sha256-GBG42EH8Ux5ncLPo07rjyHyZnK8/+vd5BjACl4H+kwE=";
   };
 
   propagatedBuildInputs = [ requests yt-dlp ];

pkgs/applications/misc/mqtt-bench/default.nix

@@ -1,32 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
-
-buildGoPackage rec {
-  pname = "mqtt-bench";
-  version = "0.3.0";
-  rev = "v${version}";
-
-  goPackagePath = "github.com/takanorig/mqtt-bench";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "takanorig";
-    repo = "mqtt-bench";
-    sha256 = "03b9ak2j303iwq6abd7j10f2cs2ianwnbflwmyx9g96i7zd74f5m";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/takanorig/mqtt-bench/pull/13.patch";
-      name = "mqtt-paho-changes.patch";
-      sha256 = "17c8ajrp5dmbsasj6njxrlhy0x08b65fignzm3yccqbhb4ijcvha";
-    })
-  ];
-
-  goDeps = ./deps.nix;
-
-  meta = with lib; {
-    description = "Mosquitto benchmark tool";
-    homepage = "https://github.com/takanorig/mqtt-bench";
-    maintainers = with maintainers; [ disassembler ];
-  };
-}

pkgs/applications/misc/mqtt-bench/deps.nix

@@ -1,21 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/eclipse/paho.mqtt.golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eclipse/paho.mqtt.golang";
-      rev = "65f43bda5f7edbbf6b7533d3a5a13b2c67cf3545";
-      sha256 = "1ad136xf78br599ya43j45f8dycjip1k0hkplayy1slg8ckwrhdr";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "8351a756f30f1297fe94bbf4b767ec589c6ea6d0";
-      sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1";
-    };
-  }
-]

pkgs/applications/networking/ids/zeek/default.nix

@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "zeek";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchurl {
     url = "https://download.zeek.org/zeek-${version}.tar.gz";
-    sha256 = "sha256-axNImzBJTHxd2kU/xQmB5ZQ9ZxW2ybW3qFq7gLvm0RY=";
+    sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw=";
   };
 
   nativeBuildInputs = [

pkgs/applications/version-management/git-lfs/default.nix

@@ -1,43 +1,56 @@
-{ lib, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles, git, testers, git-lfs }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "git-lfs";
   version = "3.2.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
     owner = "git-lfs";
     repo = "git-lfs";
+    rev = "v${version}";
     sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=";
+    leaveDotGit = true;
   };
 
-  goPackagePath = "github.com/git-lfs/git-lfs";
+  vendorSha256 = null;
 
   nativeBuildInputs = [ ronn installShellFiles ];
 
-  ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/git-lfs/git-lfs/v${lib.versions.major version}/config.Vendor=${version}"
+  ];
 
   subPackages = [ "." ];
 
   preBuild = ''
-    pushd go/src/github.com/git-lfs/git-lfs
+    go generate ./commands
-      go generate ./commands
-    popd
   '';
 
   postBuild = ''
-    make -C go/src/${goPackagePath} man
+    make man
+  '';
+
+  checkInputs = [ git ];
+
+  preCheck = ''
+    unset subPackages
   '';
 
   postInstall = ''
-    installManPage go/src/${goPackagePath}/man/man*/*
+    installManPage man/man*/*
   '';
 
+  passthru.tests.version = testers.testVersion {
+    package = git-lfs;
+  };
+
   meta = with lib; {
     description = "Git extension for versioning large files";
-    homepage    = "https://git-lfs.github.com/";
+    homepage = "https://git-lfs.github.com/";
-    changelog   = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/git-lfs/git-lfs/raw/v${version}/CHANGELOG.md";
-    license     = [ licenses.mit ];
+    license = licenses.mit;
-    maintainers = [ maintainers.twey maintainers.marsam ];
+    maintainers = with maintainers; [ twey marsam ];
   };
 }

pkgs/development/libraries/avro-c++/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avro-c++";
-  version = "1.10.2";
+  version = "1.11.0";
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
-    sha256 = "1qv2wxh5q2iq48m5g3xci9p05znzcl0v3314bhcsyr5bkpdjvzs1";
+    sha256 = "sha256-73DKihz+7XAX3LLA7VkTdN6rFhuGvmyksxK8JMranFY=";
   };
 
   nativeBuildInputs = [ cmake python3 ];

pkgs/development/web/deno/default.nix

@@ -16,15 +16,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fJ4FTHsgtRIgm2MYqd09okvolXBqYfLQT1yBIG0Z7rA=";
+    sha256 = "sha256-HKuP3P7gBimzbhdEr2NwZNkp8hhkN7sJA9qRa0CDVew=";
   };
-  cargoSha256 = "sha256-8QB1kSLT2k9frPQJmwQB6mmf3Y1flTij7EQ9J5jQy24=";
+  cargoSha256 = "sha256-hxaqMcvwVeOSybqp10BzJOetVTwCx1mrUIP2H8WjCGw=";
 
   postPatch = ''
     # upstream uses lld on aarch64-darwin for faster builds

pkgs/servers/consul/default.nix

@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.12.1";
+  version = "1.12.2";
   rev = "v${version}";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "sha256-VSxgtsCPi3EdRWon3VBE9sC0lr5k5uDn/iMqrKAJeM0=";
+    sha256 = "sha256-X2vW6fnT5IY+YxGnAP5Flk610vIwLg3Qu/rEerFyNCw=";
   };
 
   passthru.tests.consul = nixosTests.consul;

pkgs/tools/filesystems/httm/default.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.10.15";
+  version = "0.10.16";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    sha256 = "u18dIw4At78OSeWCDHJIjzDbaxpiSs3g+bf2WClFkuY=";
+    sha256 = "09zdexeMu54Y/4HbieZ0EJLxhwCv7upRJxqVbqr2hUw=";
   };
 
-  cargoSha256 = "mLFponkRIEWePpSyhQK1IG/rnJ0qpDwrS7vwAoP1ro0=";
+  cargoSha256 = "SLEp88KwRg1RN78oX+fMYNR6ia9omrfH2bnJb+PrTAY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/misc/fluent-bit/default.nix

@@ -1,35 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd, openssl }:
+{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.8.11";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "sha256-DULXfkddBdCvTWkuWXjSTEujRZ3mVVzy//qeB3j0Vz8=";
+    sha256 = "sha256-CMkVIWaD4Zt6SJ/4PLGrFDhirqeLbXcVa+96wsAYN/k=";
   };
 
-  patches = lib.optionals stdenv.isDarwin [
-    # Fix compilations errors on darwin
-    (fetchpatch {
-      url = "https://github.com/calyptia/cmetrics/commit/4f0f7ae2eeec148a69156f9fcc05d64bf249d11e.patch";
-      sha256 = "sha256-M1+28mHxpMvcFkOoKxkMMo1VCQsG33ncFZkFalOq2FQ=";
-      stripLen = 1;
-      extraPrefix = "lib/cmetrics/";
-    })
-    (fetchpatch {
-      url = "https://github.com/calyptia/cmetrics/commit/a97999cb6d7299ef230d216b7a1c584b43c64de9.patch";
-      sha256 = "sha256-RuyPEeILc86n/klPIb334XpX0F71nskQ8s/ya0rE2zI=";
-      stripLen = 1;
-      extraPrefix = "lib/cmetrics/";
-    })
-
-    # Fix bundled luajit compilation args
-    ./fix-luajit-darwin.patch
-  ];
-
   nativeBuildInputs = [ cmake flex bison ];
 
   buildInputs = [ openssl ]

pkgs/tools/misc/fluent-bit/fix-luajit-darwin.patch

@@ -1,29 +0,0 @@
-diff -Naur fluent-bit.old/cmake/luajit.cmake fluent-bit.new/cmake/luajit.cmake
---- fluent-bit.old/cmake/luajit.cmake
-+++ fluent-bit.new/cmake/luajit.cmake
-@@ -12,15 +12,7 @@
- set(LUAJIT_DEST ${CMAKE_CURRENT_BINARY_DIR})
- 
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
--  set(CFLAGS "${CFLAGS} -isysroot ${CMAKE_OSX_SYSROOT} -fno-stack-check")
--  if (CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20
--      AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 21)
--    set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=11.0")
--  else()
--    set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=10.15")
--  endif()
--else()
--  set(DEPLOYMENT_TARGET "")
-+  set(CFLAGS "${CFLAGS} -fno-stack-check")
- endif()
- 
- # luajit (UNIX)
-@@ -30,7 +22,7 @@
-   EXCLUDE_FROM_ALL TRUE
-   SOURCE_DIR ${LUAJIT_SRC}
-   CONFIGURE_COMMAND ./configure
--  BUILD_COMMAND $(MAKE) CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC" ${DEPLOYMENT_TARGET}
-+  BUILD_COMMAND $(MAKE) DEFAULT_CC=cc CROSS=${CROSS_PREFIX} CFLAGS=${CFLAGS} BUILD_MODE=static "XCFLAGS=-fPIC"
-   INSTALL_COMMAND cp src/libluajit.a "${LUAJIT_DEST}/lib/libluajit.a")
- 
- # luajit (Windows)

pkgs/tools/misc/ntfy-sh/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ntfy-sh";
-  version = "1.24.0";
+  version = "1.25.2";
 
   src = fetchFromGitHub {
     owner = "binwiederhier";
     repo = "ntfy";
     rev = "v${version}";
-    sha256 = "sha256-Jw+8rgbevtk1Mzy/g+DryAk7a/RbQXpEtwPlqJRD/UM=";
+    sha256 = "sha256-xf0hk2GpBbjovZ1DIG6unnKQ297p8fjKZmgk/23IKdY=";
   };
 
-  vendorSha256 = "sha256-MdbC+Hv8jSImg0d2HMeAmUdWLQT8+zSe+0mkIwHIJXM=";
+  vendorSha256 = "sha256-ZZdGve6+g0bhE+iqemWl9XtLRfUn4V3hbdVz/UhrxCA=";
 
   doCheck = false;
 

pkgs/tools/misc/pls/default.nix

@@ -2,20 +2,21 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pls";
-  version = "5.0.0";
+  version = "5.1.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "dhruvkb";
     repo = "pls";
     rev = version;
-    sha256 = "sha256-9AY/xZhjowBRHRDevov677Ov4uJWxbVdB789KxA1dXQ=";
+    sha256 = "sha256-xJvAAlRVKQHEOz8wbErHCUTcb8Y1otcPEUwTw2lgddo=";
   };
 
   nativeBuildInputs = [ python3.pkgs.poetry-core ];
 
   propagatedBuildInputs = with python3.pkgs; [
     pyyaml
+    requests
     rich
   ];
 

pkgs/tools/misc/tmux/default.nix

@@ -1,11 +1,12 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
-, fetchpatch
 , autoreconfHook
-, pkg-config
 , bison
-, ncurses
 , libevent
+, ncurses
+, pkg-config
+, systemd
 , utf8proc
 }:
 
@@ -22,7 +23,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "tmux";
-  version = "3.2a";
+  version = "3.3";
 
   outputs = [ "out" "man" ];
 
@@ -30,17 +31,9 @@ stdenv.mkDerivation rec {
     owner = "tmux";
     repo = "tmux";
     rev = version;
-    sha256 = "0143ylfk7zsl3xmiasb768238gr582cfhsgv3p0h0f13bp8d6q09";
+    sha256 = "sha256-Sxj2vXkbbPNRrqJKeIYwI7xdBtwRbl6a6a3yZr7UWW0=";
   };
 
-  patches = [
-    # See https://github.com/tmux/tmux/pull/2755
-    (fetchpatch {
-      url = "https://github.com/tmux/tmux/commit/d0a2683120ec5a33163a14b0e1b39d208745968f.patch";
-      sha256 = "070knpncxfxi6k4q64jwi14ns5vm3606cf402h1c11cwnaa84n1g";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
@@ -50,12 +43,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     libevent
-  ] ++ lib.optionals stdenv.isDarwin [ utf8proc ];
+  ] ++ lib.optionals stdenv.isLinux [ systemd ]
+  ++ lib.optionals stdenv.isDarwin [ utf8proc ];
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-  ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ];
+  ] ++ lib.optionals stdenv.isLinux [ "--enable-systemd" ]
+  ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ];
 
   enableParallelBuilding = true;
 
@@ -67,24 +62,21 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://tmux.github.io/";
     description = "Terminal multiplexer";
-
+    longDescription = ''
-    longDescription =
+      tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
-      '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include:
+        * A powerful, consistent, well-documented and easily scriptable command interface.
-
+        * A window may be split horizontally and vertically into panes.
-          * A powerful, consistent, well-documented and easily scriptable command interface.
+        * Panes can be freely moved and resized, or arranged into preset layouts.
-          * A window may be split horizontally and vertically into panes.
+        * Support for UTF-8 and 256-colour terminals.
-          * Panes can be freely moved and resized, or arranged into preset layouts.
+        * Copy and paste with multiple buffers.
-          * Support for UTF-8 and 256-colour terminals.
+        * Interactive menus to select windows, sessions or clients.
-          * Copy and paste with multiple buffers.
+        * Change the current window by searching for text in the target.
-          * Interactive menus to select windows, sessions or clients.
+        * Terminal locking, manually or after a timeout.
-          * Change the current window by searching for text in the target.
+        * A clean, easily extended, BSD-licensed codebase, under active development.
-          * Terminal locking, manually or after a timeout.
+    '';
-          * A clean, easily extended, BSD-licensed codebase, under active development.
-      '';
     changelog = "https://github.com/tmux/tmux/raw/${version}/CHANGES";
     license = lib.licenses.bsd3;
-
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ thammers fpletz ];
+    maintainers = with lib.maintainers; [ thammers fpletz SuperSandro2000 ];
   };
 }

pkgs/tools/security/cosign/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cosign";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-9zA50tnUWR8dglPvMagiGcJDkPHs7yXuqYV2jnRdWqA=";
+    sha256 = "sha256-l+jM0GCjaqbaoIcjUgnIZJqSGIsirWMwJWPrilBdps8=";
   };
 
   buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config installShellFiles ];
 
-  vendorSha256 = "sha256-buOdutDZUFu+GbjyF0Ql8QAXpNEv2ej0mwjSZMHDmdA=";
+  vendorSha256 = "sha256-mZeCQOnAVZrJmi9F+y7QPPXXl48f7HAjJCmri01hYew=";
 
   subPackages = [
     "cmd/cosign"

pkgs/tools/security/pinentry-bemenu/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pinentry-bemenu";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "t-8ch";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2Q8hN7AbuGqm7pfNHlJlSi1Op/OpJBun/AIDhUDnGvU=";
+    sha256 = "sha256-jt7G/OuXqJdnkW7sMNH0o+CI3noDK6EcbOLXq0JoDTk=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config ];

pkgs/top-level/aliases.nix

@@ -867,6 +867,7 @@ mapAliases ({
   mpc_cli = mpc-cli; # moved from top-level 2022-01-24
   mpd_clientlib = libmpdclient; # Added 2021-02-11
   mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22
+  mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
   msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22
   multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
   mumble_git = pkgs.mumble; # Added 2019-08-01

pkgs/top-level/all-packages.nix

@@ -19662,8 +19662,6 @@ with pkgs;
 
   mpeg2dec = libmpeg2;
 
-  mqtt-bench = callPackage ../applications/misc/mqtt-bench {};
-
   mqttui = callPackage ../tools/networking/mqttui {
     inherit (darwin.apple_sdk.frameworks) Security;
   };