Merge staging-next into staging

nixos/modules/services/networking/gnunet.nix

@@ -155,7 +155,7 @@ in
       description = "GNUnet";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      restartTriggers = [ configFile ];
+      restartTriggers = [ config.environment.etc."gnunet.conf".source ];
       path = [ cfg.package pkgs.miniupnpc ];
       serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf";
       serviceConfig.User = "gnunet";

nixos/tests/lvm2/default.nix

@@ -2,7 +2,7 @@
 , config ? { }
 , pkgs ? import ../../.. { inherit system config; }
 , lib ? pkgs.lib
-, kernelVersionsToTest ? [ "4.19" "5.4" "5.10" "5.15" "latest" ]
+, kernelVersionsToTest ? [ "4.19" "5.4" "5.10" "5.15" "6.1" "latest" ]
 }:
 
 # For quickly running a test, the nixosTests.lvm2.lvm-thinpool-linux-latest attribute is recommended

nixos/tests/lvm2/thinpool.nix

@@ -1,5 +1,5 @@
 { kernelPackages ? null }:
-import ../make-test-python.nix ({ pkgs, ... }: {
+import ../make-test-python.nix ({ pkgs, lib, ... }: {
   name = "lvm2-thinpool";
   meta.maintainers = with pkgs.lib.maintainers; [ ajs124 ];
 
@@ -17,11 +17,13 @@ import ../make-test-python.nix ({ pkgs, ... }: {
     boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
   };
 
-  testScript = ''
+  testScript = let
+    mkXfsFlags = lib.optionalString (lib.versionOlder kernelPackages.kernel.version "5.10") "-m bigtime=0 -m inobtcount=0";
+  in ''
     machine.succeed("vgcreate test_vg /dev/vdb")
     machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool")
     machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg")
-    machine.succeed("mkfs.xfs /dev/test_vg/test_lv")
+    machine.succeed("mkfs.xfs ${mkXfsFlags} /dev/test_vg/test_lv")
     machine.succeed("mkdir /mnt; mount /dev/test_vg/test_lv /mnt")
     assert "/dev/mapper/test_vg-test_lv" == machine.succeed("findmnt -no SOURCE /mnt").strip()
     machine.succeed("dd if=/dev/zero of=/mnt/empty.file bs=1M count=1024")

pkgs/applications/audio/brutefir/default.nix

@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchurl, alsa-lib, fftw, fftwFloat, flex, libjack2 }:
+
+stdenv.mkDerivation rec {
+  pname = "brutefir";
+  version = "1.0o";
+
+  src = fetchurl {
+    url = "https://torger.se/anders/files/brutefir-${version}.tar.gz";
+    sha256 = "caae4a933b53b55b29d6cb7e2803e20819f31def6d0e4e12f9a48351e6dbbe9f";
+  };
+
+  nativeBuildInputs = [ flex ];
+
+  buildInputs = [
+    alsa-lib
+    fftw
+    fftwFloat
+    libjack2
+  ];
+
+  postPatch = "substituteInPlace bfconf.c --replace /usr/local $out";
+
+  installFlags = [ "INSTALL_PREFIX=$(out)" ];
+
+  meta = with lib; {
+    homepage = "https://torger.se/anders/brutefir.html";
+    description = "A software convolution engine";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ auchter ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -3,10 +3,10 @@
 {
   firefox = buildMozillaMach rec {
     pname = "firefox";
-    version = "114.0";
+    version = "114.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "c6929d34583f25119738d1c817a24fd358fcada1f0ba5c14bab07c2acd35f18a012f23d054bfe8c6b12c0dda7bd3abdc7a305a36c7a4d36542885abeea3aafec";
+      sha512 = "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f";
     };
 
     meta = {

pkgs/applications/networking/netmaker/default.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "netmaker";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "gravitl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pzU9MiUL5M7EkGIXjZ0VqJmk4qOlbgCLCg84iPIXG70=";
+    hash = "sha256-1h/UQXaLcc962IMw9Vt79GR0qx1rYcmy5E+duisi0ck=";
   };
 
-  vendorHash = "sha256-euqQztEUEejCWy7WqtzMEIZrBDZpD/6dqnFsYhXajdE=";
+  vendorHash = "sha256-0iByCr//nOaEjfGT2alxZpzSl57x2GxXAOIiza4gnGQ=";
 
   inherit subPackages;
 

pkgs/development/interpreters/python/default.nix

@@ -57,10 +57,10 @@ in {
     sourceVersion = {
       major = "3";
       minor = "8";
-      patch = "16";
+      patch = "17";
       suffix = "";
     };
-    hash = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI=";
+    hash = "sha256-LlSwxoGR8WVS9t4ul6I5ZUBXKiGfa7soWRoTfOzEkKk=";
     inherit (darwin) configd;
     inherit passthruFun;
   };
@@ -70,10 +70,10 @@ in {
     sourceVersion = {
       major = "3";
       minor = "9";
-      patch = "16";
+      patch = "17";
       suffix = "";
     };
-    hash = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk=";
+    hash = "sha256-MM4FfETyg/jtk2Bsy9uNUd1Sa9xMYszl4Nwhe/o+jO4=";
     inherit (darwin) configd;
     inherit passthruFun;
   };
@@ -96,9 +96,9 @@ in {
       major = "3";
       minor = "12";
       patch = "0";
-      suffix = "b1";
+      suffix = "b2";
     };
-    hash = "sha256-i6dspkrNdFur37hGeCCWTfmIWO5qlXe/HZNEcle+WB4=";
+    hash = "sha256-jfxC3abk0GR8+Kb3zZAHBN6p/YZkAqKCgpvS5uJxuBg=";
     inherit (darwin) configd;
     inherit passthruFun;
   };

pkgs/development/python-modules/pdm-backend/default.nix

@@ -15,16 +15,18 @@
 
 buildPythonPackage rec {
   pname = "pdm-backend";
-  version = "2.0.7";
+  version = "2.1.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-backend";
     rev = "refs/tags/${version}";
-    hash = "sha256-+d5EkpF9rZksoR5lahN7XE/jAQpNz7IjWueFYPPGyQs=";
+    hash = "sha256-asW5L9jS++9ovq7WFh0rU7aB7R2rwi5ce80Hxk9NrI4=";
   };
 
+  env.PDM_BUILD_SCM_VERSION = version;
+
   propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
     importlib-metadata
   ];
@@ -40,6 +42,10 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  preCheck = ''
+    unset PDM_BUILD_SCM_VERSION
+  '';
+
   setupHook = ./setup-hook.sh;
 
   meta = with lib; {

pkgs/development/tools/build-managers/sbt/default.nix

@@ -6,13 +6,13 @@
 , zlib
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sbt";
-  version = "1.8.3";
+  version = "1.9.0";
 
   src = fetchurl {
-    url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
-    sha256 = "sha256-IfQhB4b9aP0V3KP0yO6crg2yScVOGw726Cnp+kk2Qjo=";
+    url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
+    hash = "sha256-zFWTSOr5z75s4i9omx5EDI4FtOSc1r6jmHZHd7N5SMQ=";
   };
 
   postPatch = ''
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nequissimus ];
     platforms = platforms.unix;
   };
-}
+})

pkgs/development/tools/earthly/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "earthly";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "earthly";
     repo = "earthly";
     rev = "v${version}";
-    sha256 = "sha256-tYoC9OCNAtdQwWyznac5PVl7KLObbFfjs138y5LeQ2A=";
+    sha256 = "sha256-zLv0wuAM6d84Z2jCf89KDIIqX+Hiiw40g3DnTZxVTYY=";
   };
 
