From 4f010615bd29df960e6744996e4104e03697f05e Mon Sep 17 00:00:00 2001
From: Matthieu Barthel <matthieu@imatt.ch>
Date: Wed, 20 Jul 2022 18:01:37 +0200
Subject: [PATCH 01/54] clipqr: init at 1.0.0

clipqr: add myself in maintainers list

clipqr: add gpg fingerprint + fix syntax

clipqr: sort maintainer entry

clipqr: fix syntax

Co-authored-by: Azat Bahawi <azat+github@bahawi.net>

clipqr: add strip flags

Co-authored-by: Azat Bahawi <azat+github@bahawi.net>

clipqr: use pkg-config

Co-authored-by: Azat Bahawi <azat+github@bahawi.net>

clipqr: fix syntax

Co-authored-by: Azat Bahawi <azat+github@bahawi.net>

clipqr: fix syntax + remove xorg dev outputs

clipqr: misc fixes
---
 pkgs/applications/misc/clipqr/default.nix | 70 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/misc/clipqr/default.nix

diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix
new file mode 100644
index 000000000000..7a83da6222a2
--- /dev/null
+++ b/pkgs/applications/misc/clipqr/default.nix
@@ -0,0 +1,70 @@
+{ buildGoModule
+, copyDesktopItems
+, fetchFromGitLab
+, lib
+, libGL
+, libX11
+, libXcursor
+, libXext
+, libXi
+, libXinerama
+, libXrandr
+, makeDesktopItem
+, mesa
+, pkg-config
+}:
+
+buildGoModule rec {
+  pname = "clipqr";
+  version = "1.0.0";
+
+  src = fetchFromGitLab {
+    owner = "imatt-foss";
+    repo = "clipqr";
+    rev = "v${version}";
+    sha256 = "sha256-E90nTJtx4GOacu8M7oQBznnSQVDIZatibgKMZEpTUaQ=";
+  };
+
+  vendorSha256 = "5kAOSyVbvot4TX/XfRNe1/zZk6fa7pS1Dvn9nz11u3U=";
+
+  ldflags = [ "-s" "-w" ];
+
+  buildInputs = [
+    libGL
+    libX11
+    libXcursor
+    libXext
+    libXi
+    libXinerama
+    libXrandr
+    mesa
+  ];
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    pkg-config
+  ];
+
+  postInstall = ''
+    install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ClipQR";
+      desktopName = "ClipQR";
+      exec = "clipqr";
+      categories = [ "Utility" ];
+      icon = "clipqr";
+      comment = "Scan QR codes on screen and from camera";
+      genericName = "ClipQR";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Scan QR codes on screen and from camera, the result is in your clipboard";
+    license = licenses.mit;
+    maintainers = with maintainers; [ MatthieuBarthel ];
+    homepage = "https://gitlab.com/imatt-foss/clipqr";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4221ad132814..8ff8b6b038c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26187,6 +26187,8 @@ with pkgs;
 
   clipit = callPackage ../applications/misc/clipit { };
 
+  clipqr = callPackage ../applications/misc/clipqr { };
+
   cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
 
   clp = callPackage ../applications/science/math/clp { };

From 85518f0ef0c20cdc7852207eaf47bec55c4d86bb Mon Sep 17 00:00:00 2001
From: Matthieu Barthel <matthieu@imatt.ch>
Date: Fri, 22 Jul 2022 18:26:37 +0200
Subject: [PATCH 02/54] clipqr: add myself as maintainer

---
 maintainers/maintainer-list.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index acc04a533f60..7fed606607b8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8022,6 +8022,15 @@
     githubId = 427866;
     name = "Matthias Beyer";
   };
+  MatthieuBarthel = {
+    email = "matthieu@imatt.ch";
+    name = "Matthieu Barthel";
+    github = "MatthieuBarthel";
+    githubId = 435534;
+    keys = [{
+      fingerprint = "80EB 0F2B 484A BB80 7BEF  4145 BA23 F10E AADC 2E26";
+    }];
+  };
   matthuszagh = {
     email = "huszaghmatt@gmail.com";
     github = "matthuszagh";

From 41b1496aa712b96e0037855638e6e32be6439ca1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 19:17:44 +0000
Subject: [PATCH 03/54] kuma-cp: 1.5.0 -> 1.7.1

---
 pkgs/applications/networking/cluster/kuma/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index ccd933e4ad51..6986af1d3d5b 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -16,15 +16,15 @@
 
 buildGoModule rec {
   inherit pname ;
-  version = "1.5.0";
+  version = "1.7.1";
   tags = lib.optionals enableGateway ["gateway"];
-  vendorSha256 = "sha256-ND1OTa37bxUNLDHceKdgiGE4LkEgBu9NmwuXtE4pZWk=";
+  vendorSha256 = "sha256-0YmWmGuzyES7BoHKWxzF2K1rDW7PO2DRdNmY3eJkUAM=";
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     rev = version;
-    sha256 = "sha256-CnL+OQfM1lamdCRHTLRmgpwfEfC7C9TX6UEF75bsOsQ=";
+    sha256 = "sha256-U8fWDXJ0ztod6r0qz63jbgYA06ItxA76BjSliniYnIQ=";
   };
 
   doCheck = false;

From f0af71a99242df73b503e29bf7aa7b6a66cd641f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Aug 2022 04:56:14 +0000
Subject: [PATCH 04/54] pam_u2f: 1.2.0 -> 1.2.1

---
 pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 1b95067bab5e..3687c64d7510 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pam_u2f";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-IwPm+Zsf3o7jw6sopN4tpt3SJclTaT6EXWstg4giH7M=";
+    sha256 = "sha256-cOdBvKGXtktPvo3R9tV84ritWMp4Y1LFJfPy1EEliUw=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 5cdb4467d2426a59c354eb9f4bd3cedc5ab57d1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Aug 2022 07:06:34 +0000
Subject: [PATCH 05/54] psmisc: 23.4 -> 23.5

---
 pkgs/os-specific/linux/psmisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 4cf3e1f7dd1b..e2f0fe59a075 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "psmisc";
-  version = "23.4";
+  version = "23.5";
 
   src = fetchFromGitLab {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-s7omgtsNooYqhr4JUTZ6WCtPaZVC1ujJGz6KxUBWIs8=";
+    sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI=";
   };
 
   nativeBuildInputs = [ autoconf automake gettext ];

From 9ba2e74b88a402546113e4518bc1a7295c21ff21 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Tue, 2 Aug 2022 16:20:02 +0200
Subject: [PATCH 06/54] mt32emu-smf2wav: 1.8.2 -> 1.9.0

---
 pkgs/applications/audio/munt/mt32emu-smf2wav.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
index eee9f01ebb55..86b5dcee4a65 100644
--- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
+++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mt32emu-smf2wav";
-  version = "1.8.2";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
     rev = "${char2underscore "-" pname}_${char2underscore "." version}";
-    sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9";
+    sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
   };
 
   postPatch = ''

