From 0e3b22768dd80530401af2757a1bd9e0b6a4612b Mon Sep 17 00:00:00 2001
From: Andrei Lapshin <alapshin@fastmail.com>
Date: Sat, 28 May 2022 14:15:48 +0300
Subject: [PATCH 01/59] Android Studio: allow to pass shell arguments

Pass parameters to Android Studio shell script.
This way Android Studio can be used as git diff/merge tool.
For example
```
[difftool "androidstudio"]
        cmd = android-studio nosplash diff $LOCAL $REMOTE 2>/dev/null
        trustExitCode = true

[mergetool "androidstudio"]
        cmd = android-studio nosplash merge $LOCAL $REMOTE $BASE $MERGED 2>/dev/null
        trustExitCode = true
```

See https://www.jetbrains.com/help/idea/working-with-the-ide-features-from-command-line.html#arguments
---
 pkgs/applications/editors/android-studio/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 25dffad43bb9..bc74edf5261d 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -196,7 +196,7 @@ in runCommand
   {
     startScript = ''
       #!${bash}/bin/bash
-      ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
+      ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@"
     '';
     preferLocalBuild = true;
     allowSubstitutes = false;

From 0ab5366945457afca70a6b997b53001288ef7837 Mon Sep 17 00:00:00 2001
From: deinferno <14363193+deinferno@users.noreply.github.com>
Date: Sat, 11 Jun 2022 18:50:46 +0500
Subject: [PATCH 02/59] linuxPackages.vmware: w16.2.3-k5.17 -> w16.2.3-k5.18

---
 pkgs/os-specific/linux/vmware/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/vmware/default.nix b/pkgs/os-specific/linux/vmware/default.nix
index 5fd6bb12e1ab..ecc43bf3f3a9 100644
--- a/pkgs/os-specific/linux/vmware/default.nix
+++ b/pkgs/os-specific/linux/vmware/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mkubecek";
     repo = "vmware-host-modules";
-    rev = "w${vmware-workstation.version}-k5.17";
-    sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0=";
+    rev = "w${vmware-workstation.version}-k5.18";
+    sha256 = "sha256-sAeCjaSrBXGP5szfCY5CpMrGwzCw4aM67EN+YfA3AWA=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mkubecek/vmware-host-modules";
     license = licenses.gpl2Only;
     platforms = [ "x86_64-linux" ];
-    broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.18";
+    broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.19";
     maintainers = with maintainers; [ deinferno ];
   };
 }

From fd30e1de1e9f5e192b392d9fd2f7909229f35b05 Mon Sep 17 00:00:00 2001
From: troydm <d.geurkov@gmail.com>
Date: Tue, 14 Jun 2022 16:29:35 +0300
Subject: [PATCH 03/59] rtl8192eu: update at 4.4.1.20220614

---
 pkgs/os-specific/linux/rtl8192eu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix
index 1f2559e06374..c91353e465e3 100644
--- a/pkgs/os-specific/linux/rtl8192eu/default.nix
+++ b/pkgs/os-specific/linux/rtl8192eu/default.nix
@@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
 
 in stdenv.mkDerivation rec {
   pname = "rtl8192eu";
-  version = "${kernel.version}-4.4.1.20220313";
+  version = "${kernel.version}-4.4.1.20220614";
 
   src = fetchFromGitHub {
     owner = "Mange";
     repo = "rtl8192eu-linux-driver";
-    rev = "e0f967cea1d0037c730246c572f7fef000865ff7";
-    sha256 = "sha256-Wgp1MZ/z8AxbZPYsmR6t7Q4nsL0TFEqTEsrkkWPI6gI=";
+    rev = "6ba1f320963376f15ea216238c0b62ff3e71fa82";
+    sha256 = "sha256-c5swRxSjWT1tCcR7tfFKdAdVVmAEYgMZuOwUxGYYESI=";
   };
 
   hardeningDisable = [ "pic" ];

From c5edc1d38aaa960a04ad2c675af102debde12462 Mon Sep 17 00:00:00 2001
From: Adam Saponara <as@php.net>
Date: Sun, 29 May 2022 13:00:49 -0400
Subject: [PATCH 04/59] mle: 1.4.3 -> 1.5.0

---
 pkgs/applications/editors/mle/default.nix | 48 +++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix
index 506f94237ff8..e6744ac8a82e 100644
--- a/pkgs/applications/editors/mle/default.nix
+++ b/pkgs/applications/editors/mle/default.nix
@@ -1,26 +1,53 @@
-{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3, makeWrapper, installShellFiles }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, pcre
+, uthash
+, lua5_4
+, makeWrapper
+, installShellFiles
+}:
 
 stdenv.mkDerivation rec {
   pname = "mle";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "adsr";
     repo = "mle";
     rev = "v${version}";
-    sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1";
+    sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0";
   };
 
-  # Fix location of Lua 5.3 header and library
+  # Bug fixes found after v1.5.0 release
+  patches = [
+    (fetchpatch {
+      name = "skip_locale_dep_test.patch";
+      url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch";
+      sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw=";
+    })
+    (fetchpatch {
+      name = "fix_input_trail.patch";
+      url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch";
+      sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ=";
+    })
+  ];
+
+  # Fix location of Lua 5.4 header and library
   postPatch = ''
