Merge master into haskell-updates

lib/systems/default.nix

@@ -158,38 +158,47 @@ rec {
         if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET"
         else if final.isiOS then "IPHONEOS_DEPLOYMENT_TARGET"
         else null;
+    } // (
+      let
+        selectEmulator = pkgs:
+          let
+            qemu-user = pkgs.qemu.override {
+              smartcardSupport = false;
+              spiceSupport = false;
+              openGLSupport = false;
+              virglSupport = false;
+              vncSupport = false;
+              gtkSupport = false;
+              sdlSupport = false;
+              pulseSupport = false;
+              smbdSupport = false;
+              seccompSupport = false;
+              hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
+            };
+            wine-name = "wine${toString final.parsed.cpu.bits}";
+            wine = (pkgs.winePackagesFor wine-name).minimal;
+          in
+          if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
+            pkgs.stdenv.hostPlatform.canExecute final
+          then "${pkgs.runtimeShell} -c '\"$@\"' --"
+          else if final.isWindows
+          then "${wine}/bin/${wine-name}"
+          else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
+          then "${qemu-user}/bin/qemu-${final.qemuArch}"
+          else if final.isWasi
+          then "${pkgs.wasmtime}/bin/wasmtime"
+          else if final.isMmix
+          then "${pkgs.mmixware}/bin/mmix"
+          else null;
+      in {
+        emulatorAvailable = pkgs: (selectEmulator pkgs) != null;
 
-      emulator = pkgs: let
-        qemu-user = pkgs.qemu.override {
-          smartcardSupport = false;
-          spiceSupport = false;
-          openGLSupport = false;
-          virglSupport = false;
-          vncSupport = false;
-          gtkSupport = false;
-          sdlSupport = false;
-          pulseSupport = false;
-          smbdSupport = false;
-          seccompSupport = false;
-          hostCpuTargets = ["${final.qemuArch}-linux-user"];
-        };
-        wine-name = "wine${toString final.parsed.cpu.bits}";
-        wine = (pkgs.winePackagesFor wine-name).minimal;
-      in
-        if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
-           pkgs.stdenv.hostPlatform.canExecute final
-        then "${pkgs.runtimeShell} -c '\"$@\"' --"
-        else if final.isWindows
-        then "${wine}/bin/${wine-name}"
-        else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
-        then "${qemu-user}/bin/qemu-${final.qemuArch}"
-        else if final.isWasi
-        then "${pkgs.wasmtime}/bin/wasmtime"
-        else if final.isMmix
-        then "${pkgs.mmixware}/bin/mmix"
-        else throw "Don't know how to run ${final.config} executables.";
+        emulator = pkgs:
+          if (final.emulatorAvailable pkgs)
+          then selectEmulator pkgs
+          else throw "Don't know how to run ${final.config} executables.";
 
-    } // mapAttrs (n: v: v final.parsed) inspect.predicates
+    }) // mapAttrs (n: v: v final.parsed) inspect.predicates
       // mapAttrs (n: v: v final.gcc.arch or "default") architectures.predicates
       // args;
   in assert final.useAndroidPrebuilt -> final.isAndroid;

nixos/modules/services/system/cachix-agent/default.nix

@@ -30,7 +30,7 @@ in {
     };
 
     host = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
       default = null;
       description = lib.mdDoc "Cachix uri to use.";
     };

nixos/modules/system/boot/systemd.nix

@@ -121,7 +121,7 @@ let
       "final.target"
       "kexec.target"
       "systemd-kexec.service"
-      "systemd-update-utmp.service"
+    ] ++ lib.optional (cfg.package.withUtmp or true) "systemd-update-utmp.service" ++ [
 
       # Password entry.
       "systemd-ask-password-console.path"

pkgs/applications/audio/lsp-plugins/default.nix

@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
         pname = "lsp-plugins";
-        version = "1.2.2";
+        version = "1.2.3";
 
         src = fetchurl {
                 url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
-                sha256 = "sha256-qIakDWNs8fQmlw/VHwTET2LmIvI+6I6zK88bmsWF4VI=";
+                sha256 = "sha256-ej8t3xk29VLJMO1lvXuzUlD00al8TTkPLL8z62fmTys=";
         };
 
         nativeBuildInputs = [ pkg-config php makeWrapper ];

pkgs/applications/audio/mympd/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mympd";
-  version = "9.5.3";
+  version = "9.5.4";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${version}";
-    sha256 = "sha256-0plbOBTrEOjfVbyfrQ8mNByJb6XygIPTrwGfY6+0DHo=";
+    sha256 = "sha256-0X/rEVfJ6zzX75R72xVntOfuCt8srp9PkiYOq3XbWPs=";
   };
 
   nativeBuildInputs = [

pkgs/applications/editors/o/default.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "o";
-  version = "2.55.1";
+  version = "2.56.0";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "o";
     rev = "v${version}";
-    hash = "sha256-owueLd6kR/bDFxKI9QOUgriH63XRsEEpIFfp5aRTSbI=";
+    hash = "sha256-mUd2IfTSmpRIurhQy2BI8KAuQyYmBoqpvPnEvnFRc7Y=";
   };
 
   postPatch = ''

pkgs/applications/editors/vim/plugins/generated.nix

@@ -5255,14 +5255,14 @@ final: prev:
 
   nvim-colorizer-lua = buildVimPluginFrom2Nix {
     pname = "nvim-colorizer.lua";
-    version = "2020-06-11";
+    version = "2022-09-10";
     src = fetchFromGitHub {
-      owner = "norcalli";
+      owner = "nvchad";
       repo = "nvim-colorizer.lua";
-      rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6";
-      sha256 = "0gvqdfkqf6k9q46r0vcc3nqa6w45gsvp8j4kya1bvi24vhifg2p9";
+      rev = "2664070cd04f2b9f803a10dd328a562be8ab15ca";
+      sha256 = "16myjv2hrqr2kk14mqidyrhdnz1i3p00yf0w97f4kxrdd158p1nz";
     };
-    meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/";
+    meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/";
   };
 
   nvim-comment = buildVimPluginFrom2Nix {

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -442,7 +442,7 @@ https://github.com/ojroques/nvim-bufdel/,,
 https://github.com/roxma/nvim-cm-racer/,,
 https://github.com/hrsh7th/nvim-cmp/,,
 https://github.com/weilbith/nvim-code-action-menu/,,
-https://github.com/norcalli/nvim-colorizer.lua/,,
+https://github.com/nvchad/nvim-colorizer.lua/,,
 https://github.com/terrortylor/nvim-comment/,,
 https://github.com/hrsh7th/nvim-compe/,,
 https://github.com/roxma/nvim-completion-manager/,,

pkgs/applications/emulators/ppsspp/default.nix

@@ -38,14 +38,14 @@ in
       + lib.optionalString enableQt "-qt"
       + lib.optionalString (!enableQt) "-sdl"
       + lib.optionalString forceWayland "-wayland";
-    version = "1.13.1";
+    version = "1.13.2";
 
     src = fetchFromGitHub {
       owner = "hrydgard";
       repo = "ppsspp";
       rev = "v${finalAttrs.version}";
       fetchSubmodules = true;
-      sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08=";
+      sha256 = "sha256-Ubbl2KCZ4QlWDtTxl4my0nKNGY25DOkD/iEurzVx4gU=";
     };
 
     postPatch = ''

pkgs/applications/emulators/wineasio/default.nix

@@ -0,0 +1,53 @@
+{ multiStdenv
+, lib
+, fetchFromGitHub
+, libjack2
+, pkg-config
+, wineWowPackages
+, pkgsi686Linux
+}:
+
+multiStdenv.mkDerivation rec {
+  pname = "wineasio";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-HEnJj9yfXe+NQuPATMpPvseFs+3TkiMLd1L+fIfQd+o=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkg-config wineWowPackages.stable ];
+
+  buildInputs = [ pkgsi686Linux.libjack2 libjack2 ];
+
+  dontConfigure = true;
+
+  makeFlags = [ "PREFIX=${wineWowPackages.stable}" ];
+
+  buildPhase = ''
+    runHook preBuild
+    make "''${makeFlags[@]}" 32
+    make "''${makeFlags[@]}" 64
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D build32/wineasio.dll $out/lib/wine/i386-windows/wineasio.dll
+    install -D build32/wineasio.dll.so $out/lib/wine/i386-unix/wineasio.dll.so
+    install -D build64/wineasio.dll $out/lib/wine/x86_64-windows/wineasio.dll
+    install -D build64/wineasio.dll.so $out/lib/wine/x86_64-unix/wineasio.dll.so
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/wineasio/wineasio";
+    description = "ASIO to JACK driver for WINE";
+    license = with licenses; [ gpl2 lgpl21 ];
+    maintainers = with maintainers; [ lovesegfault ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/file-managers/doublecmd/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "doublecmd";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "doublecmd";
     repo = "doublecmd";
     rev = "v${version}";
-    hash = "sha256-aEWu/bRVOwjK6QTWsMntRYwAfjuwo9SNuH4qkQn0mOY=";
+    hash = "sha256-HscDzeWM9lp6ba+VrXHIFmbWfE8ILg6WDn6q5WCOaOg=";
   };
 
   nativeBuildInputs = [

pkgs/applications/graphics/ImageMagick/default.nix

@@ -46,13 +46,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "imagemagick";
-  version = "7.1.0-47";
+  version = "7.1.0-48";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = version;
-    hash = "sha256-x5kC9nd38KgSpzJX3y6h2iBnte+UHrfZnbkRD/Dgqi8=";
+    hash = "sha256-ExGeZVqRajuYcck0JrIFGDEam4PfUCXF/jI2dudHh+E=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

pkgs/applications/misc/jquake/default.nix

@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jquake";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchurl {
     url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";
-    sha256 = "sha256-sdTt1+1eAU/DJAszPQnmoaBZThJ9yC9GL1k+OpD+tp4=";
+    sha256 = "sha256-fIxCcqpv0KAXUBbyinTXr/fkAcufVtpr9FUTJkXSgTs=";
   };
 
   nativeBuildInputs = [ unzip copyDesktopItems ];

pkgs/applications/misc/nwg-panel/default.nix

@@ -14,13 +14,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.7.4";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-L5oVuoEU8DEhRttFeas5cCA0XPo5sCm1D+JUAWzZdYA=";
+    sha256 = "sha256-dRYM6alxvhaVTRJPZ/minnEDXrijk8SX2C6/EYhhpEA=";
   };
 
   # No tests