From aa30734c179fdba2efebfad79524d2c685b364cf Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 3 Aug 2022 15:30:35 +0200
Subject: [PATCH 07/54] open-watcom-v2-unwrapped: unstable-2022-05-04 ->
 unstable-2022-08-02

---
 pkgs/development/compilers/open-watcom/v2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix
index 751afe8556c5..ea624ca70c20 100644
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "open-watcom-v2";
-  version = "unstable-2022-05-04";
+  version = "unstable-2022-08-02";
   name = "${pname}-unwrapped-${version}";
 
   src = fetchFromGitHub {
     owner = "open-watcom";
     repo = "open-watcom-v2";
-    rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5";
-    sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y=";
+    rev = "4bdb73995b871982dd106838296903701ded29c2";
+    sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs=";
   };
 
   postPatch = ''

From cf6b5e162421e8aa64ff2affd67e327a0187a318 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 3 Aug 2022 16:35:49 +0200
Subject: [PATCH 08/54] open-watcom-bin-unwrapped: improve meta

---
 pkgs/development/compilers/open-watcom/bin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix
index 81d321c04620..4bf3d956224b 100644
--- a/pkgs/development/compilers/open-watcom/bin.nix
+++ b/pkgs/development/compilers/open-watcom/bin.nix
@@ -114,7 +114,8 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A C/C++ Compiler (binary distribution)";
+    description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     homepage = "http://www.openwatcom.org/";
     license = licenses.watcom;
     platforms = [ "x86_64-linux" "i686-linux" ];

From 16395a9797d82b633e228aab2c0d5170b16937b8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 3 Aug 2022 16:35:12 +0200
Subject: [PATCH 09/54] wrapWatcom: use passthru.prettyName

---
 pkgs/development/compilers/open-watcom/bin.nix     |  5 +++--
 pkgs/development/compilers/open-watcom/v2.nix      | 10 ++++++----
 pkgs/development/compilers/open-watcom/wrapper.nix |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix
index 4bf3d956224b..daf7ea497693 100644
--- a/pkgs/development/compilers/open-watcom/bin.nix
+++ b/pkgs/development/compilers/open-watcom/bin.nix
@@ -85,9 +85,8 @@ let
 
 in
 stdenvNoCC.mkDerivation rec {
-  pname = "open-watcom-bin";
+  pname = "${passthru.prettyName}-unwrapped";
   version = "1.9";
-  name = "${pname}-unwrapped-${version}";
 
   src = fetchurl {
     url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}";
@@ -113,6 +112,8 @@ stdenvNoCC.mkDerivation rec {
     done
   '';
 
+  passthru.prettyName = "open-watcom-bin";
+
   meta = with lib; {
     description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix
index ea624ca70c20..bdef71006bd8 100644
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@@ -11,9 +11,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "open-watcom-v2";
+  pname = "${passthru.prettyName}-unwrapped";
   version = "unstable-2022-08-02";
-  name = "${pname}-unwrapped-${version}";
 
   src = fetchFromGitHub {
     owner = "open-watcom";
@@ -82,8 +81,11 @@ stdenv.mkDerivation rec {
   # Stripping breaks many tools
   dontStrip = true;
 
-  passthru.updateScript = unstableGitUpdater {
-    url = "https://github.com/open-watcom/open-watcom-v2.git";
+  passthru = {
+    prettyName = "open-watcom-v2";
+    updateScript = unstableGitUpdater {
+      url = "https://github.com/open-watcom/open-watcom-v2.git";
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/compilers/open-watcom/wrapper.nix b/pkgs/development/compilers/open-watcom/wrapper.nix
index 94cca7ab34ce..113df520b4fc 100644
--- a/pkgs/development/compilers/open-watcom/wrapper.nix
+++ b/pkgs/development/compilers/open-watcom/wrapper.nix
@@ -29,7 +29,7 @@ let
       ++ lib.optional isWindows "h/nt"
       ++ lib.optional isLinux "lh";
       listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list;
-      name = "${open-watcom.pname}-${open-watcom.version}";
+      name = "${open-watcom.passthru.prettyName}-${open-watcom.version}";
     in
     symlinkJoin {
       inherit name;

From aba4ef1f3f7d048444de362d5a022030492f4670 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 6 Aug 2022 00:17:51 +0100
Subject: [PATCH 10/54] apacheKafka: mark as sourceProvenance binaryBytecode

---
 pkgs/servers/apache-kafka/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index d086c2b922c3..83d145f411f9 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     homepage = "https://kafka.apache.org";
     description = "A high-throughput distributed messaging system";
     license = licenses.asl20;
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
     maintainers = [ maintainers.ragge ];
     platforms = platforms.unix;
   };

From 0a70cfeff417719a53f8147923cf22db012c9a9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Aug 2022 02:15:43 +0000
Subject: [PATCH 11/54] ortp: 5.1.12 -> 5.1.55

---
 pkgs/development/libraries/ortp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index ada36487135f..e896717644aa 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ortp";
-  version = "5.1.12";
+  version = "5.1.55";
 
   src = fetchFromGitLab {
     domain = "gitlab.linphone.org";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "sha256-CD9xn1m6zpUEC+shmNeWfGAJxNto87UbznD+TLdeuEg=";
+    sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw=";
   };
 
   # Do not build static libraries

From 8c546d02897a60d0e64e765d59b7996a316c481c Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 8 Aug 2022 10:24:21 +0200
Subject: [PATCH 12/54] dbeaver: 22.1.3 -> 22.1.4

---
 pkgs/applications/misc/dbeaver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 1eaa6177a925..8bf473d2cfc8 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -23,16 +23,16 @@
   inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
 }) rec {
   pname = "dbeaver";
-  version = "22.1.3"; # When updating also update mvnSha256
+  version = "22.1.4"; # When updating also update mvnSha256
 
   src = fetchFromGitHub {
     owner = "dbeaver";
     repo = "dbeaver";
     rev = version;
-    sha256 = "sha256-QrocrH/orgXvg0vNelm1hK4dHeDsxe3ZaVb3Q2FgYSo=";
+    sha256 = "sha256-5s2SFquB0i5X2deBO0FStudReB4wGhQkhR39PHPBEAM=";
   };
 
-  mvnSha256 = "U+RqrXtwFrku4b5d47WrFLmrlfqBs8YVif/qGf5CXqQ=";
+  mvnSha256 = "YIeKSL5scU8NxEIf+jK1g9cdFDOBVh14ruKMqUuz1Ts=";
   mvnParameters = "-P desktop,all-platforms";
 
   nativeBuildInputs = [

From ceb184396d94645b61c0286f24038951e8fa0e1f Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Mon, 8 Aug 2022 17:52:46 +0200
Subject: [PATCH 13/54] mt32emu-qt: 1.10.2 -> 1.11.1

---
 pkgs/applications/audio/munt/mt32emu-qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix
index c2b84fd6ed78..207fbc3717f7 100644
--- a/pkgs/applications/audio/munt/mt32emu-qt.nix
+++ b/pkgs/applications/audio/munt/mt32emu-qt.nix
@@ -18,13 +18,13 @@ let
 in
 mkDerivation rec {
   pname = "mt32emu-qt";
-  version = "1.10.2";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
     rev = "${char2underscore "-" pname}_${char2underscore "." version}";
-    sha256 = "1dh5xpnsgx367ch45mm5c2p26vnxf3shax2afg2cd2lrbrlii7l9";
+    sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
   };
 
   postPatch = ''

From 6cb88c97398989b2bf85b26365317cb8be6ebdda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Aug 2022 22:57:26 +0000
Subject: [PATCH 14/54] redli: 0.5.2 -> 0.6.0

---
 pkgs/tools/networking/redli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/tools/networking/redli/default.nix
index d6a9f6f8709c..449f15fb1eb9 100644
--- a/pkgs/tools/networking/redli/default.nix
+++ b/pkgs/tools/networking/redli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "redli";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "IBM-Cloud";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bR02R9M3041oNUEQId1zgAxMNPyXXQNAYEyE/XIDdPE=";
+    sha256 = "sha256-nLauKt3OnFZFnFjw0s2kTFdvdYjFkeA6eQwZEhT4n/s=";
   };
 
   vendorSha256 = null;

From 0e12c8993e35146e668f8e47331f0847f730fc75 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 11 Aug 2022 01:27:57 +0200
Subject: [PATCH 15/54] nvc: 1.6.2 -> 1.7.0

---
 pkgs/applications/science/electronics/nvc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix
index 3def53dbd2e4..236f7df5d76b 100644
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.6.2";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = pname;
     rev = "r${version}";
-    sha256 = "sha256-BtUMpT1MKRFGRlIbCEGo4OBZ/r9es1VRmJdgmk1oZFQ=";
+    sha256 = "sha256-U9VxpHzrAQPMqnSs0YcEnc9dlQUutTuZCJP5F1v7eaA=";
   };
 
   nativeBuildInputs = [
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
     (if stdenv.isLinux then elfutils else libelf)
   ];
 
-  # TODO: remove me on 1.7.0
-  postPatch = ''
-    sed -i "/vests22/d;/vhpi4/d" test/regress/testlist.txt
+  # TODO: recheck me on next release
+  postPatch = lib.optionalString stdenv.isLinux ''
+    sed -i "/vhpi4/d" test/regress/testlist.txt
   '';
 
   preConfigure = ''

From b39214bb3d0f6ed4e7b02b5f3337346a1bf5fc8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 00:24:53 +0000
Subject: [PATCH 16/54] python39Packages.pypdf2: 2.9.0 -> 2.10.0

---
 pkgs/development/python-modules/pypdf2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix
index 2ae89bf43f07..b87e5d568fa2 100644
--- a/pkgs/development/python-modules/pypdf2/default.nix
+++ b/pkgs/development/python-modules/pypdf2/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "PyPDF2";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bPGMp9D3fhMG1I/NClc5BhbsZUV5a16zJaIJQ6VQHRg=";
+    sha256 = "sha256-smB4IGIhxkEeyXpaXAiXWuebp+xGdXXRFHepnM5gHrk=";
   };
 
   LC_ALL = "en_US.UTF-8";

From 8a421ae802cdbff0aebfd0295463a53cc3b9b120 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 02:30:09 +0000
Subject: [PATCH 17/54] skypeforlinux: 8.86.0.407 -> 8.87.0.403

---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 263d3a17fa54..6048fb079edb 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.86.0.407";
+  version = "8.87.0.403";
 
   rpath = lib.makeLibraryPath [
     alsa-lib
@@ -68,7 +68,7 @@ let
           "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
           "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
         ];
-        sha256 = "sha256-46M0JYP5QBCTCRqLtNyrQsEc6PsK6WRssb55IkG6pu0=";
+        sha256 = "sha256-ibugr15eRQ2gbvX8wmk2lFioLPST9ljAuWcJHCoi9l8=";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

From 83d88b7d35a3f2fa41c726a5b233fd1079354981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 03:29:50 +0000
Subject: [PATCH 18/54] txr: 278 -> 280

---
 pkgs/tools/misc/txr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix
index d91f5fa36501..41b30f5f4a21 100644
--- a/pkgs/tools/misc/txr/default.nix
+++ b/pkgs/tools/misc/txr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "txr";
-  version = "278";
+  version = "280";
 
   src = fetchurl {
     url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-RwPdDQGFL851eegQfMb8xHxC8AP39heSIALXjp/5/cw=";
+    sha256 = "sha256-1iqWerUehLFPM63ZjJYY6xo9oHoNK7ne/a6M3+4L4so=";
   };
 
   buildInputs = [ libffi ];

From 8b0c8a49b11699eb1501fb32c7a5d1963f0936e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 03:32:04 +0000
Subject: [PATCH 19/54] waypipe: 0.8.2 -> 0.8.3

---
 pkgs/applications/networking/remote/waypipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix
index 74dc8564b0b1..7a1dd8be40d5 100644
--- a/pkgs/applications/networking/remote/waypipe/default.nix
+++ b/pkgs/applications/networking/remote/waypipe/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   pname = "waypipe";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mstoeckl";
     repo = "waypipe";
     rev = "v${version}";
-    sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4";
+    sha256 = "sha256-f1XEcDMy4skddtbZFFhCF4xg6zQahOLiGcYiJPy2SHs=";
   };
 
   strictDeps = true;

From df7ed2464bf12f0a5dbe4d501476b37d96f2aa1b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 12 Aug 2022 04:20:00 +0000
Subject: [PATCH 20/54] pam_u2f: update meta

---
 pkgs/os-specific/linux/pam_u2f/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 3687c64d7510..bcccd20cd6f0 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://developers.yubico.com/pam-u2f/";
     description = "A PAM module for allowing authentication with a U2F device";
+    changelog = "https://github.com/Yubico/pam-u2f/raw/pam_u2f-${version}/NEWS";
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ philandstuff ];

From 5121d14d5c3de193bd6acf5d4734458d7826284c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 12 Aug 2022 04:20:00 +0000
Subject: [PATCH 21/54] flexget: 3.3.22 -> 3.3.24

---
 pkgs/applications/networking/flexget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index cc62a7f7070e..033a7ba836f0 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.3.22";
+  version = "3.3.24";
 
   # Fetch from GitHub in order to use `requirements.in`
   src = fetchFromGitHub {
     owner = "flexget";
     repo = "flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VDMcOiuEOTzyogkdpVogikrme2Q6drpb40PqDgDtr7Q=";
+    hash = "sha256-AjYX9f7v6lxMO6vTjAanDMluvGDAvTwcvcq/fwMzSfk=";
   };
 
   postPatch = ''

From 8d90e0d0039f002f75a4eef954b54ced574359ed Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 12 Aug 2022 04:20:00 +0000
Subject: [PATCH 22/54] timescaledb-tune: 0.13.0 -> 0.13.1

https://github.com/timescale/timescaledb-tune/releases/tag/v0.13.1
---
 .../tools/database/timescaledb-tune/default.nix     |  4 ++--
 .../database/timescaledb-tune/fixMinMaxConn.diff    | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff

diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix
index 28b0506ff180..195a5b8b18e2 100644
--- a/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/pkgs/development/tools/database/timescaledb-tune/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "timescaledb-tune";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YZMjgEnZKxmGIO9gK00JXBpBRvNgZoXNA/cNieovT+g=";
+    sha256 = "sha256-sCwMLVp4MCTJ5ZgALDs+of+upYMQeHz3xRk4YD2g23M=";
   };
 
   vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E=";
diff --git a/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff b/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff
deleted file mode 100644
index 3a0110476cce..000000000000
--- a/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pkg/pgtune/misc.go b/pkg/pgtune/misc.go
-index 1fceb6e..3e76be5 100644
---- a/pkg/pgtune/misc.go
-+++ b/pkg/pgtune/misc.go
-@@ -35,7 +35,7 @@ const (
- 	// If you want to lower this value, consider that Patroni will not accept anything less than 25 as
- 	// a valid max_connections and will replace it with 100, per
- 	// https://github.com/zalando/patroni/blob/00cc62726d6df25d31f9b0baa082c83cd3f7bef9/patroni/postgresql/config.py#L280
--	minMaxConns = 25
-+	minMaxConns = 20
- )
- 
- // MaxConnectionsDefault is the recommended default value for max_connections.

From c6c3d995357f95bb00394d49da61c6937df1edd6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 12 Aug 2022 04:20:00 +0000
Subject: [PATCH 23/54] xonsh: 0.13.0 -> 0.13.1

https://github.com/xonsh/xonsh/releases/tag/0.13.1
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index ed11f0828d66..6c7132b46c91 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
-  version = "0.13.0";
+  version = "0.13.1";
 
   # fetch from github because the pypi package ships incomplete tests
   src = fetchFromGitHub {
     owner = "xonsh";
     repo = "xonsh";
     rev = version;
-    sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc=";
+    sha256 = "sha256-Q9FJXccpTW3nPUOCf5UD8ZWJW25QX8PNHHpsVYjesYE=";
   };
 
   LC_ALL = "en_US.UTF-8";

From bd0cf3c9104ec87cfcf37e64391fb7847e483aae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 10:35:21 +0000
Subject: [PATCH 24/54] hpccm: 22.5.0 -> 22.8.0

---
 pkgs/development/python-modules/hpccm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix
index b0c26bae9734..74372f57641e 100644
--- a/pkgs/development/python-modules/hpccm/default.nix
+++ b/pkgs/development/python-modules/hpccm/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "hpccm";
-  version = "22.5.0";
+  version = "22.8.0";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "hpc-container-maker";
     rev = "v${version}";
-    sha256 = "sha256-zR5+X9BKaUvLPQ05FnfU817esgxVqP8n+wfdWy20BN4=";
+    sha256 = "sha256-nq1zixIu/Kv2CtkQX1Sw7Q3BsOZKcCJjV0+uroXPEBs=";
   };
 
   propagatedBuildInputs = [ six archspec ];

From aecbfceccd96c8307a623f0255b34ebec9bdf40f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 12:12:56 +0000
Subject: [PATCH 25/54] kube-bench: 0.6.8 -> 0.6.9

---
 pkgs/tools/security/kube-bench/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix
index e95ff1a05477..fcad20c651f2 100644
--- a/pkgs/tools/security/kube-bench/default.nix
+++ b/pkgs/tools/security/kube-bench/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "kube-bench";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-uqjF2WtsGMzA/JDS93BSQNuBJorMIJha9qPHJkIbjQo=";
+    sha256 = "sha256-bKgUnkfOWcX3/JdspEjNhFqS2dMlwEcVffIqNfS6FEU=";
   };
