Merge master into haskell-updates

maintainers/maintainer-list.nix

@@ -5074,6 +5074,12 @@
     githubId = 2405974;
     name = "Sébastian Méric de Bellefon";
   };
+  helium = {
+    email = "helium.dev@tuta.io";
+    github = "helium18";
+    githubId = 86223025;
+    name = "helium";
+  };
   henkkalkwater = {
     email = "chris+nixpkgs@netsoj.nl";
     github = "HenkKalkwater";
@@ -8483,6 +8489,17 @@
       fingerprint = "3196 83D3 9A1B 4DE1 3DC2  51FD FEA8 88C9 F5D6 4F62";
     }];
   };
+  minion3665 = {
+    name = "Skyler Grey";
+    email = "skyler3665@gmail.com";
+    matrix = "@minion3665:matrix.org";
+    github = "Minion3665";
+    githubId = 34243578;
+    keys = [{
+      longkeyid = "rsa4096/0x1AFD10256B3C714D";
+      fingerprint = "D520 AC8D 7C96 9212 5B2B  BD3A 1AFD 1025 6B3C 714D";
+    }];
+  };
   mir06 = {
     email = "armin.leuprecht@uni-graz.at";
     github = "mir06";
@@ -9879,6 +9896,12 @@
     githubId = 8641;
     name = "Pierre Carrier";
   };