pkgs/applications/misc/octoprint/default.nix

@@ -168,6 +168,7 @@ let
                     "zeroconf"
                     "Flask-Login"
                     "werkzeug"
+                    "flask"
                   ];
                 in
                 ''

pkgs/applications/misc/remarkable/rmview/default.nix

@@ -12,12 +12,16 @@ python3Packages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];
-  propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted pyjwt pyopenssl service-identity ];
+  propagatedBuildInputs = with python3Packages; [ pyqt5 paramiko twisted pyjwt pyopenssl service-identity sshtunnel ];
 
   preBuild = ''
     pyrcc5 -o src/rmview/resources.py resources.qrc
   '';
 
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
   meta = with lib; {
     description = "Fast live viewer for reMarkable 1 and 2";
     homepage = "https://github.com/bordaigorl/rmview";

pkgs/applications/misc/spicetify-cli/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "spicetify-cli";
-  version = "2.13.0";
+  version = "2.13.1";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-XsYZoJDSaAp+oMTy5YWM9aM+TCNkqF5WXBhU/axcEVk=";
+    sha256 = "sha256-YgT4HlVqm58CEGoc/bNjo0xEzoNIcTpKGZkSdhcAgis=";
   };
 
   vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";

pkgs/applications/misc/syncthingtray/default.nix

@@ -21,14 +21,14 @@
 }:
 
 mkDerivation rec {
-  version = "1.2.2";
+  version = "1.2.3";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "sha256-BdcMW9ePOLXOZnFxFb1h/mn5a6c8fHYFr9ckK9hXJAM=";
+    sha256 = "sha256-jMl2kXpHVXH/TfdPbq6bzdpNec6f1AUWsMNZzaAvK/I=";
   };
 
   buildInputs = [

pkgs/applications/misc/tippecanoe/default.nix

@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, sqlite, zlib, perl }:
+{ lib, stdenv, fetchFromGitHub, sqlite, zlib, perl, testers }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tippecanoe";
-  version = "1.36.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
-    owner = "mapbox";
-    repo = pname;
-    rev = version;
-    sha256 = "0lbmhly4ivnqc6qk1k3sdqvsg6x3nfd8gnjx846bhqj4wag3f88m";
+    owner = "felt";
+    repo = "tippecanoe";
+    rev = finalAttrs.version;
+    hash = "sha256-58/FS5nxzK5JSc0D1KXooSjrKMdOnpF7dvwAK9rUZZk=";
   };
 
   buildInputs = [ sqlite zlib ];
@@ -19,12 +19,16 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   doCheck = true;
 
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    version = "v${finalAttrs.version}";
+  };
+
   meta = with lib; {
-    broken = stdenv.isDarwin || stdenv.isAarch64;
     description = "Build vector tilesets from large collections of GeoJSON features";
-    homepage = "https://github.com/mapbox/tippecanoe";
+    homepage = "https://github.com/felt/tippecanoe";
     license = licenses.bsd2;
     maintainers = with maintainers; [ sikmir ];
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.unix;
   };
-}
+})

pkgs/applications/misc/usql/default.nix

@@ -7,19 +7,28 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.12.0";
+  version = "0.12.13";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     rev = "v${version}";
-    sha256 = "sha256-OOu3zWK/ccmaEVriXKl7SZUJLLYaJB3tgF+eR9p+TmM=";
+    hash = "sha256-F/eOD7/w8HjJBeiXagaf4yBLZcZVuy93rfVFeSESlZo=";
   };
 
-  vendorSha256 = "sha256-9XyG0Fu3idxGG01MoBr5BMoQSz+dyZFEXRNvvb+XWjA=";
+  vendorHash = "sha256-7rMCqTfUs89AX0VP689BmKsuvLJWU5ANJVki+JMVf7g=";
 
   buildInputs = [ unixODBC icu ];
 
+  # Exclude broken impala driver
+  # The driver breaks too often and is not used.
+  #
+  # See https://github.com/xo/usql/pull/347
+  #
+  excludedPackages = [
+    "impala"
+  ];
+
   # These tags and flags are copied from build-release.sh
   tags = [
     "most"
@@ -47,9 +56,7 @@ buildGoModule rec {
     description = "Universal command-line interface for SQL databases";
     homepage = "https://github.com/xo/usql";
     license = licenses.mit;
-    maintainers = with maintainers; [ georgyo ];
-    # usql does not build on ARM.
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ georgyo anthonyroussel ];
+    platforms = with platforms; linux ++ darwin;
   };
-
 }

pkgs/applications/networking/cluster/arkade/default.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.8.42";
+  version = "0.8.44";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    sha256 = "sha256-bq4tCizdi8TPRWpNaDmD817rOpnSr9aR4tkDWn48K2w=";
+    sha256 = "sha256-2+/CQhaeg/5FUx/igitt2MM3J0p5qYOQpc9zi60Tqkg=";
   };
 
   CGO_ENABLED = 0;

pkgs/applications/networking/cluster/atmos/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "atmos";
-  version = "1.4.28";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-AqW//+x1tKzm5dJirXCLFuDBTk3dHHw7c6vwsVsI37U";
+    sha256 = "sha256-SZ/4QKO8PdbHWZ+urOqZPFUb9lFRP+HWbNff1fmwDqI=";
   };
 
-  vendorSha256 = "sha256-bepv8Ns8vcpLpmO7fsRgGijB9B6kQ5HhxUhIuEpGtOY=";
+  vendorSha256 = "sha256-d2Eod1AK6Ei5Az9wPHVqij8K4CVj7Ptewd3dBJ9Wt3o=";
 
   ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
 

pkgs/applications/networking/cluster/glooctl/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.12.12";
+  version = "1.12.15";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-aQUN1T6AH1TRj2pPkNFoS5Fmo3NPmmiEXFZfFeXtN1w=";
+    hash = "sha256-HOWBigwW5JagFG1MfcFIXSzveGAj1BWjLbJL9ESLgAQ=";
   };
 
   subPackages = [ "projects/gloo/cli/cmd" ];

pkgs/applications/networking/cluster/k0sctl/default.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "k0sctl";
-  version = "0.13.2";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-uKN+vH7BGz8lUDrmPeLp941KPkkTfOkK4Ib9GZR9D0M=";
+    sha256 = "sha256-m0BdmsqmkB3Q6JzzRPS6Tq68a33heUifY2EgTjbAm3M=";
   };
 
   vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8=";

pkgs/applications/networking/cluster/kubelogin-oidc/default.nix

@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "1.25.2";
+  version = "1.25.3";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-d3iiUmNEPKylYSFq9cSfgJuQYLPhBJavGV8tOao0l4s=";
+    sha256 = "sha256-2Ny3tzeFOZR63fweb+/q1kocIDboD8fJzlLOzcoR0nA=";
   };
 
   subPackages = ["."];
 
