From cf7fc31384e502ecd379a7722ae790fcbecff26c Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sat, 30 Jul 2022 20:48:18 +0200
Subject: [PATCH 01/60] noisetorch: install desktop item

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

diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index 9fcd35a9de32..909b77ce082b 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, copyDesktopItems }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "NoiseTorch";
@@ -20,8 +20,6 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  nativeBuildInputs = [ copyDesktopItems ];
-
   preBuild = ''
     make -C c/ladspa/
     go generate
@@ -30,7 +28,7 @@ buildGoModule rec {
 
   postInstall = ''
     install -D ./assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/noisetorch.png
-    copyDesktopItems assets/noisetorch.desktop $out/share/applications/
+    install -Dm444 ./assets/noisetorch.desktop $out/share/applications/noisetorch.desktop
   '';
 
   meta = with lib; {

From 9f601b24c8d80b448ab2fdb0a4765eeb8dff83c3 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sun, 14 Aug 2022 14:22:27 +0200
Subject: [PATCH 02/60] neomutt: enable zstd support by default, offer
 mixmaster support

---
 .../networking/mailreaders/neomutt/default.nix         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 9eb377f1b98e..d15ab04315e8 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
 , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl
 , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
+, zstd, enableZstd ? true, enableMixmaster ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +19,8 @@ stdenv.mkDerivation rec {
     cyrus_sasl gss gpgme libkrb5 libidn ncurses
     notmuch openssl perl lmdb
     mailcap sqlite
-  ];
+  ]
+  ++ lib.optional enableZstd zstd;
 
   nativeBuildInputs = [
     docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m
@@ -62,7 +64,9 @@ stdenv.mkDerivation rec {
     # https://github.com/neomutt/neomutt/pull/2367
     "--disable-include-path-in-cflags"
     "--zlib"
-  ];
+  ]
+  ++ lib.optional enableZstd "--zstd"
+  ++ lib.optional enableMixmaster "--mixmaster";
 
   # Fix missing libidn in mutt;
   # this fix is ugly since it links all binaries in mutt against libidn
@@ -95,7 +99,7 @@ stdenv.mkDerivation rec {
     description = "A small but very powerful text-based mail client";
     homepage    = "http://www.neomutt.org";
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ];
+    maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ];
     platforms   = platforms.unix;
   };
 }

From 49f4071f30a88289a30642265c881dab694cda6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Aug 2022 12:45:21 +0000
Subject: [PATCH 03/60] eggnog-mapper: 2.1.7 -> 2.1.9

---
 pkgs/applications/science/biology/eggnog-mapper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix
index 44caca2fa2c8..9aa655932d35 100644
--- a/pkgs/applications/science/biology/eggnog-mapper/default.nix
+++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix
@@ -8,13 +8,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "eggnog-mapper";
-  version = "2.1.7";
+  version = "2.1.9";
 
   src = fetchFromGitHub {
     owner = "eggnogdb";
     repo = pname;
-    rev = version;
-    hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE=";
   };
 
   postPatch = ''

From a2fd7e4f8618fb32fc5a3235bcce4b00949d1fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 24 Aug 2022 10:40:03 -0300
Subject: [PATCH 04/60] xfce.xfce4-panel: 4.16.4 -> 4.16.5

---
 pkgs/desktops/xfce/core/xfce4-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index 5ac7fa9e79b9..fed25720e336 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -17,9 +17,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.16.4";
+  version = "4.16.5";
 