-    substituteInPlace Makefile --replace "-llua5.3" "-llua";
-    substituteInPlace mle.h    --replace "<lua5.3/" "<";
+    substituteInPlace Makefile --replace "-llua5.4" "-llua";
+    substituteInPlace mle.h    --replace "<lua5.4/" "<";
     patchShebangs tests/*
   '';
 
+  # Use select(2) instead of poll(2) (poll is returning POLLINVAL on macOS)
+  # Enable compiler optimization
+  CFLAGS = "-DTB_OPT_SELECT -O2";
+
   nativeBuildInputs = [ makeWrapper installShellFiles ];
 
-  buildInputs = [ termbox pcre uthash lua5_3 ];
+  buildInputs = [ pcre uthash lua5_4 ];
 
   doCheck = true;
 
@@ -30,13 +57,8 @@ stdenv.mkDerivation rec {
     installManPage mle.1
   '';
 
-  postFixup = lib.optionalString stdenv.isDarwin ''
-    wrapProgram $out/bin/mle --prefix DYLD_LIBRARY_PATH : ${termbox}/lib
-  '';
-
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
-    description = "Small, flexible terminal-based text editor";
+    description = "Small, flexible, terminal-based text editor";
     homepage = "https://github.com/adsr/mle";
     license = licenses.asl20;
     platforms = platforms.unix;

From 18a60d21caac32d0c606309d0bef0d4c19409365 Mon Sep 17 00:00:00 2001
From: Jamie Quigley <jamie@quigley.xyz>
Date: Wed, 15 Jun 2022 19:43:56 +0100
Subject: [PATCH 05/59] xow_dongle-firmware: don't perform unpack &
 installation in buildPhase

---
 .../linux/firmware/xow_dongle-firmware/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
index 0375eb0eead8..72e3817f2aa2 100644
--- a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   pname = "xow_dongle-firmware";
   version = "2017-07";
 
-  dontUnpack = true;
-  dontInstall = true;
+  dontConfigure = true;
+  dontBuild = true;
 
   src = fetchurl {
     url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab";
@@ -14,10 +14,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cabextract ];
 
-  buildPhase = ''
+  sourceRoot = "./.";
+
+  unpackCmd = ''
     cabextract -F FW_ACC_00U.bin ${src}
-    mkdir -p $out/lib/firmware
-    cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin
+  '';
+
+  installPhase = ''
+    install -Dm644 FW_ACC_00U.bin ${placeholder "out"}/lib/firmware/xow_dongle.bin
   '';
 
   meta = with lib; {

From fdc792bf61781fe34815e502f7fc3dcacee1f0fb Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 27 Jun 2022 20:04:58 -0700
Subject: [PATCH 06/59] openafs: Patch for Linux kernel 5.18

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/servers/openafs/1.8/module.nix | 48 +++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 6e738d025ea0..f27b8188907b 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -38,14 +38,9 @@ stdenv.mkDerivation {
   buildInputs = [ libkrb5 ];
 
   patches = [
-    # Add autoconf-archive to src/external
-    (fetchBase64Patch {
-      url = "https://gerrit.openafs.org/changes/14942/revisions/006616bd8e88b2d386a5ddc23973cf3e625cb80d/patch";
-      hash = "sha256-55sc2sKy5XkQHAv6ysVxi69+0xVsHnN2TS144UTeLHU=";
-    })
     # Import of code from autoconf-archive
-    (fetchBase64Patch {
-      url = "https://gerrit.openafs.org/changes/14943/revisions/d3782b1d4e6fd81c5432e95112eb44305f07f272/patch";
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=d8205bbb482554812fbe66afa3c337d991a247b6";
       hash = "sha256-ohkjSux+S3+6slh6uZIw5UJXlvhy9UUDpDlP0YFRwmw=";
     })
     # Use autoconf-archive m4 from src/external
@@ -53,6 +48,11 @@ stdenv.mkDerivation {
       url = "https://gerrit.openafs.org/changes/14944/revisions/ea2a0e128d71802f61b8da2e44de3c6325c5f328/patch";
       hash = "sha256-PAUk/MXL5p8xwhn40/UGmo3UIhvl1PB2FwgqhmqsjJ4=";
     })
+    # cf: Use common macro to test compiler flags
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=790824ff749b6ee01c4d7101493cbe8773ef41c6";
+      hash = "sha256-Zc7AjCsH7eTmZJWCrx7ci1tBjEAgcFXS9lY1YBeboLA=";
+    })
     # Linux-5.17: kernel func complete_and_exit renamed
     (fetchBase64Patch {
       url = "https://gerrit.openafs.org/changes/14945/revisions/a714e865efe41aa1112f6f9c8479112660dacd6f/patch";
@@ -63,6 +63,36 @@ stdenv.mkDerivation {
       url = "https://gerrit.openafs.org/changes/14946/revisions/449d1faf87e2841e80be38cf2b4a5cf5ff4df2d8/patch";
       hash = "sha256-3bRTHYeMRIleLhob56m2Xt0dWzIMDo3QrytY0K1/q7c=";
     })
+    # afs: Introduce afs_IsDCacheFresh
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=0d8ce846ab2e6c45166a61f04eb3af271cbd27db";
+      hash = "sha256-+xgRYVXz8XpT5c4Essc4VEn9Fj53vasAYhcFkK0oCBc=";
+    })
+    # LINUX: Don't panic on some file open errors
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=af73b9a3b1fc625694807287c0897391feaad52d";
+      hash = "sha256-k0d+Gav1LApU24SaMI0pmR3gGfWyicqdCpTpVJLcx7U=";
+    })
+    # Linux-5.18 replace set_page_dirty with dirty_folio
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=6aa129e743e882cf30c35afd67eabf82274c5fca";
+      hash = "sha256-8R0rdKYs7+Zl1sdizOZzpBjy6e9J+42R9HzsNUa/PQ4=";
+    })
+    # afs: introduce afs_alloc_ncr/afs_free_ncr
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=209eb92448001e59525413610356070d8e4f10a0";
+      hash = "sha256-t455gTaK5U+m0qcyKjTqnWTOb4qz6VN/JYZzRAAV8kM=";
+    })
+    # afs: introduce get_dcache_readahead
+    (fetchpatch {
+      url = "https://git.openafs.org/?p=openafs.git;a=patch;h=44e24ae5d7dc41e54d23638d5f64ab2e81e43ad0";
+      hash = "sha256-gtUNDSHAq+RY1Rm17YcxcUALy7FEBQf9k8/ELQlPORU=";
+    })
+    # Linux-5.18: replace readpages with readahead
+    (fetchBase64Patch {
+      url = "https://gerrit.openafs.org/changes/14953/revisions/0497b0cd7bffb6335ab9bcbf5a1310b8c6a4b299/patch";
+      hash = "sha256-a5pd+CHHPr1mGxsF7tSlaBqoiKw2IGr1mJ7EaDHDJSw=";
+    })
   ];
 
   hardeningDisable = [ "pic" ];
@@ -102,7 +132,7 @@ stdenv.mkDerivation {
     homepage = "https://www.openafs.org";
     license = licenses.ipl10;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ maggesi spacefrogg ];
-    broken = kernel.isHardened || kernel.kernelAtLeast "5.18";
+    maintainers = with maintainers; [ andersk maggesi spacefrogg ];
+    broken = kernel.isHardened || kernel.kernelAtLeast "5.19";
   };
 }

From 4affa1417d50b503403ae7d3d4bb2461a192de38 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Mon, 4 Jul 2022 12:15:32 -0700
Subject: [PATCH 07/59] svd2rust: 0.24.0 -> 0.24.1

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

diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index dbd0876eb545..7efcfb08c479 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ=";
+    sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k=";
   };
 
-  cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE=";
+  cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 

From f4697343c6dfc114d9788655f51ca5047e345745 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 5 Jul 2022 14:55:59 +0800
Subject: [PATCH 08/59] solaar: 1.1.3 -> 1.1.4 and move udev rules to an
 individual output

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

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index 230abcf28514..7ca0520a43c9 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -13,15 +13,17 @@
 # logitech-udev-rules instead of adding this to services.udev.packages on NixOS
 python3Packages.buildPythonApplication rec {
   pname = "solaar";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "pwr-Solaar";
     repo = "Solaar";
     rev = version;
-    hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s=";
+    hash = "sha256-nDfVF7g0M54DRpkH1rnZB8o+nCV4A6b1uKMOMRQ3GbI=";
   };
 
+  outputs = [ "out" "udev" ];
+
   nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
   buildInputs = [ libappindicator librsvg ];
 
@@ -41,12 +43,9 @@ python3Packages.buildPythonApplication rec {
   postInstall = ''
     ln -s $out/bin/solaar $out/bin/solaar-cli
 
-    install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules
+    install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules
   '';
 
-  # No tests
-  doCheck = false;
-
   meta = with lib; {
     description = "Linux devices manager for the Logitech Unifying Receiver";
     longDescription = ''
@@ -61,7 +60,7 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://pwr-solaar.github.io/Solaar/";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ spinus ysndr ];
+    maintainers = with maintainers; [ spinus ysndr oxalica ];
     platforms = platforms.linux;
   };
 }

From cce5385de5f6766e55ff52d0975a122bc4b347dd Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 5 Jul 2022 11:07:32 +0800
Subject: [PATCH 09/59] logitech-udev-rules: make it an alias of solaar.udev

---
 pkgs/applications/misc/solaar/default.nix     |  3 ++-
 .../linux/logitech-udev-rules/default.nix     | 19 -------------------
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/logitech-udev-rules/default.nix

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index 7ca0520a43c9..7f2e4207d0be 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -10,7 +10,8 @@
 }:
 
 # Although we copy in the udev rules here, you probably just want to use
-# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
+# `logitech-udev-rules`, which is an alias to `udev` output of this derivation,
+# instead of adding this to `services.udev.packages` on NixOS,
 python3Packages.buildPythonApplication rec {
   pname = "solaar";
   version = "1.1.4";
diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix
deleted file mode 100644
index 0b0e9e8f203d..000000000000
--- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, stdenv, solaar }:
-
-# ltunifi and solaar both provide udev rules but solaar's rules are more
-# up-to-date so we simply use that instead of having to maintain our own rules
-
-stdenv.mkDerivation {
-  pname = "logitech-udev-rules";
-  inherit (solaar) version;
-
-  buildCommand = ''
-    install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules
-  '';
-
-  meta = with lib; {
-    description = "udev rules for Logitech devices";
-    inherit (solaar.meta) homepage license platforms;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25bac6e56b2c..003ac62a352d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24846,7 +24846,9 @@ with pkgs;
 
   logiops = callPackage ../misc/drivers/logiops { };
 
-  logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules { };
+  # ltunifi and solaar both provide udev rules but solaar's rules are more
+  # up-to-date so we simply use that instead of having to maintain our own rules
+  logitech-udev-rules = solaar.udev;
 
   # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi
   # lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia

From c99706f826fdd86ced5af6daf4621994cdfa1e9d Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Tue, 5 Jul 2022 23:44:44 +0200
Subject: [PATCH 10/59] openrct2: 0.4.0 -> 0.4.1

- Split included arguments into lines for more readable diffs.
- Include flac/ogg/vorbis, as they are now required.
- Include discord-rpc and gbenchmark as their absence disabled those
  features, especially Discord support for those who might want it.

https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.1
---
 pkgs/games/openrct2/default.nix | 40 +++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 41c3ccac1f9f..b9ffec66bcc1 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -1,29 +1,50 @@
 { lib, stdenv, fetchFromGitHub
-, SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU
-, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config
-, speexdsp, zlib
+
+, SDL2
+, cmake
+, curl
+, discord-rpc
+, duktape
+, flac
+, fontconfig
+, freetype
+, gbenchmark
+, icu
+, jansson
+, libGLU
+, libiconv
+, libogg
+, libpng
+, libpthreadstubs
+, libvorbis
+, libzip
+, nlohmann_json
+, openssl
+, pkg-config
+, speexdsp
+, zlib
 }:
 
 let
-  openrct2-version = "0.4.0";
+  openrct2-version = "0.4.1";
 
   # Those versions MUST match the pinned versions within the CMakeLists.txt
   # file. The REPLAYS repository from the CMakeLists.txt is not necessary.
-  objects-version = "1.2.7";
+  objects-version = "1.3.2";
   title-sequences-version = "0.4.0";
 
   openrct2-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${openrct2-version}";
-    sha256 = "sha256-4MDOLOPsKzk1vb1o/G90/NTyYJWBSrGRX6ZJETbBIaI=";
+    sha256 = "sha256-fMs0zrMzv9jXreZE4QyYIdvWUU/FUFVPuo4EzAF/2rU=";
   };
 
   objects-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "objects";
     rev = "v${objects-version}";
-    sha256 = "sha256-R4+rEdGdvYwFrkm/S3+zXmU+UDam51dI/pWKmFXNrbE=";
+    sha256 = "sha256-BG0IRiNb2l6/3P7tvuUqMoYNh1zkOS0lCFDDh7m9Q7Y=";
   };
 
   title-sequences-src = fetchFromGitHub {
@@ -47,15 +68,20 @@ stdenv.mkDerivation {
   buildInputs = [
     SDL2
     curl
+    discord-rpc
     duktape
+    flac
     fontconfig
     freetype
+    gbenchmark
     icu
     jansson
     libGLU
     libiconv
+    libogg
     libpng
     libpthreadstubs
+    libvorbis
     libzip
     nlohmann_json
     openssl

From 469ed5a81262da29abaa16f01e2ac052c3f7b936 Mon Sep 17 00:00:00 2001
From: Jakob Neufeld <jakob.n.neufeld@gmail.com>
Date: Wed, 6 Jul 2022 00:54:38 +0200
Subject: [PATCH 11/59] dt-shell-color-scripts: unstable-2022-02-22 ->
 unstable-2022-07-25

---
 pkgs/tools/misc/dt-shell-color-scripts/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/dt-shell-color-scripts/default.nix b/pkgs/tools/misc/dt-shell-color-scripts/default.nix
index 6a0b3da4410f..4dedbd66b332 100644
--- a/pkgs/tools/misc/dt-shell-color-scripts/default.nix
+++ b/pkgs/tools/misc/dt-shell-color-scripts/default.nix
@@ -1,22 +1,23 @@
 { stdenv
 , lib
 , fetchFromGitLab
+, installShellFiles
 , runtimeShell
 , makeWrapper
 }:
 
 stdenv.mkDerivation {
   pname = "dt-shell-color-scripts";
-  version = "unstable-2022-02-22";
+  version = "unstable-2022-07-25";
 
   src = fetchFromGitLab {
     owner = "dwt1";
     repo = "shell-color-scripts";
-    rev = "fcd013ea2e1ff80e01adbcea9d0eaf9c73db94c0";
-    sha256 = "sha256-bd3NBf99rCiADUKQb6fzCBDaKBmYaZHcO4qokm/39do=";
+    rev = "da2e3c512b94f312ee54a38d5cde131b0511ad01";
+    sha256 = "sha256-cdTgBbtsbJHaJuLIcZh0g0jKOrQyFx3P6QhYNx8hz0U=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper installShellFiles ];
 
   installPhase = ''
     runHook preInstall
@@ -25,6 +26,9 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     mkdir -p $out/opt/shell-color-scripts/
     cp -r colorscripts $out/opt/shell-color-scripts/colorscripts
+    installManPage colorscript.1
+    installShellCompletion --fish completions/colorscript.fish
+    installShellCompletion --zsh completions/_colorscript
     chmod +x colorscript.sh
     cp colorscript.sh $out/bin/colorscript
     substituteInPlace $out/bin/colorscript \

From 29946c6c213e6e0272a8b420b846279201429949 Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Fri, 1 Jul 2022 15:22:08 +0000
Subject: [PATCH 12/59] snipe-it: 6.0.5 -> 6.0.7

https://github.com/snipe/snipe-it/releases/tag/v6.0.6
https://github.com/snipe/snipe-it/releases/tag/v6.0.7
---
 pkgs/servers/web-apps/snipe-it/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix
index 02a1ff30d8f9..0f0c03a595e8 100644
--- a/pkgs/servers/web-apps/snipe-it/default.nix
+++ b/pkgs/servers/web-apps/snipe-it/default.nix
@@ -18,13 +18,13 @@ let
 
 in package.override rec {
   pname = "snipe-it";
-  version = "6.0.5";
+  version = "6.0.7";
 
   src = fetchFromGitHub {
     owner = "snipe";
     repo = pname;
     rev = "v${version}";
-    sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb";
+    sha256 = "09jvkz7j2qb79mjnyrz75015xpgf8l483yha3ma14pzk4pibn620";
   };
 
   meta = with lib; {

From 10e21aef1ceb24c5a8b7b33547138060c354e24e Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Thu, 7 Jul 2022 07:30:13 +0000
Subject: [PATCH 13/59] mysql-shell: fix missing pyyaml dependency

---
 pkgs/development/tools/mysql-shell/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix
index 915ed33c4669..e83846364170 100644
--- a/pkgs/development/tools/mysql-shell/default.nix
+++ b/pkgs/development/tools/mysql-shell/default.nix
@@ -31,14 +31,12 @@
 , CoreServices
 , developer_cmds
 , DarwinTools
+, makeWrapper
 }:
 
 let
-  pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ];
-  site = ''
-
-    import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}])
-  '';
+  pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
+  pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps;
 in
 stdenv.mkDerivation rec{
   pname = "mysql-shell";
@@ -62,12 +60,9 @@ stdenv.mkDerivation rec{
     substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
 
     substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
-
-    # For python dependencies
-    echo '${site}' >> python/packages/mysqlsh/__init__.py
   '';
 
-  nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
+  nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
 
   buildInputs = [
     boost
@@ -121,6 +116,10 @@ stdenv.mkDerivation rec{
 
   CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ];
 
+  postFixup = ''
+    wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}"
+  '';
+
   meta = with lib; {
     homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/";
     description = "A new command line scriptable shell for MySQL";

From ee803e037976e5475849618c3ac07272ec219df3 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Thu, 7 Jul 2022 19:37:20 +0300
Subject: [PATCH 14/59] draco: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix
index d35e9a229a56..dfce8765062f 100644
--- a/pkgs/development/libraries/draco/default.nix
+++ b/pkgs/development/libraries/draco/default.nix
@@ -16,14 +16,14 @@ let
   cmakeBool = b: if b then "ON" else "OFF";
 in
 stdenv.mkDerivation rec {
-  version = "1.5.2";
+  version = "1.5.3";
   pname = "draco";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "draco";
     rev = version;
-    sha256 = "sha256-o6KQJFrnxx2kz6g3vXk1w435OmaJhAJjzsKM/gmVJ2M=";
+    sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ=";
     fetchSubmodules = true;
   };
 

From 1ba2a7f398c7dcab78ac4e3e8d93d3066c550b59 Mon Sep 17 00:00:00 2001
From: WeebSorceress <hello@weebsorceress.anonaddy.me>
Date: Sat, 9 Jul 2022 14:51:57 -0300
Subject: [PATCH 15/59] anime-downloader: fix bug with qt build

---
 pkgs/applications/video/anime-downloader/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix
index eb69f4be8155..60e89c2fdf68 100644
--- a/pkgs/applications/video/anime-downloader/default.nix
+++ b/pkgs/applications/video/anime-downloader/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, aria2, mpv, nodejs, fetchFromGitHub }:
+{ lib, python3, aria2, mpv, nodejs, qt5, fetchFromGitHub }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "anime-downloader";
@@ -11,6 +11,8 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
   };
 
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
   propagatedBuildInputs = [
     aria2
     mpv
@@ -31,6 +33,10 @@ python3.pkgs.buildPythonApplication rec {
     tabulate
   ]);
 
+  preFixup = ''
+    wrapQtApp "$out/bin/anime" --prefix PATH : ${lib.makeBinPath propagatedBuildInputs}
+  '';
+
   doCheck = false;
   # FIXME: checks must be disabled because they are lacking the qt env.
   #        They fail like this, even if built and wrapped with all Qt and runtime dependencies.

From a2d05bac402454f365a3afa0143ac18e2cf464d9 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 10 Jul 2022 10:48:06 +0200
Subject: [PATCH 16/59] cargo-public-api: init 0.12.2

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../tools/rust/cargo-public-api/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cargo-public-api/default.nix

diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
new file mode 100644
index 000000000000..ef4f8dcb2fb2
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, pkg-config
+, openssl
+, stdenv
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-public-api";
+  version = "0.12.2";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-ZpzR6A9mV6ARz2+SedVtLjNANOEj8Ks09AWcQooltug=";
+  };
+
+  cargoSha256 = "sha256-8BZ1fPzRSJysyLCmoMxk+8xOfmfIs7viHFCeSfnxvt8=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  # Tests fail
+  doCheck = false;
+
+  meta = with lib; {
+    description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations";
+    homepage = "https://github.com/Enselic/cargo-public-api";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c384a14b817..afd824ad93c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14142,6 +14142,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
+
   crate2nix = callPackage ../development/tools/rust/crate2nix { };
 
   convco = callPackage ../development/tools/convco {

From 07f2b4bebf1a457d4e709ad20b3c53aa55a960e7 Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com>
Date: Mon, 11 Jul 2022 07:50:16 +0200
Subject: [PATCH 17/59] linux-firmware: 20220610 -> 20220708

---
 pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
index 1ad89613a29a..78f1001a3596 100644
--- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20220610";
+  version = "20220708";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
-    sha256 = "sha256-vsMkuTafr//ryivdBphTGZPoTsmTuvp+BFp3lKo3YYI=";
+    sha256 = "sha256-jsmbBxQ4RHBySBq2lks5tJ6YTwwlkvVe2Xc0CDJY8IE=";
   };
 
   installFlags = [ "DESTDIR=$(out)" ];
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec {
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "sha256-qJoaJacxb60ugdk5s1oZ9CLGjWKDnT5jWZEwHPnK50Y=";
+  outputHash = "sha256-FNYZMJnqR2waODUXisch3ObdEjwQN94QSiBE2dDW4sk=";
 
   meta = with lib; {
     description = "Binary firmware collection packaged by kernel.org";

From bc60496489beeed7432fd080e3856baef9377f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCrkan=20G=C3=BCr?= <gurkan.gur@innogames.com>
Date: Mon, 11 Jul 2022 10:34:33 +0200
Subject: [PATCH 18/59] pinentry-rofi: init at 2.0.3

---
 pkgs/tools/security/pinentry-rofi/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/security/pinentry-rofi/default.nix

diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/tools/security/pinentry-rofi/default.nix
new file mode 100644
index 000000000000..b971f37af69c
--- /dev/null
+++ b/pkgs/tools/security/pinentry-rofi/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, autoreconfHook
+, autoconf-archive
+, guile
+, texinfo
+, rofi
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pinentry-rofi";
+  version = "2.0.3";
+
+  src = fetchFromGitHub {
+    owner = "plattfot";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-EzbeMAhdn9SuSmE+aMHeyuje3s74isIKRDTrFO3bX04=";
+  };
+
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    pkg-config
+    texinfo
+  ];
+
+  buildInputs = [ guile ];
+
+  propagatedBuildInputs = [ rofi ];
+
+  meta = with lib; {
+    description = "Rofi frontend to pinentry";
+    homepage = "https://github.com/plattfot/pinentry-rofi";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ seqizz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de5b09bd0397..a504b107fe76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9610,6 +9610,8 @@ with pkgs;
 
   pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
 
+  pinentry-rofi = callPackage ../tools/security/pinentry-rofi { };
+
   pingtcp = callPackage ../tools/networking/pingtcp { };
 
   pinnwand = callPackage ../servers/pinnwand { };

From 7732635d42dedb809a6e6c9a607f56cff1e438e8 Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Tue, 12 Jul 2022 12:01:47 +0200
Subject: [PATCH 19/59] ddnet: 16.2.1 -> 16.2.2

---
 pkgs/games/ddnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index 39bae61160a1..33b8ca4f0e9d 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "16.2.1";
+  version = "16.2.2";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = pname;
     rev = version;
-    sha256 = "sha256-xDUvBsiQk7qZN9HEMCrCfxJSCZ/PruEdS5EjnHFufTA=";
+    sha256 = "sha256-MrCPMtWdEsWUuvKaPWZK4Mh6nhPcKpsxkFKkWugdz8A=";
   };
 
   nativeBuildInputs = [ cmake ninja pkg-config ];

From dd874e783e5ea5e85bf4f03732bbe86e41c31fa5 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 12 Jul 2022 12:31:23 +0200
Subject: [PATCH 20/59] python310Packages.awslambdaric: Fix tests

---
 pkgs/development/python-modules/awslambdaric/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix
index 9347665c2809..bc6bbcd30d72 100644
--- a/pkgs/development/python-modules/awslambdaric/default.nix
+++ b/pkgs/development/python-modules/awslambdaric/default.nix
@@ -49,6 +49,11 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # Test fails with: Assertion error
+    "test_handle_event_request_fault_exception_logging_syntax_error"
+  ];
+
   pythonImportsCheck = [ "awslambdaric" "runtime_client" ];
 
   meta = with lib; {

From b6ec9e4914a616162c3166451d2fd2b352762732 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 12 Jul 2022 21:24:29 +0200
Subject: [PATCH 21/59] python310Packages.pylint-django: Fix tests

---
 .../development/python-modules/pylint-django/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix
index ca26f11ccb3b..e6d7c6bd63d3 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/pkgs/development/python-modules/pylint-django/default.nix
@@ -33,12 +33,11 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Skip outdated tests and the one with a missing dependency (django_tables2)
+    # AttributeError, AssertionError
     "external_django_tables2_noerror_meta_class"
-    "external_factory_boy_noerror"
-    "func_noerror_foreign_key_attributes"
-    "func_noerror_foreign_key_key_cls_unbound"
-    "test_everything"
+    "external_tastypie_noerror_foreign_key"
+    "func_noerror_model_unicode_lambda"
+    "0001_noerror_initial"
   ];
 
   pythonImportsCheck = [

From f8d9ca3703cd495aaf750925be2350d038cd156f Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Tue, 12 Jul 2022 23:36:20 +0200
Subject: [PATCH 22/59] gitea: 1.16.8 -> 1.16.9

---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 2cddeea81620..c9af0c8f1f02 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -14,12 +14,12 @@
 
 buildGoPackage rec {
   pname = "gitea";
-  version = "1.16.8";
+  version = "1.16.9";
 
   # not fetching directly from the git repo, because that lacks several vendor files for the web UI
   src = fetchurl {
     url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
-    sha256 = "sha256-W/AbRfnEQfnTjXJ8wTKEFOTld4rFsBvJiXnYK8Ugoj0=";
+    sha256 = "sha256-LxPYUSyRSfDlGwCC2IFPEISP4wsRJsUbwi9F7sxbMOE=";
   };
 
   unpackPhase = ''

From 1ed8ae38c954e5b4b2607f50bf50831d9dddda13 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 30 Jun 2022 23:28:12 +0300
Subject: [PATCH 23/59] quictls: 3.0.3+quick_unstable-2022-05.04 ->
 3.0.5+quick_unstable-2022-07.05

---
 pkgs/development/libraries/quictls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix
index 0f85836a9c68..3dab26f17489 100644
--- a/pkgs/development/libraries/quictls/default.nix
+++ b/pkgs/development/libraries/quictls/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quictls";
-  version = "3.0.3+quick_unstable-2022-05.04";
+  version = "3.0.5+quick_unstable-2022-07.05";
 
   src = fetchFromGitHub {
     owner = "quictls";
     repo = "openssl";
-    rev = "368c9d581b17f0bbe425f8dedeaa7b864a7b29ce";
-    sha256 = "sha256-W3bILxhyeziWQNZUHUg/D9eV8LnmHJqEFwyzWjJrRuc=";
+    rev = "75e940831d0570d6b020cfebf128ae500f424867";
+    sha256 = "sha256-1HBGKafcCbM0RZWLvyl3vpSfGBsAcGDgjz1Nm/qclWM=";
   };
 
   patches = [

From 94ffbb4fdfd2e96e2a34885d13a647f6064b26e9 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 30 Jun 2022 23:52:34 +0300
Subject: [PATCH 24/59] quictls: specify the ABI explicitly on mips64

cherry picked from commit 77d6781cdc7b472bc5d6991b5afc5b6c0928d3d6
---
 pkgs/development/libraries/quictls/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix
index 3dab26f17489..72640989be6e 100644
--- a/pkgs/development/libraries/quictls/default.nix
+++ b/pkgs/development/libraries/quictls/default.nix
@@ -68,6 +68,12 @@ stdenv.mkDerivation rec {
       x86_64-linux = "./Configure linux-x86_64";
       x86_64-solaris = "./Configure solaris64-x86_64-gcc";
       riscv64-linux = "./Configure linux64-riscv64";
+      mips64el-linux =
+        if stdenv.hostPlatform.isMips64n64
+        then "./Configure linux64-mips64"
+        else if stdenv.hostPlatform.isMips64n32
+        then "./Configure linux-mips64"
+        else throw "unsupported ABI for ${stdenv.hostPlatform.system}";
     }.${stdenv.hostPlatform.system} or (
       if stdenv.hostPlatform == stdenv.buildPlatform
         then "./config"

From 4f99d8e7089a310436342b3554a8ee649fe1d296 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 30 Jun 2022 23:46:40 +0300
Subject: [PATCH 25/59] quictls: disable ct feature in static mode

cherry picked from commit cc60c24909a8b207a0a2dfc18082453ab85c46af
---
 pkgs/development/libraries/quictls/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix
index 72640989be6e..22981bfef7af 100644
--- a/pkgs/development/libraries/quictls/default.nix
+++ b/pkgs/development/libraries/quictls/default.nix
@@ -7,6 +7,7 @@
 # This will cause c_rehash to refer to perl via the environment, but otherwise
 # will produce a perfectly functional openssl binary and library.
 , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
+, removeReferencesTo
 }:
 
 stdenv.mkDerivation rec {
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
     !(stdenv.hostPlatform.useLLVM or false) &&
     stdenv.cc.isGNU;
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl removeReferencesTo ];
   buildInputs = lib.optional withCryptodev cryptodev
     # perl is included to allow the interpreter path fixup hook to set the
     # correct interpreter in c_rehash.
@@ -111,7 +112,11 @@ stdenv.mkDerivation rec {
     # OpenSSL needs a specific `no-shared` configure flag.
     # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options
     # for a comprehensive list of configuration options.
-    ++ lib.optional static "no-shared";
+    ++ lib.optional static "no-shared"
+    # This introduces a reference to the CTLOG_FILE which is undesired when
+    # trying to build binaries statically.
+    ++ lib.optional static "no-ct"
+    ;
 
   makeFlags = [
     "MANDIR=$(man)/share/man"
@@ -124,13 +129,16 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = lib.optionalString (!static) ''
+  postInstall = (if static then ''
+    # OPENSSLDIR has a reference to self
+    ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a
+  '' else ''
     # If we're building dynamic libraries, then don't install static
     # libraries.
     if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
         rm "$out/lib/"*.a
     fi
-  '' + lib.optionalString (!stdenv.hostPlatform.isWindows)
+  '') + lib.optionalString (!stdenv.hostPlatform.isWindows)
     # Fix bin/c_rehash's perl interpreter line
     #
     # - openssl 1_0_2: embeds a reference to buildPackages.perl

From ff1f859bf310d14fe0df164239257846ff751c36 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Wed, 13 Jul 2022 14:18:25 -0400
Subject: [PATCH 26/59] kubernetes-helm: 3.9.0 -> 3.9.1

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index e62e7c999807..c89cbc27db93 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kubernetes-helm";
-  version = "3.9.0";
-  gitCommit = "7ceeda6c585217a19a1131663d8cd1f7d641b2a7";
+  version = "3.9.1";
+  gitCommit = "a7c043acb5ff905c261cfdc923a35776ba5e66e4";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "sha256-pdWFCepVGSJmlYnvcJCaNaGSllbeh/oCdosrab8jA4s=";
+    sha256 = "sha256-bhd8SyxiJ/8XrZpVwqvHSRe5gvE2VVEwmvUbVPsSC/4=";
   };
-  vendorSha256 = "sha256-r0a38ZB6VlyzKB66+OAllRLXhqwO0qbksZjOrBWdjqM=";
+  vendorSha256 = "sha256-v6jY90ht1S1tmO/Z9VGWDOz4zOSF0G77NSIqwAsktFo=";
 
   subPackages = [ "cmd/helm" ];
   ldflags = [

From eab2d27e22601c15de88a21038a36168bf248159 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Wed, 22 Jun 2022 23:37:09 +0200
Subject: [PATCH 27/59] hydrus: 488d -> 489

---
 pkgs/applications/graphics/hydrus/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index dcebff3fcf3a..207bc48779d8 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "hydrus";
-  version = "488d";
+  version = "489";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs=";
+    sha256 = "sha256-+5QKeDm/bJemGX/45YN4COtJmSMCy0dxIlqGNHEc8HA=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,7 @@ python3Packages.buildPythonPackage rec {
     pyopenssl
     pyside2
     pysocks
-    pythonPackages.mpv
+    python3Packages.mpv
     pyyaml
     qtpy
     requests
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3ce352d912d..27322acfa420 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27199,7 +27199,8 @@ with pkgs;
 
   gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
 
-  hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
+  hydrus = python39Packages.callPackage ../applications/graphics/hydrus {
+    python3Packages = python39Packages;
     inherit miniupnpc_2 swftools;
     inherit (qt5) wrapQtAppsHook;
   };

From 76562ec8d93f2373c024de917f0ba50b4cabeec2 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Mon, 27 Jun 2022 02:43:03 +0200
Subject: [PATCH 28/59] hydrus: unpin python version

---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27322acfa420..c3ce352d912d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27199,8 +27199,7 @@ with pkgs;
 
   gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
 
-  hydrus = python39Packages.callPackage ../applications/graphics/hydrus {
-    python3Packages = python39Packages;
+  hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
     inherit miniupnpc_2 swftools;
     inherit (qt5) wrapQtAppsHook;
   };

From 250157ab541816eb9f18d42b74721db8a22a4c0a Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Sun, 3 Jul 2022 01:29:06 +0200
Subject: [PATCH 29/59] hydrus: 489 -> 490

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

diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 207bc48779d8..5bdb36135bc3 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "hydrus";
-  version = "489";
+  version = "490";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-+5QKeDm/bJemGX/45YN4COtJmSMCy0dxIlqGNHEc8HA=";
+    sha256 = "sha256-jlLP5y0onSHN0QnbaCnQsSKP7Fj+LS408MPCUxi29yc=";
   };
 
   nativeBuildInputs = [

From cec2f720952958de5b4d02afdfd6cd6a0816f275 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Wed, 13 Jul 2022 23:48:11 +0200
Subject: [PATCH 30/59] hydrus: 490 -> 491

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

diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 5bdb36135bc3..d44ef1f9cf50 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "hydrus";
-  version = "490";
+  version = "491";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-jlLP5y0onSHN0QnbaCnQsSKP7Fj+LS408MPCUxi29yc=";
+    sha256 = "sha256-ceKawn2jyfZPP4HzhkB1jIQoStCPRO/Ni/+Ys1R2FJQ=";
   };
 
   nativeBuildInputs = [

From 6f5c1bcf7bb23e7844aa1e58864bdde1539f8c58 Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Wed, 13 Jul 2022 18:11:16 -0400
Subject: [PATCH 31/59] nixos/greetd: fix minor typo for default user

It has been like this since the module was added, but it hasn't caused
problems because greetd assumes a default user of "greeter"[1] when it
isn't found anyway

[1]: https://git.sr.ht/~kennylevinsen/greetd/tree/d70030962341a3ae7a88ecf2f7af748a5a6296d1/item/greetd/src/config/mod.rs#L127
---
 nixos/modules/services/display-managers/greetd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix
index 895961707d36..4fc6ca367491 100644
--- a/nixos/modules/services/display-managers/greetd.nix
+++ b/nixos/modules/services/display-managers/greetd.nix
@@ -54,7 +54,7 @@ in
   config = mkIf cfg.enable {
 
     services.greetd.settings.terminal.vt = mkDefault cfg.vt;
-    services.greetd.settings.default_session = mkDefault "greeter";
+    services.greetd.settings.default_session.user = mkDefault "greeter";
 
     security.pam.services.greetd = {
       allowNullPassword = true;

From d39b1faa01374b5fc4c3f0dc65fa7d1bdc16afd8 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Wed, 13 Jul 2022 19:34:05 -0400
Subject: [PATCH 32/59] nomad_1_3: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix
index 0145a5b10905..2ab2cf99634c 100644
--- a/pkgs/applications/networking/cluster/nomad/1.3.nix
+++ b/pkgs/applications/networking/cluster/nomad/1.3.nix
@@ -4,7 +4,7 @@
 
 callPackage ./generic.nix {
   inherit buildGoModule;
-  version = "1.3.1";
-  sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7";
-  vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh";
+  version = "1.3.2";
+  sha256 = "0vrcdm0xjimi5z1j180wigf4gd806w73jxvrzclv2d2pr7pab6qq";
+  vendorSha256 = "139bzvaw0nyl0whvs74m2hj2xww08zfd615wkn2y10c8f5h69arj";
 }

From 84e684b7ece0e5f2a94367d1bce581d779c5ac9b Mon Sep 17 00:00:00 2001
From: Mr Hedgehog <hedgehog@mrhedgehog.xyz>
Date: Wed, 13 Jul 2022 11:16:23 -0400
Subject: [PATCH 33/59] bluetuith: init at 0.0.3

---
 pkgs/tools/bluetooth/bluetuith/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/bluetooth/bluetuith/default.nix

diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix
new file mode 100644
index 000000000000..9687b1da1e85
--- /dev/null
+++ b/pkgs/tools/bluetooth/bluetuith/default.nix
@@ -0,0 +1,25 @@
+{ buildGoModule, fetchFromGitHub, lib, stdenv }:
+
+buildGoModule rec {
+  pname = "bluetuith";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "darkhz";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-7JqpF9iga6RO+/r2JK0N9gjieVRUNkHhGNsfVFfKfRY=";
+  };
+
+  vendorSha256 = "sha256-MsVrhEG2DOFJAXvt5rvfctGUbb3hQsBJ7cjOSzWA+bc=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "TUI-based bluetooth connection manager";
+    homepage = "https://github.com/darkhz/bluetuith";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ thehedgeh0g ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3ce352d912d..4a87306bd702 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4701,6 +4701,8 @@ with pkgs;
 
   blueman = callPackage ../tools/bluetooth/blueman { };
 
+  bluetuith = callPackage ../tools/bluetooth/bluetuith { };
+
   bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
 
   bogofilter = callPackage ../tools/misc/bogofilter { };

From 8da1e102f607b923ee72c4e30e30fb84b4b74eb6 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Wed, 13 Jul 2022 19:36:17 -0400
Subject: [PATCH 34/59] nomad_1_2: 1.2.8 -> 1.2.9

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

diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix
index 5df87528448c..5a35a9493e87 100644
--- a/pkgs/applications/networking/cluster/nomad/1.2.nix
+++ b/pkgs/applications/networking/cluster/nomad/1.2.nix
@@ -4,7 +4,7 @@
 
 callPackage ./generic.nix {
   inherit buildGoModule;
-  version = "1.2.8";
-  sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8";
-  vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5";
+  version = "1.2.9";
+  sha256 = "05pd4y5aq91ac73447aqr0pk56rx5qhqzzp5cw4w06yh5iry0bmn";
+  vendorSha256 = "08nqqd3dz8bzxnh729kckvg59wnvmixmsh8g74nlxk90gq07zsn4";
 }

From 3580dd9f3caa88f099570a59a0a557d577b29321 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@doge-inc.net>
Date: Thu, 14 Jul 2022 20:35:35 -0400
Subject: [PATCH 35/59] discord-canary: 0.0.135 -> 0.0.136

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

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 87fad54f7bc6..6edceb99b0ba 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -3,7 +3,7 @@ let
   versions = if stdenv.isLinux then {
     stable = "0.0.18";
     ptb = "0.0.29";
-    canary = "0.0.135";
+    canary = "0.0.136";
   } else {
     stable = "0.0.264";
     ptb = "0.0.59";
@@ -30,7 +30,7 @@ let
       canary = fetchurl {
         url =
           "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        sha256 = "sha256-dmG+3BWS1BMHHQAv4fsXuObVeAJBeD+TqnyQz69AMac=";
+        sha256 = "sha256-OrGg4jXziesHBhQORxREN/wq776RgNGaTyjJNV4pSAU=";
       };
     };
     x86_64-darwin = {

From fa0e27d25bbe1df0440bf59ebaa873d2c04ef3c1 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Thu, 14 Jul 2022 21:41:36 -0700
Subject: [PATCH 36/59] cargo-embed: 0.12.0 -> 0.13.0

---
 pkgs/development/tools/rust/cargo-embed/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix
index 70b34dc35062..03eecf8a31ba 100644
--- a/pkgs/development/tools/rust/cargo-embed/default.nix
+++ b/pkgs/development/tools/rust/cargo-embed/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-embed";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "probe-rs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1is58n8y5lvnvzkbnh3gfk3r3f2r1w4l2qjdp2k8373apxzjxdvr";
+    sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0=";
   };
 
-  cargoSha256 = "0kalwigck9lf734zdpzg01sf2zzyrgdgq2rg3qj7hy94gfxlsk63";
+  cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs=";
 
   nativeBuildInputs = [ pkg-config rustfmt ];
   buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://probe.rs/";
     changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ fooker ];
+    maintainers = with maintainers; [ fooker newam ];
   };
 }

From 7225ddea54b5f9f9d92cf6cd1a100ae572dd7eef Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Thu, 14 Jul 2022 21:49:37 -0700
Subject: [PATCH 37/59] cargo-flash: 0.12.1 -> 0.13.0

---
 pkgs/development/tools/rust/cargo-flash/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix
index 49e9bbaceb5b..537392a65bbe 100644
--- a/pkgs/development/tools/rust/cargo-flash/default.nix
+++ b/pkgs/development/tools/rust/cargo-flash/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-flash";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "probe-rs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bd0TY8bdpLHLCdDQgJeJvqjAcSF67+LGSNx8yafYbys=";
+    sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30=";
   };
 
-  cargoSha256 = "sha256-bx2N8zP7BmqU6oM/7Nf2i9S1uNWItReQMD59vtG1RKE=";
+  cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg=";
 
   nativeBuildInputs = [ pkg-config rustfmt ];
   buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://probe.rs/";
     changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ fooker ];
+    maintainers = with maintainers; [ fooker newam ];
   };
 }

From 94488809ac0d181d84c87ca7acac3232e6c6b175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <stan.pitucha@envato.com>
Date: Fri, 4 Mar 2022 21:12:27 +1100
Subject: [PATCH 38/59] gemstash: init at 2.1.0

---
 pkgs/development/tools/gemstash/Gemfile      |   2 +
 pkgs/development/tools/gemstash/Gemfile.lock |  64 ++++
 pkgs/development/tools/gemstash/default.nix  |  16 +
 pkgs/development/tools/gemstash/gemset.nix   | 313 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |   2 +
 5 files changed, 397 insertions(+)
 create mode 100644 pkgs/development/tools/gemstash/Gemfile
 create mode 100644 pkgs/development/tools/gemstash/Gemfile.lock
 create mode 100644 pkgs/development/tools/gemstash/default.nix
 create mode 100644 pkgs/development/tools/gemstash/gemset.nix

diff --git a/pkgs/development/tools/gemstash/Gemfile b/pkgs/development/tools/gemstash/Gemfile
new file mode 100644
index 000000000000..55e71911a52b
--- /dev/null
+++ b/pkgs/development/tools/gemstash/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'gemstash'
diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock
new file mode 100644
index 000000000000..b7f9f963f3b8
--- /dev/null
+++ b/pkgs/development/tools/gemstash/Gemfile.lock
@@ -0,0 +1,64 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.6.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.1.9)
+    dalli (2.7.11)
+    faraday (0.17.5)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.14.0)
+      faraday (>= 0.7.4, < 1.0)
+    gemstash (2.1.0)
+      activesupport (>= 4.2, < 6)
+      dalli (~> 2.7)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.10)
+      lru_redux (~> 1.1)
+      puma (~> 4.0)
+      sequel (~> 5.0)
+      server_health_check-rack (~> 0.1)
+      sinatra (>= 1.4, < 3.0)
+      sqlite3 (~> 1.3)
+      thor (~> 0.20)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    lru_redux (1.1.0)
+    minitest (5.15.0)
+    multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.8)
+    puma (4.3.11)
+      nio4r (~> 2.0)
+    rack (2.2.3)
+    rack-protection (2.2.0)
+      rack
+    ruby2_keywords (0.0.5)
+    sequel (5.54.0)
+    server_health_check (1.0.2)
+    server_health_check-rack (0.1.0)
+      server_health_check (~> 1.0, >= 1.0.1)
+    sinatra (2.2.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.0)
+      tilt (~> 2.0)
+    sqlite3 (1.4.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gemstash
+
+BUNDLED WITH
+   2.1.4
diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/development/tools/gemstash/default.nix
new file mode 100644
index 000000000000..13ab213c15e0
--- /dev/null
+++ b/pkgs/development/tools/gemstash/default.nix
@@ -0,0 +1,16 @@
+{ lib, bundlerApp, bundlerUpdateScript }:
+
+bundlerApp rec {
+  pname = "gemstash";
+  gemdir = ./.;
+  exes = [ pname ];
+
+  passthru.updateScript = bundlerUpdateScript pname;
+
+  meta = with lib; {
+    description = "A cache for RubyGems.org and a private gem server";
+    homepage    = "https://github.com/rubygems/gemstash";
+    license     = licenses.mit;
+    maintainers = [ maintainers.viraptor ];
+  };
+}
diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix
new file mode 100644
index 000000000000..fd5ddcd6537c
--- /dev/null
+++ b/pkgs/development/tools/gemstash/gemset.nix
@@ -0,0 +1,313 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "5.2.6.2";
+  };
+  concurrent-ruby = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.1.9";
+  };
+  dalli = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0br39scmr187w3ifl5gsddl2fhq6ahijgw6358plqjdzrizlg764";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.7.11";
+  };
+  faraday = {
+    dependencies = ["multipart-post"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bs2lm0wd273kwq8nk1p8pk43n1wrizv4c1bdywkpcm9g2f5sp6p";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "0.17.5";
+  };
+  faraday_middleware = {
+    dependencies = ["faraday"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "0.14.0";
+  };
+  gemstash = {
+    dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "thor"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fimbc5xnsxq1g2zb7kn4qf3rp4klx7fxbigg34gr9i9apq8qfrc";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.1.0";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.10.0";
+  };
+  lru_redux = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.1.0";
+  };
+  minitest = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "5.15.0";
+  };
+  multipart-post = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.1.1";
+  };
+  mustermann = {
+    dependencies = ["ruby2_keywords"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.1.1";
+  };
+  nio4r = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.5.8";
+  };
+  puma = {
+    dependencies = ["nio4r"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "4.3.11";
+  };
+  rack = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.2.3";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.2.0";
+  };
+  ruby2_keywords = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "0.0.5";
+  };
+  sequel = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "5.54.0";
+  };
+  server_health_check = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06chz92parchhj1457lf5lbj3hrmvqpq6mfskxcnj5f4qa14n5wd";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.0.2";
+  };
+  server_health_check-rack = {
+    dependencies = ["server_health_check"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cgqr94x18f60n27sk9lgg471c6vk6qy132z7i1ppp32kvmjfphs";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "0.1.0";
+  };
+  sinatra = {
+    dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.2.0";
+  };
+  sqlite3 = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.4.2";
+  };
+  thor = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "0.20.3";
+  };
+  thread_safe = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "0.3.6";
+  };
+  tilt = {
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "2.0.10";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    gem_platform = "ruby";
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
+      type = "gem";
+    };
+    target_platform = "ruby";
+    version = "1.2.9";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 048df57d6a2c..deb89df61477 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5465,6 +5465,8 @@ with pkgs;
 
   frr = callPackage ../servers/frr { };
 
+  gemstash = callPackage ../development/tools/gemstash { };
+
   hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { };
 
   libbsd = callPackage ../development/libraries/libbsd { };

From b922b2d9d78b96838a3ea68f84457d44c55d40a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 08:24:08 +0200
Subject: [PATCH 39/59] python310Packages.adafruit-platformdetect: 3.24.1 ->
 3.25.0

---
 .../python-modules/adafruit-platformdetect/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 3758e000b173..c5d1d1b9e88d 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.24.1";
+  version = "3.25.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    hash = "sha256-srM5VX0QXZMLmYmqKttcB8W8oMlGz64e6dQh04OQq8Q=";
+    hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24=";
   };
 
   nativeBuildInputs = [

From e8e1d54a27c864c184783cf616321e8a9dec973e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 08:39:07 +0200
Subject: [PATCH 40/59] python310Packages.asn1: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix
index b46152f3a094..7e1b8834cd0e 100644
--- a/pkgs/development/python-modules/asn1/default.nix
+++ b/pkgs/development/python-modules/asn1/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "asn1";
-  version = "2.5.0";
+  version = "2.6.0";
 
   disabled = pythonOlder "3.7";
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "andrivet";
     repo = "python-asn1";
     rev = "v${version}";
-    sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo=";
+    sha256 = "sha256-oz9xZhFU4himXttVtfW6tTn7lfB0c7MlgxtbKxdJtUA=";
   };
 
   propagatedBuildInputs = [

From 48777302b4a696051bb63977d3d1d1b408506bc1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 08:39:54 +0200
Subject: [PATCH 41/59] python310Packages.iso4217: 1.9 -> 1.11

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

diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix
index 8df5f962ce58..5832b6e4a773 100644
--- a/pkgs/development/python-modules/iso4217/default.nix
+++ b/pkgs/development/python-modules/iso4217/default.nix
@@ -16,7 +16,7 @@ let
 in
 buildPythonPackage rec {
   pname = "iso4217";
-  version = "1.9";
+  version = "1.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "dahlia";
     repo = pname;
     rev = version;
-    hash = "sha256-7VrXAP/Qyzy2BDTmFwDlxHvF7HhndJsDMt/qHcsmhzs=";
+    hash = "sha256-zJYtEIrsuHKPwnSoRjyZC/0rgAZoNMZ0Oh8gQcIb20Q=";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [

From 129aa9a1d6155c768c8a508312c868b70dc260cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 08:42:21 +0200
Subject: [PATCH 42/59] python310Packages.msldap: 0.3.38 -> 0.3.40

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

diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix
index 7a2a2611d3cd..0c0eecbac12f 100644
--- a/pkgs/development/python-modules/msldap/default.nix
+++ b/pkgs/development/python-modules/msldap/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "msldap";
-  version = "0.3.38";
+  version = "0.3.40";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc=";
+    hash = "sha256-4sIqbjlrTX1l1zhj7URhISDo4lcP+JW1Qh3fajUAhbs=";
   };
 
   propagatedBuildInputs = [

From 93bdfd5f7bf13fd00ef7cdd7b1cbae53a164ee26 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 08:55:54 +0200
Subject: [PATCH 43/59] python310Packages.types-setuptools: 62.6.1 -> 63.2.0

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

diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index be41acffdd6f..fafb100aa8b3 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-setuptools";
-  version = "62.6.1";
+  version = "63.2.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-r/2WijpyGOHJbxgG60V/QCfqyAOzyq3cz5ik5XdrFyQ=";
+    sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ=";
   };
 
   # Module doesn't have tests

From 13048d69f926d1f605429305bfc4c8b91db92d83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 09:03:59 +0200
Subject: [PATCH 44/59] python310Packages.weconnect: 0.44.2 -> 0.45.0

---
 pkgs/development/python-modules/weconnect/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index f0c96acf5e02..719682eb005e 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect";
-  version = "0.44.2";
+  version = "0.45.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
     rev = "v${version}";
-    hash = "sha256-Sbo8KfcwmFjbQ0/MTMLO7HYVTksBI5kNjxQhHvgy/p4=";
+    hash = "sha256-iAKw05vMaGTQ/V1uwqbkO2AZOOtsMOfSnponnE5AdXE=";
   };
 
   propagatedBuildInputs = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \
       --replace "tests_require=TEST_REQUIRED," "tests_require=[],"
     substituteInPlace image_extra_requirements.txt \
-      --replace "pillow~=9.0.1" "pillow"
+      --replace "pillow~=9.2.0" "pillow"
     substituteInPlace pytest.ini \
       --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \
       --replace "pytest-cov" ""

From 2bc1718c842df1bfb68162c198e8ea296c7ac423 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 09:04:19 +0200
Subject: [PATCH 45/59] python310Packages.weconnect-mqtt: 0.38.1 -> 0.38.1

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

diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index 174d9e5b9f0a..eb8c8f51d785 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect-mqtt";
-  version = "0.37.2";
+  version = "0.38.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CzdQ5aYaxOZ2rE5vMP53u66OvBBWhi6yXvzGbbCHEuc=";
+    hash = "sha256-ybSslUdOlD87Kl6dkNRO/pHLBmQB3ioT/3p4uHYssBI=";
   };
 
   propagatedBuildInputs = [

From 85ac722fcdbdf4ac01a17baeed6a728f8169cf22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 09:10:59 +0200
Subject: [PATCH 46/59] python310Packages.unifi-discovery: 1.1.4 -> 1.1.5

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

diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix
index 309c87f8b32b..5b1e86459867 100644
--- a/pkgs/development/python-modules/unifi-discovery/default.nix
+++ b/pkgs/development/python-modules/unifi-discovery/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "unifi-discovery";
-  version = "1.1.4";
+  version = "1.1.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-+af1boeJtTI89ZJqgXXsxXQXGDhG4ewgukfKDdhWl9g=";
+    hash = "sha256-WO1oLD09fokMR7lVCqs1Qeodjc+Yg431otl9rohtmPo=";
   };
 
   nativeBuildInputs = [

From acc7f3a3b6263cbde6b8e75bd6562820c46bd63b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 08:43:47 +0200
Subject: [PATCH 47/59] python310Packages.venstarcolortouch: 0.16 -> 0.18

---
 .../python-modules/venstarcolortouch/default.nix         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix
index 10f92a997823..0672060d3570 100644
--- a/pkgs/development/python-modules/venstarcolortouch/default.nix
+++ b/pkgs/development/python-modules/venstarcolortouch/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "venstarcolortouch";
-  version = "0.17";
+  version = "0.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-HgUtGC2lXJ6BFhOnFK7DF4b/IooXIFPGcpJ4ru3kPNs=";
+    sha256 = "sha256-ucz0Ejpgiss8boF8dzt45FwpieNoJ6S3DUvtay6FDrw=";
   };
 
   propagatedBuildInputs = [
@@ -19,7 +19,10 @@ buildPythonPackage rec {
 
   # Project has no tests
   doCheck = false;
-  pythonImportsCheck = [ "venstarcolortouch" ];
+
+  pythonImportsCheck = [
+    "venstarcolortouch"
+  ];
 
   meta = with lib; {
     description = "Python interface for Venstar ColorTouch thermostats Resources";

From f3b23d390d39df60b7107afaca187136814837be Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 15 Jul 2022 09:50:15 +0200
Subject: [PATCH 48/59] sonixd: 0.15.1 -> 0.15.3

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

diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix
index 961fa2c8c1cd..38110df29157 100644
--- a/pkgs/applications/audio/sonixd/default.nix
+++ b/pkgs/applications/audio/sonixd/default.nix
@@ -5,11 +5,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "sonixd";
-  version = "0.15.1";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage";
-    sha256 = "sha256-23WU1nwvrzyw0J+Pplm3JbsScjJxu+RhmwVoe/PjozY=";
+    sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw=";
   };
 
   extraInstallCommands = ''

From 7f55ee3a532e62c2222c9aeab41efaf6ac54869d Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Fri, 15 Jul 2022 09:57:13 +0200
Subject: [PATCH 49/59] netdata: fix post start for module

---
 nixos/modules/services/monitoring/netdata.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 489dd337bb7c..c6a3315d4022 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -201,7 +201,7 @@ in {
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
         ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
-        ExecPostStart = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
+        ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
 
         TimeoutStopSec = 60;
         Restart = "on-failure";

From 2440c3f5eef947a5ba38142f3756935d5109ec52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Jul 2022 08:56:44 +0000
Subject: [PATCH 50/59] python310Packages.aioftp: 0.21.2 -> 0.21.3

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

diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix
index 77b1d34b6a92..da0e8021d509 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/pkgs/development/python-modules/aioftp/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "aioftp";
-  version = "0.21.2";
+  version = "0.21.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-JWzeBdCPXLYMmKkvCqQQF/mHoRbdRvj0vKVF4+D8LSI=";
+    sha256 = "sha256-xtrlCzqgfwlbLZOoN9Y23ZPyNaqv5Ure+Cvg+OVWf9I=";
   };
 
   propagatedBuildInputs = [

From a1dab95d7e1490d2af6e0b4abbbd39127b74e9e2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 11:05:53 +0200
Subject: [PATCH 51/59] python310Packages.dicttoxml2: init at 2.0.0

---
 .../python-modules/dicttoxml2/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/dicttoxml2/default.nix

diff --git a/pkgs/development/python-modules/dicttoxml2/default.nix b/pkgs/development/python-modules/dicttoxml2/default.nix
new file mode 100644
index 000000000000..5f407d61b67b
--- /dev/null
+++ b/pkgs/development/python-modules/dicttoxml2/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "dicttoxml2";
+  version = "2.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-8/Zbv8WxDP5Bn4hgd7hTstmYv7amTlTxhQoKvzYrG/I=";
+  };
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "dicttoxml2"
+  ];
+
+  meta = with lib;{
+    description = "Converts a Python dictionary or other native data type into a valid XML string";
+    homepage = "https://pypi.org/project/dicttoxml2/";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34cced4ec221..6d16359d29f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2280,6 +2280,8 @@ in {
 
   dicttoxml = callPackage ../development/python-modules/dicttoxml { };
 
+  dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { };
+
   diff-cover = callPackage ../development/python-modules/diff-cover { };
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };

From 7cb9abed68f15ffea9d78627f067be621c4d9430 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Fri, 15 Jul 2022 11:19:33 +0200
Subject: [PATCH 52/59] unicode-paracode: 2.7 -> 2.9

https://github.com/garabik/unicode/releases/tag/v2.9

- update unicode data from 13.0.0 to 14.0.0
- add passthru.updateScript
---
 pkgs/tools/misc/unicode/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix
index a2bc615ed86f..967332f5fd4b 100644
--- a/pkgs/tools/misc/unicode/default.nix
+++ b/pkgs/tools/misc/unicode/default.nix
@@ -1,19 +1,19 @@
-{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }:
+{ lib, fetchFromGitHub, fetchurl, python3Packages, installShellFiles, gitUpdater }:
 
 python3Packages.buildPythonApplication rec {
   pname = "unicode";
-  version = "2.7";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "garabik";
     repo = "unicode";
     rev = "v${version}";
-    sha256 = "15d9yvarxsiy0whx1mxzsjnnkrjdm3ga4qv2yy398mk0jh763q9v";
+    sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY=";
   };
 
   ucdtxt = fetchurl {
-    url = "https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt";
-    sha256 = "1fz8fcd23lxyl97ay8h42zvkcgcg8l81b2dm05nklkddr2zzpgxx";
+    url = "https://www.unicode.org/Public/14.0.0/ucd/UnicodeData.txt";
+    sha256 = "sha256-NgGOaGV/3LNIX2NmMP/oyFMuAcl3cD0oA/W4nWxf6vs=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -27,6 +27,12 @@ python3Packages.buildPythonApplication rec {
     installManPage paracode.1 unicode.1
   '';
 
+  passthru.updateScript = gitUpdater {
+    inherit version;
+    pname = "unicode-paracode";
+    rev-prefix = "v";
+  };
+
   meta = with lib; {
     description = "Display unicode character properties";
     homepage = "https://github.com/garabik/unicode";

From c52d46e7d0461acd2c55f56035f5c6bdcaa7d183 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Jul 2022 11:16:29 +0200
Subject: [PATCH 53/59] python310Packages.pyialarm: 2.0.0 -> 2.2.0

---
 pkgs/development/python-modules/pyialarm/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index 501f1497a3a7..db4bf7eb3c5e 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, dicttoxml
+, dicttoxml2
 , fetchFromGitHub
 , pythonOlder
 , xmltodict
@@ -8,25 +8,27 @@
 
 buildPythonPackage rec {
   pname = "pyialarm";
-  version = "2.0.0";
+  version = "2.2.0";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "RyuzakiKK";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-rJS6KgEy4iuiY6QRue6K6woyGefuTN7/4RLCu8cb8M4=";
+    hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU=";
   };
 
   propagatedBuildInputs = [
-    dicttoxml
+    dicttoxml2
     xmltodict
   ];
 
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [ "pyialarm" ];
+  pythonImportsCheck = [
+    "pyialarm"
+  ];
 
   meta = with lib; {
     description = "Python library to interface with Antifurto365 iAlarm systems";

From 65fae659e31098ca4ac825a6fef26d890aaf3f4e Mon Sep 17 00:00:00 2001
From: Popa Ioan Alexandru <alexioanpopa11@gmail.com>
Date: Fri, 15 Jul 2022 02:01:57 +0300
Subject: [PATCH 54/59] themechanger: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix
index 17e5d458b89b..945bd8de5420 100644
--- a/pkgs/applications/misc/themechanger/default.nix
+++ b/pkgs/applications/misc/themechanger/default.nix
@@ -15,14 +15,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "themechanger";
-  version = "0.11.0";
+  version = "0.11.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "ALEX11BR";
     repo = "ThemeChanger";
     rev = "v${version}";
-    sha256 = "sha256-umRkGPeNDZOmx6pjWLU9rRdHX6QFuHY/dsuQ8oI2YLI=";
+    sha256 = "sha256-zSbh+mqCKquOyQASwVUW6hghmUc37nTuoa8pWCHM/a8=";
   };
 
   nativeBuildInputs = [

From d73e58de0abfea246a592adfe3892a36d573b71a Mon Sep 17 00:00:00 2001
From: Aiken Cairncross <acairncross@gmail.com>
Date: Fri, 15 Jul 2022 15:22:23 +0100
Subject: [PATCH 55/59] vhd2vl: Fix executable name (#177493)

* vhd2vl: Fix executable name

* vhd2vl: Fix tests

This partially reverts commit 5d44c9a2223e4493e9bac4e5c57beb587530289f.
---
 .../science/electronics/vhd2vl/default.nix    | 11 ++++--
 .../science/electronics/vhd2vl/test.patch     | 35 -------------------
 2 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/applications/science/electronics/vhd2vl/test.patch

diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix
index 089ebb9bb198..9fc65b739273 100644
--- a/pkgs/applications/science/electronics/vhd2vl/default.nix
+++ b/pkgs/applications/science/electronics/vhd2vl/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , bison
 , flex
 , verilog
@@ -18,8 +19,12 @@ stdenv.mkDerivation rec {
   };
 
   patches = lib.optionals (!stdenv.isAarch64) [
-    # fix build with verilog 11.0
-    ./test.patch
+    # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15
+    # for some strange reason, this is not needed for aarch64
+    (fetchpatch {
+      url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch";
+      sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf";
+    })
   ];
 
   nativeBuildInputs = [
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -D -m755 src/vhd2vl $out/bin/vdh2vl
+    install -D -m755 src/vhd2vl $out/bin/vhd2vl
     runHook postInstall
   '';
 
diff --git a/pkgs/applications/science/electronics/vhd2vl/test.patch b/pkgs/applications/science/electronics/vhd2vl/test.patch
deleted file mode 100644
index 85b91964e392..000000000000
--- a/pkgs/applications/science/electronics/vhd2vl/test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/translated_examples/fifo.v  1970-01-01 00:00:01.000000000 +0000
-+++ a/temp/verilog/fifo.v 2022-05-11 03:44:43.173604945 +0000
-@@ -107,7 +107,7 @@
-   //--- Read address counter --------------
-   //---------------------------------------
-   assign add_RD_CE = (iempty == 1'b1) ? 1'b0 : (RD == 1'b0) ? 1'b0 : 1'b1;
--  assign n_add_RD = (add_RD) + 4'h1;
-+  assign n_add_RD = add_RD + 4'h1;
-   always @(posedge clk_RD, posedge rst) begin
-     if((rst == 1'b1)) begin
-       add_RD <= {5{1'b0}};
-diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/test.v temp/verilog/test.v
---- a/translated_examples/test.v  1970-01-01 00:00:01.000000000 +0000
-+++ a/temp/verilog/test.v 2022-05-11 03:44:43.189604945 +0000
-@@ -125,7 +125,7 @@
-     endcase
-   end
-
--  assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
-+  assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
-   // Asynch process
-   always @(we, addr, config1, bip) begin
-     if(we == 1'b1) begin
-diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/withselect.v temp/verilog/withselect.v
---- a/translated_examples/withselect.v    1970-01-01 00:00:01.000000000 +0000
-+++ a/temp/verilog/withselect.v   2022-05-11 03:44:43.193604945 +0000
-@@ -33,7 +33,7 @@
-     endcase
-   end
-
--  assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
-+  assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
-   assign foo = {(((1 + 1))-((0))+1){1'b0}};
-   assign egg = {78{1'b0}};
-   assign baz = {(((bus_width * 4))-((bus_width * 3 - 1))+1){1'b1}};

From 8ee452b03a00ded9d4f19cc5a3962f3e6ab4ad1f Mon Sep 17 00:00:00 2001
From: Jocelyn Thode <jocelyn.thode@gmail.com>
Date: Fri, 8 Jul 2022 11:04:48 +0200
Subject: [PATCH 56/59] kubectl-node-shell: init at 1.6.0

---
 .../cluster/kubectl-node-shell/default.nix    | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kubectl-node-shell/default.nix

diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix
new file mode 100644
index 000000000000..148d308c4f10
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix
@@ -0,0 +1,32 @@
+{ stdenvNoCC, lib, fetchFromGitHub, bash }:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "kubectl-node-shell";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "kvaps";
+    repo = "kubectl-node-shell";
+    rev = "v${version}";
+    sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E=";
+  };
+
+  strictDeps = true;
+  buildInputs = [ bash ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -m755 ./kubectl-node_shell -D $out/bin/kubectl-node_shell
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Exec into node via kubectl";
+    homepage = "https://github.com/kvaps/kubectl-node-shell";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f23345c36a6..3942dee24cb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28123,6 +28123,8 @@ with pkgs;
 
   kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
 
+  kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { };
+
   kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { };
 
   kubelogin = callPackage ../applications/networking/cluster/kubelogin { };

From 67842176632292ae795faf2f5fe775e147bf6d2a Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 15 Jul 2022 16:40:31 +0200
Subject: [PATCH 57/59] Update
 pkgs/applications/networking/instant-messengers/discord/default.nix

---
 .../networking/instant-messengers/discord/default.nix          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 6edceb99b0ba..8407927d8189 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -28,8 +28,7 @@ let
         sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";
       };
       canary = fetchurl {
-        url =
-          "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
+        url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
         sha256 = "sha256-OrGg4jXziesHBhQORxREN/wq776RgNGaTyjJNV4pSAU=";
       };
     };

From 22cc20eba8cd24397482305eb50172d5bf3a4c1e Mon Sep 17 00:00:00 2001
From: Elia Argentieri <elia@elinvention.ovh>
Date: Fri, 15 Jul 2022 16:41:29 +0200
Subject: [PATCH 58/59] obs-studio-plugins.obs-pipewire-audio-capture: init at
 1.0.3 (#179459)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 maintainers/maintainer-list.nix               |  6 ++++
 .../video/obs-studio/plugins/default.nix      |  1 +
 .../plugins/obs-pipewire-audio-capture.nix    | 32 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5a1e46290878..77cf94884495 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3733,6 +3733,12 @@
     githubId = 1897147;
     name = "Elijah Caine";
   };
+  Elinvention = {
+    email = "elia@elinvention.ovh";
+    github = "Elinvention";
+    githubId = 5737945;
+    name = "Elia Argentieri";
+  };
   elitak = {
     email = "elitak@gmail.com";
     github = "elitak";
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index 844d4a50b852..9b46ae4de357 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -9,5 +9,6 @@
   wlrobs = callPackage ./wlrobs.nix {};
   looking-glass-obs = callPackage ./looking-glass-obs.nix {};
   obs-nvfbc = callPackage ./obs-nvfbc.nix {};
+  obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix {};
   obs-vkcapture = callPackage ./obs-vkcapture.nix {};
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
new file mode 100644
index 000000000000..150e7e602536
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
@@ -0,0 +1,32 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, ninja
+, obs-studio
+, pipewire
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-pipewire-audio-capture";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "dimtpap";
+    repo = pname;
+    rev = "${version}";
+    sha256 = "OX27NTUsceEC8kHqlM+oeGjPxguake6lwaXFYsoEqKU=";
+  };
+
+  nativeBuildInputs = [ cmake ninja pkg-config ];
+  buildInputs = [ obs-studio pipewire ];
+
+  meta = with lib; {
+    description = " Audio device and application capture for OBS Studio using PipeWire ";
+    homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture";
+    maintainers = with maintainers; [ Elinvention ];
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}

From a925c1a8ff20b47730b8f31f24338a5d98683f18 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 15 Jul 2022 18:33:32 +0300
Subject: [PATCH 59/59] isort: add top-level attribute

like pylint,black,mypy
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e1b5ad3625d..3d7af295f543 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18391,6 +18391,8 @@ with pkgs;
 
   iso-flags = callPackage ../data/icons/iso-flags { };
 
+  isort = with python3Packages; toPythonApplication isort;
+
   ispc = callPackage ../development/compilers/ispc {
     inherit (llvmPackages) stdenv;
   };