-  vendorSha256 = "sha256-XxVXhNWZOyvrdh2yPQogtH62h7d8NbsNhhrwGuqcLJs=";
+  vendorSha256 = "sha256-iY4CmtWwQQwZBQM4iJXedFePL4vzSBfNWrVOxYvrhMs=";
 
   # Rename the binary instead of symlinking to avoid conflict with the
   # Azure version of kubelogin

pkgs/applications/networking/giara/default.nix

@@ -14,11 +14,11 @@
 , glib-networking
 , libadwaita
 , appstream
+, blueprint-compiler
 }:
-
 python3.pkgs.buildPythonApplication rec {
   pname = "giara";
-  version = "1.0";
+  version = "1.0.1";
 
   format = "other";
 
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "World";
     repo = pname;
     rev = version;
-    hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg=";
+    hash = "sha256-hKaniW+bbuKUrETMQGWwvC2kyudK9tCE/R69dOFzdQM=";
   };
 
   nativeBuildInputs = [
@@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
     pkg-config
     ninja
     wrapGAppsHook4
+    blueprint-compiler
   ];
 
   buildInputs = [
@@ -58,16 +59,6 @@ python3.pkgs.buildPythonApplication rec {
     beautifulsoup4
   ];
 
-  patches = [
-    # Proper support for gtk4 and libadwaita
-    # @TODO: Remove when bumping the version.
-    (fetchpatch {
-      name = "giara-gtk4-libadwaita.patch";
-      url = "https://gitlab.gnome.org/World/giara/-/commit/6204427f8b8e3d8c72b669717a3f129ffae401d9.patch";
-      sha256 = "sha256-E8kbVsACPD2gkfNrzYUy0+1U7+/pIkUu4rCkX+xY0us=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace meson_post_install.py \
       --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"

pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix

@@ -45,6 +45,11 @@ in stdenv.mkDerivation rec {
     runHook preConfigure
 
     export HOME=$PWD/tmp
+    # with the update of openssl3, some key ciphers are not supported anymore
+    # this flag will allow those codecs again as a workaround
+    # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
+    # and https://github.com/vector-im/element-web/issues/21043
+    export NODE_OPTIONS=--openssl-legacy-provider
     mkdir -p $HOME
 
     pushd element-web

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "5.57.0"; # Please backport all updates to the stable channel.
+  version = "5.58.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "sha256-42xKqK/7V2GPHk/L396O7UoWn5vTyILVTbLa0Tf6NaY=";
+    sha256 = "sha256-1UM68aDXM0MseQmOAVmX13yD/GLPCmq6wikt8CwEdgc=";
   };
 
   nativeBuildInputs = [

pkgs/applications/office/beamerpresenter/default.nix

@@ -22,17 +22,18 @@
 # choose renderer: mupdf or poppler or both (not recommended)
 , usePoppler ? false
 , useMupdf ? true
+, useExternalRenderer ? false
 }:
 
 stdenv.mkDerivation rec {
   pname = "beamerpresenter";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "stiglers-eponym";
     repo = "BeamerPresenter";
     rev = "v${version}";
-    sha256 = "16v263nnnipih3lxg95rmwz0ihnvpl4n1wlj9r6zavnspzlp9dvb";
+    sha256 = "1n9d0i0j67ymnghn8zkqf52c88zby6rqin8aicbw8cpn35fqf5a6";
   };
 
   nativeBuildInputs = [
@@ -67,6 +68,9 @@ stdenv.mkDerivation rec {
     "-DGIT_VERSION=OFF"
     "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}"
     "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}"
+    "-DUSE_QTPDF=OFF"
+    "-DUSE_MUPDF_THIRD=ON"
+    "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}"
     "-DUSE_MUJS=OFF"
     "-DUSE_GUMBO=ON"
     "-DUSE_TRANSLATIONS=ON"

pkgs/applications/science/electronics/nanovna-saver/default.nix

@@ -6,13 +6,13 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "nanovna-saver";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "NanoVNA-Saver";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-2/A9uFYa682cvK2uzvBLZBDouhS6C6Q91v8Pun7GgSw=";
+    sha256 = "sha256-PP4VHEp6NSSLsuYABr0/S3+YuhpAyvh/xGnQGyszCtM=";
   };
 
   nativeBuildInputs = [ wrapQtAppsHook ];

pkgs/applications/science/logic/elan/default.nix

@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "elan";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "sha256-jHECNSXSATLuNHNSVwi7mBTI8l6+cLPDISc5T/4yHDg=";
+    sha256 = "1aq06d66y622n0bbd57dx8s0ajz6cdv1vzaz25wvi4i62sg4x21x";
   };
 
-  cargoSha256 = "sha256-/XwlTmUboDbB6RTanhKyO6o2GBUhxpH/NQjeNsKpse0=";
+  cargoSha256 = "sha256-RzeewQzsV5F5E0xwJF1MpzzQ8usyfQjzlDInOJqZdO8=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 

pkgs/applications/science/logic/potassco/clingo.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clingo";
-  version = "5.5.2";
+  version = "5.6.0";
 
   src = fetchFromGitHub {
     owner = "potassco";
     repo = "clingo";
     rev = "v${version}";
-    sha256 = "sha256-fBf7MRFkd5SfHDQ5OvWx4lP/N716SrF9uY4JF7SiWRk=";
+    sha256 = "sha256-3qyQ7CnpELs6IsDxrW+IbV/TmlfYxP9VIVVjc7sM9fg=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/data/icons/numix-icon-theme-circle/default.nix

@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "22.09.04";
+  version = "22.09.12";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-eRBso0oeL+EkOw6oINbuf9s07BtKc8132FK5QbAeA8s=";
+    sha256 = "sha256-W8hk6UniK4HDJPtMaRQzhfvmE2uZhz4J0QMIbSrtJFo=";
   };
 
   nativeBuildInputs = [ gtk3 ];

pkgs/data/icons/numix-icon-theme-square/default.nix

@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "22.09.04";
+  version = "22.09.12";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-BzwuaWaSBVIh9Vk3Y7uv0+9aivXNFhBGJJMoDPrpKh4=";
+    sha256 = "sha256-cwdP7vY7sXYhBbMpSvfDuuNZBalddmP5XEYMYmpYeoc=";
   };
 
   nativeBuildInputs = [ gtk3 ];

pkgs/development/compilers/llvm/14/llvm/default.nix

@@ -148,6 +148,7 @@ in stdenv.mkDerivation (rec {
     # Disables building of shared libs, -fPIC is still injected by cc-wrapper
     "-DLLVM_ENABLE_PIC=OFF"
     "-DLLVM_BUILD_STATIC=ON"
+    "-DLLVM_LINK_LLVM_DYLIB=off"
     # libxml2 needs to be disabled because the LLVM build system ignores its .la
     # file and doesn't link zlib as well.
     # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812

pkgs/development/interpreters/python/default.nix

@@ -206,9 +206,9 @@ in {
       major = "3";
       minor = "11";
       patch = "0";
-      suffix = "rc1";
+      suffix = "rc2";
     };
-    sha256 = "sha256-U6U3fDeoosbaB1sU651jN0V59/PHGPog8KH7sOlKkis=";
+    sha256 = "sha256-JbNcx9gsWtNNhnsXmhwWldEpvl7RSiHka2t/I1CotJA=";
     inherit (darwin) configd;
     inherit passthruFun;
   };

pkgs/development/libraries/gdcm/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gdcm";
-  version = "3.0.15";
+  version = "3.0.17";
 
   src = fetchFromGitHub {
     owner = "malaterre";
     repo = "GDCM";
     rev = "v${version}";
-    sha256 = "sha256-kyazfsm0lGgz26PWJUyFRmFxQFxmotDPXrwx3N/EVl0=";
+    sha256 = "sha256-LQQBVl3DraZRnh0SXP0k1tJoKYh+t+uXd2JIerUDYlM=";
   };
 
   cmakeFlags = [

pkgs/development/libraries/libcifpp/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcifpp";
-  version = "4.2.0";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "PDB-REDO";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1hzi6fgbsmy8h8nfwkyfds9jz13nqw72h0x81jqw5516kkvar5iw";
+    sha256 = "0mhplcpni4p8lavrq4fz9qq8mbxhvpnlxzy55yrz8y07d76ajg6y";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/libpsl/default.nix

@@ -18,7 +18,11 @@ let
   enableValgrindTests = !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
     # Apparently valgrind doesn't support some new ARM features on (some) Hydra machines:
     #  VEX: Mismatch detected between RDMA and atomics features.
-    && !stdenv.isAarch64;
+    && !stdenv.isAarch64
+    # Valgrind on musl does not hook malloc calls properly, resulting in errors `Invalid free() / delete / delete[] / realloc()`
+    # https://bugs.kde.org/show_bug.cgi?id=435441
+    && !stdenv.hostPlatform.isMusl
+  ;
 in stdenv.mkDerivation rec {
   pname = "libpsl";
   version = "0.21.1";

pkgs/development/libraries/libzim/default.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libzim";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = pname;
     rev = version;
-    sha256 = "sha256-FSotc2hkWvkYEdZ3HI3JLzjtKFaWOc1Bx6r0WyeS/Kg=";
+    sha256 = "sha256-IehJe+25aDuMbOuC3Hwnkip2djqlTSIs51yZ/zw1L9Y=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/xed/default.nix

@@ -4,25 +4,25 @@ let
   # mbuild is a custom build system used only to build xed
   mbuild = python3Packages.buildPythonPackage rec {
     pname = "mbuild";
-    version = "0.2496-dev";
+    version = "2022.07.28";
 
     src = fetchFromGitHub {
       owner = "intelxed";
       repo = "mbuild";
-      rev = "3e8eb33aada4153c21c4261b35e5f51f6e2019e8";
-      sha256 = "0yamgzkzw4v6x1a857psw9f7i62ydgd0zaqrf33dbdg8hfd2mq3q";
+      rev = "v${version}";
+      sha256 = "sha256-eOAqmoPotdXGcBmrD9prXph4XOL6noJU6GYT/ud/VXk=";
     };
   };
 
 in stdenv.mkDerivation rec {
   pname = "xed";
-  version = "12.0.1";
+  version = "2022.08.11";
 
   src = fetchFromGitHub {
     owner = "intelxed";
     repo = "xed";
-    rev = version;
-    sha256 = "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f";
+    rev = "v${version}";
+    sha256 = "sha256-Iil+dfjuWYPbzmSjgwKTKScSE/IsWuHEKQ5HsBJDqWM=";
   };
 
   nativeBuildInputs = [ mbuild ];

pkgs/development/misc/brev-cli/default.nix

@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "brev-cli";
-  version = "0.6.95";
+  version = "0.6.102";
 
   src = fetchFromGitHub {
     owner = "brevdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "09qhc38ycqs6vdyy1rxaxbihq0q59g2ffkmmlk6ipdlv2b3ywz0f";
+    sha256 = "sha256-QXYcLy8k1s2/kVwgnMnsJemkewCQzm8NJq7GcBD06vE=";
   };
 
   vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";

pkgs/development/misc/resholve/resholve-utils.nix

@@ -167,7 +167,8 @@ rec {
       */
       unresholved = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])
         // {
-        inherit pname version src;
+        inherit version src;
+        pname = "${pname}-unresholved";
       }));
     in
     /*
@@ -178,8 +179,7 @@ rec {
     */
     lib.extendDerivation true passthru (stdenv.mkDerivation {
       src = unresholved;
-      version = unresholved.version;
-      pname = "resholved-${unresholved.pname}";
+      inherit version pname;
       buildInputs = [ resholve ];
 
       # retain a reference to the base
@@ -199,5 +199,8 @@ rec {
       # supports default python.logging levels
       # LOGLEVEL="INFO";
       preFixup = phraseSolutions solutions unresholved;
+
+      # don't break the metadata...
+      meta = unresholved.meta;
     });
 }

pkgs/development/python-modules/adafruit-platformdetect/default.nix

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.27.3";
+  version = "3.29.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    hash = "sha256-qAkyminqLmO9ea6pwkE4gquJIbwj6cE90dd59wTQbtI=";
+    hash = "sha256-D3uME31aWBTwjDIcdt3ueOBqlkCeTvpl4ReHLNSHaCw=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/ansible/core.nix

@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.13.2";
+  version = "2.13.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-t3nQ5VqXcXwO5ehrSGqmfAfCgJ70d74qyErQkajdLds=";
+    sha256 = "sha256-ePRcLEcq9gubS4y9q6WjkRB5CHiRqfbG7XJjJ7jyHGo=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

pkgs/development/python-modules/coqui-trainer/default.nix

@@ -17,7 +17,7 @@
 
 let
   pname = "coqui-trainer";
-  version = "0.0.14";
+  version = "0.0.15";
 in
 buildPythonPackage {
   inherit pname version;
@@ -27,7 +27,7 @@ buildPythonPackage {
     owner = "coqui-ai";
     repo = "Trainer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WvJDGV7gmf/QQN3SswTq/ABy9ppPFi5xYnMeL/M7GxY=";
+    hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/fastapi/default.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.79.0";
+  version = "0.79.1";
   format = "flit";
 
   disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-HaA9a/tqKtB24YtObk/XAsUy2mmWNonRyPXHflGRiPQ=";
+    hash = "sha256-vriEwUcdITKLeIy1++dvsl5Guhtjlk2WZQrprVQsYMc=";
   };
 
   postPatch = ''

pkgs/development/python-modules/fastbencode/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fastbencode";
-  version = "0.0.11";
+  version = "0.0.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-hMLS59/BlzK7aPoTWN5YgE77xEBBYpvYurUD98XqkDI=";
+    sha256 = "sha256-w7F+70R1Wizo/i0GGCc13ADf6JqARtPXMS6/qTmPKEY=";
   };
 
   nativeBuildInputs = [ cython ];

pkgs/development/python-modules/idasen/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "idasen";
-  version = "0.9.1";
+  version = "0.9.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "newAM";
     repo = "idasen";
     rev = "v${version}";
-    hash = "sha256-QMHxQLHp2p3/kGDd995CjBvQqn2BVM6d02NCzrjExr0=";
+    hash = "sha256-Nxg0r90EQTICstjbVp9nxJKkNRQEUhB2oEwc7r58t5k=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/localstack-client/default.nix

@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, boto3
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "localstack-client";
+  version = "1.36";
+
+  src = fetchFromGitHub {
+    owner = "localstack";
+    repo = "localstack-python-client";
+    # Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38
+    rev = "92229c02c5b3cd0cef006e99c3d47db15aefcb4f";
+    sha256 = "sha256-pbDpe/5o4YU/2UIi8YbhzhIlXigOb/M2vjW9DKcIxoI=";
+  };
+
+  propagatedBuildInputs = [
+    boto3
+  ];
+
+  pythonImportsCheck = [
+    "localstack_client"
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Has trouble creating a socket
+    "test_session"
+  ];
+
+  # For tests
+  __darwinAllowLocalNetworking = true;
+
+  meta = with lib; {
+    description = "A lightweight Python client for LocalStack";
+    homepage = "https://github.com/localstack/localstack-python-client";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/development/python-modules/localstack-ext/default.nix

@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, dill
+, dnslib
+, dnspython
+, plux
+, pyaes
+, python-jose
+, requests
+, tabulate
+}:
+
+buildPythonPackage rec {
+  pname = "localstack-ext";
+  version = "1.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-YNj4V/mv8gn+TEPBejgyMIuSXYmIXNjk5xruyVbf1qA=";
+  };
+
+  postPatch = ''
+    # Avoid circular dependency
+    sed -i '/localstack>=/d' setup.cfg
+
+    # Pip is unable to resolve attr logic, so it will emit version as 0.0.0
+    substituteInPlace setup.cfg \
+      --replace "version = attr: localstack_ext.__version__" "version = ${version}"
+    cat setup.cfg
+
+    substituteInPlace setup.cfg \
+      --replace "dill==0.3.2" "dill~=0.3.0" \
+      --replace "requests>=2.20.0,<2.26" "requests~=2.20"
+  '';
+
+  propagatedBuildInputs = [
+    dill
+    dnslib
+    dnspython
+    plux
+    pyaes
+    python-jose
+    requests
+    tabulate
+  ];
+
+  pythonImportsCheck = [ "localstack_ext" ];
+
+  # No tests in repo
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Extensions for LocalStack";
+    homepage = "https://github.com/localstack/localstack";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/development/python-modules/localstack/default.nix

@@ -0,0 +1,69 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, apispec
+, boto3
+, cachetools
+, click
+, localstack-client
+, localstack-ext
+, plux
+, psutil
+, python-dotenv
+, pyyaml
+, requests
+, rich
+, semver
+, tailer
+}:
+
+buildPythonPackage rec {
+  pname = "localstack";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "localstack";
+    repo = "localstack";
+    rev = "v${version}";
+    sha256 = "sha256-JDF3wM5AVhfkAFlxmy1f3aMxs4J5LWd0JOY8MzRAzT4=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "requests>=2.20.0,<2.26" "requests~=2.20" \
+      --replace "cachetools~=5.0.0" "cachetools~=5.0"
+  '';
+
+  propagatedBuildInputs = [
+    apispec
+    boto3
+    cachetools
+    click
+    localstack-client
+    localstack-ext
+    plux
+    psutil
+    python-dotenv
+    pyyaml
+    requests
+    rich
+    semver
+    tailer
+  ];
+
+  pythonImportsCheck = [ "localstack" ];
+
+  # Test suite requires boto, which has been removed from nixpkgs
+  # Just do minimal test, buildPythonPackage maps checkPhase
+  # to installCheckPhase, so we can test that entrypoint point works.
+  checkPhase = ''
+    $out/bin/localstack --version
+  '';
+
+  meta = with lib; {
+    description = "A fully functional local Cloud stack";
+    homepage = "https://github.com/localstack/localstack";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/development/python-modules/mkdocs-material/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonApplication rec {
   pname = "mkdocs-material";
-  version = "8.3.9";
+  version = "8.4.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonApplication rec {
     owner = "squidfunk";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Mi5eWznVuyH+69RtS0fUS9YD9mCumTk8HmgLVDKZC+I=";
+    hash = "sha256-ntArFD/wnoFC2vMS9WjiFP5/I1XklgSPGKGxFXxdNxs=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/mypy/default.nix

@@ -1,50 +1,58 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
+, attrs
 , buildPythonPackage
+, filelock
+, lxml
 , mypy-extensions
+, psutil
+, py
+, pytest-forked
+, pytest-xdist
+, pytestCheckHook
 , python
 , pythonOlder
+, six
 , typed-ast
 , typing-extensions
 , tomli
 , types-typed-ast
+, virtualenv
 }:
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.961";
-  disabled = pythonOlder "3.6";
+  version = "0.971";
+  format = "pyproject";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "mypy";
-    rev = "v${version}";
-    hash = "sha256-K6p73+/SeWniMSD/mP09qwqFOBr/Pqohl+PaTDVpvZI=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-J1lUnJco9rLYgFpJkfujGfVq1CfC4pdvvDzoan3jGkU=";
   };
 
-  patches = [
-    # FIXME: Remove patch after upstream has decided the proper solution.
-    #        https://github.com/python/mypy/pull/11143
-    (fetchpatch {
-      url = "https://github.com/python/mypy/commit/2004ae023b9d3628d9f09886cbbc20868aee8554.patch";
-      hash = "sha256-y+tXvgyiECO5+66YLvaje8Bz5iPvfWNIBJcsnZ2nOdI=";
-    })
-  ];
-
-  buildInputs = [
+  nativeBuildInputs = [
     types-typed-ast
   ];
 
   propagatedBuildInputs = [
     mypy-extensions
-    tomli
-    typed-ast
     typing-extensions
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    typed-ast
   ];
 
-  # Tests not included in pip package.
+  passthru.optional-dependencies = {
+    dmypy = [ psutil ];
+    reports = [ lxml ];
+  };
+
+  # TODO: enable tests
   doCheck = false;
 
   pythonImportsCheck = [

pkgs/development/python-modules/mypy/extensions.nix

@@ -2,7 +2,8 @@
 , fetchFromGitHub
 , buildPythonPackage
 , typing
-, unittestCheckHook
+, pytestCheckHook
+, pythonAtLeast
 , pythonOlder
 }:
 
@@ -19,11 +20,23 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing;
 
-  checkInputs = [ unittestCheckHook ];
+  # make the testsuite run with pytest, so we can disable individual tests
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  unittestFlagsArray = [ "tests" ];
+  pytestFlagsArray = [
+    "tests/testextensions.py"
+  ];
 
-  pythonImportsCheck = [ "mypy_extensions" ];
+  disabledTests = lib.optionals (pythonAtLeast "3.11") [
+    # https://github.com/python/mypy_extensions/issues/24
+    "test_typeddict_errors"
+  ];
+
+  pythonImportsCheck = [
+    "mypy_extensions"
+  ];
 
   meta = with lib; {
     description = "Experimental type system extensions for programs checked with the mypy typechecker";

pkgs/development/python-modules/patiencediff/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "patiencediff";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "456d9fc47fe43f9aea863059ea2c6df5b997285590e4b7f9ee8fbb6c3419b5a7";
+    sha256 = "sha256-ATyTGFDomGUY8e53krBJzVgab7ked73fbIIwp63+tzI=";
   };
 
   meta = with lib; {

pkgs/development/python-modules/plux/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, stevedore
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "plux";
+  version = "1.3.1";
+  format = "pyproject";
+
+  # Tests are not available from PyPi
+  src = fetchFromGitHub {
+    owner = "localstack";
+    repo = "plux";
+    # Request for proper tags: https://github.com/localstack/plux/issues/4
+    rev = "a412ab0a0d7d17c3b5e1f560b7b31dc1876598f7";
+    sha256 = "sha256-zFwrRc93R4cXah7zYXjVLBIeBpDedsInxuyXOyBI8SA=";
+  };
+
+  propagatedBuildInputs = [
+    stevedore
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "plugin.core" ];
+
+  meta = with lib; {
+    description = "Dynamic code loading framework for building pluggable Python distributions";
+    homepage = "https://github.com/localstack/plux";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}

pkgs/development/python-modules/poetry-dynamic-versioning/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "poetry-dynamic-versioning";
-  version = "0.17.1";
+  version = "0.18.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mtkennerly";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-okOooz0Z2d3EBm+lp68il2tXmbG5nRmDQmUdOXaHjpc=";
+    hash = "sha256-UO2D80cZurfPCtDXAEQ4nOJdhNtIghLtZN7gL+9xbGc=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/protonvpn-nm-lib/default.nix

@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "protonvpn-nm-lib";
-  version = "3.11.0";
+  version = "3.12.0";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-kfOLhM0/jzHj+KlDrnCe571Bcmv8TvuAbXMpt3uR2L0=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-pjXixZDjjkCYM4J5sjwX5YtTBXlGccG4S+wYTKbru94=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pytorch-metric-learning/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname   = "pytorch-metric-learning";
-  version = "1.5.1";
+  version = "1.6.0";
 
   disabled = isPy27;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "KevinMusgrave";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-d7Ngd4SzGTJXtpgs2Jqb+y1aeMt9YUqIOft5ByDtRsc=";
+    sha256 = "sha256-DmipbtzfCkd85dZ/ECPT8tkwmt5AKPD6oWF3X7vRJPo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/ruby-modules/gem-config/default.nix

@@ -642,11 +642,10 @@ in
 
   sqlite3 = attrs: if lib.versionAtLeast attrs.version "1.5.0"
   then {
-    nativeBuildInputs = [ pkg-config sqlite.dev ];
-    buildInputs = [ sqlite.out ];
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ sqlite ];
     buildFlags = [
       "--enable-system-libraries"
-      "--with-pkg-config=${pkg-config}/bin/pkg-config"
     ];
   }
   else {

pkgs/development/tools/ctlptl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ctlptl";
-  version = "0.8.6";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "tilt-dev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-FJtp4g4kIkXFYvYcM9yF3BY6tgHmip11/oIyMSfTwqM=";
+    sha256 = "sha256-cSgsEjOnaFUuf9Vf6UOCC7LsmVg47wEQKU0LxpngLYc=";
   };
 
-  vendorSha256 = "sha256-s+Cc7pG/GLK0ZhXX/wK7jMNcDIeu/Am2vCgzrNXKpdw=";
+  vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s=";
 
   ldflags = [
     "-s"

pkgs/development/tools/konf/default.nix

@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "konf";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "SimonTheLeg";
+    repo = "konf-go";
+    rev = "v${version}";
+    hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k=";
+  };
+
+  vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time";
+    homepage = "https://github.com/SimonTheLeg/konf-go";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ arikgrahl ];
+  };
+}

pkgs/development/tools/oh-my-posh/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "9.0.0";
+  version = "9.1.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0f7rA/GxXgIeJ9hh/g+MpAPdPW8NzaVKLApYyrhlIVM=";
+    sha256 = "sha256-waqEXmKGxGgAjJ+USsK/sfLSJV3XPAhkdXCqb45Gs+M=";
   };
 
   vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";

