Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

13 files changed, 90 insertions, 42 deletions

diff --git a/nixpkgs/pkgs/misc/ananicy-cpp/default.nix b/nixpkgs/pkgs/misc/ananicy-cpp/default.nix
index e8679c9cb578..6d21f219c463 100644
--- a/nixpkgs/pkgs/misc/ananicy-cpp/default.nix
+++ b/nixpkgs/pkgs/misc/ananicy-cpp/default.nix
@@ -14,14 +14,14 @@
 
 clangStdenv.mkDerivation rec {
   pname = "ananicy-cpp";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ananicy-cpp";
     repo = "ananicy-cpp";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-BomtP9KcipBJuZjra/ojRyJi+pgktxGGEdt86N1H9Hc=";
+    sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
   };
 
   strictDeps = true;
diff --git a/nixpkgs/pkgs/misc/calaos/installer/default.nix b/nixpkgs/pkgs/misc/calaos/installer/default.nix
index 575471b2ee51..7b24ddb94d9d 100644
--- a/nixpkgs/pkgs/misc/calaos/installer/default.nix
+++ b/nixpkgs/pkgs/misc/calaos/installer/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "calaos_installer";
-  version = "3.5";
+  version = "3.11";
 
   src = fetchFromGitHub {
     owner = "calaos";
     repo = "calaos_installer";
     rev = "v${version}";
-    sha256 = "hx7XVF2iueKFR67U0EvSK1vYZnJBnuOpUOkSjx7h1XY=";
+    sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
   };
 
   nativeBuildInputs = [ qmake qttools ];
diff --git a/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix b/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix
index de98f607d011..cb8156b0a0a9 100644
--- a/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix
+++ b/nixpkgs/pkgs/misc/cups/drivers/foomatic-db/default.nix
@@ -13,15 +13,15 @@
 
 stdenv.mkDerivation rec {
   pname = "foomatic-db";
-  version = "unstable-2023-08-02";
+  version = "unstable-2023-09-02";
 
   src = fetchFromGitHub {
     # there is also a daily snapshot at the `downloadPage`,
     # but it gets deleted quickly and would provoke 404 errors
     owner = "OpenPrinting";
     repo = "foomatic-db";
-    rev = "a6e32fa657f3598dc87c650a9fa9cfa38dda6a60";
-    hash = "sha256-lEnog9Klxny6oEm/l2HDlI0DY5aIdPjHhWCBex2vp9Y=";
+    rev = "4e6ab90da63afddee33d80115acb44149d2d292b";
+    hash = "sha256-wtDGJUyViiCenCY4zvr0Ia4ecZpoDsDSWwlYYs3YMT8=";
   };
 
   buildInputs = [ cups cups-filters ghostscript gnused perl ];
diff --git a/nixpkgs/pkgs/misc/fastly/default.nix b/nixpkgs/pkgs/misc/fastly/default.nix
index 19089c59af77..498394cda0ce 100644
--- a/nixpkgs/pkgs/misc/fastly/default.nix
+++ b/nixpkgs/pkgs/misc/fastly/default.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "10.3.0";
+  version = "10.4.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UkhcSRVABgZs9/G5r6ZMLfFPZMeXE8atR5+HNG5y3tk=";
+    hash = "sha256-NEbQ4GoZXnFes6jvqKDg4T8eDAHHEYytJ7W7qeZSCmE=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
@@ -33,7 +33,7 @@ buildGoModule rec {
     "cmd/fastly"
   ];
 
-  vendorHash = "sha256-IimrJZLaSkwWsqoVmNRyLhcME4y1YKw5xLayKxRj5lw=";
+  vendorHash = "sha256-mpN4YCiuL2jrZ4r/YOUhQSOBlGGHndQyrB9GT5mTAyI=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix
index 21ed258e2be7..07d0a4dd2363 100644
--- a/nixpkgs/pkgs/misc/jackaudio/default.nix
+++ b/nixpkgs/pkgs/misc/jackaudio/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper
 , libsamplerate, libsndfile, readline, eigen, celt
-, wafHook
+, waf
 # Darwin Dependencies
 , aften, AudioUnit, CoreAudio, libobjc, Accelerate
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkg-config python makeWrapper wafHook ];
+  nativeBuildInputs = [ pkg-config python makeWrapper waf.hook ];
   buildInputs = [ libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ] ++ lib.optionals stdenv.isDarwin [
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = (if libOnly then ''
     rm -rf $out/{bin,share}
     rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
-  '' else ''
+  '' else lib.optionalString (optDbus != null) ''
     wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
   '');
 
diff --git a/nixpkgs/pkgs/misc/jackaudio/tools.nix b/nixpkgs/pkgs/misc/jackaudio/tools.nix
new file mode 100644
index 000000000000..1e3a74e6f6ee
--- /dev/null
+++ b/nixpkgs/pkgs/misc/jackaudio/tools.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, lib
+
+, fetchFromGitHub
+
+, pkg-config
+, meson
+, ninja
+
+, jack
+, alsa-lib
+, libopus
+, libsamplerate
+, libsndfile
+, readline
+, zita-alsa-pcmi
+, zita-resampler
+}:
+
+stdenv.mkDerivation (final: {
+  pname = "jack-example-tools";
+  version = "4";
+
+  src = fetchFromGitHub {
+    owner = "jackaudio";
+    repo = "jack-example-tools";
+    rev = "tags/${final.version}";
+    hash = "sha256-5jmynNxwNVLxEZ1MaqQUG6kRwipDkjhrdDCbZHtmAHk=";
+  };
+
+  nativeBuildInputs = [ pkg-config meson ninja ];
+  buildInputs = [
+    jack
+    alsa-lib
+    libopus
+    libsamplerate
+    libsndfile
+    readline
+    zita-alsa-pcmi
+    zita-resampler
+  ];
+
+  postPatch = ''
+    patchShebangs scripts
+  '';
+
+  # no tests defined, but prepare for some in the future.
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Official examples and tools from the JACK project";
+    homepage = "https://jackaudio.org";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
+    maintainers = with maintainers; [ pennae ];
+  };
+})
diff --git a/nixpkgs/pkgs/misc/lilypond/unstable.nix b/nixpkgs/pkgs/misc/lilypond/unstable.nix
index ff016344c7a4..11e91ddb377c 100644
--- a/nixpkgs/pkgs/misc/lilypond/unstable.nix
+++ b/nixpkgs/pkgs/misc/lilypond/unstable.nix
@@ -1,10 +1,10 @@
 { lib, fetchurl, lilypond }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.6";