-  vendorSha256 = "sha256-/LSgIfLBsGRSyz9gExgLKAjO+RF/C8CkxSvwx2jZjoI=";
+  vendorSha256 = "sha256-f/B9E9Ot9njop04PKh0XYG1DnWKBRsVi4XHQNmZeQho=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From fc1d293d70840a5ebdf57118edd59e2e3f4926c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 12:45:41 +0000
Subject: [PATCH 26/54] python310Packages.azure-keyvault-administration: 4.1.0
 -> 4.1.1

---
 .../python-modules/azure-keyvault-administration/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
index 838572d064ee..1f5b2d9cbb48 100644
--- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "azure-keyvault-administration";
-  version = "4.1.0";
+  version = "4.1.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI=";
+    sha256 = "sha256-m5dkKUZoPkpUzSW1K39+wpIfWHc2oRyxMetOf/Ybzuc=";
   };
 
   propagatedBuildInputs = [

From 49793edd2760c4766f0b2ab1e5689a35efc864b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Aug 2022 13:25:25 +0000
Subject: [PATCH 27/54] libzim: 7.2.2 -> 8.0.0

---
 pkgs/development/libraries/libzim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix
index 3f290d4ffa3c..abb570730f66 100644
--- a/pkgs/development/libraries/libzim/default.nix
+++ b/pkgs/development/libraries/libzim/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libzim";
-  version = "7.2.2";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = pname;
     rev = version;
-    sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs=";
+    sha256 = "sha256-FSotc2hkWvkYEdZ3HI3JLzjtKFaWOc1Bx6r0WyeS/Kg=";
   };
 
   nativeBuildInputs = [

From c44293e9da1e16e6f29c262ee3fdf6ca12e3364d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Fri, 12 Aug 2022 13:57:23 +0100
Subject: [PATCH 28/54] flexoptix-app: 5.11.0 -> 5.12.1

---
 pkgs/tools/misc/flexoptix-app/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix
index 4438d9d637ba..de2b166f47e2 100644
--- a/pkgs/tools/misc/flexoptix-app/default.nix
+++ b/pkgs/tools/misc/flexoptix-app/default.nix
@@ -1,12 +1,11 @@
 { lib, appimageTools, fetchurl, nodePackages }: let
   pname = "flexoptix-app";
-  version = "5.11.0";
-  name = "${pname}-${version}";
+  version = "5.12.1";
 
   src = fetchurl {
-    name = "${name}.AppImage";
+    name = "${pname}-${version}.AppImage";
     url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
-    hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM=";
+    hash = "sha256-ugnJcSFgEEPJ9qxqmRGgW1fraE4E/HbbxpK/00TXPmw=";
   };
 
   udevRules = fetchurl {
@@ -14,7 +13,7 @@
     hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc=";
   };
 
-  appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: {
+  appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {
     buildCommand = ''
       ${oA.buildCommand}
 
@@ -26,7 +25,7 @@
   });
 
 in appimageTools.wrapAppImage {
-  inherit name;
+  inherit pname version;
   src = appimageContents;
 
   multiPkgs = null; # no 32bit needed
@@ -36,7 +35,7 @@ in appimageTools.wrapAppImage {
 
   extraInstallCommands = ''
     # Add desktop convencience stuff
-    mv $out/bin/{${name},${pname}}
+    mv $out/bin/{${pname}-*,${pname}}
     install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications
     install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps
     substituteInPlace $out/share/applications/flexoptix-app.desktop \

From 56554b73b5f4fe87cb72d621734107b9542d925c Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Fri, 12 Aug 2022 14:15:23 -0700
Subject: [PATCH 29/54] python310Packages.python-fsutil: Unmark broken on
 Darwin

At least on my aarch64 Darwin machine, python-fsutil builds fine.
---
 pkgs/development/python-modules/python-fsutil/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix
index 70c3422a3d97..3f18bd09aa45 100644
--- a/pkgs/development/python-modules/python-fsutil/default.nix
+++ b/pkgs/development/python-modules/python-fsutil/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
@@ -44,7 +43,6 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "Module with file-system utilities";
     homepage = "https://github.com/fabiocaccamo/python-fsutil";
     license = licenses.mit;

From 342bb0e86c683e882193a692b07eff1f1fe73513 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Tue, 10 May 2022 22:43:35 +0200
Subject: [PATCH 30/54] radicle-cli: init at 0.6.1

---
 .../git-and-tools/radicle-cli/default.nix     | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix
new file mode 100644
index 000000000000..0febc33a3cdd
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/radicle-cli/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, cmake
+, installShellFiles
+, asciidoctor
+, DarwinTools
+, openssl
+, libusb1
+, AppKit
+, openssh
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "radicle-cli";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "radicle-dev";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-LS6zYpMg0LanRL2M8ioGG8Ys07TPT/3hP7geEGehwxg=";
+  };
+
+  cargoSha256 = "sha256-o7ahnV7NnvzKxXb7HdNqKcxekshOtKanYKb0Sy15mhs=";
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    installShellFiles
+    asciidoctor
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    DarwinTools
+  ];
+
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    libusb1
+    AppKit
+  ];
+
+  postInstall = ''
+    for f in $(find . -name '*.adoc'); do
+      mf=''${f%.*}
+      asciidoctor --doctype manpage --backend manpage $f -o $mf
+      installManPage $mf
+    done
+  '';
+
+  checkInputs = [ openssh ];
+  preCheck = ''
+    eval $(ssh-agent)
+  '';
+
+  meta = {
+    description = "Command-line tooling for Radicle, a decentralized code collaboration network";
+    homepage = "https://radicle.xyz";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ amesgen ];
+    platforms = lib.platforms.unix;
+    mainProgram = "rad";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bccc501ca7da..fa8b9b51f035 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23129,6 +23129,10 @@ with pkgs;
 
   radicale = radicale3;
 