pkgs/development/tools/riot-redis/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "riot-redis";
-  version = "2.17.0";
+  version = "2.18.1";
 
   src = fetchzip {
     url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip";
-    sha256 = "sha256-Blhjss0ypHzdd3XTRzzHnIPg8+m1ke7a+8VuBB6oA/0=";
+    sha256 = "sha256-mRuW/mPcqDO2txVwL2MlqZeprNDifjmOx7UUUy3yF3M=";
   };
 
   buildInputs = [ jre_headless ];

pkgs/development/tools/rust/cargo-valgrind/default.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-valgrind";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "jfrimmel";
     repo = "cargo-valgrind";
-    rev = version;
-    sha256 = "sha256-PEGDao010COqSJGha7GQvR7vNOV+C7faduijVNjB5DE=";
+    rev = "v${version}";
+    sha256 = "sha256-FCz15kMSKckifYWSTMGqJbRpZ8X/AM5dSw46dg8ERcY=";
   };
 
-  cargoSha256 = "sha256-00WUYrkKKJOEN9jXKQ3YraTq89U+3djdvLRuZSbeNHk=";
+  cargoSha256 = "sha256-csSUe2qUIN2xKOMHWyM56FZyCwKPdfAI0NrFiDOtRiE=";
 
   passthru = {
     updateScript = nix-update-script {
@@ -31,8 +31,10 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]}
   '';
 