-  vendorSha256 = "sha256-1y34WH1JGAs1eDxreHMqUlGTyrixUFIV1DPN/N5wzS4=";
+  vendorHash = "sha256-NUm+vkJsT78pxrPqwDofPlrc6jQMTFjsRF7uPUPhDGQ=";
   subPackages = [ "cmd/earthly" "cmd/debugger" ];
 
   CGO_ENABLED = 0;

pkgs/development/tools/go-callvis/default.nix

@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "go-callvis";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "ofabry";
+    repo = "go-callvis";
+    rev = "v${version}";
+    hash = "sha256-PIzmnqlK+uFtzZW4H0xpP5c+X30hFvOjQydvreJn4xM=";
+  };
+
+  vendorHash = "sha256-AfbUxA5C5dH70+vqC+1RGaTt7S0FL9CBcxel0ifmHKs=";
+
+  ldflags = [ "-s" "-w" ];
+
+  # Build errors in github.com/goccy/go-graphviz/internal/ccall when format hardening is enabled:
+  #   cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
+  hardeningDisable = [ "format" ];
+
+  meta = with lib; {
+    description = "Visualize call graph of a Go program using Graphviz";
+    homepage = "https://github.com/ofabry/go-callvis";
+    license = licenses.mit;
+    maintainers = with maintainers; [ meain ];
+  };
+}