+  radicle-cli = callPackage ../applications/version-management/git-and-tools/radicle-cli {
+    inherit (darwin) DarwinTools;
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+  };
   radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {};
 
   rake = callPackage ../development/tools/build-managers/rake { };

From e3f8f9953f93b54e72a86f3a40c435560faaf47b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 01:33:23 +0000
Subject: [PATCH 31/54] php80Extensions.protobuf: 3.21.4 -> 3.21.5

---
 pkgs/development/php-packages/protobuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix
index 692fdac22684..c07e71702ff3 100644
--- a/pkgs/development/php-packages/protobuf/default.nix
+++ b/pkgs/development/php-packages/protobuf/default.nix
@@ -3,8 +3,8 @@
 buildPecl {
   pname = "protobuf";
 
-  version = "3.21.4";
-  sha256 = "sha256-vhfoUu63KhndfQTiITtTnaqFVF9OWMCaLf/9PUioKkQ=";
+  version = "3.21.5";
+  sha256 = "sha256-B8ytFyUJ8fLBwHmaKXxfOy0h6tRELjqc5IxUUl/YU5w=";
 
   buildInputs = [ pcre2 ];
 

From 8871fbf2a80f48f90df72376f4d40197853d125e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 01:39:31 +0000
Subject: [PATCH 32/54] python310Packages.awscrt: 0.13.14 -> 0.14.0

---
 pkgs/development/python-modules/awscrt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index ef179d27f0bd..33d3dcf49918 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "awscrt";
-  version = "0.13.14";
+  version = "0.14.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-K2x0Up3H6kIWcYeWvVegd1CkTjq8RoM0AOm0SX5u6wQ=";
+    hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [

From de7656ee782f13097bacbab3944cc4088cada7c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 02:07:44 +0000
Subject: [PATCH 33/54] python310Packages.audioread: 2.1.9 -> 3.0.0

---
 pkgs/development/python-modules/audioread/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
index d2964accc144..ee3413415232 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "audioread";
-  version = "2.1.9";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
+    sha256 = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo=";
   };
 
   # No tests, need to disable or py3k breaks

From 2e506b019ca0ba0ee43617aa5f65192d899917b1 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 12 Aug 2022 23:25:34 -0300
Subject: [PATCH 34/54] hardlink: remove

A dignified burial for this expression. Long live hardlink on util-linux!
---
 pkgs/tools/system/hardlink/default.nix | 32 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 pkgs/top-level/all-packages.nix        |  2 --
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/system/hardlink/default.nix

diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
deleted file mode 100644
index a82318648495..000000000000
--- a/pkgs/tools/system/hardlink/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, pcre2 }:
-
-
-stdenv.mkDerivation {
-  pname = "hardlink";
-  version = "1.3-4";
-
-  src = fetchurl {
-    url = "https://src.fedoraproject.org/cgit/rpms/hardlink.git/snapshot/hardlink-aa6325ac4e8100b8ac7d38c7f0bc2708e69bd855.tar.xz";
-    sha256 = "0g4hyrnd9hpykbf06qvvp3s4yyk7flbd95gilkf7r3w9vqiagvs2";
-  };
-
-  buildInputs = [ pcre2 ];
-  NIX_CFLAGS_LINK = "-lpcre2-8";
-
-  buildPhase = ''
-    $CC -O2 hardlink.c -o hardlink $NIX_CFLAGS_LINK
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/man/man1
-    cp -f hardlink $out/bin/hardlink
-    cp -f hardlink.1 $out/share/man/man1/hardlink.1
-  '';
-
-  meta = with lib; {
-    description = "Consolidate duplicate files via hardlinks";
-    homepage = "https://pagure.io/hardlink";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b2a8d4a5a659..3ea7c71457a6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -581,6 +581,7 @@ mapAliases ({
   ### H ###
 
   hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07
+  hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12
   inherit (harePackages) hare harec; # Added 2022-08-10
   hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
   heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 018e6dfc9084..27045f0896a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7189,8 +7189,6 @@ with pkgs;
 
   habitat = callPackage ../applications/networking/cluster/habitat { };
 
-  hardlink = callPackage ../tools/system/hardlink { };
-
   hashcash = callPackage ../tools/security/hashcash { };
 
   hashcat = callPackage ../tools/security/hashcat { };

From 5975411744eb1e46bf07a3e1d08ab0c3ae0b432b Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Fri, 12 Aug 2022 22:23:20 -0400
Subject: [PATCH 35/54] nixos/localtimed: fix service

---
 nixos/modules/misc/ids.nix                   |  2 +
 nixos/modules/module-list.nix                |  2 +-
 nixos/modules/services/system/localtime.nix  | 37 -----------
 nixos/modules/services/system/localtimed.nix | 66 ++++++++++++++++++++
 4 files changed, 69 insertions(+), 38 deletions(-)
 delete mode 100644 nixos/modules/services/system/localtime.nix
 create mode 100644 nixos/modules/services/system/localtimed.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index e3d7866cabb5..38ab338aa56c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -354,6 +354,7 @@ in
       webdav = 322;
       pipewire = 323;
       rstudio-server = 324;
+      localtimed = 325;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -662,6 +663,7 @@ in
       webdav = 322;
       pipewire = 323;
       rstudio-server = 324;
+      localtimed = 325;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6e979561fa03..837bc7635a06 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1023,7 +1023,7 @@
   ./services/system/cloud-init.nix
   ./services/system/dbus.nix
   ./services/system/earlyoom.nix
-  ./services/system/localtime.nix
+  ./services/system/localtimed.nix
   ./services/system/kerberos/default.nix
   ./services/system/nscd.nix
   ./services/system/saslauthd.nix
diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix
deleted file mode 100644
index c80fe366453e..000000000000
--- a/nixos/modules/services/system/localtime.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.localtimed;
-in {
-  imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
-
-  options = {
-    services.localtimed = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Enable `localtimed`, a simple daemon for keeping the
-          system timezone up-to-date based on the current location. It uses
-          geoclue2 to determine the current location.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.geoclue2.appConfig.localtimed = {
-      isAllowed = true;
-      isSystem = true;
-    };
-
-    # Install the polkit rules.
-    environment.systemPackages = [ pkgs.localtime ];
-    # Install the systemd unit.
-    systemd.packages = [ pkgs.localtime ];
-
-    systemd.services.localtime.wantedBy = [ "multi-user.target" ];
-  };
-}
diff --git a/nixos/modules/services/system/localtimed.nix b/nixos/modules/services/system/localtimed.nix
new file mode 100644
index 000000000000..345bdbd8dda0
--- /dev/null
+++ b/nixos/modules/services/system/localtimed.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.localtimed;
+in {
+  imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ];
+
+  options = {
+    services.localtimed = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = lib.mdDoc ''
+          Enable `localtimed`, a simple daemon for keeping the
+          system timezone up-to-date based on the current location. It uses
+          geoclue2 to determine the current location.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.geoclue2.appConfig.localtimed = {
+      isAllowed = true;
+      isSystem = true;
+      users = [ (toString config.ids.uids.localtimed) ];
+    };
+
+    # Install the polkit rules.
+    environment.systemPackages = [ pkgs.localtime ];
+
+    systemd.services.localtimed = {
+      wantedBy = [ "multi-user.target" ];
+      partOf = [ "localtimed-geoclue-agent.service" ];
+      after = [ "localtimed-geoclue-agent.service" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.localtime}/bin/localtimed";
+        Restart = "on-failure";
+        Type = "exec";
+        User = "localtimed";
+      };
+    };
+
+    systemd.services.localtimed-geoclue-agent = {
+      wantedBy = [ "multi-user.target" ];
+      partOf = [ "geoclue.service" ];
+      after = [ "geoclue.service" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent";
+        Restart = "on-failure";
+        Type = "exec";
+        User = "localtimed";
+      };
+    };
+
+    users = {
+      users.localtimed = {
+        uid = config.ids.uids.localtimed;
+        group = "localtimed";
+      };
+      groups.localtimed.gid = config.ids.gids.localtimed;
+    };
+  };
+}

From 348da227c569d07ca572e6279e41a84dafe48404 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sat, 13 Aug 2022 13:31:05 +0200
Subject: [PATCH 36/54] communi: fix Qt wrapping

---
 .../networking/irc/communi/default.nix        | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index b9321f0797fa..71c559cbe713 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,4 +1,11 @@
-{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, libcommuni
+, qmake
+, qtbase
+, wrapQtAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "communi";
@@ -15,12 +22,15 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ qmake ]
-    ++ lib.optional stdenv.isDarwin wrapQtAppsHook;
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+  ];
 
-  buildInputs = [ libcommuni qtbase ];
-
-  dontWrapQtApps = true;
+  buildInputs = [
+    libcommuni
+    qtbase
+  ];
 
   preConfigure = ''
     export QMAKEFEATURES=${libcommuni}/features
@@ -32,20 +42,19 @@ stdenv.mkDerivation rec {
     "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor"
     "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications"
     "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes"
-    (if stdenv.isDarwin
-      then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ]
-      else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ])
+    "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}"
   ];
 