-  # Disable check phase as there are failures (2 tests fail)
-  doCheck = false;
+  checkFlags = [
+    "--skip examples_are_runnable"
+    "--skip tests_are_runnable"
+  ];
 
   meta = with lib; {
     description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner'';

pkgs/development/tools/rust/rust-analyzer/default.nix

@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2022-08-22";
-  cargoSha256 = "sha256-A1oH2He1nEmVmBBTfMsZpJNKNtIQpmNx3AE56e9Z1qk=";
+  version = "2022-09-12";
+  cargoSha256 = "sha256-mi6Ab3CyOfz1ZYViYbJwJCIew/N+IPt37bkq7x/N7IY=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    sha256 = "sha256-G/IElEE6eetQcLpESXCQtuYED/uTrsdeZj8fkqC3FSM=";
+    sha256 = "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8=";
   };
 
   cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

pkgs/games/angband/default.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://angband.github.io/angband";
     description = "A single-player roguelike dungeon exploration game";
-    maintainers = [ ];
+    maintainers = [ maintainers.kenran ];
     license = licenses.gpl2;
   };
 }

pkgs/games/fheroes2/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fheroes2";
-  version = "0.9.18";
+  version = "0.9.19";
 
   src = fetchFromGitHub {
     owner = "ihhub";
     repo = "fheroes2";
     rev = version;
-    sha256 = "sha256-I79PoNE6GFvYD4jnsxKo7MsoPgVow8b8fTIiClOGnAI=";
+    sha256 = "sha256-GLF5OXPEc1V1r9INbEdIM17tm7pKq1ZuOuShtAnqXjM=";
   };
 
   buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