+  pedrohlc = {
+    email = "root@pedrohlc.com";
+    github = "PedroHLC";
+    githubId = 1368952;
+    name = "Pedro Lara Campos";
+  };
   penguwin = {
     email = "penguwin@penguwin.eu";
     github = "penguwin";

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

@@ -2098,6 +2098,28 @@
         <programlisting language="bash">
 redis-cli save
 cp /var/lib/redis/dump.rdb &quot;/var/lib/redis-mastodon/dump.rdb&quot;
+</programlisting>
+      </listitem>
+      <listitem>
+        <para>
+          Peertube now uses services.redis.servers to start a new redis
+          server, instead of using a global redis server. This improves
+          compatibility with other services that use redis.
+        </para>
+        <para>
+          Redis database is used for storage only cache and job queue.
+          More information can be found here -
+          <link xlink:href="https://docs.joinpeertube.org/contribute-architecture">Peertube
+          architecture</link>.
+        </para>
+        <para>
+          If you do want to save the redis database, you can use the
+          following commands before upgrade OS:
+        </para>
+        <programlisting language="bash">
+redis-cli save
+sudo mkdir /var/lib/redis-peertube
+sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
 </programlisting>
       </listitem>
       <listitem>

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

@@ -98,6 +98,17 @@
           <literal>hardware.saleae-logic.package</literal>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Matrix Synapse now requires entries in the
+          <literal>state_group_edges</literal> table to be unique, in
+          order to prevent accidentally introducing duplicate
+          information (for example, because a database backup was
+          restored multiple times). If your Synapse database already has
+          duplicate rows in this table, this could fail with an error
+          and require manual remediation.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>

nixos/doc/manual/release-notes/rl-2205.section.md

@@ -765,6 +765,17 @@ In addition to numerous new and upgraded packages, this release has the followin
   redis-cli save
   cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
   ```
+- Peertube now uses services.redis.servers to start a new redis server, instead of using a global redis server.
+  This improves compatibility with other services that use redis.
+
+  Redis database is used for storage only cache and job queue. More information can be found here - [Peertube architecture](https://docs.joinpeertube.org/contribute-architecture).
+
+  If you do want to save the redis database, you can use the following commands before upgrade OS:
+  ```bash
+  redis-cli save
+  sudo mkdir /var/lib/redis-peertube
+  sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
+  ```
 
 - If you are using Wayland you can choose to use the Ozone Wayland support
   in Chrome and several Electron apps by setting the environment variable

nixos/doc/manual/release-notes/rl-2211.section.md

@@ -45,5 +45,6 @@ In addition to numerous new and upgraded packages, this release has the followin
 ## Other Notable Changes {#sec-release-22.11-notable-changes}
 
 * A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
+* Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/hardware/video/nvidia.nix

@@ -163,8 +163,19 @@ in
       '';
     };
 
+    hardware.nvidia.forceFullCompositionPipeline = lib.mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to force-enable the full composition pipeline.
+        This sometimes fixes screen tearing issues.
+        This has been reported to reduce the performance of some OpenGL applications and may produce issues in WebGL.
+        It also drastically increases the time the driver needs to clock down after load.
+      '';
+    };
+
     hardware.nvidia.package = lib.mkOption {
-      type = lib.types.package;
+      type = types.package;
       default = config.boot.kernelPackages.nvidiaPackages.stable;
       defaultText = literalExpression "config.boot.kernelPackages.nvidiaPackages.stable";
       description = ''
@@ -255,13 +266,18 @@ in
         ''
           BusID "${pCfg.nvidiaBusId}"
           ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
-          ${optionalString cfg.powerManagement.finegrained "Option \"NVreg_DynamicPowerManagement=0x02\""}
         '';
       screenSection =
         ''
           Option "RandRRotation" "on"
-          ${optionalString syncCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
-        '';
+        '' + optionalString syncCfg.enable ''
+          Option "AllowEmptyInitialConfiguration"
+        '' + optionalString cfg.forceFullCompositionPipeline ''
+          Option         "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
+          Option         "AllowIndirectGLXProtocol" "off"
+          Option         "TripleBuffer" "on"
+        ''
+        ;
     };
 
     services.xserver.serverLayoutSection = optionalString syncCfg.enable ''
@@ -367,7 +383,8 @@ in
           RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}"
         KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
         KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 1'"
-      '' + optionalString cfg.powerManagement.finegrained ''
+      '' + optionalString cfg.powerManagement.finegrained (
+      optionalString (versionOlder config.boot.kernelPackages.kernel.version "5.5") ''
         # Remove NVIDIA USB xHCI Host Controller devices, if present
         ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"
 
@@ -376,7 +393,7 @@ in
 
         # Remove NVIDIA Audio devices, if present
         ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1"
-
+      '' + ''
         # Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
         ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
         ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
@@ -384,7 +401,7 @@ in
         # Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
         ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
         ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"
-      '';
+      '');
 
     boot.extraModprobeConfig = mkIf cfg.powerManagement.finegrained ''
       options nvidia "NVreg_DynamicPowerManagement=0x02"

nixos/modules/services/web-apps/peertube.nix

@@ -209,7 +209,7 @@ in {
 
       port = lib.mkOption {
         type = lib.types.nullOr lib.types.port;
-        default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 6379;
+        default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 31638;
         defaultText = lib.literalExpression ''
           if config.${opt.redis.createLocally} && config.${opt.redis.enableUnixSocket}
           then null
@@ -344,7 +344,7 @@ in {
           };
         };
       }
-      (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; })
+      (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis-peertube/redis.sock"; }; })
     ];
 
     systemd.tmpfiles.rules = [
@@ -441,13 +441,17 @@ in {
       enable = true;
     };
 
-    services.redis = lib.mkMerge [
+    services.redis.servers.peertube = lib.mkMerge [
       (lib.mkIf cfg.redis.createLocally {
         enable = true;
       })
+      (lib.mkIf (cfg.redis.createLocally && !cfg.redis.enableUnixSocket) {
+        bind = "127.0.0.1";
+        port = cfg.redis.port;
+      })
       (lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {
-        unixSocket = "/run/redis/redis.sock";
-        unixSocketPerm = 770;
+        unixSocket = "/run/redis-peertube/redis.sock";
+        unixSocketPerm = 660;
       })
     ];
 
@@ -465,7 +469,7 @@ in {
         };
       })
       (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ])
-      (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis" ];})
+      (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
     ];
 
     users.groups = lib.optionalAttrs (cfg.group == "peertube") {

nixos/modules/services/x11/desktop-managers/phosh.nix

@@ -78,7 +78,13 @@ let
         description = ''
           Display scaling factor.
         '';
-        type = types.nullOr types.ints.unsigned;
+        type = types.nullOr (
+          types.addCheck
+          (types.either types.int types.float)
+          (x : x > 0)
+        ) // {
+          description = "null or positive integer or float";
+        };
         default = null;
         example = 2;
       };

nixos/tests/matrix/mjolnir.nix

@@ -45,6 +45,7 @@ import ../make-test-python.nix (
             enable_registration = true;
             enable_registration_without_verification = true;
             registration_shared_secret = "supersecret-registration";
+            enable_registration_without_verification = true;
 
             listeners = [ {
               # The default but tls=false

nixos/tests/web-apps/peertube.nix

@@ -11,7 +11,7 @@ import ../make-test-python.nix ({pkgs, ...}:
             { address = "192.168.2.10"; prefixLength = 24; }
           ];
         };
-        firewall.allowedTCPPorts = [ 5432 6379 ];
+        firewall.allowedTCPPorts = [ 5432 31638 ];
       };
 
       services.postgresql = {
@@ -34,7 +34,7 @@ import ../make-test-python.nix ({pkgs, ...}:
         enable = true;
         bind = "0.0.0.0";
         requirePass = "turrQfaQwnanGbcsdhxy";
-        port = 6379;
+        port = 31638;
       };
     };
 
@@ -76,6 +76,7 @@ import ../make-test-python.nix ({pkgs, ...}:
 
         redis = {
           host = "192.168.2.10";
+          port = 31638;
           passwordFile = "/etc/peertube/password-redis-db";
         };
 
@@ -113,7 +114,7 @@ import ../make-test-python.nix ({pkgs, ...}:
     database.wait_for_unit("redis-peertube.service")
 
     database.wait_for_open_port(5432)
-    database.wait_for_open_port(6379)
+    database.wait_for_open_port(31638)
 
     server.wait_for_unit("peertube.service")
     server.wait_for_open_port(9000)

pkgs/applications/audio/famistudio/default.nix

@@ -0,0 +1,66 @@
+{ lib
+, stdenv
+, fetchzip
+, autoPatchelfHook
+, makeWrapper
+, alsa-lib
+, gtk-sharp-2_0
+, glib
+, gtk2
+, mono
+, openal
+}:
+
+stdenv.mkDerivation rec {
+  pname = "famistudio";
+  version = "3.3.0";
+
+  src = fetchzip {
+    url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
+    stripRoot = false;
+    sha256 = "1r7y7z3s3b0zm7lvdgr9z70iall1swzlr3npx7g5azz6vza00vva";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+
+  buildInputs = [ alsa-lib gtk-sharp-2_0 glib gtk2 mono openal ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/famistudio}
+    mv * $out/lib/famistudio
+
+    makeWrapper ${mono}/bin/mono $out/bin/famistudio \
+      --add-flags $out/lib/famistudio/FamiStudio.exe \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 gtk-sharp-2_0 ]}
+
+    # Fails to find openal32.dll on its own, needs abit of help
+    rm $out/lib/famistudio/libopenal32.so
+    cat <<EOF >$out/lib/famistudio/OpenTK.dll.config
+    <configuration>
+      <dllmap dll="openal32.dll" target="${openal}/lib/libopenal.so"/>
+    </configuration>
+    EOF
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://famistudio.org/";
+    description = "NES Music Editor";
+    longDescription = ''
+      FamiStudio is very simple music editor for the Nintendo Entertainment System
+      or Famicom. It is targeted at both chiptune artists and NES homebrewers.
+    '';
+    license = licenses.mit;
+    # Maybe possible to build from source but I'm not too familiar with C# packaging
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

pkgs/applications/audio/mmlgui/default.nix

@@ -0,0 +1,87 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, unstableGitUpdater
+, pkg-config
+, glfw
+, libvgm
+, libX11
+, libXau
+, libXdmcp
+, Carbon
+, Cocoa
+, cppunit
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mmlgui";
+  version = "unstable-2022-05-24";
+
+  src = fetchFromGitHub {
+    owner = "superctr";
+    repo = "mmlgui";
+    rev = "fe2b298c1eddae4cc38096f6c1ba1ccaed562cf1";
+    fetchSubmodules = true;
+    sha256 = "Q34zzZthdThMbduXcc/qMome89mAMrn1Vinr073u4zo=";
+  };
+
+  postPatch = ''
+    # Actually wants pkgconf but that seems abit broken:
+    # https://github.com/NixOS/nixpkgs/pull/147503#issuecomment-1055943897
+    # Removing a pkgconf-specific option makes it work with pkg-config
+    substituteInPlace libvgm.mak \
+      --replace '--with-path=/usr/local/lib/pkgconfig' ""
+    substituteInPlace Makefile \
+      --replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    glfw
+    libvgm
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libX11
+    libXau
+    libXdmcp
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    Carbon
+    Cocoa
+  ];
+
+  checkInputs = [
+    cppunit
+  ];
+
+  makeFlags = [
+    "RELEASE=1"
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 {,$out/}bin/mmlgui
+    mkdir -p $out/share/ctrmml
+    mv ctrmml/sample $out/share/ctrmml/
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    url = "https://github.com/superctr/mmlgui.git";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/superctr/mmlgui";
+    description = "MML (Music Macro Language) editor and compiler GUI, powered by the ctrmml framework";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = platforms.all;
+  };
+}

pkgs/applications/audio/vgmplay-libvgm/default.nix

@@ -0,0 +1,43 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, unstableGitUpdater
+, cmake
+, pkg-config
+, zlib
+, libvgm
+, inih
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vgmplay-libvgm";
+  version = "unstable-2022-03-17";
+
+  src = fetchFromGitHub {
+    owner = "ValleyBell";
+    repo = "vgmplay-libvgm";
+    rev = "a2c21cb134b58043a013ac2efc060144cdecf13d";
+    sha256 = "0g251laqjvvzblyflkg8xac424dbxm1v35ckfazsfchmcqiaqfw4";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [ zlib libvgm inih ];
+
+  postInstall = ''
+    install -Dm644 ../VGMPlay.ini $out/share/vgmplay/VGMPlay.ini
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    url = "https://github.com/ValleyBell/vgmplay-libvgm.git";
+  };
+
+  meta = with lib; {
+    mainProgram = "vgmplay";
+    homepage = "https://github.com/ValleyBell/vgmplay-libvgm";
+    description = "New VGMPlay, based on libvgm";
+    license = licenses.unfree; # no licensing text anywhere yet
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = platforms.all;
+  };
+}

pkgs/applications/blockchains/groestlcoin/default.nix

@@ -24,7 +24,7 @@
 }:
 
 let
-  version = "22.0";
+  version = "23.0";
   desktop = fetchurl {
     url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop";
     sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "Groestlcoin";
     repo = "groestlcoin";
     rev = "v${version}";
-    sha256 = "104zzcigpk976iqyinjn6mw3l36zb1if7249iz44ds1zaxv3g1v1";
+    sha256 = "1ag7wpaw4zssx1g482kziqr95yl2vk9r332689s3093xv9i9pz4s";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ]

pkgs/applications/emulators/dolphin-emu/master.nix

@@ -81,9 +81,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ MP2E ashkitten xfix ];
     branch = "master";
-    # x86_32 is an unsupported platform.
-    # Enable generic build if you really want a JIT-less binary.
     broken = stdenv.isDarwin;
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+    platforms = platforms.unix;
   };
 }

pkgs/applications/emulators/dolphin-emu/primehack.nix

@@ -48,13 +48,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dolphin-emu-primehack";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "shiiion";
     repo = "dolphin";
     rev = version;
-    sha256 = "011qghswgh9l7k993lfn1hrwhgyrv9m33smgspsjq50jww6r27fl";
+    sha256 = "sha256-ywCh6wiBjXY5baWfu7cBgwc8w8yJaLM3QQ0FATsrweQ=";
     fetchSubmodules = true;
   };
 
@@ -143,9 +143,7 @@ stdenv.mkDerivation rec {
     description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ MP2E ashkitten Madouura ];
-    # x86_32 is an unsupported platform.
-    # Enable generic build if you really want a JIT-less binary.
     broken = stdenv.isDarwin;
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    platforms = platforms.unix;
   };
 }

pkgs/applications/graphics/gimp/default.nix

@@ -115,6 +115,8 @@ in stdenv.mkDerivation rec {
     libwebp
     libheif
     python
+    # Duplicated here because python.withPackages does not expose the dev output with pkg-config files
+    python2.pkgs.pygtk
     libexif
     xorg.libXpm
     glib-networking

pkgs/applications/misc/ArchiSteamFarm/default.nix

@@ -12,13 +12,13 @@
 buildDotnetModule rec {
   pname = "archisteamfarm";
   # nixpkgs-update: no auto update
-  version = "5.2.5.7";
+  version = "5.2.6.3";
 
   src = fetchFromGitHub {
     owner = "justarchinet";
     repo = pname;
     rev = version;
-    sha256 = "sha256-NXRHLE9Y7j10l8mAUY68+556wcxRXLfdKeCI+b4Xs7I=";
+    sha256 = "sha256-ZsBOF3ZFZ0aicaAJ5j+6DQPwDyloxSafae8FTKSdwAI=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;

pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix

@@ -1,7 +1,7 @@
 { fetchNuGet }: [
   (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; })
   (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; })
-  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; })
+  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
   (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
   (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
   (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
@@ -110,9 +110,9 @@
   (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
   (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
   (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
-  (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; })
-  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; })
-  (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; })
+  (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; })
+  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; })
+  (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; })
   (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
   (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
   (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })

pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix

@@ -1,7 +1,7 @@
 { fetchNuGet }: [
   (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; })
   (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; })
-  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; })
+  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
   (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
   (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
   (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
@@ -110,9 +110,9 @@
   (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
   (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
   (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
-  (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; })
-  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; })
-  (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; })
+  (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; })
+  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; })
+  (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; })
   (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
   (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
   (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })

pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix

@@ -11,8 +11,8 @@ let
     repo = "ASF-ui";
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
-    rev = "bb59242af6f17a54449e6f87e9df397da1a19525";
-    sha256 = "0d9x0fcjxghmjqnfxj22x2hnx3k6jfsayb2ws7ayn3azcczfsccp";
+    rev = "5c7d99928e2d390bc1cd5fa74b2f422aa760d78e";
+    sha256 = "04wcmqav2q7dchvjyy0k6g8cv5ff1sw2a238sz38670cnwx569r2";
   };
 
 in

pkgs/applications/misc/hugo/default.nix

@@ -33,7 +33,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
+    broken = stdenv.isDarwin && stdenv.isx86_64;
     description = "A fast and modern static website engine";
     homepage = "https://gohugo.io";
     license = licenses.asl20;

pkgs/applications/misc/liberasurecode/default.nix

@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "liberasurecode";
-  version = "1.6.2";
+  version = "1.6.3";
 
   outputs = [ "out" "dev" "doc" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "openstack";
     repo = pname;
     rev = version;
-    sha256 = "sha256-qV7DL/7zrwrYOaPj6iHnChGA6KHFwYKjeaMnrGrTPrQ=";
+    sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU=";
   };
 
   postPatch = ''

pkgs/applications/misc/logseq/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logseq";
-  version = "0.6.9";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    sha256 = "sha256-ubhGDx5T1AAJjU6Ka1Pqy5kL8HPa097QhhK5Sp3HWEo=";
+    sha256 = "sha256-oXNSd0ZU2ZsMK51tq8iq2sfuLg0ZHaiXhpJpWZkEmeY=";
     name = "${pname}-${version}.AppImage";
   };
 

pkgs/applications/misc/organicmaps/default.nix

@@ -20,13 +20,13 @@
 
 mkDerivation rec {
   pname = "organicmaps";
-  version = "2022.04.27-2";
+  version = "2022.05.31-10";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     rev = "${version}-android";
-    sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0=";
+    sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/swaynag-battery/default.nix

@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "swaynag-battery";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "m00qek";
+    repo = "swaynag-battery";
+    rev = "v${version}";
+    hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8=";
+  };
+
+  vendorSha256 = "h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08=";
+
+  meta = with lib; {
+    homepage = "https://github.com/m00qek/swaynag-battery";
+    description = "Shows a message when your battery is discharging ";
+    maintainers = with maintainers; [ asbachb ];
+    license = licenses.mit;
+  };
+}

pkgs/applications/networking/instant-messengers/chatterino2/default.nix

@@ -2,12 +2,12 @@
 
 mkDerivation rec {
   pname = "chatterino2";
-  version = "2.3.4";
+  version = "2.3.5";
   src = fetchFromGitHub {
     owner = "Chatterino";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ZmUM56+YNH98J3XE/mWOOIfb0qBld2n4iuHpImbrU4o=";
+    sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI=";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];

pkgs/applications/networking/instant-messengers/pond/default.nix

@@ -1,36 +0,0 @@
-{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3,
-  fetchFromGitHub }:
-
-let
-  gui = true; # Might be implemented with nixpkgs config.
-in
-buildGoPackage rec {
-  pname = "pond";
-  version = "unstable-2015-08-30";
-
-  goPackagePath = "github.com/agl/pond";
-
-  src = fetchFromGitHub {
-    owner = "agl";
-    repo = "pond";
-    rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
-    sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y=";
-  };
-
-  goDeps = ./deps.nix;
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ trousers gtk3 gtkspell3 ]
-    ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi
-    ++ lib.optionals gui [ wrapGAppsHook ];
-  tags = lib.optionals (!gui) [ "nogui" ];
-  excludedPackages = [ "appengine" "bn256cgo" ];
-  postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 ''
-    grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
-      -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
-      -e "s,bn256\.,bn256cgo.,g"
-  '';
-
-  # https://hydra.nixos.org/build/150102618/nixlog/2
-  meta.broken = stdenv.isAarch64;
-}

pkgs/applications/networking/instant-messengers/pond/deps.nix

@@ -1,47 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    };
-  }
-  {
-    goPackagePath = "github.com/agl/ed25519";
-    fetch = {
-      type = "git";
-      url = "https://github.com/agl/ed25519";
-      rev = "278e1ec8e8a6e017cd07577924d6766039146ced";
-      sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "59b73b37c1e45995477aae817e4a653c89a858db";
-      sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
-    };
-  }
-  {
-    goPackagePath = "github.com/agl/go-gtk";
-    fetch = {
-      type = "git";
-      url = "https://github.com/agl/go-gtk";
-      rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15";
-      sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d";
-    };
-  }
-]

pkgs/applications/networking/instant-messengers/xmpp-client/default.nix

@@ -1,25 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "xmpp-client";
-  version = "20160916-${lib.strings.substring 0 7 rev}";
-  rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e";
-
-  goPackagePath = "github.com/agl/xmpp-client";
-
-  src = fetchFromGitHub {
-    owner = "agl";
-    repo = "xmpp-client";
-    inherit rev;
-    sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s";
-  };
-
-  goDeps = ./deps.nix;
-
-  meta = with lib; {
-    description = "An XMPP client with OTR support";
-    homepage = "https://github.com/agl/xmpp-client";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ codsl ];
-  };
-}

pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix

@@ -1,20 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    };
-  }
-]

pkgs/applications/networking/mailreaders/notmuch/default.nix

@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "notmuch";
-  version = "0.35";
+  version = "0.36";
 
   src = fetchurl {
     url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
-    sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8";
+    sha256 = "0h6f6mh9m9vrijm638x5sbsl321b74a25cdasbxhx67x62w320hk";
   };
 
   nativeBuildInputs = [
@@ -79,11 +79,6 @@ stdenv.mkDerivation rec {
   in ''
     mkdir -p test/test-databases
     ln -s ${test-database} test/test-databases/database-v1.tar.xz
-  ''
-  # TODO: restore after resolved upstream
-  # https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html
-  + ''
-    rm test/T355-smime.sh
   '';
 
   doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");

pkgs/applications/networking/remote/citrix-workspace/generic.nix

@@ -207,7 +207,7 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     description = "Citrix Workspace";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pmenke ];
+    maintainers = with maintainers; [ pmenke michaeladler ];
     inherit homepage;
   };
 }

pkgs/applications/networking/remote/citrix-workspace/sources.nix

@@ -13,61 +13,6 @@ let
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
   supportedVersions = lib.mapAttrs mkVersionInfo {
-    "20.04.0" = {
-      major     = "20";
-      minor     = "04";
-      patch     = "0";
-      x64hash   = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB";
-      x86hash   = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F";
-      x64suffix = "21";
-      x86suffix = "21";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html";
-    };
-
-    "20.06.0" = {
-      major     = "20";
-      minor     = "06";
-      patch     = "0";
-      x64hash   = "1kpfcfg95mpprlca6cccnjlsqbj3xvv77cn3fc5msd304nsi9x1v";
-      x86hash   = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194";
-      x64suffix = "15";
-      x86suffix = "15";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html";
-    };
-
-    "20.09.0" = {
-      major     = "20";
-      minor     = "9";
-      patch     = "0";
-      x64hash   = "15gjq1vk1y76c39p72xnam9h9rnr0632i4n11l6xbjnfnad8d4pr";
-      x86hash   = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4";
-      x64suffix = "15";
-      x86suffix = "15";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html";
-    };
-
-    "20.10.0" = {
-      major     = "20";
-      minor     = "10";
-      patch     = "0";
-      x64hash   = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf";
-      x86hash   = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx";
-      x64suffix = "6";
-      x86suffix = "6";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html";
-    };
-
-    "20.12.0" = {
-      major     = "20";
-      minor     = "12";
-      patch     = "0";
-      x64hash   = "1268nriqjp27nxqqi4dvkv8r01yj3bhglxv21xd185761da2mzry";
-      x86hash   = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf";
-      x64suffix = "12";
-      x86suffix = "12";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html";
-    };
-
     "21.01.0" = {
       major     = "21";
       minor     = "1";
@@ -120,7 +65,7 @@ let
       x86hash   = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51";
       x64suffix = "25";
       x86suffix = "25";
-      homepage  = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
+      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html";
     };
 
     "21.12.0" = {
@@ -131,6 +76,17 @@ let
       x86hash   = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292";
       x64suffix = "18";
       x86suffix = "18";
+      homepage  = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html";
+    };
+
+    "22.05.0" = {
+      major     = "22";
+      minor     = "5";
+      patch     = "0";
+      x64hash   = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053";
+      x86hash   = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1";
+      x64suffix = "16";
+      x86suffix = "16";
       homepage  = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };

pkgs/applications/networking/remote/teamviewer/default.nix

@@ -6,6 +6,8 @@
 
 mkDerivation rec {
   pname = "teamviewer";
+  # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
+  outputs = [ "out" "dev" ];
   version = "15.29.4";
 
   src = fetchurl {

pkgs/applications/science/robotics/mavproxy/default.nix

@@ -3,11 +3,11 @@
 
 buildPythonApplication rec {
   pname = "MAVProxy";
-  version = "1.8.49";
+  version = "1.8.50";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ=";
+    sha256 = "sha256-dTdXmhm6sWZphLhcoKRDQ2Ir0hcu0ev0xCul2O9hAXg=";
   };
 
   postPatch = ''

pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix

@@ -1,17 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "git-annex-remote-b2";
-  version = "unstable-2015-12-12";
-
-  goPackagePath = "github.com/encryptio/git-annex-remote-b2";
-
-  src = fetchFromGitHub {
-    owner = "encryptio";
-    repo = "git-annex-remote-b2";
-    rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba";
-    sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ=";
-  };
-
-  goDeps = ./deps.nix;
-}

pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix

@@ -1,20 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/pquerna/ffjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pquerna/ffjson";
-      rev = "674bc015b5b3f50f9bb2561179778586b9af68c5";
-      sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/kothar/go-backblaze.v0";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/kothar/go-backblaze.v0";
-      rev = "373819725fc560fa962c6cd883b533d2ebec4844";
-      sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx";
-    };
-  }
-]

pkgs/applications/version-management/git-lfs/1.nix

@@ -1,31 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "git-lfs";
-  version = "1.5.6";
-  rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
-
-  goPackagePath = "github.com/git-lfs/git-lfs";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "git-lfs";
-    repo = "git-lfs";
-    sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d";
-  };
-
-  subPackages = [ "." ];
-
-  preBuild = ''
-    pushd go/src/github.com/git-lfs/git-lfs
-      go generate ./commands
-    popd
-  '';
-
-  meta = with lib; {
-    description = "Git extension for versioning large files";
-    homepage    = "https://git-lfs.github.com/";
-    license     = [ licenses.mit ];
-    maintainers = [ maintainers.twey ];
-  };
-}

pkgs/applications/virtualization/podman-tui/default.nix

@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , pkg-config
 , fetchFromGitHub
 , buildGoModule
@@ -11,25 +12,21 @@
 }:
 buildGoModule rec {
   pname = "podman-tui";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     rev = "v${version}";
-    sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk=";
+    sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8=";
   };
 
   vendorSha256 = null;
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [
-    btrfs-progs
-    gpgme
-    libassuan
-    lvm2
-  ];
+  buildInputs = [ gpgme libassuan ]
+    ++ lib.optionals stdenv.isLinux [ btrfs-progs lvm2 ];
 
   ldflags = [ "-s" "-w" ];
 
@@ -44,6 +41,5 @@ buildGoModule rec {
     description = "Podman Terminal UI";
     license = licenses.asl20;
     maintainers = with maintainers; [ aaronjheng ];
-    platforms = platforms.linux;
   };
 }

pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix

@@ -1,10 +1,11 @@
 { stdenv
+, targetPackages
 , lib
 , makeSetupHook
 , dieHook
 , writeShellScript
 , tests
-, cc ? stdenv.cc
+, cc ? targetPackages.stdenv.cc
 , sanitizers ? []
 }:
 
@@ -14,7 +15,7 @@ makeSetupHook {
     ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc;
 
   substitutions = {
-    cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";
+    cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";
 
     # Extract the function call used to create a binary wrapper from its embedded docstring
     passthru.extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''

pkgs/desktops/gnome/misc/geary/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , pkg-config
 , gtk3
 , vala
@@ -54,6 +55,21 @@ stdenv.mkDerivation rec {
     sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik";
   };
 
+  patches = [
+    # Fix accessibility issues with initializer of constants (Fix build with vala 0.56)
+    # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch";
+      sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw=";
+    })
+    # Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56)
+    # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch";
+      sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI=";
+    })
+  ];
+
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils

pkgs/development/compilers/mono/4.nix

@@ -1,9 +1,9 @@
-{ callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc, stdenv, lib }:
 
 callPackage ./generic.nix ({
   inherit Foundation libobjc;
   version = "4.8.1.0";
   sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
   enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
-  extraPatches = [ ./mono4-glibc.patch ];
+  extraPatches = lib.optionals stdenv.isLinux [ ./mono4-glibc.patch ];
 })

pkgs/development/compilers/mono/generic.nix

@@ -76,7 +76,9 @@ stdenv.mkDerivation rec {
   inherit enableParallelBuilding;
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
+    # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed upstream, but a
+    # stable release with the fix is not available yet.
+    broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129";
     homepage = "https://mono-project.com/";
     description = "Cross platform, open source .NET development framework";
     platforms = with platforms; darwin ++ linux;

pkgs/development/libraries/libdigidocpp/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl
+{ lib, stdenv, fetchurl, cmake, makeWrapper, minizip, pcsclite, opensc, openssl
 , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,20 @@ stdenv.mkDerivation rec {
      sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config xxd ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config xxd ];
 
   buildInputs = [
     minizip pcsclite opensc openssl xercesc
     xml-security-c xsd zlib xalanc
   ];
 
+  # replace this hack with a proper cmake variable or environment variable
+  # once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged.
+  postInstall = ''
+    wrapProgram $out/bin/digidoc-tool \
+      --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
+  '';
+
   meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     homepage = "http://www.id.ee/";

pkgs/development/libraries/libspnav/default.nix

@@ -21,7 +21,10 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [ "--disable-debug"];
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ];
 
   preInstall = ''
     mkdir -p $out/{lib,include}

pkgs/development/libraries/libvgm/default.nix

@@ -0,0 +1,122 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, unstableGitUpdater
+, cmake
+, libiconv
+, zlib
+, enableShared ? true
+
+, enableAudio ? true
+, withWaveWrite ? true
+, withWinMM ? stdenv.hostPlatform.isWindows
+, withDirectSound ? stdenv.hostPlatform.isWindows
+, withXAudio2 ? stdenv.hostPlatform.isWindows
+, withWASAPI ? stdenv.hostPlatform.isWindows
+, withOSS ? stdenv.hostPlatform.isFreeBSD
+, withSADA ? stdenv.hostPlatform.isSunOS
+, withALSA ? stdenv.hostPlatform.isLinux
+, alsa-lib
+, withPulseAudio ? stdenv.hostPlatform.isLinux
+, libpulseaudio
+, withCoreAudio ? stdenv.hostPlatform.isDarwin
+, CoreAudio
+, AudioToolbox
+, withLibao ? true
+, libao
+
+, enableEmulation ? true
+, withAllEmulators ? true
+, emulators ? [ ]
+
+, enableLibplayer ? true
+
+, enableTools ? false
+}:
+
+assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
+
+let
+  inherit (lib) optional optionals;
+  onOff = val: if val then "ON" else "OFF";
+in
+stdenv.mkDerivation rec {
+  pname = "libvgm";
+  version = "unstable-2022-05-27";
+
+  src = fetchFromGitHub {
+    owner = "ValleyBell";
+    repo = "libvgm";
+    rev = "ec6ddae3e3488b6dc9e993cb0f76d3015d2f6fff";
+    sha256 = "AwIx4LuVSuCf7xgtximcB6N+rzC7g1ajeBdaBz6RSyk=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ] ++ optional enableTools "bin";
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    libiconv
+    zlib
+  ] ++ optionals withALSA [
+    alsa-lib
+  ] ++ optionals withPulseAudio [
+    libpulseaudio
+  ] ++ optionals withCoreAudio [
+    CoreAudio
+    AudioToolbox
+  ] ++ optionals withLibao [
+    libao
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_LIBAUDIO=${onOff enableAudio}"
+    "-DBUILD_LIBEMU=${onOff enableEmulation}"
+    "-DBUILD_LIBPLAYER=${onOff enableLibplayer}"
+    "-DBUILD_TESTS=${onOff enableTools}"
+    "-DBUILD_PLAYER=${onOff enableTools}"
+    "-DBUILD_VGM2WAV=${onOff enableTools}"
+    "-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}"
+    "-DUSE_SANITIZERS=ON"
+  ] ++ optionals enableAudio [
+    "-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}"
+    "-DAUDIODRV_WINMM=${onOff withWinMM}"
+    "-DAUDIODRV_DSOUND=${onOff withDirectSound}"
+    "-DAUDIODRV_XAUDIO2=${onOff withXAudio2}"
+    "-DAUDIODRV_WASAPI=${onOff withWASAPI}"
+    "-DAUDIODRV_OSS=${onOff withOSS}"
+    "-DAUDIODRV_SADA=${onOff withSADA}"
+    "-DAUDIODRV_ALSA=${onOff withALSA}"
+    "-DAUDIODRV_PULSE=${onOff withPulseAudio}"
+    "-DAUDIODRV_APPLE=${onOff withCoreAudio}"
+    "-DAUDIODRV_LIBAO=${onOff withLibao}"
+  ] ++ optionals enableEmulation ([
+    "-DSNDEMU__ALL=${onOff withAllEmulators}"
+  ] ++ optionals (!withAllEmulators)
+    (lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON"))
+  ) ++ optionals enableTools [
+    "-DUTIL_CHARCNV_ICONV=ON"
+    "-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}"
+  ];
+
+  passthru.updateScript = unstableGitUpdater {
+    url = "https://github.com/ValleyBell/libvgm.git";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/ValleyBell/libvgm";
+    description = "More modular rewrite of most components from VGMPlay";
+    license =
+      if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then
+        licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43
+      else
+        licenses.gpl2Only;
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = platforms.all;
+  };
+}

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

@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.23.0";
+  version = "3.24.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    hash = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM=";
+    hash = "sha256-XeaRtdw23mNJ+kgSthGRhq4PCGAwTjpjVyNlNRshoQg=";
   };
 
   nativeBuildInputs = [

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiopyarr";
-  version = "22.2.2";
+  version = "22.6.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "tkdrob";
     repo = pname;
     rev = version;
-    hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng=";
+    hash = "sha256-LfZEM1vPccQBrvNz9CGVlihg6YAB7FAvUZogu/ngZ4Y=";
   };
 
   propagatedBuildInputs = [

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "asyncstdlib";
-  version = "3.10.4";
+  version = "3.10.5";
   format = "flit";
 
   disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "maxfischer2781";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-zPWXI5iHMCkSVjyNRcXplTadobYCeMv3Unjt+QVF8D8=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ILb+iWg2xYWBEQY1a4jPITm4QCPO8qfVCPgO3YWIVAQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix

@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-applicationinsights";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-K46J0WqQt4vwr1CE4yjxKUT/Atds5BLs0k8EjOA4yzA=";
+    sha256 = "sha256-mFUKupq4IXywGs6aQQYFYSNNH9PCNxicS1mRneSdhHU=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,25 +1,32 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "datadiff";
-  version = "1.1.6";
+  version = "2.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543";
+    hash = "sha256-VASUQKiW3lJH7i57eqVCX5OayDLDftshAfjTA26Jyqg=";
   };
 
-  buildInputs = [ nose ];
+  # Tests are not part of the PyPI releases
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "datadiff"
+  ];
 
   meta = with lib; {
-    description = "DataDiff";
+    description = "Library to provide human-readable diffs of Python data structures";
     homepage = "https://sourceforge.net/projects/datadiff/";
     license = licenses.asl20;
+    maintainers = with maintainers; [ ];
   };
-
 }

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

@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "eventlet";
-  version = "0.33.0";
+  version = "0.33.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "eventlet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-kE/eYBbaTt1mPGoUIMhonvFBlQOdAfPU5GvCvPaRHvs=";
+    hash = "sha256-8tIvvTTCcIG56VaPZMhdzAKnFRsYV3YC9xcf47nh838=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/flask-jwt-extended/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "flask-jwt-extended";
-  version = "4.4.0";
+  version = "4.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Flask-JWT-Extended";
     inherit version;
-    hash = "sha256-P+gVBL3JGtjxy5db0tlexgElHzG94YQRXjn8fm7SPqY=";
+    hash = "sha256-CYh/o3K91Omrtg2KcVWpZr8Rt0mZVUQQsgl1gCrsJ34=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-audit-log/default.nix

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-audit-log";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d0852f525ad65705f9fbff6288be4493e1449a7906fb5e01bd71c8d1e424d1fc";
+    sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0=";
   };
 
   propagatedBuildInputs = [ googleapis-common-protos protobuf ];

pkgs/development/python-modules/google-cloud-bigtable/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "2.8.1";
+  version = "2.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Gy/CS06uGQyQoPLjm8ChR6MkO6CYkpC/n5wM/VncDDs=";
+    hash = "sha256-nicUpEaPhDBmWU2jP/R01d54xu9tgNUxZVD4gZGAyAw=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-core/default.nix

@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "2.2.3";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-idL3GJvG3HTeEo1CPqUsyHGfCl28zZyoBDP2UEogJVw=";
+    sha256 = "sha256-/apinmF0tBd8LVbrirHd2HZhBk0KPpuwa2Lk1+I0Rmk=";
   };
 
   propagatedBuildInputs = [ google-api-core ];

pkgs/development/python-modules/google-cloud-datacatalog/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datacatalog";
-  version = "3.7.1";
+  version = "3.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU=";
+    hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-firestore/default.nix

@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-firestore";
-  version = "2.5.0";
+  version = "2.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-g/IgGlVWHjkqJKDFvkmp/TVNA0TgN+Xf65M10+x3f+o=";
+    sha256 = "sha256-ltFXT+cU/YGPqu28WcStV6bJarbiIGbjsHLI+9UZU80=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-secret-manager/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-secret-manager";
-  version = "2.10.0";
+  version = "2.11.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nQfdej2SveO0Qxam57ZRAyTQ0NnGoyb4nx2YFnqtAhI=";
+    hash = "sha256-naE1e7T1E0P3MxJCMYc3YZ79v/3VTW19D/LhzRie7jk=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-storage/default.nix

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "2.2.1";
+  version = "2.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc=";
+    hash = "sha256-9Muw3l4XIo6cCc3Il9geqnDiw5b1hRP3neDoJFhMj1s=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-i18n-address/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "google-i18n-address";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "mirumee";
     repo = "google-i18n-address";
     rev = version;
-    sha256 = "0fn5sph6fq68zrjssgvnnvrkavs8arshjwgxng5dr5fsn6qii3mq";
+    sha256 = "sha256-VQEDZkGseZTKOsAMgNYyf6FcgnCjLPpWXijeUmtgyv0=";
   };
 
   propagatedBuildInputs = [ requests ];

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "1.7.2";
+  version = "1.8.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-lLv3DrBPxw5M903ehKMYqsbBicmXcVS2v7P7FgTNkSQ=";
+    sha256 = "sha256-5nW+IOjBkbgEn1VGHwny1iT771UqWA4BhDLamqS/xAM=";
   };
 
   propagatedBuildInputs = [

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

@@ -24,11 +24,11 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-SbNIiWakPusCAOpRG5l+ZAPCXVY6mExjMOgqDr/EVAw=";
+    sha256 = "sha256-Bm8a3diRFM1qG5yzVVyOqn0BNnPuEDS9/lBgaIBKngU=";
   };
 
   postPatch = ''

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow";
-  version = "3.15.0";
+  version = "3.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "marshmallow-code";
     repo = pname;
     rev = version;
-    hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc=";
+    hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/oslo-concurrency/default.nix

@@ -18,12 +18,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-concurrency";
-  version = "4.5.0";
+  version = "4.5.1";
 
   src = fetchPypi {
     pname = "oslo.concurrency";
     inherit version;
-    sha256 = "1h76pq9p1bpwcs6jl9m2w4280wcp2w3is88qlaqknqkd3pdaixwr";
+    sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc=";
   };
 
   postPatch = ''

pkgs/development/python-modules/oslo-db/default.nix

@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-db";
-  version = "11.2.0";
+  version = "11.3.0";
 
   src = fetchPypi {
     pname = "oslo.db";
     inherit version;
-    sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4=";
+    sha256 = "sha256-CSlZI05V8p+lCgjPcG6LZi4y2nVNrFhjI95TDM/WJnM=";
   };
 
   nativeBuildInputs = [ pbr ];

pkgs/development/python-modules/oslo-log/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "oslo-log";
-  version = "4.7.0";
+  version = "5.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "oslo.log";
     inherit version;
-    hash = "sha256-ycLEyW098LLuuTG0djvbCpBbqvKbiVgW2Vd41p+hJwc=";
+    hash = "sha256-c6tyNKii1QvfUmyHTfocsrEIO6+a2VvC64r1YkidTQE=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/oslo-utils/default.nix

@@ -23,12 +23,12 @@
 
 buildPythonPackage rec {
   pname = "oslo-utils";
-  version = "4.12.2";
+  version = "4.13.0";
 
   src = fetchPypi {
     pname = "oslo.utils";
     inherit version;
-    sha256 = "sha256-Qf0sT/bS6No4qttaW/JCWKhlDg4KaYprI51IuOQXfDs=";
+    sha256 = "sha256-RbqKql7QVqjo5GBZ75PVwte5yZvHSA42HPV4Pkfyj7o=";
   };
 
   postPatch = ''

pkgs/development/python-modules/proto-plus/default.nix

@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "proto-plus";
-  version = "1.20.3";
+  version = "1.20.5";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU=";
+    sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU=";
   };
 
   propagatedBuildInputs = [ protobuf ];

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

@@ -1,14 +1,14 @@
 { buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytestCheckHook, asn1crypto }:
 
 buildPythonPackage rec {
-  version = "0.3.26";
+  version = "0.3.27";
   pname = "pyaxmlparser";
 
   src = fetchFromGitHub {
     owner = "appknox";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wD0rN00q4ipKnKubptrgrjNwkBpqsA+ix2xedOOr8Yg=";
+    sha256 = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw=";
   };
 
   propagatedBuildInputs = [ asn1crypto click lxml ];

pkgs/development/python-modules/pytest-testmon/default.nix

@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-testmon";
-  version = "1.3.1";
+  version = "1.3.3";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6gWWCtm/GHknhjLyRdVf42koeaSKzk5/V0173DELmj0=";
+    sha256 = "sha256-Csg5wIm9+ZdAQYdZozlx09rMaVz3GazeS5Z/f4jRECw=";
   };
 
   propagatedBuildInputs = [ pytest coverage ];

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

@@ -5,18 +5,18 @@
 , fetchFromGitHub
 , substituteAll
 , file
-, glibcLocales
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "python-magic";
-  version = "0.4.25";
+  version = "0.4.26";
 
   src = fetchFromGitHub {
     owner = "ahupp";
     repo = "python-magic";
     rev = version;
-    sha256 = "sha256-h7YQVH5Z7zunT6AdLPBh3TWpxLpZ5unSHDhkVDFOWDI=";
+    sha256 = "sha256-RcKldMwSRroNZNEl0jwuJG9C+3OIPBzk+CjqkxKK/eY=";
   };
 
   patches = [
@@ -26,12 +26,14 @@ buildPythonPackage rec {
     })
   ];
 
-  checkInputs = [ glibcLocales ];
-
-  checkPhase = ''
-    LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py
+  preCheck = ''
+    export LC_ALL=en_US.UTF-8
   '';
 
+  checkInputs = [
+    pytestCheckHook
+  ];
+
   meta = with lib; {
     description = "A python interface to the libmagic file type identification library";
     homepage = "https://github.com/ahupp/python-magic";

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "scmrepo";
-  version = "0.0.23";
+  version = "0.0.24";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs=";
+    hash = "sha256-S1jeLls0do9sCqTWe8h8+8CO3oM160J97UmISUhTU/s=";
   };
 
   propagatedBuildInputs = [

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

@@ -9,7 +9,6 @@
 , nixosTests
 }:
 
-
 let
   # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some
   # absolute paths. Replaced by relative path so it is found when used in nix.
@@ -31,15 +30,15 @@ buildPythonPackage rec {
     sha256 = "039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy";
   };
 
-  buildInputs = [xorg.libX11];
+  buildInputs = [ xorg.libX11 ];
 
   propagatedBuildInputs = [
     geckodriver urllib3
   ];
 
-  patchPhase = lib.optionalString stdenv.isLinux ''
+  postPatch = lib.optionalString stdenv.isLinux ''
     cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
-    substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6"
+    substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${lib.getLib xorg.libX11}/lib/libX11.so.6"
     cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
     cc -shared \
       -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \

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

@@ -1,12 +1,14 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
-, poetry-core
 , attrs
+, buildPythonPackage
 , cattrs
+, fetchFromGitHub
 , fonttools
 , fs
+, importlib-metadata
+, poetry-core
 , pytestCheckHook
+, pythonOlder
 , ufo2ft
 , ufoLib2
 }:
@@ -14,14 +16,15 @@
 buildPythonPackage rec {
   pname = "statmake";
   version = "0.4.1";
-
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "daltonmaag";
-    repo = "statmake";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0=";
+    sha256 = "sha256-OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +37,8 @@ buildPythonPackage rec {
     fonttools
     # required by fonttools[ufo]
     fs
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
   ];
 
   checkInputs = [
@@ -46,9 +51,21 @@ buildPythonPackage rec {
     # https://github.com/daltonmaag/statmake/pull/41
     substituteInPlace pyproject.toml \
       --replace 'requires = ["poetry>=1.0.0"]' 'requires = ["poetry-core"]' \
-      --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"'
+      --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' \
+      --replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"'
   '';
 
+  disabledTests = [
+    # cattrs.errors.IterableValidationError: While structuring typing.List[statmake.classes.Axis]
+    # https://github.com/daltonmaag/statmake/issues/42
+    "test_load_stylespace_broken_range"
+    "test_load_stylespace_broken_multilingual_no_en"
+  ];
+
+  pythonImportsCheck = [
+    "statmake"
+  ];
+
   meta = with lib; {
     description = "Applies STAT information from a Stylespace to a variable font";
     homepage = "https://github.com/daltonmaag/statmake";

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "7.9.1";
+  version = "7.9.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-oi8LqyeqN8gn06B/m1wNI9iNu7hU3NrdkL7xTsImYPI=";
+    hash = "sha256-JFCYHiPvKYveHYf6SWkmovuvas5+9IGpsnQWqVIaTto=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/types-requests/default.nix

@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.27.29";
+  version = "2.27.30";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+0U7OnakjspmOBzqgAT+quoSg16DgZb1x6yHx1xcGe8=";
+    sha256 = "sha256-yo18xUnD0Q28s8acG1Pj/9EnAInBABplwenhAX615wQ=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/ua-parser/default.nix

@@ -1,20 +1,44 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyyaml
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "ua-parser";
   version = "0.10.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "ua-parser";
+    repo = "uap-python";
+    rev = version;
+    fetchSubmodules = true;
+    hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pyyaml"' ""
+  patches = [
+    ./dont-fetch-submodule.patch
+  ];
+
+  nativeBuildInputs = [
+    pyyaml
+  ];
+
+  preBuild = ''
+    mkdir -p build/lib/ua_parser
   '';
 
-  doCheck = false; # requires files from uap-core
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    # import from $out
+    rm ua_parser/__init__.py
+  '';
 
   pythonImportsCheck = [ "ua_parser" ];
 

pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch

@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index a976eee..6919795 100644
+--- a/setup.py
++++ b/setup.py
+@@ -64,12 +64,6 @@ class build_regexes(Command):
+ 
+     def run(self):
+         work_path = self.work_path
+-        if not os.path.exists(os.path.join(work_path, ".git")):
+-            return
+-
+-        log.info("initializing git submodules")
+-        check_output(["git", "submodule", "init"], cwd=work_path)
+-        check_output(["git", "submodule", "update"], cwd=work_path)
+ 
+         yaml_src = os.path.join(work_path, "uap-core", "regexes.yaml")
+         if not os.path.exists(yaml_src):

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

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.45.1";
+  version = "0.46.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy";
-    rev = version;
-    sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-YCkNjygNSvGNuhP7N1apCWYevl18GASgUFSSTLHj2YU=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python2-modules/pygtk/default.nix

@@ -3,6 +3,7 @@
 
 buildPythonPackage rec {
   pname = "pygtk";
+  outputs = [ "out" "dev" ];
   version = "2.24.0";
 
   disabled = isPy3k;

pkgs/development/tools/analysis/checkov/default.nix

@@ -32,14 +32,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.0.1175";
+  version = "2.0.1186";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = version;
-    hash = "sha256-nLh00DaSpKT6rngiXKa6z0+Ouu1/hMWzIYa54PHPD1k=";
+    hash = "sha256-5EFB/BgSJny3AdgtgsmIszcM5Wum/dtdmmP/40/sH0Y=";
   };
 
   nativeBuildInputs = with py.pkgs; [

pkgs/development/tools/analysis/tflint/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.36.2";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-DPgYc0nUrRkidWqhv0X9v+2VSNPy1+0ZQ2gCe7T2gu0=";
+    sha256 = "sha256-2fcrKwbYuCOZE++Sin0zNuGaBQQd0dNs1MRL/doOLOw=";
   };
 
-  vendorSha256 = "sha256-Is4dpBu/Nm34NZ3NftSGTZnSR8831kM56dvBjtfUTGU=";
+  vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4=";
 
   doCheck = false;
 

pkgs/development/tools/buf/default.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-cKb9pZYEsO1thgtl/8XFJHpNrO6P3OR8Lox/Gf9ccYk=";
+    sha256 = "sha256-Jcj1tpcG64mSVn444isGsK9AcITh171ibECukv3bXDI=";
   };
 
-  vendorSha256 = "sha256-zXLvKEdiIFnmwWQBgbJHCEBe2i7FobgeUOnA3LvHl8w=";
+  vendorSha256 = "sha256-aHGV8UfPn7xsySPXRSzsEpcaz1Ll49Mj1S9izvaIRWY=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
@@ -48,13 +48,9 @@ buildGoModule rec {
     runHook preInstall
 
     # Binaries
-    mkdir -p "$out/bin"
     # Only install required binaries, don't install testing binaries
-    for FILE in \
-      "buf" \
-      "protoc-gen-buf-breaking" \
-      "protoc-gen-buf-lint"; do
-      cp "$GOPATH/bin/$FILE" "$out/bin/"
+    for FILE in buf protoc-gen-buf-breaking protoc-gen-buf-lint; do
+      install -D -m 555 -t $out/bin $GOPATH/bin/$FILE
     done
 
     # Completions

pkgs/development/tools/corgi/default.nix

@@ -1,27 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "corgi";
-  version = "0.2.4";
-
-  goPackagePath = "github.com/DrakeW/corgi";
-
-  src = fetchFromGitHub {
-    owner = "DrakeW";
-    repo = "corgi";
-    rev = "v${version}";
-    sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn";
-  };
-
-  goDeps = ./deps.nix;
-
-  meta = with lib; {
-    description = "CLI workflow manager";
-    longDescription = ''
-      Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet.
-    '';
-    homepage = "https://github.com/DrakeW/corgi";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kalbasit ];
-  };
-}

pkgs/development/tools/corgi/deps.nix

@@ -1,47 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/chzyer/readline";
-    fetch = {
-      type = "git";
-      url = "https://github.com/chzyer/readline";
-      rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
-      sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
-    };
-  }
-  {
-    goPackagePath = "github.com/fatih/color";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/color";
-      rev = "2d684516a8861da43017284349b7e303e809ac21";
-      sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
-      sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "99dc123558852f67743bd0b2caf8383cb3c6d720";
-      sha256 = "0b2rjgycgpkpvpsqgvilqkr66bfk477lyd6l0jxmgxb1h0za5s25";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "d929dcbb10863323c436af3cf76cb16a6dfc9b29";
-      sha256 = "1qjmqvszs9cmic7brm7pknq86zjra4hq923bn88blfvr3bap5bc4";
-    };
-  }
-]

pkgs/development/tools/go-repo-root/default.nix

@@ -1,17 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "go-repo-root";
-  version = "unstable-2014-09-11";
-
-  goPackagePath = "github.com/cstrahan/go-repo-root";
-
-  src = fetchFromGitHub {
-    owner = "cstrahan";
-    repo = "go-repo-root";
-    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
-    sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y=";
-  };
-
-  goDeps = ./deps.nix;
-}

pkgs/development/tools/go-repo-root/deps.nix

@@ -1,20 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/tools/go/vcs";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
-      sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
-    };
-  }
-  {
-    goPackagePath = "code.google.com/p/go.tools/go/vcs";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
-      sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
-    };
-  }
-]

pkgs/development/tools/gojq/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gojq";
-  version = "0.12.7";
+  version = "0.12.8";
 
   src = fetchFromGitHub {
     owner = "itchyny";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-aQZLuwMFnggtwHZaE6KGBKJSbtmAz+Cs1RqLgvIsO24=";
+    sha256 = "sha256-WcPvsThYgXwYXwXyylOqopTZOfsXmDU4wbhEdS3neA8=";
   };
 
-  vendorSha256 = "sha256-b7TQywIOxzFnUNwgxGFR3W++QGHYUROBG7P/lTRmhGc=";
+  vendorSha256 = "sha256-fFW+gWdGMxDApcyR6dy0491WvQcVMAJ5dgMQqgNmOkw=";
 
   ldflags = [ "-s" "-w" ];
 

pkgs/development/tools/misc/ccache/default.nix

@@ -15,13 +15,13 @@
 
 let ccache = stdenv.mkDerivation rec {
   pname = "ccache";
-  version = "4.6";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b";
+    sha256 = "sha256-XcelGBb5bRLZKSbtC2J40d6CsSF/ZF3eJW0UXe1Y40A=";
   };
 
   outputs = [ "out" "man" ];

pkgs/development/tools/misc/texlab/default.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "3.3.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI=";
+    sha256 = "sha256-hRY1cJFakbq6pU2TKql+eVWvKtNDzVIQkE5BbRW5n5A=";
   };
 
-  cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA=";
+  cargoSha256 = "sha256-VwB02FfoAKL0fEvpvpxfkAR6PcWZFK/d5aVOtUq7f10=";
 
   outputs = [ "out" "man" ];
 
@@ -30,13 +30,6 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     installManPage texlab.1
-
-    # Remove generated dylib of html2md dependency. TexLab statically
-    # links to the generated rlib and doesn't reference the dylib. I
-    # couldn't find any way to prevent building this by passing cargo flags.
-    # See https://gitlab.com/Kanedias/html2md/-/blob/0.2.10/Cargo.toml#L20
-    rm "$out/lib/libhtml2md${stdenv.hostPlatform.extensions.sharedLibrary}"
-    rmdir "$out/lib"
   '';
 
   passthru.updateScript = nix-update-script {

pkgs/development/tools/ocaml/ocamlformat/default.nix

@@ -7,55 +7,6 @@ let mkOCamlformat = callPackage ./generic.nix; in
 #  https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433
 
 rec {
-  ocamlformat_0_11_0 = mkOCamlformat {
-    version = "0.11.0";
-  };
-
-  ocamlformat_0_12 = mkOCamlformat {
-    version = "0.12";
-  };
-
-  ocamlformat_0_13_0 = mkOCamlformat rec {
-    version = "0.13.0";
-    tarballName = "ocamlformat-${version}-2.tbz";
-  };
-
-  ocamlformat_0_14_0 = mkOCamlformat {
-    version = "0.14.0";
-  };
-
-  ocamlformat_0_14_1 = mkOCamlformat {
-    version = "0.14.1";
-  };
-
-  ocamlformat_0_14_2 = mkOCamlformat {
-    version = "0.14.2";
-  };
-
-  ocamlformat_0_14_3 = mkOCamlformat {
-    version = "0.14.3";
-  };
-
-  ocamlformat_0_15_0 = mkOCamlformat {
-    version = "0.15.0";
-  };
-
-  ocamlformat_0_15_1 = mkOCamlformat {
-    version = "0.15.1";
-  };
-
-  ocamlformat_0_16_0 = mkOCamlformat {
-    version = "0.16.0";
-  };
-
-  ocamlformat_0_17_0 = mkOCamlformat {
-    version = "0.17.0";
-  };
-
-  ocamlformat_0_18_0 = mkOCamlformat {
-    version = "0.18.0";
-  };
-
   ocamlformat_0_19_0 = mkOCamlformat {
     version = "0.19.0";
   };
@@ -72,5 +23,9 @@ rec {
     version = "0.21.0";
   };
 
-  ocamlformat = ocamlformat_0_21_0;
+  ocamlformat_0_22_4 = mkOCamlformat {
+    version = "0.22.4";
+  };
+
+  ocamlformat = ocamlformat_0_22_4;
 }

pkgs/development/tools/ocaml/ocamlformat/generic.nix

@@ -4,39 +4,18 @@
 }:
 
 let src =
-  if version == "0.11.0"
-  then fetchzip {
-    url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz";
-    sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx";
-  } else fetchurl {
+  fetchurl {
     url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}";
     sha256 = {
-      "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj";
-      "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq";
-      "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi";
-      "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa";
-      "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
-      "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
-      "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
-      "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
-      "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
-      "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
-      "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq";
       "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32";
       "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
       "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU=";
       "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
+      "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA=";
     }."${version}";
   };
-  ocamlPackages =
-  if lib.versionAtLeast version "0.19.0"
-  then ocaml-ng.ocamlPackages
-  else if lib.versionAtLeast version "0.17.0"
-  then ocaml-ng.ocamlPackages_4_12
-  else if lib.versionAtLeast version "0.14.3"
-  then ocaml-ng.ocamlPackages_4_10
-  else ocaml-ng.ocamlPackages_4_07
-; in
+  ocamlPackages = ocaml-ng.ocamlPackages;
+in
 
 with ocamlPackages;
 
@@ -44,10 +23,7 @@ buildDunePackage {
   pname = "ocamlformat";
   inherit src version;
 
-  minimumOCamlVersion =
-    if lib.versionAtLeast version "0.17.0"
-    then "4.08"
-    else "4.06";
+  minimumOCamlVersion = "4.08";
 
   useDune2 = true;
 
@@ -57,120 +33,27 @@ buildDunePackage {
     menhir
   ];
 
-  buildInputs =
-    if lib.versionAtLeast version "0.20.0"
-    then [
-      base
-      (if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0)
-      dune-build-info
-      either
-      fix
-      fpath
-      menhirLib
-      menhirSdk
-      ocaml-version
-      ocp-indent
-      (if version == "0.20.0" then odoc-parser.override { version = "0.9.0"; } else odoc-parser)
-      re
-      stdio
-      uuseg
-      uutf
-    ]
-    else if lib.versionAtLeast version "0.19.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      ocp-indent
-      dune-build-info
-      (odoc-parser.override { version = "0.9.0"; })
-    ]
-    else if lib.versionAtLeast version "0.18.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      dune-build-info
-      ocaml-version
-      # Changed since 0.16.0:
-      (ppxlib.override { version = "0.22.0"; })
-    ]
-    else if lib.versionAtLeast version "0.17.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      dune-build-info
-      ocaml-version
-      # Changed since 0.16.0:
-      (ppxlib.override { version = "0.22.0"; })
-      ocaml-migrate-parsetree-2
-    ]
-    else if lib.versionAtLeast version "0.15.1"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      (ppxlib.override { version = "0.18.0"; })
-      dune-build-info # lib.versionAtLeast version "0.16.0"
-      ocaml-version # lib.versionAtLeast version "0.16.0"
-    ]
-    else if lib.versionAtLeast version "0.14"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      ocaml-migrate-parsetree
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-    ] else [
-      base
-      cmdliner_1_0
-      fpath
-      ocaml-migrate-parsetree
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-    ];
+  buildInputs = [
+    base
+    dune-build-info
+    fix
+    fpath
+    menhirLib
+    menhirSdk
+    ocp-indent
+    re
+    stdio
+    uuseg
+    uutf
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ]
+  ++ (if lib.versionAtLeast version "0.20.1"
+      then [ odoc-parser ]
+      else [ (odoc-parser.override { version = "0.9.0"; }) ])
+  ++ (if lib.versionAtLeast version "0.21.0"
+      then [ cmdliner_1_1 ]
+      else [ cmdliner_1_0 ])
+  ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ];
 
   meta = {
     homepage = "https://github.com/ocaml-ppx/ocamlformat";

pkgs/development/tools/pypi-mirror/default.nix

@@ -4,13 +4,13 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "pypi-mirror";
-  version = "4.2.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "montag451";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1ci19bqyhig1s5myzw6klkiycd8k0lzhk3yqfx5fjirc2f0xpz5j";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-x0to3VrnuON1Ghj6LlMOjJfqSVh9eF3Yg6Cdcxtpbc8=";
   };
 
   pythonImportsCheck = [ "pypi_mirror" ];

pkgs/os-specific/linux/nvidia-x11/default.nix

@@ -19,21 +19,21 @@ rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = if stdenv.hostPlatform.system == "x86_64-linux"
     then generic {
-      version = "510.68.02";
-      sha256_64bit = "sha256-vSw0SskrL8ErBgQ1kKT+jU6wzLdNDEk1LwBM8tKZ9MU=";
-      settingsSha256 = "sha256-4TBA/ITpaaBiVDkpj7/Iydei1knRPpruPL4fRrqFAmU=";
-      persistencedSha256 = "sha256-Q1Rk6dAK4pnm6yDK4kmj5Vg4GRbi034C96ypywHYB2I=";
+      version = "515.48.07";
+      sha256_64bit = "sha256-4odkzFsTwy52NwUT2ur8BcKJt37gURVSRQ8aAOMa4eM=";
+      settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
+      persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
     }
     else legacy_390;
 
   # see https://www.nvidia.com/en-us/drivers/unix/ "Production branch"
-  production = legacy_470;
+  production = stable;
 
   beta = generic {
-    version = "510.39.01";
-    sha256_64bit = "sha256-Lj7cOvulhApeuRycIiyYy5kcPv3ZlM8qqpPUWl0bmRs=";
-    settingsSha256 = "sha256-qlSwNq0wC/twvrbQjY+wSTcDaV5KG4Raq6WkzTizyXw=";
-    persistencedSha256 = "sha256-UNrl/hfiNXKGACQ7aHpsNcfcHPWVnycQ51yaa3eKXhI=";
+    version = "515.43.04";
+    sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc=";
+    settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY=";
+    persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo=";
   };
 
   # Vulkan developer beta driver
@@ -54,21 +54,19 @@ rec {
 
   # Last one supporting Kepler architecture
   legacy_470 = generic {
-      version = "470.103.01";
-      sha256_64bit = "VsIwn4nCE0Y7DEY2D3siddc3HTxyevP+3IjElu3Ih6U=";
-      settingsSha256 = "Roc2OFSNEnIGLVwP0D9f8vFTf5v3KkL99S0mZBWN7s0=";
-      persistencedSha256 = "AVI0j2bpfMCMBTKuQp+BoCewaXIW3Xt4NnV1fjAHOr0=";
+      version = "470.129.06";
+      sha256_64bit = "sha256-QQkQtwBuFzBjMnaDKfS1PW+ekcxVXCiJkXWOKo8IqZg=";
+      settingsSha256 = "sha256-vUS4O/c4IrbC8offzUFGLlMdP/Tlz1GwQIV2geRfj/o=";
+      persistencedSha256 = "sha256-jCcYUsbhQ77IOQquXqbTZfh1N0IvKQOWrIMU9rEwSW0=";
   };
 
   # Last one supporting x86
   legacy_390 = generic {
-    version = "390.147";
-    sha256_32bit = "00avsns7l0j1ai8bf8gav2qshvphfdngy388bwzz24p61mfv1i1a";
-    sha256_64bit = "09qcdfn4j5jza3iw59wqwgq4a489qf7kx355yssrcahaw9g87lxz";
-    settingsSha256 = "16qqw0jy31da65cdi17y3j2kcdhw09vra7g17bkcimaqnf70j0ni";
-    persistencedSha256 = "1ad81y4qfpxrx0vqsk81a3h0bi1yg8hw5gi5y5d58p76vc8083i9";
-
-    broken = kernel.kernelAtLeast "5.17";
+    version = "390.151";
+    sha256_32bit = "sha256-lOOZtFllnBKxNE6Mj09e7h7VkV/0WfyLuDHJ4dRGd9s=";
+    sha256_64bit = "sha256-UibkhCBEz/2Qlt6tr2iTTBM9p04FuAzNISNlhLOvsfw=";
+    settingsSha256 = "sha256-teXQa0pQctQl1dvddVJtI7U/vVuMu6ER1Xd99Jprpvw=";
+    persistencedSha256 = "sha256-FxiTXYABplKFcBXr4orhYWiJq4zVePpplMbg2kvEuXk=";
   };
 
   legacy_340 = generic {

pkgs/servers/etcd/3.5.nix

@@ -1,12 +1,12 @@
 { lib, buildGoModule, fetchFromGitHub, symlinkJoin }:
 
 let
-  etcdVersion = "3.5.1";
+  etcdVersion = "3.5.4";
   etcdSrc = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
     rev = "v${etcdVersion}";
-    sha256 = "sha256-Ip7JAWbZBZcc8MXd+Sw05QmTs448fQXpQ5XXo6RW+Gs=";
+    sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM=";
   };
 
   commonMeta = with lib; {
@@ -21,7 +21,7 @@ let
     pname = "etcdserver";
     version = etcdVersion;
 
-    vendorSha256 = "sha256-hJzmxCcwN6MTgE0NpjtFlm8pjZ83clQXv1k5YM8Gmes=";
+    vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw=";
 
     src = etcdSrc;
     modRoot = "./server";
@@ -45,7 +45,7 @@ let
     pname = "etcdutl";
     version = etcdVersion;
 
-    vendorSha256 = "sha256-My0kzsN2i8DgPm2yIkbql3VyMXPaHmQSeaa/uK/RFxo=";
+    vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg=";
 
     src = etcdSrc;
     modRoot = "./etcdutl";
@@ -56,10 +56,10 @@ let
   };
 
   etcdctl = buildGoModule rec {
-    pname = "etcdutl";
+    pname = "etcdctl";
     version = etcdVersion;
 
-    vendorSha256 = "sha256-XZKBA95UrhbiefnDvpaXcBA0wUjnpH+Pb6yXp7yc4HQ=";
+    vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4=";
 
     src = etcdSrc;
     modRoot = "./etcdctl";

pkgs/servers/matrix-synapse/default.nix

@@ -11,11 +11,11 @@ in
 with python3.pkgs;
 buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.59.1";
+  version = "1.60.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EASd+tlPIYQpQP2OOHJSPDzgJZyVoigVfcC2b2c2A2o=";
+    sha256 = "sha256-sR+DZhpAkPpurPs6jSBVphYp12z8qulcQSl3ngcCrcs=";
   };
 
   buildInputs = [ openssl ];

pkgs/servers/mjolnir/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mjolnir";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "mjolnir";
     rev = "v${version}";
-    sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
+    sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM=";
   };
 
   nativeBuildInputs = [