-  postInstall = if stdenv.isDarwin then ''
-    # Nix qmake does not add the bundle rpath by default.
-    install_name_tool \
-      -add_rpath @executable_path/../Frameworks \
-      $out/Applications/Communi.app/Contents/MacOS/Communi
-  '' else ''
-    substituteInPlace "$out/share/applications/communi.desktop" \
-      --replace "/usr/bin" "$out/bin"
-  '';
+  postInstall =
+    if stdenv.isDarwin then ''
+      # Nix qmake does not add the bundle rpath by default.
+      install_name_tool \
+        -add_rpath @executable_path/../Frameworks \
+        $out/Applications/Communi.app/Contents/MacOS/Communi
+    '' else ''
+      substituteInPlace "$out/share/applications/communi.desktop" \
+        --replace "/usr/bin" "$out/bin"
+    '';
 
   preFixup = ''
     rm -rf lib
@@ -56,6 +65,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/communi/communi-desktop";
     license = licenses.bsd3;
     maintainers = with maintainers; [ hrdinka ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
+    broken = stdenv.isDarwin;
   };
 }

From f00bac4225db625ef65a18820868ad233dd2b6af Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 18 Jul 2022 15:09:53 -0400
Subject: [PATCH 37/54] hdfview: 3.1.4 -> 3.2.0

---
 pkgs/tools/misc/hdfview/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 012ac19c206c..10844db77ba5 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hdfview";
-  version = "3.1.4";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
-    sha256 = "sha256-iY/NUifU57aX795eWpaUBflrclF/nfvb3OKZEpD9VqA=";
+    sha256 = "sha256-08De/yy9lZUIxNqccS2nL7IE/2gYo0NPAKcHH46M8rg=";
   };
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6316fc0fe4c..f0336451d109 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7265,9 +7265,7 @@ with pkgs;
 
   hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };
 
-  hdfview = callPackage ../tools/misc/hdfview {
-    hdf5 = hdf5_1_10;
-  };
+  hdfview = callPackage ../tools/misc/hdfview { };
 
   hecate = callPackage ../applications/editors/hecate { };
 

From d5627b30e9ed3815c3f00e9eb1b75ee66bdb4f31 Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Sat, 13 Aug 2022 10:21:27 -0700
Subject: [PATCH 38/54] librewolf: 103.0-1 -> 103.0.2-1