-  sha256 = "sha256-DlGcec5oUPDMzVztADw9fROmBIIO7isZ8gZEMGeDVcA=";
+  sha256 = "sha256-RK4sEir8CvB1aa2dZWJftA+2n4YPUEkhF9afOfOTA0Y=";
 
   nativeBuildInputs = [
     gobject-introspection

From 41fa2436ddf466895d51adbc07e583b20e6be120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 24 Aug 2022 11:17:02 -0300
Subject: [PATCH 05/60] xfce.xfdesktop: 4.16.0 -> 4.16.1

---
 pkgs/desktops/xfce/core/xfdesktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix
index 7e397b395f35..bc3c714eb0a4 100644
--- a/pkgs/desktops/xfce/core/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfdesktop";
-  version = "4.16.0";
+  version = "4.16.1";
 
-  sha256 = "sha256-w/JNjyAlxZqfVpm8EBt+ieHhUziOtfd//XHzIjJjy/4=";
+  sha256 = "sha256-JecuD0DJASHaxL6gwmL3hcmAEA7sVIyaM0ushrdq4/Y=";
 
   buildInputs = [
     exo

From c73d086a49f5792872a619671e63627415138305 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Sat, 20 Aug 2022 22:55:41 +0000
Subject: [PATCH 06/60] quartus-prime-lite: cleanup

Fixes a few issues, listed below.

Intel's website redesign broke the requireFile link, but fortunately
files can now be downloaded without a user account. The derivation
is modified to remove requireFile and download directly instead.

Issues with quoting command line arguments are corrected.

An issue causing crashes when running in containers is worked around
with LD_PRELOAD.

The meta.platforms attribute is corrected to the supported processors.
---
 .../editors/quartus-prime/default.nix             | 11 ++++++++---
 .../editors/quartus-prime/quartus.nix             | 15 +++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix
index 5a790e78090d..d8e57fdb508f 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@@ -25,7 +25,6 @@ in buildFHSUserEnv rec {
     # qsys requirements
     xorg.libXtst
     xorg.libXi
-    libudev0-shim
   ];
   multiPkgs = pkgs: with pkgs; let
     # This seems ugly - can we override `libpng = libpng12` for all `pkgs`?
@@ -44,6 +43,7 @@ in buildFHSUserEnv rec {
     xorg.libX11
     xorg.libXext
     xorg.libXrender
+    libudev0-shim
   ];
 
   passthru = { inherit unwrapped; };
@@ -71,7 +71,7 @@ in buildFHSUserEnv rec {
     EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}"
     for executable in $EXECUTABLES; do
         echo "#!${stdenv.shell}" >> $out/$executable
-        echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable
+        echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
     done
 
     cd $out
@@ -80,7 +80,12 @@ in buildFHSUserEnv rec {
     ln --symbolic --relative --target-directory ./bin $EXECUTABLES
   '';
 
+  # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when
+  # starting most operations in many containerized environments, including WSL2, Docker, and LXC
+  # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation)
+  # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version
+  # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032
   runScript = writeScript "${name}-wrapper" ''
-    exec $@
+    exec env LD_PRELOAD=libudev.so.0 "$@"
   '';
 }
diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix
index 4b5669860238..134a7807e0b3 100644
--- a/pkgs/applications/editors/quartus-prime/quartus.nix
+++ b/pkgs/applications/editors/quartus-prime/quartus.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, unstick, requireFile
+{ stdenv, lib, unstick, fetchurl
 , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
 }:
 
@@ -34,18 +34,18 @@ let
   };
 
   version = "20.1.1.720";
-  homepage = "https://fpgasoftware.intel.com";
 
-  require = {name, sha256}: requireFile {
+  download = {name, sha256}: fetchurl {
     inherit name sha256;
-    url = "${homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux";
+    # e.g. "20.1.1.720" -> "20.1std.1/720"
+    url = "https://downloads.intel.com/akdlm/software/acdsinst/${lib.versions.majorMinor version}std.${lib.versions.patch version}/${lib.elemAt (lib.splitVersion version) 3}/ib_installers/${name}";
   };
 
 in stdenv.mkDerivation rec {
   inherit version;
   pname = "quartus-prime-lite-unwrapped";
 
-  src = map require ([{
+  src = map download ([{
     name = "QuartusLiteSetup-${version}-linux.run";
     sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k";
   } {
@@ -87,12 +87,11 @@ in stdenv.mkDerivation rec {
     '';
 
   meta = with lib; {
-    inherit homepage;
+    homepage = "https://fpgasoftware.intel.com";
     description = "FPGA design and simulation software";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    platforms = platforms.linux;
-    hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kwohlfahrt ];
   };
 }

From ae6ec03e3e85c1284fb6b4da7e4bde6d42c5c90f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 31 Aug 2022 23:52:00 +0200
Subject: [PATCH 07/60] espanso: fix build on darwin

---
 pkgs/applications/office/espanso/default.nix | 11 ++++++++++-
 pkgs/top-level/all-packages.nix              |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix
index e4b46c5bc2dd..6b87afd54cf4 100644
--- a/pkgs/applications/office/espanso/default.nix
+++ b/pkgs/applications/office/espanso/default.nix
@@ -11,6 +11,10 @@
 , xclip
 , xdotool
 , makeWrapper
+, stdenv
+, AppKit
+, Cocoa
+, Foundation
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -39,7 +43,12 @@ rustPlatform.buildRustPackage rec {
     libnotify
     xclip
     openssl
+  ] ++ lib.optionals stdenv.isLinux [
     xdotool
+  ] ++ lib.optionals stdenv.isDarwin [
+    AppKit
+    Cocoa
+    Foundation
   ];
 
   # Some tests require networking
@@ -55,7 +64,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://espanso.org";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kimat ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
 
     longDescription = ''
       Espanso detects when you type a keyword and replaces it while you're typing.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c9f080bb5ba..49c37444b6f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3752,7 +3752,9 @@ with pkgs;
 
   eschalot = callPackage ../tools/security/eschalot { };
 
-  espanso = callPackage ../applications/office/espanso { };
+  espanso = callPackage ../applications/office/espanso {
+    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
+  };
 
   esphome = callPackage ../tools/misc/esphome { };
 

From 84650ed3fdfb407445b97cc200327529e710d9dc Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 1 Sep 2022 16:50:54 +0200
Subject: [PATCH 08/60] python310Packages.sumo: 2.3.3 -> 2.3.4

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

diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix
index f26ceb4ab135..9569de3e6496 100644
--- a/pkgs/development/python-modules/sumo/default.nix
+++ b/pkgs/development/python-modules/sumo/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "sumo";
-  version = "2.3.3";
+  version = "2.3.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -27,16 +27,9 @@ buildPythonPackage rec {
     owner = "SMTG-UCL";
     repo = "sumo";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-XEs4lLbVwN00UDnDC0kUNlut9RFXPfcyevBA1f1UqSU=";
+    sha256 = "sha256-kgTTYCTq8jTNOmc92TRskbsOcnk6wTZgf0UfoctJ4M4=";
   };
 
-  postPatch = ''
-    # Loosen castepxbin dependency version pinning
-    # https://github.com/SMTG-UCL/sumo/issues/173
-    substituteInPlace setup.py \
-      --replace "castepxbin==0.1.0" "castepxbin>=0.1.0"
-  '';
-
   nativeBuildInputs = [
     cython
   ];

From bf261353743042da2e58f345a30dd93d7eb1704f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 16:47:47 +0000
Subject: [PATCH 09/60] groonga: 12.0.6 -> 12.0.7

---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 0ed96d249b49..ffe9f901df58 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "groonga";
-  version = "12.0.6";
+  version = "12.0.7";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
-    sha256 = "sha256-DVum2fUa1BiSyL0d8hzRo3AzEVSRX2EBrJ4DBBIxftE=";
+    sha256 = "sha256-Eaei4Zi0Rg9zu7DInLAcaRo8Fyu2mqBblcYNRaS46c8=";
   };
 
   preConfigure = ''

From a40ff9e1b792509cfd227dea77fa50a3e23ff0c4 Mon Sep 17 00:00:00 2001
From: Alex Vorobiev <alexander.vorobiev@gmail.com>
Date: Wed, 31 Aug 2022 12:05:23 -0500
Subject: [PATCH 10/60] mkl: use cp instead of install to preserve symlinks

---
 pkgs/development/libraries/science/math/mkl/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index dc68abe38c36..559d8094b287 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -131,9 +131,10 @@ in stdenvNoCC.mkDerivation ({
     install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt
 
     # Dynamic libraries
-    install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so*
-    install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so*
-    install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so*
+    mkdir -p $out/lib
+    cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib
+    cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib
+    cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib
 
     # Headers
     cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/

From d7ce838ec54447d1aaa15fa1e503063663114142 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 22:13:20 +0000
Subject: [PATCH 11/60] morgen: 2.5.10 -> 2.5.13

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

diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix
index 6492e6e1e2c9..a5964e0d28a6 100644
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "2.5.10";
+  version = "2.5.13";
 
   src = fetchurl {
     url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
-    sha256 = "sha256-uKHLKZtvaaklJMYqAHtu4ULwcfbut1L2h6bjZkqI91o=";
+    sha256 = "sha256-n9lZfg+0JRRaO3H+sDXRIrELTs6NE5G78Ni0RKWzYuI=";
   };
 
   nativeBuildInputs = [

From ad8166bdd3d3e4b9de93af55648d527adc6cd84b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 23:58:15 +0000
Subject: [PATCH 12/60] pmd: 6.48.0 -> 6.49.0

---
 pkgs/development/tools/analysis/pmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index c0adbad33e8a..4695854dbfad 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pmd";
-  version = "6.48.0";
+  version = "6.49.0";
 
   src = fetchurl {
     url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip";
-    hash = "sha256-DXoiV5AunDGagfq8BWHFcgGBv9OdGij5DDuxOKJYnE4=";
+    hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0=";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 5e7df79c7616e6a6e6324eac3bdd3d013a986f5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Sep 2022 01:53:52 +0000
Subject: [PATCH 13/60] python310Packages.markdownify: 0.11.4 -> 0.11.5

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

diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix
index 7083f9514cdc..4c198c2ad7c3 100644
--- a/pkgs/development/python-modules/markdownify/default.nix
+++ b/pkgs/development/python-modules/markdownify/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "markdownify";
-  version = "0.11.4";
+  version = "0.11.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-crOkiv/M8v7rJd/Tvsq67PU76vTgi+aNzthEcniDKBM=";
+    sha256 = "sha256-uPmakJ92tBqt+3SPLD6+I39B37JhdEZFr2cSwe0r11g=";
   };
 
   propagatedBuildInputs = [ beautifulsoup4 six ];

From 780b0c92a9833f8db5674015db510da571b1ba1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Sep 2022 03:22:17 +0000
Subject: [PATCH 14/60] python310Packages.pyphen: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix
index 7bb46b115e00..6822886bda4e 100644
--- a/pkgs/development/python-modules/pyphen/default.nix
+++ b/pkgs/development/python-modules/pyphen/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pyphen";
-  version = "0.12.0";
+  version = "0.13.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b";
+    sha256 = "sha256-Boc86//WWo/KfCDA49wDJlXH7o3g9VIgXK07V0JlwpM=";
   };
 
   nativeBuildInputs = [

From 037ee6bb8c3dd06faeedd4fafb5cb3b158dfc868 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 2 Sep 2022 15:48:45 +0900
Subject: [PATCH 15/60] python3Packages.rdkit: 2022.03.4 -> 2022.03.5

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

diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index 2dcb884931d9..ad3bac33e24e 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -40,7 +40,7 @@ let
 in
 buildPythonPackage rec {
   pname = "rdkit";
-  version = "2022.03.4";
+  version = "2022.03.5";
 
   src =
     let
@@ -50,7 +50,7 @@ buildPythonPackage rec {
       owner = pname;
       repo = pname;
       rev = "Release_${versionTag}";
-      sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2";
+      sha256 = "19idgilabh04cbr1qj6zgrgsfjm248mmfz6fsr0smrd68d0xnml9";
     };
 
   unpackPhase = ''

From 4ef26ded53c3ef5f67db756f184d3e8f37f93a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Fri, 2 Sep 2022 05:55:16 -0300
Subject: [PATCH 16/60] graphite-gtk-theme: 2022-03-22 -> 2022-09-02

---
 pkgs/data/themes/graphite-gtk-theme/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix
index 132e2e9c3762..7dcb5a8a501a 100644
--- a/pkgs/data/themes/graphite-gtk-theme/default.nix
+++ b/pkgs/data/themes/graphite-gtk-theme/default.nix
@@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2022-03-22";
+  version = "2022-09-02";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891";
-    sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc=";
+    rev = version;
+    sha256 = "PaqEkl0E3pUEJDEv1WwUqcjzAcQniN8rUGhVgbOxuhA=";
   };
 
   nativeBuildInputs = [
@@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation rec {
       )
     ''}
 
-    jdupes -L -r $out/share
+    jdupes --quiet --link-soft --recurse $out/share
 
     runHook postInstall
   '';

From 2e8163e66e442b53f30aadfa76cf7a0fe172e23a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Sep 2022 10:28:50 +0000
Subject: [PATCH 17/60] cilium-cli: 0.12.2 -> 0.12.3

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

diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix
index eb51cf14dadb..7b68d68beece 100644
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-LayPASPMSnRZkDs9LylWR62eS+b/5TB9PidDQCs+MXU=";
+    sha256 = "sha256-mgyzdu7xzN6rDSHBcC8Uz8m5+5VEfA0RPe8cPZYfEgM=";
   };
 
   vendorSha256 = null;

From a6899dd9187c07166aed1df28daed98312f3075b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 2 Sep 2022 12:30:12 +0200
Subject: [PATCH 18/60] python310Packages.black: 22.6.0 -> 22.8.0

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

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index 61a93bf98655..d1c28e8066a0 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -22,13 +22,13 @@
 
 buildPythonPackage rec {
   pname = "black";
-  version = "22.6.0";
+  version = "22.8.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bG054ortN5rsQNocZUNMd9deZbtZoeHCg95UX7Tnxsk=";
+    hash = "sha256-eS9+tUC6mhfoZWU4cB0+sa/LE047RbcfILJcd6jbfm4=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From e3887562bc1b64c5aaabfae6191593b4e222c305 Mon Sep 17 00:00:00 2001
From: Baitinq <manuelpalenzuelamerino@gmail.com>
Date: Thu, 1 Sep 2022 18:13:07 +0200
Subject: [PATCH 19/60] smart-wallpaper: init at unstable-2022-09-01

---
 pkgs/tools/X11/smart-wallpaper/default.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/X11/smart-wallpaper/default.nix

diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/tools/X11/smart-wallpaper/default.nix
new file mode 100644
index 000000000000..20779e6e07b9
--- /dev/null
+++ b/pkgs/tools/X11/smart-wallpaper/default.nix
@@ -0,0 +1,36 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, makeWrapper
+, xdpyinfo
+, killall
+, xwinwrap
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "smart-wallpaper";
+  version = "unstable-2022-09-01";
+
+  src = fetchFromGitHub {
+    owner = "Baitinq";
+    repo = "smart-wallpaper";
+    rev = "d175695d3485fb14144c1908eb3569b20caa6ba5";
+    sha256 = "sha256-cFgvuntdKPzdQJ7xE2DIT+aNAazocIhM6BBbcQOlryU=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -Dm755 -t $out/bin smart-wallpaper
+    wrapProgram $out/bin/smart-wallpaper \
+      --prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap ]}
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/Baitinq/smart-wallpaper";
+    description = "A simple bash script that automatically changes your wallpaper depending on if its daytime or nighttime";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ baitinq ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 946f87d3ffc9..11c3a7adb08b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9224,6 +9224,8 @@ with pkgs;
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
+  smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { };
+
   nms = callPackage ../tools/misc/nms { };
 
   nomachine-client = callPackage ../tools/admin/nomachine-client { };

From 87b7e89ebfeb6d9a6fa1a2f18a900370af3fd32a Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Fri, 2 Sep 2022 06:39:19 -0600
Subject: [PATCH 20/60] legendary-gl: 0.20.27 -> 0.20.28

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

diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix
index 6b81593c8af1..c04c90b97753 100644
--- a/pkgs/games/legendary-gl/default.nix
+++ b/pkgs/games/legendary-gl/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "legendary-gl"; # Name in pypi
-  version = "0.20.27";
+  version = "0.20.28";
 
   src = fetchFromGitHub {
     owner = "derrod";
     repo = "legendary";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-h9WmeVONX19/pUBfE1T/OSMI/HkTKJiTfyyEJV/noB8=";
+    sha256 = "sha256-33EsxwwvgkN9U8kpYywV0wsRnLzjGv87zYJ9jSVi91c=";
   };
 
   propagatedBuildInputs = [ requests ];

From f6d144637c334de703b453f1c2d007dc2433f6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 2 Sep 2022 14:56:32 +0200
Subject: [PATCH 21/60] python310Packages.graphql-server-core: remove pseudo
 black test, little cleanup

---
 .../python-modules/graphql-server-core/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix
index e26e936f48fd..2ba45e099673 100644
--- a/pkgs/development/python-modules/graphql-server-core/default.nix
+++ b/pkgs/development/python-modules/graphql-server-core/default.nix
@@ -1,16 +1,17 @@
 { buildPythonPackage
 , fetchFromGitHub
 , lib
-, black
 , graphql-core
 , promise
 , fetchpatch
 , pythonOlder
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "graphql-server-core";
   version = "2.0.0";
+  disable = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "graphql-python";
@@ -19,8 +20,6 @@ buildPythonPackage rec {
     sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr";
   };
 
-  disable = pythonOlder "3.6";
-
   patches = [
     (fetchpatch {
       url = "https://github.com/graphql-python/graphql-server-core/commit/865ee9d5602f352c958f6f7e15adbe9abe216784.patch";
@@ -33,18 +32,17 @@ buildPythonPackage rec {
     promise
   ];
 
-  checkPhase = "black --check graphql_server tests";
+  # fail with: cannot import name 'format_error' from 'graphql'
+  doCheck = false;
 
   checkInputs = [
-    black
+    pytestCheckHook
   ];
 
   meta = with lib; {
     description = "Core package for using GraphQL in a custom server easily";
     homepage = "https://github.com/graphql-python/graphql-server-core";
     license = licenses.mit;
-    maintainers = with maintainers; [
-      kamadorueda
-    ];
+    maintainers = with maintainers; [ kamadorueda ];
   };
 }

From c5b5bcd7860c51a9cb6e2c9da66c9909f0fcbf28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 2 Sep 2022 15:16:33 +0200
Subject: [PATCH 22/60] noto-fonts: remove unused black, update meta

---
 pkgs/data/fonts/noto-fonts/tools.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix
index 7d850ef71667..e829e98bee0b 100644
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub, lib, buildPythonPackage, pythonOlder
-, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
+, afdko, appdirs, attrs, booleanoperations, brotlipy, click
 , defcon, fontmath, fontparts, fontpens, fonttools, lxml
 , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
 , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
@@ -28,7 +28,6 @@ buildPythonPackage rec {
     afdko
     appdirs
     attrs
-    black
     booleanoperations
     brotlipy
     click
@@ -70,9 +69,10 @@ buildPythonPackage rec {
     cp -r third_party $out
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Noto fonts support tools and scripts plus web site generation";
-    license = lib.licenses.asl20;
     homepage = "https://github.com/googlefonts/nototools";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
   };
 }

From 8fab1c44c93a5e7d7d73bddbad686931d32857ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Sep 2022 13:50:59 +0000
Subject: [PATCH 23/60] exoscale-cli: 1.59.0 -> 1.59.1

---
 pkgs/tools/admin/exoscale-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix
index cd58c8a72846..4f3caefefa9b 100644
--- a/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "exoscale-cli";
-  version = "1.59.0";
+  version = "1.59.1";
 
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-QLIxoCV+QL+uXmT0IdeztzefiOpW9xNVf0XuZPVpp/Y=";
+    sha256 = "sha256-dkiUO68NtWU/GOOuJvihlOfnEjF+5sNSkOAttCrQEHI=";
   };
 
   vendorSha256 = null;

From 827b92fb51563c37e5c6754a6d41979b6ba1d72f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Sep 2022 15:02:12 +0000
Subject: [PATCH 24/60] hugo: 0.102.2 -> 0.102.3

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 70602b7b7cde..ef996754f19d 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.102.2";
+  version = "0.102.3";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mAkdx42JaYSSpNLssBNkX45V3VniVKVbPt2SQ/QaXmY=";
+    sha256 = "sha256-qk5iv/oJ2Q8vR5jFl0gR7gA0H/3sHJOOlr8rwg7HjUY=";
   };
 
   vendorSha256 = "sha256-oWOu8vmxe0a/nIgkjpx7XrB49rjcuqnnpuOMtI9bLfY=";

From 38701b81edf550cf7504360e1c3cd2b7ed8c2d9a Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 20 Aug 2022 13:16:05 +0200
Subject: [PATCH 25/60] python310Packages.napari-npe2: 0.5.1 -> 0.6.1

---
 pkgs/development/python-modules/napari-npe2/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix
index f6658ad1f6f8..f8d9b341663e 100644
--- a/pkgs/development/python-modules/napari-npe2/default.nix
+++ b/pkgs/development/python-modules/napari-npe2/default.nix
@@ -17,7 +17,8 @@
 
 buildPythonPackage rec {
   pname = "napari-npe2";
-  version = "0.5.1";
+  version = "0.6.1";
+
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
     owner = "napari";
     repo = "npe2";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+tTJrtJFUGwOhFzWgA5cFVp458DGuPVkErN/5O2LHk4=";
+    hash = "sha256-1wGMd4box+ulHcEL4zoArJ3ez95s7GcbXa9bWfLbSCw=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 0cf9509045f5cc177ee101bc8fc1ae044c0567f9 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Fri, 2 Sep 2022 19:31:22 +0300
Subject: [PATCH 26/60] netbird: 0.8.10 -> 0.8.11

---
 pkgs/tools/networking/netbird/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 0aad6619a7de..001a6deeedb0 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -14,16 +14,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.8.10";
+  version = "0.8.11";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Re/tcS9aZhMtMuUIVrDLjTM8stm7LE6VF5H4EEmcqq4=";
+    sha256 = "sha256-bVfe2Imklv1Q/5HoGJVlIO+CotrFQ1yG0L6p+MBE9vI=";
   };
 
-  vendorSha256 = "sha256-KtRQwrCBsOX7Jk9mKdDNOD7zfssADfBXCO1RPZbp5Aw=";
+  vendorSha256 = "sha256-HGWKkvJKIEwTLhEK8i+4lraoFEDSljmwxMOhFHhobms=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 
@@ -84,6 +84,7 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://netbird.io";
+    changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}";
     description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls";
     license = licenses.bsd3;
     maintainers = with maintainers; [ misuzu ];

From dcd536f6005b72ccb7a1f2879384380e036d50e8 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Fri, 2 Sep 2022 16:15:24 +0100
Subject: [PATCH 27/60] entwine: init at unstable-2022-08-03

---
 .../applications/graphics/entwine/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/graphics/entwine/default.nix

diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix
new file mode 100644
index 000000000000..f9378c06ea4c
--- /dev/null
+++ b/pkgs/applications/graphics/entwine/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pdal
+, curl
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "entwine";
+  version = "unstable-2022-08-03";
+
+  src = fetchFromGitHub {
+    owner = "connormanning";
+    repo = "entwine";
+    rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae";
+    sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g=";
+  };
+
+  buildInputs = [
+    openssl
+    pdal
+    curl
+  ];
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = with lib; {
+    description = "Point cloud organization for massive datasets";
+    homepage = "https://entwine.io/";
+    license = licenses.lgpl2Only;
+    maintainers = with maintainers; [ matthewcroughan ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82f2c598389e..fb32a6398411 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3744,6 +3744,8 @@ with pkgs;
 
   ent = callPackage ../tools/misc/ent { };
 
+  entwine = callPackage ../applications/graphics/entwine { };
+
   envconsul = callPackage ../tools/system/envconsul { };
 
   envsubst = callPackage ../tools/misc/envsubst { };

From e5c65b5f987aad9561c1a233b4fc73d130f9c7ff Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Fri, 2 Sep 2022 23:05:05 +0200
Subject: [PATCH 28/60] salt: 3004.2 -> 3005

---
 pkgs/tools/admin/salt/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 1a30548f3cc4..9d636d0bae61 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -9,11 +9,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "salt";
-  version = "3004.2";
+  version = "3005";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    hash = "sha256-L6ZE9iANTja1WEbLNytuZ7bKD77AaX8djXPncbZl7XA=";
+    hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -30,10 +30,6 @@ python3.pkgs.buildPythonApplication rec {
 
   patches = [
     ./fix-libcrypto-loading.patch
-    (fetchpatch {
-      url = "https://github.com/saltstack/salt/commit/6ec8b90e402ff3fa8f27c7da70ece898592416bc.patch";
-      hash = "sha256-OQCJeG12cp2EZ0BErp6yqsqhv023923rVFDHAFUfF6c=";
-    })
   ];
 
   postPatch = ''
@@ -46,14 +42,6 @@ python3.pkgs.buildPythonApplication rec {
     # `extraInputs` like on any other platform
     echo -n > "requirements/darwin.txt"
 
-    # Bug in 3004.1: https://github.com/saltstack/salt/pull/61839
-    substituteInPlace "salt/utils/entrypoints.py" \
-      --replace 'if sys.version_info >= (3, 10):' 'if False:'
-
-    # Bug in 3004.1: https://github.com/saltstack/salt/issues/61865
-    substituteInPlace "salt/transport/tcp.py" \
-      --replace 'payload = self.pack_publish(package)' 'package = self.pack_publish(package)'
-
     # 3004.1: requirement of pyzmq was restricted to <22.0.0; looks like that req was incorrect
     # https://github.com/saltstack/salt/commit/070597e525bb7d56ffadede1aede325dfb1b73a4
     # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259279

From 5b95b61fa1ac52171eb65ff207d9df5a74f70c3d Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 1 Sep 2022 18:34:13 -0400
Subject: [PATCH 29/60] taplo: 0.6.9 -> 0.7.0

---
 pkgs/development/tools/taplo/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix
index 64437bb32529..50372b287411 100644
--- a/pkgs/development/tools/taplo/default.nix
+++ b/pkgs/development/tools/taplo/default.nix
@@ -1,7 +1,6 @@
 { lib
 , rustPlatform
 , fetchCrate
-, openssl
 , stdenv
 , Security
 , withLsp ? true
@@ -9,18 +8,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "taplo";
-  version = "0.6.9";
+  version = "0.7.0";
 
   src = fetchCrate {
     inherit version;
     pname = "taplo-cli";
-    sha256 = "sha256-gf58V/KIsbM+mCT3SvjZ772cuikS2L81eRb7uy8OPys=";
+    sha256 = "sha256-lJdDr6pXOxndv3mBAbqkDnVXOFklSMcnzTed0U1Nm9U=";
   };
 
-  cargoSha256 = "sha256-f+jefc3qw4rljmikvrmvZfCCadBKicBs7SMh/mJ4WSs=";
-
-  OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
-  OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
+  cargoSha256 = "sha256-1wN43HOyrSFTs9nKxUi3kcnGvtONW8SgKwIEK1ckCgk=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 

From 98d1746cac46f85c69e7a8ab589d9d432a8dbf11 Mon Sep 17 00:00:00 2001
From: nixpkgs-upkeep-bot <skainsworth@gmail.com>
Date: Sat, 3 Sep 2022 00:24:36 +0000
Subject: [PATCH 30/60] vscodium: 1.70.2.22230 -> 1.71.0.22245

---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index e8043eef9fac..5018ba6ca78f 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1b2603fcb28479dajwg9q2ck083fym6khjv02ax3l0p6jazjyc70";
-    x86_64-darwin = "0xggqfmsm7zzbn43mjmmk8wg75nr2nvkiaddcgwq3a2xn1x90jb5";
-    aarch64-linux = "1wfrfap840a9azik1dbzp7kib04amc3y2m6s45v3qa3c0kw1162a";
-    aarch64-darwin = "1nfv5ysri6p2sfp47786alv7b8rrn7mxsaisdlz970r8d79mrp5n";
-    armv7l-linux = "185ayjvahyqxqab7dkpygxd68adxai25sw4fcw00x5c4l5lgmvhl";
+    x86_64-linux = "03lbfl3azrjhxzkadrz632dpwnv6hyyls10mc8wzspwraz77v1m5";
+    x86_64-darwin = "1fd66fbs414lja7ca38sdgx02nw9w1qfrlxhcb52ijls5xbmbgm4";
+    aarch64-linux = "0hwzx0lvrxrzrpggpsymjzy53dq4msg0j3vrxq82308ydc5ssnzd";
+    aarch64-darwin = "0dqhi6br29bq8a97wgfxgz4d236cg0ydgaqv8j5nqjgvjwp13p9l";
+    armv7l-linux = "07qq0ic9nckl9fkk5rl9dy4gksw3l248jsy7v8ws8f3mq4l8gi49";
   }.${system} or throwSystem;
 
   sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.70.2.22230";
+    version = "1.71.0.22245";
     pname = "vscodium";
 
     executableName = "codium";

From d396bdfe3079de9d2e602bb18051aa94eb98ee55 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Fri, 2 Sep 2022 18:27:52 -0700
Subject: [PATCH 31/60] kooha: fix missing x264enc codec

---
 pkgs/applications/video/kooha/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix
index 667dfd83d2cf..66cac403727a 100644
--- a/pkgs/applications/video/kooha/default.nix
+++ b/pkgs/applications/video/kooha/default.nix
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-ugly
     gtk4
     libadwaita
     libpulseaudio

From f9b34059ff47056e87c67a2e2693b3f9bc1392cc Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 2 Sep 2022 22:31:58 -0400
Subject: [PATCH 32/60] difftastic: 0.34.0 -> 0.35.0

---
 pkgs/tools/text/difftastic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
index 7cbbdfc0c36c..d22612e0bc76 100644
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "difftastic";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "wilfred";
     repo = pname;
     rev = version;
-    sha256 = "sha256-HooO8T1FLIuERlI2dWGWMtPbtjVB9MPuA1IB+9CYytw=";
+    sha256 = "sha256-gf8Q/x9JXQcYEPa7fHoxwEvLFjpXVraY5aEcA89xJsc=";
   };
 
   depsExtraArgs = {
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
       popd
     '';
   };
-  cargoSha256 = "sha256-5HwipbtQ/zW61fgam1BGnEJYVzA98TH7y3eZ8bES2Ck=";
+  cargoSha256 = "sha256-CUbiEqFNEQCe9CKhpa8m8+/XVOOTv1ltmx0sXssx+e8=";
 
   passthru.tests.version = testers.testVersion { package = difftastic; };
 

From 1d8239c9b6cfd0a7a7513527986cfd943dc0be36 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Sep 2022 04:20:00 +0000
Subject: [PATCH 33/60] bundletool: 1.11.0 -> 1.11.1

https://github.com/google/bundletool/releases/tag/1.11.1
---
 pkgs/development/tools/bundletool/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix
index 2c9e9092939c..24306ddf4173 100644
--- a/pkgs/development/tools/bundletool/default.nix
+++ b/pkgs/development/tools/bundletool/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }:
+{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "bundletool";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchurl {
     url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
-    sha256 = "sha256-xCw2Wuc2ndTcLrwR7uv5FFnwImxTcG/STeTQBiaKuIw=";
+    sha256 = "sha256-Zlk6wUQBftst8Tx+dAT67/WBID1BHD4aSAvRcGO9ErE=";
   };
 
   dontUnpack = true;

From 5f29bc3608fef79cdf5535a5feaec00159feb858 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Sep 2022 04:20:00 +0000
Subject: [PATCH 34/60] ltex-ls: use stdenvNoCC

---
 pkgs/tools/text/ltex-ls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/tools/text/ltex-ls/default.nix
index c21ab2e038ab..c2464895cf90 100644
--- a/pkgs/tools/text/ltex-ls/default.nix
+++ b/pkgs/tools/text/ltex-ls/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }:
+{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "ltex-ls";
   version = "15.2.0";
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out
     cp -rfv bin/ lib/ $out
-    rm -fv $out/bin/*.bat
+    rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat
     for file in $out/bin/{ltex-ls,ltex-cli}; do
       wrapProgram $file --set JAVA_HOME "${jre_headless}"
     done

From 94be1e971bca1a29d519e74a1e9fccf2df71d6b0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Sep 2022 04:20:00 +0000
Subject: [PATCH 35/60] python310Packages.markdownify: 0.11.5 -> 0.11.6

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

diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix
index 4c198c2ad7c3..cc5f3a36e85b 100644
--- a/pkgs/development/python-modules/markdownify/default.nix
+++ b/pkgs/development/python-modules/markdownify/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "markdownify";
-  version = "0.11.5";
+  version = "0.11.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-uPmakJ92tBqt+3SPLD6+I39B37JhdEZFr2cSwe0r11g=";
+    sha256 = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4=";
   };
 
   propagatedBuildInputs = [ beautifulsoup4 six ];

From 13f377567ee90cf12a814c281a9cffbe805fda20 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Sep 2022 04:20:00 +0000
Subject: [PATCH 36/60] millet: 0.3.5 -> 0.3.6

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

diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix
index 75971e7ad342..98ad6a7a05ee 100644
--- a/pkgs/development/tools/millet/default.nix
+++ b/pkgs/development/tools/millet/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-6laSFo8aBmZpeN5V3utZQHIWuoQcdy1hd1yU8LxpEJQ=";
+    sha256 = "sha256-HV/0ORI3siAnVyLcNDzu4BwK/sFO841ptQoxK6c+1Xs=";
   };
 
-  cargoSha256 = "sha256-bbyeI/cr5aBejiEcYyyyJO8UX5QoIlT9MFgnpDr/z1M=";
+  cargoSha256 = "sha256-jhn795bTcqOG60yzydWJ5Y9eR2UTVUBteuMw03M7wM0=";
 
   cargoBuildFlags = [ "--package" "lang-srv" ];
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "A language server for Standard ML";
     homepage = "https://github.com/azdavis/millet";
     changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md";
-    license = licenses.mit;
+    license = [ licenses.mit /* or */ licenses.asl20 ];
     maintainers = with maintainers; [ marsam ];
   };
 }

From a15b4f838ccd28f7014f583931a41a8cedca6533 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Sep 2022 08:56:20 +0200
Subject: [PATCH 37/60] exploitdb: 2022-08-10 -> 2022-09-02

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 744c5c6aabe9..e3a684ae7448 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2022-08-10";
+  version = "2022-09-02";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-t+y28QDeu0tIUidPjSqSPcmOzfaH6SnreuiEBDtKzP0=";
+    hash = "sha256-gZdoaY3wm45DhM2jlKneOzMupmKsPbeOzHIBhmgDeV0=";
   };
 
   nativeBuildInputs = [

From 828e6da991144f3da50e7be4a32df0d0f8b6f777 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Sep 2022 09:03:41 +0200
Subject: [PATCH 38/60] memray: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix
index fb646d395955..405e7e7b9b07 100644
--- a/pkgs/development/tools/memray/default.nix
+++ b/pkgs/development/tools/memray/default.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "memray";
-  version = "1.3.0";
+  version = "1.3.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bloomberg";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-8uFAWcf9ookmFAnCdA97+oade+fECt58DuDSk1uTMQI=";
+    hash = "sha256-zHdgVpe92OiwLC4jHVtT3oC+WnB30e5U3ZOHnmuo+Ao=";
   };
 
   buildInputs = [

From 1cb7e689a0a0b6368811c5e4dcb326b35416d2e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Sep 2022 09:28:56 +0200
Subject: [PATCH 39/60] python310Packages.fastcore: 1.5.22 -> 1.5.23

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

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index ab5e1f579fc8..6b8f662cbcc6 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.5.22";
+  version = "1.5.23";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-pJGyfo+7Sz4IxurkAo+51veN+o6gHAqBor5SLXERNdo=";
+    sha256 = "sha256-Zf2+GOyLQelFR0gugSzHWJV9WSKD/8IEkc4li4N+jnI=";
   };
 
   propagatedBuildInputs = [

From 7c36eb005e4db6e7db366213156db1df52565b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 3 Sep 2022 08:09:50 -0300
Subject: [PATCH 40/60] greybird: 3.23.1 -> 3.23.2

---
 pkgs/data/themes/greybird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
index a52c0d0357bc..19a7eb4a0fad 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/pkgs/data/themes/greybird/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "greybird";
-  version = "3.23.1";
+  version = "3.23.2";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = pname;
     rev = "v${version}";
-    sha256 = "hfi2TBRrZTSN43tYKMPvb/dWwwUE7RakKTMBziHnCWA=";
+    sha256 = "h4sPjKpTufaunVP0d4Z5x/K+vRW1FpuLrMJjydx/a6w=";
   };
 
   nativeBuildInputs = [

From 067a1b75f124da77a06c58efc05dbf1688501ce0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 11:59:41 +0000
Subject: [PATCH 41/60] igraph: 0.9.9 -> 0.9.10

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

diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index e36793debdff..69778f034829 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "igraph";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchFromGitHub {
     owner = "igraph";
     repo = pname;
     rev = version;
-    hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc=";
+    hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk=";
   };
 
   postPatch = ''

From d9a2e8ccc0ee28e1205daf38e47d6f10c53db265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 13:04:14 +0000
Subject: [PATCH 42/60] jql: 4.0.7 -> 5.0.1

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

diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix
index 58af734a16cc..e19bd18b68c1 100644
--- a/pkgs/development/tools/jql/default.nix
+++ b/pkgs/development/tools/jql/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jql";
-  version = "4.0.7";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "yamafaktory";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-5QVktJpGpHzwRUN8oIFoLydnA+ELhUprcQASeGzgLG8=";
+    sha256 = "sha256-UfVhkwb89OU7yENcCXM7JfYNsO//des0gsEnvnJGMjA=";
   };
 
-  cargoSha256 = "sha256-qmLmkWFP8T886uR8kJKCqB0G5XIfk+r+kubamKryktc=";
+  cargoSha256 = "sha256-kkWslFEdjsWGIrRWylGyTDZnNXcfCVrWT+dVnyvTRqk=";
 
   meta = with lib; {
     description = "A JSON Query Language CLI tool built with Rust";

From 56d5c28bd37cadc9866355707eff0b2199600b0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 14:54:20 +0000
Subject: [PATCH 43/60] opendht: 2.4.9 -> 2.4.10

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

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 218059ab1afb..dc1afaab3f40 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opendht";
-  version = "2.4.9";
+  version = "2.4.10";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = "v${version}";
-    sha256 = "sha256-S/eJrSueJOv3+cUyzcCE3l287l0ihvzOZHB6ZCHtHpQ=";
+    sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0=";
   };
 
   nativeBuildInputs = [

From 2c4f8fca9a8ae814ab995e1249aea00cd8b29b2b Mon Sep 17 00:00:00 2001
From: SamLukeYes <samlukeyes123@gmail.com>
Date: Sat, 3 Sep 2022 23:10:49 +0800
Subject: [PATCH 44/60] vscode: add commandLineArgs

---
 pkgs/applications/editors/vscode/generic.nix  | 3 ++-
 pkgs/applications/editors/vscode/vscode.nix   | 6 +++++-
 pkgs/applications/editors/vscode/vscodium.nix | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index b4731b5701c9..92c2a5daffeb 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -11,7 +11,7 @@
 , nodePackages, bash
 
 # Attributes inherit from specific versions
-, version, src, meta, sourceRoot
+, version, src, meta, sourceRoot, commandLineArgs
 , executableName, longName, shortName, pname, updateScript
 # sourceExecutableName is the name of the binary in the source archive, over
 # which we have no control
@@ -110,6 +110,7 @@ let
         # Add gio to PATH so that moving files to the trash works when not using a desktop environment
         --prefix PATH : ${glib.bin}/bin
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+        --add-flags ${lib.escapeShellArg commandLineArgs}
       )
     '';
 
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 9f3ebcd916f7..a0ffaf348d06 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -1,4 +1,7 @@
-{ stdenv, lib, callPackage, fetchurl, isInsiders ? false }:
+{ stdenv, lib, callPackage, fetchurl
+, isInsiders ? false
+, commandLineArgs ? ""
+}:
 
 let
   inherit (stdenv.hostPlatform) system;
@@ -31,6 +34,7 @@ in
     executableName = "code" + lib.optionalString isInsiders "-insiders";
     longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
     shortName = "Code" + lib.optionalString isInsiders " - Insiders";
+    inherit commandLineArgs;
 
     src = fetchurl {
       name = "VSCode_${version}_${plat}.${archive_fmt}";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index e8043eef9fac..fd912beb6acd 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, fetchurl, nixosTests }:
+{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "" }:
 
 let
   inherit (stdenv.hostPlatform) system;
@@ -25,7 +25,7 @@ let
   sourceRoot = if stdenv.isDarwin then "" else ".";
 in
   callPackage ./generic.nix rec {
-    inherit sourceRoot;
+    inherit sourceRoot commandLineArgs;
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.

From fd30eef8fd7d3969ac4c628674d638f9ed4341e6 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 4 Sep 2022 00:21:38 +0800
Subject: [PATCH 45/60] variety: fix wrapper

---
 pkgs/applications/misc/variety/default.nix | 35 +++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix
index 42c2a429de96..10b98e0642c0 100644
--- a/pkgs/applications/misc/variety/default.nix
+++ b/pkgs/applications/misc/variety/default.nix
@@ -11,8 +11,10 @@
 , python3
 , runtimeShell
 , wrapGAppsHook
-, fehSupport ? false, feh
-, imagemagickSupport ? true, imagemagick
+, fehSupport ? false
+, feh
+, imagemagickSupport ? true
+, imagemagick
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -29,17 +31,19 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = [
     intltool
     wrapGAppsHook
+    gobject-introspection
   ];
 
-  propagatedBuildInputs = [
-   gexiv2
-   gobject-introspection
-   gtk3
-   hicolor-icon-theme
-   libnotify
-   librsvg
-  ]
-  ++ (with python3.pkgs; [
+  buildInputs = [
+    gexiv2
+    gobject-introspection
+    gtk3
+    hicolor-icon-theme
+    libnotify
+    librsvg
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
     beautifulsoup4
     configobj
     dbus-python
@@ -51,14 +55,17 @@ python3.pkgs.buildPythonApplication rec {
     pygobject3
     requests
     setuptools
-  ])
+  ]
   ++ lib.optional fehSupport feh
   ++ lib.optional imagemagickSupport imagemagick;
 
   doCheck = false;
 
-  postInstall = ''
-    wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
+  # Prevent double wrapping, let the Python wrapper use the args in preFixup.
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
   prePatch = ''

From fa7eb30103713b79062fac69a1f642e057137ed7 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Sat, 3 Sep 2022 10:23:46 -0700
Subject: [PATCH 46/60] elf2uf2-rs: unstable-2021-12-12 -> 1.3.7

---
 pkgs/development/embedded/elf2uf2-rs/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix
index fac10a28107f..3b6255683c8c 100644
--- a/pkgs/development/embedded/elf2uf2-rs/default.nix
+++ b/pkgs/development/embedded/elf2uf2-rs/default.nix
@@ -1,14 +1,12 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }:
+{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }:
 
 rustPlatform.buildRustPackage rec {
   pname = "elf2uf2-rs";
-  version = "unstable-2021-12-12";
+  version = "1.3.7";
 
-  src = fetchFromGitHub {
-    owner = "JoNil";
-    repo = pname;
-    rev = "91ae98873ed01971ab1543b98266a5ad2ec09210";
-    sha256 = "sha256-DGrT+YdDLdTYy5SWcQ+DNbpifGjrF8UTXyEeE/ug564=";
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-2ZilZIYXCNrKJlkHBsz/2/pMtF+UDfjDlt53ylcwgus=";
   };
 
   nativeBuildInputs = [
@@ -19,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  cargoSha256 = "sha256-5ui1+987xICP2wUSHy4YzKskn52W51Pi4DbEh+GbSPE=";
+  cargoSha256 = "sha256-+3Rqlzkrw9XfM3PelGNbnRGaWQLbzVJ7iJgvGgVt5FE=";
 
   meta = with lib; {
     description = "Convert ELF files to UF2 for USB Flashing Bootloaders";

From 698f0ae63d742053cd5a8b02f48eca87f90b5a4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 18:33:36 +0000
Subject: [PATCH 47/60] python310Packages.geoalchemy2: 0.12.4 -> 0.12.5

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

diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index 9eb4c8525a32..92bdb1a6578e 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "geoalchemy2";
-  version = "0.12.4";
+  version = "0.12.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "GeoAlchemy2";
     inherit version;
-    hash = "sha256-PHs6bS/I6BpJYEPHgB9yuM35Ix33fN5n/KxqKuQzwEk=";
+    hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc=";
   };
 
   nativeBuildInputs = [

From 2fb2e966a514789f332d8c9fe61f34b4a6075722 Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Sun, 4 Sep 2022 03:14:19 +0800
Subject: [PATCH 48/60] vivaldi: ignore unused debian revision number

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 pkgs/applications/networking/browsers/vivaldi/update.sh   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 69cb5562109a..9fdaa586db2c 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -20,10 +20,10 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "5.4.2753.37-1";
+  version = "5.4.2753.37";
 
   src = fetchurl {
-    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
+    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
     sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw";
   };
 
diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh
index ab072340173a..ec8a9d7d6624 100755
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@@ -12,7 +12,7 @@ version() {
 }
 
 vivaldi_version_old=$(version vivaldi)
-vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p')
+vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
 
 if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
   echo "vivaldi is already up-to-date"
@@ -20,7 +20,7 @@ if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
 fi
 
 # Download vivaldi and save hash and file path.
-url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb"
+url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb"
 mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
 hash=${prefetch[0]}
 path=${prefetch[1]}

From a04201bb98abe7390ab992d32d5963834fcef097 Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Sun, 4 Sep 2022 03:21:08 +0800
Subject: [PATCH 49/60] vivaldi: 5.4.2753.37 -> 5.4.2753.47

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 9fdaa586db2c..53c01b977e4e 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -20,11 +20,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "5.4.2753.37";
+  version = "5.4.2753.47";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb";
-    sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw";
+    sha256 = "1p155mcrmfz395yajxa6fqjk1paac216kim26i3r56wah5329gmr";
   };
 
   unpackPhase = ''

From 1eab439e4b9f7b54340e0a98d05a170cf0a739f6 Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Sun, 4 Sep 2022 03:21:23 +0800
Subject: [PATCH 50/60] vivaldi-ffmepg-codecs: 104.0.5112.79 -> 104.0.5112.101

---
 .../networking/browsers/vivaldi/ffmpeg-codecs.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index a49f2fe1307a..b5c9cd02e792 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "chromium-codecs-ffmpeg-extra";
-  version = "104.0.5112.79";
+  version = "104.0.5112.101";
 
   src = fetchurl {
-    url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
-    sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38=";
+    url = "https://launchpadlibrarian.net/618703258/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
+    sha256 = "sha256-V+zqLhI8L/8ssxSR6S2v4gUAtoK3fB8Fi9bajBFEauU=";
   };
 
   buildInputs = [ dpkg ];

From 8098b43eddfbb179609e3d3a2e1206c0aed72437 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 19:52:08 +0000
Subject: [PATCH 51/60] traefik: 2.8.3 -> 2.8.4

---
 pkgs/servers/traefik/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index d7b65d55d152..f6c4cdaba046 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "traefik";
-  version = "2.8.3";
+  version = "2.8.4";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    sha256 = "sha256-ww5yy4W6voP5Wo1wVuCXUtmyA9CoVk1HU5UzPUoHf/E=";
+    sha256 = "sha256-TzNjz1usnQ0CMu47i9pnCRR6N/d3ig2E0wVH3E8xJp0=";
     stripRoot = false;
   };
 
-  vendorSha256 = "sha256-ogq/4gBX4+5GZomk00Yu8J3JSbkhEFOWE6Ik+HqtkWk=";
+  vendorSha256 = "sha256-+jqMokDuvw5LTqBxJ/2VyoT3wkdBHewTrYsK/5Uv6js=";
 
   subPackages = [ "cmd/traefik" ];
 

From 8d8f743f9067cdd23631a0b3fb95e7177d8e3873 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 4 Sep 2022 00:23:42 +0300
Subject: [PATCH 52/60] prospector: fix build

---
 pkgs/development/tools/prospector/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix
index 5458df424b12..d2855861dc8f 100644
--- a/pkgs/development/tools/prospector/default.nix
+++ b/pkgs/development/tools/prospector/default.nix
@@ -58,7 +58,8 @@ buildPythonApplication rec {
     substituteInPlace pyproject.toml \
       --replace 'requirements-detector = "^0.7"' 'requirements-detector = "*"' \
       --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \
-      --replace 'mccabe = "^0.6.0"' 'mccabe = "*"'
+      --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' \
+      --replace 'pycodestyle = ">=2.6.0,<2.9.0"' 'pycodestyle = "*"'
   '';
 
   pythonImportsCheck = [

From 7754fddc2e493b128442bdac72d082502de8327d Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 4 Sep 2022 00:33:32 +0300
Subject: [PATCH 53/60] pls: fix build

---
 pkgs/tools/misc/pls/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix
index d6ffd653204b..95c775417cb8 100644
--- a/pkgs/tools/misc/pls/default.nix
+++ b/pkgs/tools/misc/pls/default.nix
@@ -26,6 +26,11 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'rich = "^12.5.1"' 'rich = "*"' \
+  '';
+
   pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ];
 
   pythonImportsCheck = [ "pls" ];

From bf5ccf2e9168abb51a1367c6b1c969514a0a3406 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 10:45:23 +0000
Subject: [PATCH 54/60] python310Packages.awkward: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 97bdc19a8039..64e5ce632065 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI=";
+    sha256 = "sha256-yteZI35DcLUPd+cW543TVlp7P9gvzVpBp2qhUS1RB10=";
   };
 
   nativeBuildInputs = [ cmake ];

From ef16c5189bf31c85db823303b841b25a524bb8b5 Mon Sep 17 00:00:00 2001
From: MatthewCroughan <matt@croughan.sh>
Date: Sun, 4 Sep 2022 00:11:26 +0100
Subject: [PATCH 55/60] auth0-cli: init at 0.11.10 (#189335)

Co-authored-by: Nikolay Korotkiy <sikmir@disroot.org>
Co-authored-by: Azat Bahawi <azat+github@bahawi.net>
Co-authored-by: 06kellyjac <dev@j-k.io>
---
 pkgs/tools/admin/auth0-cli/default.nix | 37 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/admin/auth0-cli/default.nix

diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix
new file mode 100644
index 000000000000..98bdf82e0ad9
--- /dev/null
+++ b/pkgs/tools/admin/auth0-cli/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "auth0-cli";
+  version = "0.11.10";
+
+  src = fetchFromGitHub {
+    owner = "auth0";
+    repo = "auth0-cli";
+    rev = "v${version}";
+    hash = "sha256-1/T2hpSNamorWFuaSBoLsGpe9I06HGew9S3yJsDLmLQ=";
+  };
+
+  vendorHash = "sha256-d9ZwK/LAZGgeagGsg3bGYnVykfQcCLUex0pe/PUCtkA=";
+
+  ldflags = [
+    "-s" "-w"
+    "-X github.com/auth0/auth0-cli/internal/buildinfo.Version=v${version}"
+    "-X github.com/auth0/auth0-cli/internal/buildinfo.Revision=0000000"
+  ];
+
+  preCheck = ''
+    # Feed in all tests for testing
+    # This is because subPackages above limits what is built to just what we
+    # want but also limits the tests
+    unset subPackages
+  '';
+
+  subPackages = [ "cmd/auth0" ];
+
+  meta = with lib; {
+    description = "Supercharge your developer workflow";
+    homepage = "https://auth0.github.io/auth0-cli";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthewcroughan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 246b73746775..9ebf6bcefe1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -274,6 +274,8 @@ with pkgs;
 
   authz0 = callPackage ../tools/security/authz0 { };
 
+  auth0-cli = callPackage ../tools/admin/auth0-cli { };
+
   atomic-operator = callPackage ../tools/security/atomic-operator { };
 
   avro-tools = callPackage ../development/tools/avro-tools { };

From d324ac2db7eabf7c01a5a2880404a595248990cb Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sun, 4 Sep 2022 06:14:17 +0800
Subject: [PATCH 56/60] vimPlugins.vim-llvm: init at 2022-05-03

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5f4eaedc8aab..1cea988235ea 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -10243,6 +10243,18 @@ final: prev:
     meta.homepage = "https://github.com/tpope/vim-liquid/";
   };
 
+  vim-llvm = buildVimPluginFrom2Nix {
+    pname = "vim-llvm";
+    version = "2022-05-03";
+    src = fetchFromGitHub {
+      owner = "rhysd";
+      repo = "vim-llvm";
+      rev = "ac3fbdd79b0f5bd68049d38a4901e43a93d4cfd0";
+      sha256 = "1nzmyd2fh2rfxqi87pgdx40xxq7b16izgi57fib8fpywcw26s2ga";
+    };
+    meta.homepage = "https://github.com/rhysd/vim-llvm/";
+  };
+
   vim-localvimrc = buildVimPluginFrom2Nix {
     pname = "vim-localvimrc";
     version = "2022-05-11";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2f6ba2b088fa..726ef1447eba 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -860,6 +860,7 @@ https://github.com/lfe-support/vim-lfe/,,
 https://github.com/josa42/vim-lightline-coc/,,
 https://github.com/tommcdo/vim-lion/,,
 https://github.com/tpope/vim-liquid/,,
+https://github.com/rhysd/vim-llvm/,HEAD,
 https://github.com/embear/vim-localvimrc/,,
 https://github.com/andreshazard/vim-logreview/,,
 https://github.com/mlr-msft/vim-loves-dafny/,,

From 57b9c13e63111abc0e3de8a2131c7b63351dcaad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 23:41:25 +0000
Subject: [PATCH 57/60] python310Packages.python-glanceclient: 4.0.1 -> 4.1.0

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

diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix
index 10537b419ae8..4f63cca8a8b1 100644
--- a/pkgs/development/python-modules/python-glanceclient/default.nix
+++ b/pkgs/development/python-modules/python-glanceclient/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonApplication rec {
   pname = "python-glanceclient";
-  version = "4.0.1";
+  version = "4.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pfQnIvrZFw16eRF2kPxmthWpY7qWkBu9SUavQnXO8zQ=";
+    hash = "sha256-fknYBKZzCA6sThugNQT5+p+/hqv8vW6M2LMMpbT+7rY=";
   };
 
   postPatch = ''

From 31dcc18fe31de96066abf8eba52f5aa8e085f3bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 23:41:52 +0000
Subject: [PATCH 58/60] python310Packages.python-heatclient: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix
index 38daad08bdb0..c51c222dd6fa 100644
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonApplication rec {
   pname = "python-heatclient";
-  version = "3.0.0";
+  version = "3.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs=";
+    hash = "sha256-/SW8hRj588N++4Cuz7elbU0qO++4Jhm1va069JnNmZo=";
   };
 
   propagatedBuildInputs = [

From 62523d7e0edb241dfc9c3e61bdff73a7b5ae120e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 23:45:07 +0000
Subject: [PATCH 59/60] python310Packages.python-keystoneclient: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix
index 198ef19465c4..55fb3fff3182 100644
--- a/pkgs/development/python-modules/python-keystoneclient/default.nix
+++ b/pkgs/development/python-modules/python-keystoneclient/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-keystoneclient";
-  version = "5.0.0";
+  version = "5.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-D1DaM78gtVrPxZ1PlGD6Lvwb4V/QXsPyNnTQPror6j8=";
+    hash = "sha256-qLv2cfVsJKpaN6IluY8plLggY9c+NIZlfrUAozpAbSk=";
   };
 
   propagatedBuildInputs = [

From 1f3451081258c70bc994b636daafd10dd8ee0475 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 3 Sep 2022 23:49:01 +0000
Subject: [PATCH 60/60] python310Packages.python-manilaclient: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix
index d0a8fc3a0fc6..9a9e01ff4be7 100644
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -23,12 +23,12 @@
 
 buildPythonApplication rec {
   pname = "python-manilaclient";
-  version = "4.0.0";
+  version = "4.1.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TEGzUNgYTkb2VrvW2E3lurD6N1XcIhH2tjmPlsJ/5MI=";
+    hash = "sha256-yoyQyhyqRQZ8yyn3sv94JqkVZQMybwxLGFForZowr3o=";
   };
 
   nativeBuildInputs = [