pkgs/development/tools/zprint/default.nix

@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "zprint";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchurl {
     url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
-    sha256 = "sha256-mzhl7boAMKZ5bj184LLCWR/faDjJI+crX4Vzbh7eosY=";
+    sha256 = "sha256-C2WEzF7Xl37/LDlk6f77/WcWNadE0zAfzxEw+RTRGto=";
   };
 
   extraNativeImageBuildArgs = [

pkgs/development/web/nodejs/v20.nix

@@ -9,8 +9,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.2.0";
-  sha256 = "sha256-IlI98jFsNVaXFP8fabBTwuKGztRgiYQX3uRpRe/N+Yk=";
+  version = "20.3.0";
+  sha256 = "sha256-G6jUlCPtOnVykGa7PqJkk+6ct9ZWjvlIWX/J70VPdDU=";
   patches = [
     ./revert-arm64-pointer-auth.patch
     ./disable-darwin-v8-system-instrumentation-node19.patch

pkgs/tools/admin/acme-sh/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "acme.sh";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner = "acmesh-official";
     repo = "acme.sh";
     rev = "refs/tags/${version}";
-    hash = "sha256-IDhJRIsk+a+tP+ZeNm6nGvkDh54M0uvAMnSWHbCF3E8=";
+    hash = "sha256-4Chqdr4a9+T+/o1vCPY5xMREoYl0HxY3OlGRD86ulGs=";
   };
 
   nativeBuildInputs = [

pkgs/tools/admin/ansible/lint.nix

@@ -6,12 +6,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ansible-lint";
-  version = "6.16.1";
+  version = "6.17.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Hyt5Y3n4bi3Ffxv+QoikbJdqHUBtYiHuRuOsgwf3PKM=";
+    hash = "sha256-xtoS6ett1YIjsKSEAKqiXmd69srD2dtB+xtiAG3euzY=";
   };
 
   postPatch = ''
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     # https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in
     ansible-core
+    ansible-compat
     black
     filelock
     jsonschema

pkgs/tools/misc/ical2orgpy/default.nix

@@ -1,10 +1,10 @@
-{ lib, python3Packages, ... }:
+{ lib, python3Packages, fetchPypi, ... }:
 
 python3Packages.buildPythonPackage rec {
   pname = "ical2orgpy";
   version = "0.4.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-7/kWW1oTSJXPJtN02uIDrFdNJ9ExKRUa3tUNA0oJSoc=";
   };

pkgs/tools/misc/opentelemetry-collector/default.nix

@@ -5,17 +5,17 @@
 
 buildGoModule rec {
   pname = "opentelemetry-collector";
-  version = "0.78.2";
+  version = "0.79.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "v${version}";
-    hash = "sha256-zYKm5P+o59F1g5kCMirCEW0X5FrOwMdIRw64CMbUsAg=";
+    hash = "sha256-OTddX0hTrcxvU1XI5DSXOYPhVrn3dJ9Ryvr/wf1AHQ0=";
   };
   # there is a nested go.mod
   sourceRoot = "source/cmd/otelcorecol";
-  vendorHash = "sha256-7rnj3hIdp12CMva0zxWzkTi+a4N1uBIbG6BBaKjzH+4=";
+  vendorHash = "sha256-Efsgogk3C7oroniRPrl5GwTogBk7lT0XPkbz0ygJh48=";
 
   # upstream strongly recommends disabling CGO
   # additionally dependencies have had issues when GCO was enabled that weren't caught upstream

pkgs/tools/networking/mailctl/default.nix

@@ -0,0 +1,85 @@
+{ mkDerivation
+, fetchFromSourcehut
+, aeson
+, base
+, bytestring
+, containers
+, directory
+, hsyslog
+, http-conduit
+, lib
+, network-uri
+, optparse-applicative
+, pretty-simple
+, process
+, template-haskell
+, text
+, time
+, twain
+, utf8-string
+, warp
+, yaml
+}:
+mkDerivation rec {
+  pname = "mailctl";
+  version = "0.8.8";
+
+  src = fetchFromSourcehut {
+    owner = "~petrus";
+    repo = "mailctl";
+    rev = version;
+    hash = "sha256-aFt6y2DzreROLcOLU8ynnSSVQW840T5wFqSRdSODQX4=";
+  };
+
+  isLibrary = true;
+  isExecutable = true;
+
+  libraryHaskellDepends = [
+    aeson
+    base
+    bytestring
+    containers
+    directory
+    hsyslog
+    http-conduit
+    network-uri
+    optparse-applicative
+    pretty-simple
+    process
+    template-haskell
+    text
+    time
+    twain
+    utf8-string
+    warp
+    yaml
+  ];
+
+  executableHaskellDepends = [
+    aeson
+    base
+    bytestring
+    containers
+    directory
+    hsyslog
+    http-conduit
+    network-uri
+    optparse-applicative
+    pretty-simple
+    process
+    template-haskell
+    text
+    time
+    twain
+    utf8-string
+    warp
+    yaml
+  ];
+
+  description = "OAuth2 tool for mail clients";
+  homepage = "https://sr.ht/~petrus/mailctl/";
+  changelog = "https://git.sr.ht/~petrus/mailctl/refs/${version}";
+  license = lib.licenses.bsd3;
+  maintainers = with lib.maintainers; [ aidalgol ];
+  mainProgram = "mailctl";
+}

pkgs/tools/security/s5/default.nix

@@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "s5";
+  version = "0.1.12";
+
+  src = fetchFromGitHub {
+    owner = "mvisonneau";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "003l4v7d671rvw7q32fxhxv3qazw6v8v9ch7hmyy9lvwkc7x6dlm";
+  };
+
+  subPackages = [ "cmd/${pname}" ];
+
+  ldflags = [
+    "-X main.version=v${version}"
+  ];
+
+  vendorSha256 = "TrCIUeY0B+BsWNaUkDTEgrEaWfJKnID2mafj3ink+i8=";
+  doCheck = true;
+
+  meta = with lib; {
+    description = "cipher/decipher text within a file";
+    homepage = "https://github.com/mvisonneau/s5";
+    license = licenses.asl20;
+    platforms = platforms.unix ++ platforms.darwin;
+    maintainers = with maintainers; [ mvisonneau ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2376,6 +2376,9 @@ with pkgs;
 
   mainsail = callPackage ../applications/misc/mainsail { };
 
+  # Does not build with default Haskell version because upstream uses a newer Cabal version.
+  mailctl = haskell.packages.ghc94.callPackage ../tools/networking/mailctl { };
+
   mame = libsForQt5.callPackage ../applications/emulators/mame { };
 
   mame-tools = lib.addMetaAttrs {
@@ -12164,6 +12167,8 @@ with pkgs;
 
   s4cmd = callPackage ../tools/networking/s4cmd { };
 
+  s5 = callPackage ../tools/security/s5 { };
+
   s5cmd = callPackage ../tools/networking/s5cmd { };
 
   sacad = callPackage ../tools/misc/sacad { };
@@ -27439,6 +27444,8 @@ with pkgs;
 
   goconvey = callPackage ../development/tools/goconvey { };
 
+  go-callvis = callPackage ../development/tools/go-callvis { };
+
   gofumpt = callPackage ../development/tools/gofumpt { };
 
   gotags = callPackage ../development/tools/gotags { };
@@ -29516,6 +29523,8 @@ with pkgs;
 
   blocky = callPackage ../applications/networking/blocky { };
 
+  brutefir = callPackage ../applications/audio/brutefir { };
+
   cadence = libsForQt5.callPackage ../applications/audio/cadence { };
 
   cheesecutter = callPackage ../applications/audio/cheesecutter { };