pkgs/games/hedgewars/default.nix

@@ -7,20 +7,18 @@
 }:
 
 let
-  # gameServer/hedgewars-server.cabal depends on network < 3
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random
+          SHA bytestring entropy hslogger network pkgs.zlib random
           regex-tdfa sandi utf8-string vector
         ]);
-
 in
 stdenv.mkDerivation rec {
   pname = "hedgewars";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
-    sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1";
+    sha256 = "sha256-IB/l5FvYyls9gbGOwGvWu8n6fCxjvwGQBeL4C+W88hI=";
   };
 
   nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
@@ -33,33 +31,11 @@ stdenv.mkDerivation rec {
     qtbase
   ] ++ lib.optional withServer ghc;
 
-  patches = [
-    ./qt515.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace gameServer/CMakeLists.txt \
-      --replace mask evaluate
-
-    # compile with fpc >= 3.2.0
-    # https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26
-    sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas
-  '';
-
   cmakeFlags = [
     "-DNOVERSIONINFOUPDATE=ON"
     "-DNOSERVER=${if withServer then "OFF" else "ON"}"
   ];
 
-
-  # hslogger brings network-3 and network-bsd which conflict with
-  # network-2.6.3.1
-  preConfigure = ''
-    substituteInPlace gameServer/CMakeLists.txt \
-      --replace "haskell_flags}" \
-        "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd"
-  '';
-
   NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
     SDL2.out
     SDL2_image
@@ -107,8 +83,5 @@ stdenv.mkDerivation rec {
        all movement on the battlefield has ceased).'';
     maintainers = with maintainers; [ kragniz fpletz ];
     inherit (fpc.meta) platforms;
-    # https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584
-    broken = true;
-    hydraPlatforms = platforms.none;
   };
 }

pkgs/games/hedgewars/qt515.patch

@@ -1,10 +0,0 @@
---- a/QTfrontend/ui/page/pagegamestats.cpp
-+++ b/QTfrontend/ui/page/pagegamestats.cpp
-@@ -22,6 +22,7 @@
- #include <QGraphicsScene>
- #include <QGroupBox>
- #include <QSizePolicy>
-+#include <QPainterPath>
- 
- #include "pagegamestats.h"
- #include "team.h"

pkgs/os-specific/linux/systemd/default.nix

@@ -100,6 +100,7 @@
 , withTimesyncd ? true
 , withTpm2Tss ? !stdenv.hostPlatform.isMusl
 , withUserDb ? !stdenv.hostPlatform.isMusl
+, withUtmp ? !stdenv.hostPlatform.isMusl
   # tests assume too much system access for them to be feasible for us right now
 , withTests ? false
 
@@ -502,9 +503,10 @@ stdenv.mkDerivation {
     "-Dbpf-framework=true"
   ] ++ lib.optionals withTpm2Tss [
     "-Dtpm2=true"
+  ] ++ lib.optionals (!withUtmp) [
+    "-Dutmp=false"
   ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     "-Dgshadow=false"
-    "-Dutmp=false"
     "-Didn=false"
   ];
   preConfigure =
@@ -683,7 +685,7 @@ stdenv.mkDerivation {
     # runtime; otherwise we can't and we need to reboot.
     interfaceVersion = 2;
 
-    inherit withCryptsetup withHostnamed withImportd withLocaled withMachined withTimedated util-linux kmod kbd;
+    inherit withCryptsetup withHostnamed withImportd withLocaled withMachined withTimedated withUtmp util-linux kmod kbd;
 
     tests = {
       inherit (nixosTests) switchTest;

pkgs/servers/http/apache-modules/mod_wsgi/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_wsgi";
-  version = "4.9.3";
+  version = "4.9.4";
 
   src = fetchFromGitHub {
     owner = "GrahamDumpleton";
     repo = "mod_wsgi";
     rev = version;
-    hash = "sha256-P/mx0JxlJGpel0zBFIe8r313VkwPEK2LP0kiUIwKZAM=";
+    hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0=";
   };
 
   buildInputs = [ apacheHttpd python ncurses ];
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/GrahamDumpleton/mod_wsgi";
     description = "Host Python applications in Apache through the WSGI interface";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/servers/klipper/default.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "unstable-2022-06-18";
+  version = "unstable-2022-09-11";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "d3c4ba4839dd7a4339ae024752e6c6424884c185";
-    sha256 = "sha256-2Fq56JIk5qcKpWffz1k/EJ+xYAnUpuxvCryq88l//8E=";
+    rev = "ee5bdbadd1d00cf161e0b2cdfbcf5c622abc8326";
+    sha256 = "sha256-nVnJQEi6xNMNpC5byG1ce3M5hpJOd53g1ugjHXKY2zI=";
   };
 
   sourceRoot = "source/klippy";

pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub }:
+{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub, fetchurl, autoPatchelfHook }:
 
 let
   ourNodePackages = import ./node-composition.nix {
@@ -7,6 +7,26 @@ let
   };
   version = (lib.importJSON ./package.json).version;
   srcInfo = lib.importJSON ./src.json;
+
+  # TODO: package matrix-rust-sdk and use that instead of fetching & patching binaries
+  platform = {
+    "x86_64-linux" = "linux-x64-gnu";
+    "aarch64-linux" = "linux-arm64-gnu";
+  }.${stdenv.hostPlatform.system} or
+    (throw "matrix-appservice-irc: Unsupported platform ${stdenv.hostPlatform.system}");
+
+  matrix-sdk-crypto = let
+    version = "0.1.0-beta.1";
+    base = "https://github.com/matrix-org/matrix-rust-sdk/releases/download/matrix-sdk-crypto-nodejs-v${version}";
+  in
+    fetchurl {
+      url = "${base}/matrix-sdk-crypto.${platform}.node";
+      hash = {
+        "x86_64-linux" = "sha256-a6FX+KhHooipIMsJ7Fl7gmUBt8WbTUgT6sXN4N3NXRk=";
+        "aarch64-linux" = "sha256-jvr6gMTQ4aAk5x0iXpA28ADdaCgDpvOjmogd52Z6bIY=";
+      }.${stdenv.hostPlatform.system} or
+        (throw "matrix-appservice-irc: Unsupported platform ${stdenv.hostPlatform.system}");
+    };
 in
 ourNodePackages.package.override {
   pname = "matrix-appservice-irc";
@@ -19,11 +39,18 @@ ourNodePackages.package.override {
     inherit (srcInfo) sha256;
   };
 
-  nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ];
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.node-gyp-build ];
+
+  dontAutoPatchelf = true;
 
   postInstall = ''
     makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \
       --add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js"