---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index 44f09e3d2cb9..1b149daa8ba2 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "103.0-3",
+  "packageVersion": "103.0.2-1",
   "source": {
-    "rev": "103.0-3",
-    "sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq"
+    "rev": "103.0.2-1",
+    "sha256": "0cfhrxnvxlidipg0cpz0gapya8pvfqcmjkyqns4xz1jq5lkm1xg3"
   },
   "firefox": {
-    "version": "103.0",
-    "sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e"
+    "version": "103.0.2",
+    "sha512": "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a"
   }
 }

From 9f7c464ec39ca2882098e19c9021186fd9945e47 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 13 Aug 2022 20:26:19 +0300
Subject: [PATCH 39/54] python310Packages.fs: propagate setuptools

fixes pkgsCross.aarch64-multiplatform.python310Packages.statmake

> ERROR: Could not find a version that satisfies the requirement setuptools (from fs) (from versions: none)
> ERROR: No matching distribution found for setuptools
---
 pkgs/development/python-modules/fs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 32b5dd747dda..1d4326f74ee3 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -2,6 +2,7 @@
 , glibcLocales
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , six
 , appdirs
 , scandir ? null
@@ -32,7 +33,7 @@ buildPythonPackage rec {
   # strong cycle with paramaterized
   doCheck = false;
   checkInputs = [ pyftpdlib mock psutil pytestCheckHook ];
-  propagatedBuildInputs = [ six appdirs pytz ]
+  propagatedBuildInputs = [ six appdirs pytz setuptools ]
     ++ lib.optionals (!isPy3k) [ backports_os ]
     ++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
     ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]

From dbc3c159e925930755009d4dbec590665feba52b Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sat, 13 Aug 2022 14:46:53 -0300
Subject: [PATCH 40/54] fluxcd: fix cross compilation

---
 pkgs/applications/networking/cluster/fluxcd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index d98601f5aa0a..89772f9aa7be 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