+  version = "2.25.7";
   src = fetchurl {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    sha256 = "sha256-auDkASJQgq4+Yc6jFvJ8rUvVRMn6ndr2Cd6yzK75irk=";
+    sha256 = "sha256-b7prbe4lnUfiLGcmWbrjXTTXqJTX4PsAMBbSvZgHLwI=";
   };
 
   passthru.updateScript = {
diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix
index 5db0b9b705fc..1c9ee8c1af0a 100644
--- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix
@@ -26,13 +26,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "betterlockscreen";
-  version = "4.0.4";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "pavanjadhaw";
     repo = "betterlockscreen";
     rev = "v${version}";
-    sha256 = "sha256-ZZnwByxfESE8ZOOh1vnbphUHDolo9MIQh3erjtBLmWQ=";
+    sha256 = "sha256-e/NyUxrN18+x2zt+JzqVA00P8VdHo8oj9Bx09XKI+Eg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix b/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix
index ec7e8f4e7e5c..88b4b6b795f3 100644
--- a/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/nixpkgs/pkgs/misc/screensavers/xss-lock/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Use external locker (such as i3lock) as X screen saver";
     license = licenses.mit;
+    mainProgram = "xss-lock";
     maintainers = with maintainers; [ malyn offline ];
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/misc/uboot/default.nix b/nixpkgs/pkgs/misc/uboot/default.nix
index ce4e18b656ad..9ac761601270 100644
--- a/nixpkgs/pkgs/misc/uboot/default.nix
+++ b/nixpkgs/pkgs/misc/uboot/default.nix
@@ -8,6 +8,7 @@
 , fetchurl
 , flex
 , gnutls
+, installShellFiles
 , libuuid
 , meson-tools
 , ncurses
@@ -61,6 +62,7 @@ let
       bison
       dtc
       flex
+      installShellFiles
       openssl
       (buildPackages.python3.withPackages (p: [
         p.libfdt
@@ -132,6 +134,12 @@ in {
     dontStrip = false;
     extraMeta.platforms = lib.platforms.linux;
     extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+
+    outputs = [ "out" "man" ];
+
+    postInstall = ''
+      installManPage doc/*.1
+    '';
     filesToInstall = [
       "tools/dumpimage"
       "tools/fdtgrep"
diff --git a/nixpkgs/pkgs/misc/vencord/default.nix b/nixpkgs/pkgs/misc/vencord/default.nix
index 73a4b2cf5ea2..4d2c9449bfa9 100644
--- a/nixpkgs/pkgs/misc/vencord/default.nix
+++ b/nixpkgs/pkgs/misc/vencord/default.nix
@@ -1,14 +1,13 @@
 { buildNpmPackage
 , fetchFromGitHub
-, fetchpatch2
 , lib
 , esbuild
 , buildGoModule
 , buildWebExtension ? false
 }:
 let
-  version = "1.4.5";
-  gitHash = "98a03c8";
+  version = "1.4.6";
+  gitHash = "9b987d1";
 in
 buildNpmPackage rec {
   pname = "vencord";
@@ -18,7 +17,7 @@ buildNpmPackage rec {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${version}";
-    sha256 = "sha256-ZoHOCl0j+RBSl2lL9wO2rJ8VR+GNIeWJYe65c3lVoz8=";
+    sha256 = "sha256-LVFCf2BdTdl4t+Fp2oM7jAskzGx/fhSr6tNcaZ1X8xA=";
   };
 
   ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
@@ -37,7 +36,7 @@ buildNpmPackage rec {
   # Supresses an error about esbuild's version.
   npmRebuildFlags = [ "|| true" ];
 
-  npmDepsHash = "sha256-51IK95QY9YX0WerGu4GuOrYKoj8Uoo0R1b6WZpC5v4U=";
+  npmDepsHash = "sha256-GoVVOLg20oi0MJGLqevpiqHDM/7yaRJSQnM/tt+AkQ8=";
   npmFlags = [ "--legacy-peer-deps" ];
   npmBuildScript = if buildWebExtension then "buildWeb" else "build";
   npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
@@ -46,24 +45,6 @@ buildNpmPackage rec {
     cp ${./package-lock.json} ./package-lock.json
   '';
 
-  patches = [
-    (fetchpatch2 {
-      name = "allow-git-hash-remote-preset.patch";
-      url = "https://github.com/Vendicated/Vencord/commit/d9f55664428007199348123b05818f9e08c4f64d.patch";
-      hash = "sha256-l4PP8nVtyQJYUqtU9xYGT4j1Oayy08DE6TfbwPun0pY=";
-    })
-    (fetchpatch2 {
-      name = "use-source-date-epoch.patch";
-      url = "https://github.com/Vendicated/Vencord/commit/28247c88a949eeaac75b13a8d6653164d9659f56.patch";
-      hash = "sha256-mMpsB3GkI9LUiMQ/NFOiRw4z+wVkktmWgUHNTgxUFPU=";
-    })
-    (fetchpatch2 {
-      name = "allow-disabling-updater.patch";
-      url = "https://github.com/Vendicated/Vencord/commit/bad1fa0c766b2d42cd2eb0e0d1ab2e0c381bab98.patch";
-      hash = "sha256-yp453kFvVC02QEB3Op8PfopnLt3xGkjp4WfP6kPeIJ0=";
-    })
-  ];
-
   VENCORD_HASH = gitHash;
   VENCORD_REMOTE = "${src.owner}/${src.repo}";
 
diff --git a/nixpkgs/pkgs/misc/vencord/package-lock.json b/nixpkgs/pkgs/misc/vencord/package-lock.json
index e53695d7098c..e2048c38d7d1 100644
--- a/nixpkgs/pkgs/misc/vencord/package-lock.json
+++ b/nixpkgs/pkgs/misc/vencord/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "vencord",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/nixpkgs/pkgs/misc/zeyple/default.nix b/nixpkgs/pkgs/misc/zeyple/default.nix
index a14996e1d7d1..18c938453715 100644
--- a/nixpkgs/pkgs/misc/zeyple/default.nix
+++ b/nixpkgs/pkgs/misc/zeyple/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0r2d1drg2zvwmn3zg0qb32i9mh03r5di9q1yszx23r32rsax9mxh";
   };
 
-  propagatedBuildInputs = [ python3Packages.pygpgme ];
+  propagatedBuildInputs = [ python3Packages.gpgme ];
   installPhase = ''
     install -Dm755 $src/zeyple/zeyple.py $out/bin/zeyple
   '';