+
+    # install the native bindings for matrix-sdk-crypto
+    export CRYPTO_SDK_PATH="$out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/matrix-sdk-crypto-nodejs/matrix-sdk-crypto.${platform}.node"
+    cp -v ${matrix-sdk-crypto} "$CRYPTO_SDK_PATH"
+    autoPatchelf "$CRYPTO_SDK_PATH"
   '';
 
   passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;
@@ -34,5 +61,6 @@ ourNodePackages.package.override {
     maintainers = with maintainers; [ ];
     homepage = "https://github.com/matrix-org/matrix-appservice-irc";
     license = licenses.asl20;
+    platforms = platforms.linux;
   };
 }

pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-irc",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "An IRC Bridge for Matrix",
   "main": "app.js",
   "bin": "./bin/matrix-appservice-irc",
@@ -34,7 +34,7 @@
     "he": "^1.2.0",
     "logform": "^2.4.0",
     "matrix-appservice-bridge": "^3.2.0",
-    "matrix-org-irc": "^1.2.1",
+    "matrix-org-irc": "1.3.0",
     "matrix-bot-sdk": "0.5.19",
     "nopt": "^3.0.1",
     "p-queue": "^6.6.2",
@@ -65,6 +65,6 @@
     "proxyquire": "^2.1.3",
     "nyc": "^15.1.0",
     "request-promise-native": "^1.0.9",
-    "typescript": "^4.5.5"
+    "typescript": "^4.8.2"
   }
 }

pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/matrix-org/matrix-appservice-irc",
-  "rev": "8faf9614e80073e3cf07c96dbd295379d80f4161",
-  "date": "2022-05-04T09:06:31+02:00",
-  "path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc",
-  "sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l",
+  "rev": "b52ac9ec9e45fe82fb3eb9c1a5e420c1eba73b9b",
+  "date": "2022-09-13T09:07:52+01:00",
+  "path": "/nix/store/nd7jrqynfikcirmzc22jp82bgmliglnp-matrix-appservice-irc",
+  "sha256": "0bw06rzlsi3rddjmw1v32vlpq3clda26dcyq3f8qaily9rdxr7vn",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

pkgs/servers/routinator/default.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "routinator";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-C6BY+Ba5KQgi+jMUKRi7osZNEDMLMDOhA4TQlbqb9jY=";
+    sha256 = "sha256-zQ68PN3CbLx6Z84jFeuAck6mzp9f3sbALgVqssecsUU=";
   };
 
-  cargoSha256 = "sha256-5ZBE7jbhO4j4FwGSXLIbYjmtmNxFpiME9JqXBqwHSUA=";
+  cargoSha256 = "sha256-M8JO4E8TwLbPGdwslO2Uw+ooAJkIoyc1t1wgxw8CFF0=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 

pkgs/servers/samba/4.x.nix

@@ -46,11 +46,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "samba";
-  version = "4.15.5";
+  version = "4.15.9";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
-    sha256 = "sha256-aRFeM4MZN7pRUb4CR5QxR3Za7OZYunQ/RHQWcq1o0X8=";
+    sha256 = "sha256-loKixxwv8lOqJ8uwEmDqyJf/YlzznbIO4yBz5Thv4hk=";
   };
 
   outputs = [ "out" "dev" "man" ];

pkgs/servers/sql/postgresql/ext/age.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "age";
-  version = "1.0.0-rc1";
+  version = "1.1.0-rc0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "age";
     rev = "v${version}";
-    sha256 = "sha256-b5cBpS5xWaohRZf5H0DwzNq0BodqWDjkAP44osPVYps=";
+    sha256 = "sha256-7qQGiiFkGbS/j7ouP2Joj5EGT+ferIgYYMoTe9jmTqQ=";
   };
 
   buildInputs = [ postgresql ];

pkgs/servers/sql/postgresql/ext/postgis.nix

@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "3.3.0";
+  version = "3.3.1";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "sha256-aWe3f3yKcjqHa+wmWPgqbLfytt3/sEgKsG0zcnivYFU=";
+    sha256 = "sha256-kb6ACnLXSMWjpKANgqwd5CAj4p2mHs5uv5x3/iKPyxo=";
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

pkgs/servers/sql/postgresql/ext/rum.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rum";
-  version = "1.3.11";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "postgrespro";
     repo = "rum";
     rev = version;
-    sha256 = "sha256-OuVyZ30loPycQkDwlL0289H/4RRPneibqgibgzqhWo4=";
+    hash = "sha256-dI3R1L3dXvEt6Ell7HuGc6XqK8YDf0RmN+JLDtv+uYI=";
   };
 
   buildInputs = [ postgresql ];

pkgs/shells/zsh/oh-my-zsh/default.nix

@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
 
 stdenv.mkDerivation rec {
-  version = "2022-09-08";
+  version = "2022-09-10";
   pname = "oh-my-zsh";
-  rev = "dfa88b4d369f6afc7205af0b399a0ef05a4bef2e";
+  rev = "7dcabbe6826073ef6069c8a4b6f9a943f00d2df0";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "BzJAQIZXKoj1LtQQvM4LEA0V8yKoND4hVxzQA+weESk=";
+    sha256 = "Mk2GQh7Yh0cyklSEIutIIUEQNMAcPC1i3QT5K6lCEt8=";
   };
 
   strictDeps = true;

pkgs/tools/admin/cf-vault/default.nix

@@ -1,16 +1,16 @@
 {buildGoModule, fetchFromGitHub, lib}:
 buildGoModule rec {
   pname = "cf-vault";
-  version = "0.0.11";
+  version = "0.0.13";
 
   src = fetchFromGitHub {
     owner = "jacobbednarz";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Imd9qeT4xg5ujVPLHSSqoteSPl9t97q3Oc4C/vzHphg=";
+    sha256 = "sha256-wW/CSF+DexrdmOvp3BpyBmltOyF4TBTW3OXwjdqfaR4=";
   };
 
-  vendorSha256 = "sha256-PkmbVg5HnsUaSL/Kp3YJVdyzpjgvr/p9mKNmOubwXQA=";
+  vendorSha256 = "sha256-H44YCoay/dVL22YhMy2AT/Jageu0pM9IS0SWPp9E4F8=";
 
   meta = with lib; {
     description = ''

pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix

@@ -3,6 +3,10 @@
 , jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad }:
 let
   inherit (python3Packages) python gyp six;
+  utdic = fetchurl {
+    url = "https://osdn.net/downloads/users/39/39056/mozcdic-ut-20220904.tar.bz2";
+    sha256 = "sha256-pmLBCcw2Zsirzl1PjYkviRIZoyfUz5rpESeABDxuhtU=";
+  };
   japanese_usage_dictionary = fetchFromGitHub {
     owner = "hiroyuki-komatsu";
     repo = "japanese-usage-dictionary";
@@ -47,6 +51,9 @@ in clangStdenv.mkDerivation rec {
   postUnpack = ''
     unzip ${x-ken-all} -d $sourceRoot/src/
     unzip ${jigyosyo} -d $sourceRoot/src/
+    mkdir $TMPDIR/unpack
+    tar xf ${utdic} -C $TMPDIR/unpack
+    cat $TMPDIR/unpack/mozcdic-ut-20220904/mozcdic-ut-20220904.txt >> $sourceRoot/src/data/dictionary_oss/dictionary00.txt
 
     rmdir $sourceRoot/src/third_party/breakpad/
     ln -s ${breakpad} $sourceRoot/src/third_party/breakpad
@@ -100,7 +107,7 @@ in clangStdenv.mkDerivation rec {
     description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)";
     homepage = "https://github.com/fcitx/mozc";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ berberman ];
+    maintainers = with maintainers; [ berberman govanify ];
     platforms = platforms.linux;
   };
 }

pkgs/tools/misc/broot/default.nix

@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-3SaR3ug9J1nqhbM8OW9oIM8mJwbw99YXrPgSIHsDG/0=";
+    sha256 = "sha256-OtpIbBrQtpxx8njhBKDB+Vk6o5sJY4jzs8cIYmUxEmw=";
   };
 
-  cargoHash = "sha256-bNDM7RJCclEMRZ+BlXy0ALLZZ3Wu7wjxPMRmSeWNaVw=";
+  cargoHash = "sha256-lGV4fvpZ5/pcUMAvffSqh/PBASiFIpnpEKc+8zQ5/0M=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/tools/misc/cyberchef/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cyberchef";
-  version = "9.46.0";
+  version = "9.46.4";
 
   src = fetchzip {
     url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
-    sha256 = "sha256-4IqXp7fYgXwIuciUklrQoRD2XagatdhQ3l6ghjgTCR8=";
+    sha256 = "sha256-3QcrJN7ahyPGZsY6EM6K5sgr0eLZQazlh+G0TdN0uQc=";
     stripRoot = false;
   };
 

pkgs/tools/misc/grafterm/default.nix