+{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
 
 let
   version = "0.32.0";
@@ -46,7 +46,7 @@ in buildGoModule rec {
     $out/bin/flux --version | grep ${version} > /dev/null
   '';
 
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     for shell in bash fish zsh; do
       $out/bin/flux completion $shell > flux.$shell
       installShellCompletion flux.$shell

From 027d13f84f8fd49a22e0425e5407fc43cfe0be02 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 13 Aug 2022 19:59:24 +0200
Subject: [PATCH 41/54] firecracker: 1.0.0 -> 1.1.1

---
 pkgs/applications/virtualization/firecracker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index 9d35e87f1614..877bcc2f8b04 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, lib, stdenv }:
 
 let
-  version = "1.0.0";
+  version = "1.1.1";
 
   suffix = {
     x86_64-linux = "x86_64";
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
 
   sourceRoot = ".";
   src = dlbin {
-    x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0=";
-    aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo=";
+    x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c=";
+    aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
   };
 
   dontConfigure = true;

From da2865a9a7cef10f0a50880cde213b73637cb7d4 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 13 Aug 2022 19:59:37 +0200
Subject: [PATCH 42/54] firectl: unstable-2022-03-01 -> unstable-2022-07-12

---
 pkgs/applications/virtualization/firectl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix
index 458e2ffc7e5e..64c933a5d325 100644
--- a/pkgs/applications/virtualization/firectl/default.nix
+++ b/pkgs/applications/virtualization/firectl/default.nix
@@ -4,16 +4,16 @@ buildGoModule rec {
   pname = "firectl";
   # The latest upstream 0.1.0 is incompatible with firecracker
   # v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82
-  version = "unstable-2022-03-01";
+  version = "unstable-2022-07-12";
 
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = pname;
-    rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c";
-    sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno=";
+    rev = "ec72798240c0561dea8341d828e8c72bb0cc36c5";
+    sha256 = "sha256-RAl1DaeMR7eYYwqVAvm6nib5gEGaM/t7TR8u1IpqOIM=";
   };
 
-  vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c=";
+  vendorSha256 = "sha256-dXAJOifRtzcTyGzUTFu9+daGAlL/5dQSwcjerkZDuKA=";
 
   doCheck = false;
 

From 42de620da4009965ec35d73a45b97eda83c3101d Mon Sep 17 00:00:00 2001
From: Iwan Briquemont <tracnar@gmail.com>
Date: Sat, 13 Aug 2022 20:08:32 +0200
Subject: [PATCH 43/54] numberstation: gobject-introspection is needed at
 runtime by pygobject3

---
 pkgs/applications/misc/numberstation/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix
index af50644f1f71..1dba44531e59 100644
--- a/pkgs/applications/misc/numberstation/default.nix
+++ b/pkgs/applications/misc/numberstation/default.nix
@@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec {
     desktop-file-utils
     glib
     gtk3
+    gobject-introspection
     meson
     ninja
     pkg-config
@@ -41,7 +42,6 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gobject-introspection
     gtk3
     libhandy
     librsvg

From 4143044a3f17a7a244496273c29847258915177c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 13 Aug 2022 21:02:55 +0200
Subject: [PATCH 44/54] python310Packages.aiotractive: 0.5.4 -> 0.5.5

---
 pkgs/development/python-modules/aiotractive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix
index f864dd35f1a8..cb560d88c7c1 100644
--- a/pkgs/development/python-modules/aiotractive/default.nix
+++ b/pkgs/development/python-modules/aiotractive/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "aiotractive";
-  version = "0.5.4";
+  version = "0.5.5";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "zhulik";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pcGUl8mq1O1QY5EPkNhWRLCKDn2FWAF9XymXkUXWEUk=";
+    sha256 = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA=";
   };
 
   propagatedBuildInputs = [

From 0cf5cd886164b9fa3679c8b9f4831104a2ff3a2b Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Fri, 12 Aug 2022 17:40:30 +0200
Subject: [PATCH 45/54] komga: init at 0.157.0

---
 pkgs/servers/komga/default.nix  | 33 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/servers/komga/default.nix

diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix
new file mode 100644
index 000000000000..fb8e3fd55acc
--- /dev/null
+++ b/pkgs/servers/komga/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, makeWrapper
+, jdk11_headless
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "komga";
+  version = "0.157.0";
+
+  src = fetchurl {
+    url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
+    sha256 = "sha256-PkQL61fKplt6h1jcFCIMER+ZfzowDP466dR1AaDHw5Q=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildCommand = ''
+    makeWrapper ${jdk11_headless}/bin/java $out/bin/komga --add-flags "-jar $src"
+  '';
+
+  meta = with lib; {
+    description = "Free and open source comics/mangas server";
+    homepage = "https://komga.org/";
+    license = licenses.mit;
+    platforms = jdk11_headless.meta.platforms;
+    maintainers = with maintainers; [ govanify ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6316fc0fe4c..cbc581f2d37e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4087,6 +4087,8 @@ with pkgs;
 
   klog = qt5.callPackage ../applications/radio/klog { };
 
+  komga = callPackage ../servers/komga { };
+
   krapslog = callPackage ../tools/misc/krapslog { };
 
   krelay = callPackage ../applications/networking/cluster/krelay { };

From c1896ff0654d819901433dff9572175c773d958b Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 13 Aug 2022 21:03:34 +0300
Subject: [PATCH 46/54] python310Packages.pyatspi: fix cross

python3.10-pyatspi> checking for a Python interpreter with version >= 2.6... none
python3.10-pyatspi> configure: error: no suitable Python interpreter found

then after PYTHON=

python3.10-pyatspi> ./configure: line 3939: which: command not found
---
 pkgs/development/python-modules/pyatspi/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index f839dc4df312..d32a4a1ca3a1 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }:
+{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome, python }:
 
 buildPythonPackage rec {
   pname = "pyatspi";
@@ -17,6 +17,16 @@ buildPythonPackage rec {
     pygobject3
   ];
 
+  configureFlags = [
+    "PYTHON=${python.pythonForBuild.interpreter}"
+  ];
+
+  postPatch = ''
+    # useless python existence check for us
+    substituteInPlace configure \
+      --replace '&& ! which' '&& false'
+  '';
+
   disabled = !isPy3k;
 
   passthru = {

From 7f3ad42166719506e33ba67b4bdc539a816c4728 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 19:28:38 +0000
Subject: [PATCH 47/54] snakemake: 7.12.0 -> 7.12.1

---
 pkgs/applications/science/misc/snakemake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 3777f6e24896..89a967678aa5 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "snakemake";
-  version = "7.12.0";
+  version = "7.12.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-URywo88EcQBYorwnKqgGOzunf2JunEWa36adhA1wha0=";
+    hash = "sha256-QfSk6K/Vpj3+k+5w0thiP9O4CTvL8JDRwj4lDSt2NnU=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From be47339ee7514885b413d02bfc84a3356e7bef97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 20:31:43 +0000
Subject: [PATCH 48/54] prometheus-redis-exporter: 1.37.0 -> 1.43.1

---
 pkgs/servers/monitoring/prometheus/redis-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index fa654c3a4656..17a09e07b084 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.37.0";
+  version = "1.43.1";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-S60/SwbMp6INf98MGc26zMZH8q7gBynyaT/ivN7o0rA=";
+    sha256 = "sha256-5S9c2lx7EQthY0bTPCSwVcGCD5G+IJEMV5zpCkjTw0s=";
   };
 
-  vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc=";
+  vendorSha256 = "sha256-E4+eUjkrOUnVg2CfCo1rc+Zs5HAm4+i8Ax0G8WnsL64=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"

From 8d1b0356a41dca4a45f1af307418d4cbd44f0008 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 21:07:49 +0000
Subject: [PATCH 49/54] python310Packages.exchangelib: 4.7.3 -> 4.7.6

---
 pkgs/development/python-modules/exchangelib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index 137f034d51a0..1ca0c2046568 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "exchangelib";
-  version = "4.7.3";
+  version = "4.7.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "ecederstrand";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-79113cUVl07oeXjlDaqfdfwNZvD7EWJK8JKHsPnBRG8=";
+    hash = "sha256-Oarmdc2PuE4kQ/qUqQhuzdTpIrrMFCK72CrVmoSH1DI=";
   };
 
   propagatedBuildInputs = [

From 999916d802c8b4121323043bb19af73ace649c1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 13 Aug 2022 23:31:32 +0200
Subject: [PATCH 50/54] python3Packages.psycopg: use proper shared library
 extension

Closes: #185918
---
 pkgs/development/python-modules/psycopg/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 23e0f0bc0f9a..6c80ab10f745 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , fetchurl
@@ -59,7 +60,7 @@ buildPythonPackage {
   patches = [
     (substituteAll {
       src = ./libpq.patch;
-      libpq = "${postgresql.lib}/lib/libpq.so";
+      libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
   ];
 

From 92f9aabe1b45c526e922023c4c06bdc849e757a8 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 1 Aug 2022 00:32:51 +0300
Subject: [PATCH 51/54] =?UTF-8?q?gpxsee:=2011.1=20=E2=86=92=2011.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/gpxsee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 7ce85dc6f767..0fbfbcba3139 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gpxsee";
-  version = "11.1";
+  version = "11.3";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84=";
+    sha256 = "sha256-n8busir6IYyWyGOv9AzYjm8erR0fjMAduIzITH+EvVI=";
   };
 
   patches = (substituteAll {

From 8dfe2136dd5e2849a20c31f57dd05e73852ee8f6 Mon Sep 17 00:00:00 2001
From: Xavier Lambein <xlambein@gmail.com>
Date: Sun, 14 Aug 2022 00:24:30 +0200
Subject: [PATCH 52/54] wasm-bindgen-cli: 0.2.81 -> 0.2.82

---
 pkgs/development/tools/wasm-bindgen-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 4c8941e973cf..1fd0284784c6 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-bindgen-cli";
-  version = "0.2.81";
+  version = "0.2.82";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-DUcY22b9+PD6RD53CwcoB+ynGulYTEYjkkonDNeLbGM=";
+    sha256 = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU=";
   };
 
-  cargoSha256 = "sha256-mfVQ6rSzCgwYrN9WwydEpkm6k0E3302Kfs/LaGzRSHE=";
+  cargoSha256 = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 8bc6440d3b647c58d6037ba3143132c04a0f4d98 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Sun, 14 Aug 2022 08:37:40 +1000
Subject: [PATCH 53/54] spot: add platforms.linux to meta.platforms

Motivation: Ensure Hydra builds this on aarch64-linux.
---
 pkgs/applications/audio/spot/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix
index 7dab868b941a..e995f8cfa1b9 100644
--- a/pkgs/applications/audio/spot/default.nix
+++ b/pkgs/applications/audio/spot/default.nix
@@ -80,5 +80,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/xou816/spot";
     license = licenses.mit;
     maintainers = with maintainers; [ jtojnar tomfitzhenry ];
+    platforms = platforms.linux;
   };
 }

From 86ead2fed9cbd61ef7b7f4f2af4702a9456536cf Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 14 Aug 2022 00:47:24 +0200
Subject: [PATCH 54/54] communi: fix on Darwin

Manual `wrapQtApp` call was previously removed in e0532475bca400362a2a488e31c86c6628a8e55a
but is required here because we work around `wrapQtAppsHook` trying to wrap
dylibs in app bundles.
---
 pkgs/applications/networking/irc/communi/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 71c559cbe713..cbd099c33bc7 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
     qtbase
   ];
 
+  # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin
+  # Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script
+  # So we manually call the wrapper script on just the binary
+  dontWrapQtApps = stdenv.isDarwin;
+
   preConfigure = ''
     export QMAKEFEATURES=${libcommuni}/features
   '';
@@ -51,6 +56,9 @@ stdenv.mkDerivation rec {
       install_name_tool \
         -add_rpath @executable_path/../Frameworks \
         $out/Applications/Communi.app/Contents/MacOS/Communi
+
+      # Do not remove until wrapQtAppsHook doesn't wrap dylibs in app bundles anymore
+      wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi
     '' else ''
       substituteInPlace "$out/share/applications/communi.desktop" \
         --replace "/usr/bin" "$out/bin"
@@ -66,6 +74,5 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ hrdinka ];
     platforms = platforms.all;
-    broken = stdenv.isDarwin;
   };
 }