@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "grafterm";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "slok";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-0pM36rAmwx/P1KAlmVaGoSj8eb9JucYycNC2R867dVo=";
+  };
+
+  vendorHash = "sha256-veg5B68AQhkSZg8YA/e4FbqJNG0YGwnUQFsAdscz0QI=";
+
+  ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
+
+  meta = with lib; {
+    description = "Command-line tool for rendering metrics dashboards inspired by Grafana";
+    homepage = "https://github.com/slok/grafterm";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ arikgrahl ];
+  };
+}

pkgs/tools/misc/lsd/default.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lsd";
-  version = "0.23.0";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "Peltoche";
     repo = pname;
     rev = version;
-    sha256 = "sha256-E0STOvHeKC5uJ4l3+UU7L1gK9oKL/EChM7yVWCPqxLg=";
+    sha256 = "sha256-FY1odcKBl7zJ+MxfohkmC1e45fPQK3MKB3orQdCRpA4=";
   };
 
-  cargoSha256 = "sha256-jO/3BGZIx7XibaAqd+vO1mwku3BG91/vkwpHvrUYV+Y=";
+  cargoSha256 = "sha256-t7J7hIbLlRq99Yd2/3Zn+PbHhJtaJRdDluDXN0Hp/Jc=";
 
   nativeBuildInputs = [ installShellFiles pandoc ];
   postInstall = ''

pkgs/tools/misc/miniserve/default.nix

@@ -1,11 +1,8 @@
 { lib
-, stdenv
 , rustPlatform
 , fetchFromGitHub
 , installShellFiles
-, pkg-config
-, zlib
-, libiconv
+, stdenv
 , Security
 }:
 
@@ -24,12 +21,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     installShellFiles
-    pkg-config
-    zlib
   ];
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    libiconv
     Security
   ];
 
@@ -51,9 +45,9 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "CLI tool to serve files and directories over HTTP";
     homepage = "https://github.com/svenstaro/miniserve";
+    changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
+    maintainers = with maintainers; [ figsoda ];
     # https://hydra.nixos.org/build/162650896/nixlog/1
     broken = stdenv.isDarwin && stdenv.isAarch64;
   };

pkgs/tools/misc/promql-cli/default.nix

@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "promql-cli";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "nalbury";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-uuoUvEBnLxopdt6u4vX6pYnuyOATwJFJo9ozQ9jhSyo=";
+  };
+
+  vendorHash = "sha256-OLkOyeLyBnNmijNYFrXIZ4nbOvV/65KIKjOFOVS9Yiw=";
+
+  ldflags = [ "-s" "-w" ];
+
+  postInstall = ''
+    mv -v $out/bin/promql-cli $out/bin/promql
+  '';
+
+  meta = with lib; {
+    description = "Command-line tool to query a Prometheus server with PromQL and visualize the output";
+    homepage = "https://github.com/nalbury/promql-cli";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ arikgrahl ];
+  };
+}

pkgs/tools/misc/qflipper/default.nix

@@ -28,13 +28,6 @@ let
   timestamp = "99999999999";
   commit = "nix-${version}";
 
-  udev_rules = ''
-    #Flipper Zero serial port
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5740", ATTRS{manufacturer}=="Flipper Devices Inc.", TAG+="uaccess"
-    #Flipper Zero DFU
-    SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", ATTRS{manufacturer}=="STMicroelectronics", TAG+="uaccess"
-  '';
-
 in
 mkDerivation {
   inherit pname version;
@@ -92,9 +85,7 @@ mkDerivation {
     cp qFlipper-cli $out/bin
 
     mkdir -p $out/etc/udev/rules.d
-    tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF
-    ${udev_rules}
-    EOF
+    cp installer-assets/udev/42-flipperzero.rules $out/etc/udev/rules.d/
   '';
 
   passthru.updateScript = nix-update-script {

pkgs/tools/misc/rpcsvc-proto/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, buildPackages }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, buildPackages, fetchpatch, targetPackages }:
 
 stdenv.mkDerivation rec {
   pname = "rpcsvc-proto";
@@ -11,12 +11,27 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk=";
   };
 
+  patches = [
+    # https://github.com/thkukuk/rpcsvc-proto/pull/14
+    (fetchpatch {
+      name = "follow-RPCGEN_CPP-env-var";
+      url = "https://github.com/thkukuk/rpcsvc-proto/commit/e772270774ff45172709e39f744cab875a816667.diff";
+      sha256 = "sha256-KrUD6YwdyxW9S99h4TB21ahnAOgQmQr2tYz++MIbk1Y=";
+    })
+  ];
+
   outputs = [ "out" "man" ];
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoreconfHook ];
 
-  postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp";
+
+  postPatch = ''
+    # replace fallback cpp with the target prefixed cpp
+    substituteInPlace rpcgen/rpc_main.c \
+      --replace 'CPP = "cpp"' \
+                'CPP = "${targetPackages.stdenv.cc.targetPrefix}cpp"'
+  '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)  ''
     substituteInPlace rpcsvc/Makefile.am \
       --replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen'
   '';

pkgs/tools/misc/vector/default.nix

@@ -31,7 +31,7 @@
 
 let
   pname = "vector";
-  version = "0.24.0";
+  version = "0.24.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -40,10 +40,10 @@ rustPlatform.buildRustPackage {
     owner = "vectordotdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-kZ6Ek3CagAznyU7yDv96jFk1xCjfF2gvrNYyVTeFuO0=";
+    sha256 = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ=";
   };
 
-  cargoSha256 = "sha256-4aHMPrawTF9QpoX7cmiPv9ddu0LF008uqBTu0oyan98=";
+  cargoSha256 = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk=";
   nativeBuildInputs = [ pkg-config cmake perl ];
   buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
     ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

pkgs/tools/misc/wakatime/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "wakatime";
-  version = "1.54.0";
+  version = "1.55.1";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     rev = "v${version}";
-    sha256 = "sha256-HjhicBNkpyKb2GX4J3crhp2JgRGqmkQPUZe8rHrQG/g=";
+    sha256 = "sha256-kfgMkVhiY/ftRtqT56OPHS+qfhFnNY0EJEbQsF9RvLg=";
   };
 
-  vendorSha256 = "sha256-8QMrfCq5oAS+fjUccBeGrEGU5y4vtZr2o2HhpDk90K0=";
+  vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM=";
 
   meta = with lib; {
     inherit (src.meta) homepage;

pkgs/tools/security/gopass/hibp.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gopass-hibp";
-  version = "1.14.3";
+  version = "1.14.6";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-JwZZ2VaSD9xkLny5sFeku5rN4FitI1dyW56JSWPMagM=";
+    sha256 = "sha256-BVL6gLaZmGFa72gpfYFs2U6gVJL7LgoxyAs16vk13Rc=";
   };
 
-  vendorSha256 = "sha256-YySkVWdfGIT5qz0jTGlLEHoO0vGY0iNZ/oG9IZCjwRE=";
+  vendorSha256 = "sha256-ouFZlZaJhlgCIanWgpzlXEKr9ua/wa7exk7QTNpxAaM=";
 
   subPackages = [ "." ];
 

pkgs/tools/security/gopass/summon.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gopass-summon-provider";
-  version = "1.14.3";
+  version = "1.14.6";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Pbe5LMQioHDBHeEoT2brtsEBKq4oNROIlLccIjppRVo=";
+    sha256 = "sha256-/hkXYaWsykJyKmwLmEclRPjdecH+z8zo8p1uecWSAlo=";
   };
 
-  vendorSha256 = "sha256-U0qniRHl4YgSy1GpsaYknMQpjpM8uKNtyLm6YblSd4U=";
+  vendorSha256 = "sha256-OADJVtnggv3y5tjyiJxhKQsWs0svLN63M1wCOqBEKpU=";
 
   subPackages = [ "." ];
 

pkgs/tools/security/rnp/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rnp";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "rnpgp";
     repo = "rnp";
     rev = "v${version}";
-    sha256 = "u0etVslTBF9fBqnpVBofYsm0uC/eR6gO3lhwzqua5Qw=";
+    sha256 = "sha256-EpmQ9dCbc46OEbWJy/9wi/WKAZ14azCojpS5k6Awx6w=";
   };
 
   buildInputs = [ zlib bzip2 json_c botan2 ];

pkgs/tools/system/gdu/default.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gdu";
-  version = "5.17.0";
+  version = "5.17.1";
 
   src = fetchFromGitHub {
     owner = "dundee";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8YC0KUf+kSVnSt1436Ob1CdLJT/w5VYDOEHV0mDkO7E=";
+    sha256 = "sha256-IKD28berto3OAuzFnk9oGByOLfNPBgF7hzOfjFKBes0=";
   };
 
   vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE=";