Merge master into haskell-updates

.github/workflows/nixos-manual.yml

@@ -23,4 +23,12 @@ jobs:
     - name: Check DocBook files generated from Markdown are consistent
       run: |
         nixos/doc/manual/md-to-db.sh
-        git diff --exit-code
+        git diff --exit-code || {
+          echo
+          echo 'Generated manual files are out of date.'
+          echo 'Please run'
+          echo
+          echo '    nixos/doc/manual/md-to-db.sh'
+          echo
+          exit 1
+        }

doc/builders/images/dockertools.section.md

@@ -20,7 +20,12 @@ buildImage {
   fromImageName = null;
   fromImageTag = "latest";
 
-  contents = pkgs.redis;
+  copyToRoot = pkgs.buildEnv {
+    name = "image-root";
+    paths = [ pkgs.redis ];
+    pathsToLink = [ "/bin" ];
+  };
+
   runAsRoot = ''
     #!${pkgs.runtimeShell}
     mkdir -p /data
@@ -46,7 +51,7 @@ The above example will build a Docker image `redis/latest` from the given base i
 
 - `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's `null`, in which case `buildImage` will peek the first tag available for the base image.
 
-- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`.
+- `copyToRoot` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`.
 
 - `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`.
 
@@ -81,7 +86,11 @@ pkgs.dockerTools.buildImage {
   name = "hello";
   tag = "latest";
   created = "now";
-  contents = pkgs.hello;
+  copyToRoot = pkgs.buildEnv {
+    name = "image-root";
+    paths = [ pkgs.hello ];
+    pathsToLink = [ "/bin" ];
+  };
 
   config.Cmd = [ "/bin/hello" ];
 }

maintainers/maintainer-list.nix

@@ -6329,6 +6329,12 @@
     github = "jsimonetti";
     githubId = 5478838;
   };
+  jsoo1 = {
+    email = "jsoo1@asu.edu";
+    github = "jsoo1";
+    name = "John Soo";
+    githubId = 10039785;
+  };
   jtcoolen = {
     email = "jtcoolen@pm.me";
     name = "Julien Coolen";
@@ -6699,6 +6705,12 @@
     githubId = 845652;
     name = "Kier Davis";
   };
+  kilimnik = {
+    email = "mail@kilimnik.de";
+    github = "killercup";
+    githubId = 5883283;
+    name = "Daniel Kilimnik";
+  };
   killercup = {
     email = "killercup@gmail.com";
     github = "killercup";
@@ -7200,10 +7212,14 @@
     name = "Daniel Kuehn";
   };
   leo60228 = {
-    email = "iakornfeld@gmail.com";
+    email = "leo@60228.dev";
+    matrix = "@leo60228:matrix.org";
     github = "leo60228";
     githubId = 8355305;
     name = "leo60228";
+    keys = [{
+      fingerprint = "5BE4 98D5 1C24 2CCD C21A  4604 AC6F 4BA0 78E6 7833";
+    }];
   };
   leona = {
     email = "nix@leona.is";
@@ -12642,6 +12658,7 @@
     github = "thiagokokada";
     githubId = 844343;
     name = "Thiago K. Okada";
+    matrix = "@k0kada:matrix.org";
   };
   thibaultlemaire = {
     email = "thibault.lemaire@protonmail.com";

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

@@ -303,6 +303,15 @@
           and require manual remediation.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>dockerTools.buildImage</literal> deprecates the
+          misunderstood <literal>contents</literal> parameter, in favor
+          of <literal>copyToRoot</literal>. Use
+          <literal>copyToRoot = buildEnv { ... };</literal> or similar
+          if you intend to add packages to <literal>/bin</literal>.
+        </para>
+      </listitem>
       <listitem>
         <para>
           memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.

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

@@ -114,6 +114,9 @@ Use `configure.packages` instead.
 
 - 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.
 
+- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.
+  Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.
+
 - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
 
 - Add udev rules for the Teensy family of microcontrollers.

nixos/modules/config/qt5.nix

@@ -9,10 +9,12 @@ let
   isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"];
   isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]);
   isQt5ct = cfg.platformTheme == "qt5ct";
+  isLxqt = cfg.platformTheme == "lxqt";
 
   packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
     else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
     else if isQt5ct then [ pkgs.libsForQt5.qt5ct ]
+    else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]
     else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";
 
 in
@@ -29,6 +31,7 @@ in
         type = types.enum [
           "gtk2"
           "gnome"
+          "lxqt"
           "qt5ct"
         ];
         example = "gnome";
@@ -36,6 +39,7 @@ in
           "qgnomeplatform"
           ["libsForQt5" "qtstyleplugins"]
           ["libsForQt5" "qt5ct"]
+          ["lxqt" "lxqt-qtplugin"]
         ];
         description = ''
           Selects the platform theme to use for Qt5 applications.</para>
@@ -53,6 +57,13 @@ in
                 <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
               </para></listitem>
             </varlistentry>
+            <varlistentry>
+              <term><literal>lxqt</literal></term>
+              <listitem><para>Use LXQt style set using the
+                <link xlink:href="https://github.com/lxqt/lxqt-config">lxqt-config-appearance</link>
+                application.
+              </para></listitem>
+            </varlistentry>
             <varlistentry>
               <term><literal>qt5ct</literal></term>
               <listitem><para>Use Qt style set using the
@@ -108,7 +119,7 @@ in
 
     environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;
 
-    environment.variables.QT_STYLE_OVERRIDE = mkIf (! isQt5ct) cfg.style;
+    environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt)) cfg.style;
 
     environment.systemPackages = packages;
 

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

@@ -20,6 +20,9 @@ in
       path = with pkgs; [
         csdr
         digiham
+        codec2
+        js8call
+        m17-cxx-demod
         alsaUtils
         netcat
       ];

nixos/tests/docker-tools-cross.nix

@@ -24,7 +24,11 @@ let
   hello1 = remoteCrossPkgs.dockerTools.buildImage {
     name = "hello1";
     tag = "latest";
-    contents = remoteCrossPkgs.hello;
+    copyToRoot = remoteCrossPkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ remoteCrossPkgs.hello ];
+    };
   };
 
   hello2 = remoteCrossPkgs.dockerTools.buildLayeredImage {

nixos/tests/installed-tests/flatpak-builder.nix

@@ -6,6 +6,7 @@ makeInstalledTest {
   testConfig = {
     services.flatpak.enable = true;
     xdg.portal.enable = true;
+    xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
     environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
     virtualisation.diskSize = 2048;
   };

pkgs/applications/audio/LibreArp/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "LibreArp";
-  version = "2.2";
+  version = "2.4";
 
   src = fetchFromGitLab {
     owner = "LibreArp";
     repo = "LibreArp";
     rev = version;
-    hash = "sha256-jCUT/sflO9L57xRTqNR90RbwJ0uZ+xJVXnB3n+FhWBo=";
+    hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg=";
     fetchSubmodules = true;
   };
 

pkgs/applications/audio/LibreArp/lv2.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "LibreArp-lv2";
-  version = "2.2";
+  version = "2.4";
 
   src = fetchFromGitLab {
     owner = "LibreArp";
     repo = "LibreArp";
     rev = "${version}-lv2";
-    hash = "sha256-j5SksuhC4ZXXILfOpwXNqIu5fO07a/6tiZ5qUo+p0Ug=";
+    hash = "sha256-x+ZPiU/ZFzrXb8szMS9Ts4JEEyXYpM8CLZHT4lNJWY8=";
     fetchSubmodules = true;
   };
 

pkgs/applications/audio/open-stage-control/default.nix

@@ -0,0 +1,72 @@
+{ pkgs, stdenv, lib, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, nodejs, electron, python3, ... }:
+
+let
+  nodeComposition = import ./node-composition.nix {
+    inherit pkgs nodejs;
+    inherit (stdenv.hostPlatform) system;
+  };
+in
+
+nodeComposition.package.override rec {
+  pname = "open-stage-control";
+  inherit (nodeComposition.args) version;
+
+  src = fetchFromGitHub {
+    owner = "jean-emmanuel";
+    repo = "open-stage-control";
+    rev = "v${version}";
+    hash = "sha256-q18pRtsHfme+OPmi3LhJDK1AdpfkwhoE9LA2rNenDtY=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    python3.pkgs.python-rtmidi
+  ];
+
+  dontNpmInstall = true;
+
+  postInstall = ''
+    # build assets
+    npm run build
+
+    # copy icon
+    install -Dm644 resources/images/logo.png $out/share/icons/hicolor/256x256/apps/open-stage-control.png
+    install -Dm644 resources/images/logo.svg $out/share/icons/hicolor/scalable/apps/open-stage-control.svg
+
+    # wrap electron and include python-rtmidi
+    makeWrapper '${electron}/bin/electron' $out/bin/open-stage-control \
+      --inherit-argv0 \
+      --add-flags $out/lib/node_modules/open-stage-control/app \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PATH : '${lib.makeBinPath [ python3 ]}'
+  '';
+
+  installCheckPhase = ''
+    XDG_CONFIG_HOME="$(mktemp -d)" $out/bin/open-stage-control --help
+  '';
+  doInstallCheck = true;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "open-stage-control";
+      exec = "open-stage-control";
+      icon = "open-stage-control";
+      desktopName = "Open Stage Control";
+      comment = meta.description;
+      categories = [ "Network" "Audio" "AudioVideo" "Midi" ];
+      startupWMClass = "open-stage-control";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Libre and modular OSC / MIDI controller";
+    homepage = "https://openstagecontrol.ammd.net/";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ lilyinstarlight ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/audio/open-stage-control/generate-dependencies.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p jq nodePackages.node2nix
+
+# Get latest release tag
+tag="$(curl -s https://api.github.com/repos/jean-emmanuel/open-stage-control/releases/latest | jq -r .tag_name)"
+
+# Download package.json from the latest release
+curl -s https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/"$tag"/package.json | grep -v '"electron"\|"electron-installer-debian"\|"electron-packager"\|"electron-packager-plugin-non-proprietary-codecs-ffmpeg"' >package.json
+
+# Lock dependencies with node2nix
+node2nix \
+  --node-env ../../../development/node-packages/node-env.nix \
+  --nodejs-16 \
+  --input package.json \
+  --output node-packages.nix \
+  --composition node-composition.nix
+
+rm -f package.json

pkgs/applications/audio/open-stage-control/node-composition.nix

@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.11.1. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
+
+let
+  nodeEnv = import ../../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
+    inherit pkgs nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit nodeEnv;
+}

pkgs/applications/audio/pyradio/default.nix

@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
-  version = "0.8.9.21";
+  version = "0.8.9.22";
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-uaQG840R4twPkE3GYLpcF0MHVH5JaLn5CSAd1DrNOvQ=";
+    sha256 = "sha256-QBgXg2SNEQX1ngY+cEWqStC0zsFZ0Er81tuhTszbHWM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

pkgs/applications/editors/vscode/extensions/cpptools/default.nix

@@ -1,7 +1,8 @@
 { lib, vscode-utils
-, fetchurl, mono, writeScript, runtimeShell
+, fetchurl, writeScript, runtimeShell
 , jq, clang-tools
 , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
+, autoPatchelfHook, makeWrapper, stdenv, lttng-ust, libkrb5, zlib
 }:
 
 /*
@@ -29,47 +30,27 @@
 
 let
   gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
-
-
-  openDebugAD7Script = writeScript "OpenDebugAD7" ''
-    #!${runtimeShell}
-    BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)"
-    ${if gdbUseFixed
-        then ''
-          export PATH=''${PATH}''${PATH:+:}${gdb}/bin
-        ''
-        else ""}
-    ${mono}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $*
-  '';
 in
-
 vscode-utils.buildVscodeMarketplaceExtension rec {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "1.9.1";
+    version = "1.11.0";
+    sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d";
+    arch = "linux-x64";
   };
 
-  vsix = fetchurl {
+  nativeBuildInputs = [
-    name = "${mktplcRef.publisher}-${mktplcRef.name}.gz";
+    autoPatchelfHook
-    url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64";
+    makeWrapper
-    sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI=";
+  ];
-  };
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    gzip -d $src --stdout &> temporary.zip
-    unzip temporary.zip
-    rm temporary.zip
-
-    cd extension/
-
-    runHook postUnpack
-  '';
 
   buildInputs = [
     jq
+    lttng-ust
+    libkrb5
+    zlib
+    stdenv.cc.cc.lib
   ];
 
   postPatch = ''
@@ -85,27 +66,25 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     # Prevent download/install of extensions
     touch "./install.lock"
 
-    # Mono runtimes from nix package (used by generated `OpenDebugAD7`).
-    mv ./debugAdapters/bin/OpenDebugAD7 ./debugAdapters/bin/OpenDebugAD7_orig
-    cp -p "${openDebugAD7Script}" "./debugAdapters/bin/OpenDebugAD7"
-
     # Clang-format from nix package.
-    mv  ./LLVM/ ./LLVM_orig
+    mv ./LLVM/ ./LLVM_orig
     mkdir "./LLVM/"
     find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM"
 
-    # Patching  cpptools and cpptools-srv
+    # Patching binaries
-    elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)"
+    chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7
-    patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools
+    patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so
-    patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools-srv
-    chmod a+x ./bin/cpptools{-srv,}
   '';
 
-    meta = with lib; {
+  postFixup = lib.optionalString gdbUseFixed ''
-      license = licenses.unfree;
+    wrapProgram $out/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7 --prefix PATH : ${lib.makeBinPath [ gdb ]}
-      maintainers = [ maintainers.jraygauthier ];
+  '';
-      # A 32 bit linux would also be possible with some effort (specific download of binaries +
+
-      # patching of the elf files with 32 bit interpreter).
+  meta = with lib; {
-      platforms = [ "x86_64-linux" ];
+    description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging.";
-    };
+    homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ jraygauthier stargate01 ];
+    platforms = [ "x86_64-linux" ];
+  };
 }

pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix

@@ -1,6 +1,9 @@
-{ publisher, name, version, sha256 ? "" }:
+{ publisher, name, version, arch ? "", sha256 ? "" }:
+let
+  archurl = (if arch == "" then "" else "?targetPlatform=${arch}");
+in
 {
-  url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage";
+  url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}";
   sha256 = sha256;
   # The `*.vsix` file is in the end a simple zip file. Change the extension
   # so that existing `unzip` hooks takes care of the unpacking.

pkgs/applications/misc/ArchiSteamFarm/default.nix

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

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

@@ -11,31 +11,30 @@ 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 = "5c7d99928e2d390bc1cd5fa74b2f422aa760d78e";
+    rev = "99278781c3716064dc25e3608a344900ebb05165";
-    sha256 = "04wcmqav2q7dchvjyy0k6g8cv5ff1sw2a238sz38670cnwx569r2";
+    sha256 = "0nly16g39cv4lhnm40w5ci6bdwypk0gp8n70l914907hy0nvz4vg";
   };
 
 in
-  nodePackages.package.override {
+nodePackages.package.override {
-    inherit src;
+  inherit src;
 
-    # upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time)
+  # upstream isn't tagged, but we are using the latest official commit for that specific asf version (assuming both get updated at the same time)
-    version = ArchiSteamFarm.version;
+  version = ArchiSteamFarm.version;
 
-    nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ];
+  nativeBuildInputs = [ pkgs.nodePackages.node-gyp-build ];
 
-    postInstall = ''
+  postInstall = ''
-      patchShebangs node_modules/
+    patchShebangs node_modules/
-      npm run build
+    npm run build
-      cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist
+    cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist
-      rm -rf $out/lib/node_modules/
+    rm -rf $out/lib/node_modules/
-    '';
+  '';
 
-    meta = with lib; {
+  meta = with lib; {
-      description = "The official web interface for ASF";
+    description = "The official web interface for ASF";
-      license = licenses.apsl20;
+    license = licenses.apsl20;
-      homepage = "https://github.com/JustArchiNET/ASF-ui";
+    homepage = "https://github.com/JustArchiNET/ASF-ui";
-      platforms = ArchiSteamFarm.meta.platforms;
+    inherit (ArchiSteamFarm.meta) maintainers platforms;
-      maintainers = with maintainers; [ lom ];
+  };
-    };
+}
-  }

pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix

@@ -31,13 +31,13 @@ let
         sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==";
       };
     };
-    "@babel/core-7.18.2" = {
+    "@babel/core-7.18.5" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.18.2";
+      version = "7.18.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz";
-        sha512 = "A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==";
+        sha512 = "MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==";
       };
     };
     "@babel/eslint-parser-7.18.2" = {
@@ -283,13 +283,13 @@ let
         sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==";
       };
     };
-    "@babel/parser-7.18.0" = {
+    "@babel/parser-7.18.5" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.18.0";
+      version = "7.18.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.0.tgz";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz";
-        sha512 = "AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg==";
+        sha512 = "YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==";
       };
     };
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = {
@@ -904,22 +904,22 @@ let
         sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==";
       };
     };
-    "@babel/traverse-7.18.2" = {
+    "@babel/traverse-7.18.5" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.18.2";
+      version = "7.18.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz";
-        sha512 = "9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==";
+        sha512 = "aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==";
       };
     };
-    "@babel/types-7.18.2" = {
+    "@babel/types-7.18.4" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.18.2";
+      version = "7.18.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.18.2.tgz";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz";
-        sha512 = "0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q==";
+        sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==";
       };
     };
     "@discoveryjs/json-ext-0.5.5" = {
@@ -985,13 +985,13 @@ let
         sha512 = "0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg==";
       };
     };
-    "@fortawesome/vue-fontawesome-2.0.6" = {
+    "@fortawesome/vue-fontawesome-2.0.7" = {
       name = "_at_fortawesome_slash_vue-fontawesome";
       packageName = "@fortawesome/vue-fontawesome";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.6.tgz";
+        url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.7.tgz";
-        sha512 = "V3vT3flY15AKbUS31aZOP12awQI3aAzkr2B1KnqcHLmwrmy51DW3pwyBczKdypV8QxBZ8U68Hl2XxK2nudTxpg==";
+        sha512 = "D1a5FJQeiCFG5a29Re5uNAUAI8SdkCPZlvf0EyfEy9XBVB7tEsL/tfXO6ToXoEOE8CAzJCwuM/PXSCHusXT5/Q==";
       };
     };
     "@humanwhocodes/config-array-0.9.2" = {
@@ -1462,31 +1462,31 @@ let
         sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==";
       };
     };
-    "@webpack-cli/configtest-1.1.1" = {
+    "@webpack-cli/configtest-1.2.0" = {
       name = "_at_webpack-cli_slash_configtest";
       packageName = "@webpack-cli/configtest";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz";
+        url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz";
-        sha512 = "1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==";
+        sha512 = "4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==";
       };
     };
-    "@webpack-cli/info-1.4.1" = {
+    "@webpack-cli/info-1.5.0" = {
       name = "_at_webpack-cli_slash_info";
       packageName = "@webpack-cli/info";
-      version = "1.4.1";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz";
+        url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz";
-        sha512 = "PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==";
+        sha512 = "e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==";
       };
     };
-    "@webpack-cli/serve-1.6.1" = {
+    "@webpack-cli/serve-1.7.0" = {
       name = "_at_webpack-cli_slash_serve";
       packageName = "@webpack-cli/serve";
-      version = "1.6.1";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz";
+        url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz";
-        sha512 = "gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==";
+        sha512 = "oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -1516,15 +1516,6 @@ let
         sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
       };
     };
-    "acorn-7.4.1" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "7.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
-        sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
-      };
-    };
     "acorn-8.7.1" = {
       name = "acorn";
       packageName = "acorn";
@@ -1606,15 +1597,6 @@ let
         sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==";
       };
     };
-    "ajv-8.9.0" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "8.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz";
-        sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==";
-      };
-    };
     "ajv-formats-2.1.1" = {
       name = "ajv-formats";
       packageName = "ajv-formats";
@@ -1732,15 +1714,6 @@ let
         sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
       };
     };
-    "array-union-3.0.1" = {
-      name = "array-union";
-      packageName = "array-union";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz";
-        sha512 = "1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==";
-      };
-    };
     "array-uniq-1.0.3" = {
       name = "array-uniq";
       packageName = "array-uniq";
@@ -2263,13 +2236,13 @@ let
         sha512 = "i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==";
       };
     };
-    "copy-webpack-plugin-10.2.4" = {
+    "copy-webpack-plugin-11.0.0" = {
       name = "copy-webpack-plugin";
       packageName = "copy-webpack-plugin";
-      version = "10.2.4";
+      version = "11.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz";
+        url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz";
-        sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==";
+        sha512 = "fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==";
       };
     };
     "core-js-compat-3.22.3" = {
@@ -2362,15 +2335,6 @@ let
         sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
       };
     };
-    "debug-4.3.2" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
-        sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
-      };
-    };
     "debug-4.3.3" = {
       name = "debug";
       packageName = "debug";
@@ -2713,13 +2677,13 @@ let
         sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
       };
     };
-    "eslint-8.16.0" = {
+    "eslint-8.17.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "8.16.0";
+      version = "8.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz";
+        url = "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz";
-        sha512 = "MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==";
+        sha512 = "gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==";
       };
     };
     "eslint-config-airbnb-base-15.0.0" = {
@@ -2758,13 +2722,13 @@ let
         sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==";
       };
     };
-    "eslint-plugin-vue-7.20.0" = {
+    "eslint-plugin-vue-9.1.1" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "7.20.0";
+      version = "9.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.1.tgz";
-        sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==";
+        sha512 = "W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw==";
       };
     };
     "eslint-scope-5.1.1" = {
@@ -2785,15 +2749,6 @@ let
         sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==";
       };
     };
-    "eslint-utils-2.1.0" = {
-      name = "eslint-utils";
-      packageName = "eslint-utils";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz";
-        sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==";
-      };
-    };
     "eslint-utils-3.0.0" = {
       name = "eslint-utils";
       packageName = "eslint-utils";
@@ -2803,15 +2758,6 @@ let
         sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==";
       };
     };
-    "eslint-visitor-keys-1.3.0" = {
-      name = "eslint-visitor-keys";
-      packageName = "eslint-visitor-keys";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
-        sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==";
-      };
-    };
     "eslint-visitor-keys-2.1.0" = {
       name = "eslint-visitor-keys";
       packageName = "eslint-visitor-keys";
@@ -2830,24 +2776,6 @@ let
         sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==";
       };
     };
-    "espree-6.2.1" = {
-      name = "espree";
-      packageName = "espree";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz";
-        sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==";
-      };
-    };
-    "espree-9.3.1" = {
-      name = "espree";
-      packageName = "espree";
-      version = "9.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz";
-        sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==";
-      };
-    };
     "espree-9.3.2" = {
       name = "espree";
       packageName = "espree";
@@ -3289,13 +3217,13 @@ let
         sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==";
       };
     };
-    "globby-12.2.0" = {
+    "globby-13.1.1" = {
       name = "globby";
       packageName = "globby";
-      version = "12.2.0";
+      version = "13.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz";
+        url = "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz";
-        sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==";
+        sha512 = "XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q==";
       };
     };
     "globby-6.1.0" = {
@@ -3604,15 +3532,6 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
-    "indexes-of-1.0.1" = {
-      name = "indexes-of";
-      packageName = "indexes-of";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz";
-        sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607";
-      };
-    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -4954,22 +4873,13 @@ let
         sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==";
       };
     };
-    "postcss-selector-parser-6.0.2" = {
+    "postcss-selector-parser-6.0.10" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
-      version = "6.0.2";
+      version = "6.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
+        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz";
-        sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==";
+        sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==";
-      };
-    };
-    "postcss-selector-parser-6.0.6" = {
-      name = "postcss-selector-parser";
-      packageName = "postcss-selector-parser";
-      version = "6.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz";
-        sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==";
       };
     };
     "postcss-value-parser-4.2.0" = {
@@ -5341,22 +5251,22 @@ let
         sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
       };
     };
-    "sass-1.52.1" = {
+    "sass-1.52.3" = {
       name = "sass";
       packageName = "sass";
-      version = "1.52.1";
+      version = "1.52.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz";
+        url = "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz";
-        sha512 = "fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==";
+        sha512 = "LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==";
       };
     };
-    "sass-loader-12.6.0" = {
+    "sass-loader-13.0.0" = {
       name = "sass-loader";
       packageName = "sass-loader";
-      version = "12.6.0";
+      version = "13.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz";
+        url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz";
-        sha512 = "oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==";
+        sha512 = "IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q==";
       };
     };
     "schema-utils-2.7.1" = {
@@ -5431,13 +5341,13 @@ let
         sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
       };
     };
-    "semver-7.3.5" = {
+    "semver-7.3.7" = {
       name = "semver";
       packageName = "semver";
-      version = "7.3.5";
+      version = "7.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz";
-        sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
+        sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==";
       };
     };
     "send-0.17.2" = {
@@ -5926,15 +5836,6 @@ let
         sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==";
       };
     };
-    "uniq-1.0.1" = {
-      name = "uniq";
-      packageName = "uniq";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz";
-        sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
-      };
-    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -6034,15 +5935,6 @@ let
         sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==";
       };
     };
-    "vue-eslint-parser-7.11.0" = {
-      name = "vue-eslint-parser";
-      packageName = "vue-eslint-parser";
-      version = "7.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz";
-        sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==";
-      };
-    };
     "vue-eslint-parser-8.3.0" = {
       name = "vue-eslint-parser";
       packageName = "vue-eslint-parser";
@@ -6052,6 +5944,15 @@ let
         sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==";
       };
     };
+    "vue-eslint-parser-9.0.2" = {
+      name = "vue-eslint-parser";
+      packageName = "vue-eslint-parser";
+      version = "9.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.2.tgz";
+        sha512 = "uCPQwTGjOtAYrwnU+76pYxalhjsh7iFBsHwBqDHiOPTxtICDaraO4Szw54WFTNZTAEsgHHzqFOu1mmnBOBRzDA==";
+      };
+    };
     "vue-hot-reload-api-2.3.4" = {
       name = "vue-hot-reload-api";
       packageName = "vue-hot-reload-api";
@@ -6169,13 +6070,13 @@ let
         sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
       };
     };
-    "webpack-5.72.1" = {
+    "webpack-5.73.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "5.72.1";
+      version = "5.73.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz";
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz";
-        sha512 = "dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==";
+        sha512 = "svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==";
       };
     };
     "webpack-bundle-analyzer-4.5.0" = {
@@ -6187,13 +6088,13 @@ let
         sha512 = "GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==";
       };
     };
-    "webpack-cli-4.9.2" = {
+    "webpack-cli-4.10.0" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "4.9.2";
+      version = "4.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz";
-        sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==";
+        sha512 = "NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==";
       };
     };
     "webpack-dev-middleware-5.3.1" = {
@@ -6205,13 +6106,13 @@ let
         sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==";
       };
     };
-    "webpack-dev-server-4.9.1" = {
+    "webpack-dev-server-4.9.2" = {
       name = "webpack-dev-server";
       packageName = "webpack-dev-server";
-      version = "4.9.1";
+      version = "4.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.1.tgz";
+        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz";
-        sha512 = "CTMfu2UMdR/4OOZVHRpdy84pNopOuigVIsRbGX3LVDMWNP8EUgC5mUBMErbwBlHTEX99ejZJpVqrir6EXAEajA==";
+        sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==";
       };
     };
     "webpack-merge-5.8.0" = {
@@ -6322,6 +6223,15 @@ let
         sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==";
       };
     };
+    "xml-name-validator-4.0.0" = {
+      name = "xml-name-validator";
+      packageName = "xml-name-validator";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz";
+        sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==";
+      };
+    };
     "yallist-2.1.2" = {
       name = "yallist";
       packageName = "yallist";
@@ -6350,7 +6260,7 @@ let
       sources."@ampproject/remapping-2.1.1"
       sources."@babel/code-frame-7.16.7"
       sources."@babel/compat-data-7.17.10"
-      (sources."@babel/core-7.18.2" // {
+      (sources."@babel/core-7.18.5" // {
         dependencies = [
           sources."debug-4.3.4"
           sources."json5-2.2.1"
@@ -6400,7 +6310,7 @@ let
       sources."@babel/helper-wrap-function-7.16.8"
       sources."@babel/helpers-7.18.2"
       sources."@babel/highlight-7.16.7"
-      sources."@babel/parser-7.18.0"
+      sources."@babel/parser-7.18.5"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12"
       sources."@babel/plugin-proposal-async-generator-functions-7.17.12"
@@ -6473,19 +6383,17 @@ let
       sources."@babel/preset-modules-0.1.5"
       sources."@babel/runtime-7.14.6"
       sources."@babel/template-7.16.7"
-      (sources."@babel/traverse-7.18.2" // {
+      (sources."@babel/traverse-7.18.5" // {
         dependencies = [
           sources."debug-4.3.3"
           sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.18.2"
+      sources."@babel/types-7.18.4"
       sources."@discoveryjs/json-ext-0.5.5"
       (sources."@eslint/eslintrc-1.3.0" // {
         dependencies = [
           sources."debug-4.3.3"
-          sources."eslint-visitor-keys-3.3.0"
-          sources."espree-9.3.2"
           sources."globals-13.15.0"
           sources."ms-2.1.2"
         ];
@@ -6502,7 +6410,7 @@ let
           sources."@fortawesome/fontawesome-common-types-6.1.1"
         ];
       })
-      sources."@fortawesome/vue-fontawesome-2.0.6"
+      sources."@fortawesome/vue-fontawesome-2.0.7"
       (sources."@humanwhocodes/config-array-0.9.2" // {
         dependencies = [
           sources."debug-4.3.3"
@@ -6566,9 +6474,9 @@ let
       sources."@webassemblyjs/wasm-opt-1.11.1"
       sources."@webassemblyjs/wasm-parser-1.11.1"
       sources."@webassemblyjs/wast-printer-1.11.1"
-      sources."@webpack-cli/configtest-1.1.1"
+      sources."@webpack-cli/configtest-1.2.0"
-      sources."@webpack-cli/info-1.4.1"
+      sources."@webpack-cli/info-1.5.0"
-      sources."@webpack-cli/serve-1.6.1"
+      sources."@webpack-cli/serve-1.7.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."accepts-1.3.8"
@@ -6682,16 +6590,14 @@ let
       sources."cookie-0.4.2"
       sources."cookie-signature-1.0.6"
       sources."copy-to-clipboard-3.3.1"
-      (sources."copy-webpack-plugin-10.2.4" // {
+      (sources."copy-webpack-plugin-11.0.0" // {
         dependencies = [
-          sources."ajv-8.9.0"
+          sources."ajv-8.11.0"
           sources."ajv-keywords-5.1.0"
-          sources."array-union-3.0.1"
           sources."glob-parent-6.0.2"
-          sources."globby-12.2.0"
+          sources."globby-13.1.1"
           sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.0.0"
-          sources."slash-4.0.0"
         ];
       })
       (sources."core-js-compat-3.22.3" // {
@@ -6760,7 +6666,7 @@ let
       sources."escalade-3.1.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-8.16.0" // {
+      (sources."eslint-8.17.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."chalk-4.1.2"
@@ -6769,13 +6675,6 @@ let
           sources."debug-4.3.4"
           sources."escape-string-regexp-4.0.0"
           sources."eslint-scope-7.1.1"
-          (sources."eslint-utils-3.0.0" // {
-            dependencies = [
-              sources."eslint-visitor-keys-2.1.0"
-            ];
-          })
-          sources."eslint-visitor-keys-3.3.0"
-          sources."espree-9.3.2"
           sources."estraverse-5.3.0"
           sources."glob-parent-6.0.2"
           sources."globals-13.15.0"
@@ -6806,22 +6705,23 @@ let
           sources."doctrine-2.1.0"
         ];
       })
-      (sources."eslint-plugin-vue-7.20.0" // {
+      (sources."eslint-plugin-vue-9.1.1" // {
         dependencies = [
-          sources."debug-4.3.2"
+          sources."debug-4.3.4"
+          sources."eslint-scope-7.1.1"
+          sources."estraverse-5.3.0"
           sources."ms-2.1.2"
-          sources."semver-6.3.0"
+          sources."vue-eslint-parser-9.0.2"
-          sources."vue-eslint-parser-7.11.0"
         ];
       })
       sources."eslint-scope-5.1.1"
-      sources."eslint-utils-2.1.0"
+      (sources."eslint-utils-3.0.0" // {
-      sources."eslint-visitor-keys-1.3.0"
-      (sources."espree-6.2.1" // {
         dependencies = [
-          sources."acorn-7.4.1"
+          sources."eslint-visitor-keys-2.1.0"
         ];
       })
+      sources."eslint-visitor-keys-3.3.0"
+      sources."espree-9.3.2"
       (sources."esquery-1.4.0" // {
         dependencies = [
           sources."estraverse-5.2.0"
@@ -6974,7 +6874,6 @@ let
         ];
       })
       sources."imurmurhash-0.1.4"
-      sources."indexes-of-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       (sources."internal-slot-1.0.3" // {
@@ -7147,13 +7046,9 @@ let
       sources."postcss-8.4.12"
       sources."postcss-modules-extract-imports-3.0.0"
       sources."postcss-modules-local-by-default-4.0.0"
-      (sources."postcss-modules-scope-3.0.0" // {
+      sources."postcss-modules-scope-3.0.0"
-        dependencies = [
-          sources."postcss-selector-parser-6.0.6"
-        ];
-      })
       sources."postcss-modules-values-4.0.0"
-      sources."postcss-selector-parser-6.0.2"
+      sources."postcss-selector-parser-6.0.10"
       sources."postcss-value-parser-4.2.0"
       sources."prelude-ls-1.2.1"
       sources."prettier-1.19.1"
@@ -7203,12 +7098,12 @@ let
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."sass-1.52.1"
+      sources."sass-1.52.3"
-      sources."sass-loader-12.6.0"
+      sources."sass-loader-13.0.0"
       sources."schema-utils-3.1.1"
       sources."select-hose-2.0.0"
       sources."selfsigned-2.0.1"
-      (sources."semver-7.3.5" // {
+      (sources."semver-7.3.7" // {
         dependencies = [
           sources."lru-cache-6.0.0"
           sources."yallist-4.0.0"
@@ -7240,6 +7135,7 @@ let
       })
       sources."signal-exit-3.0.3"
       sources."sirv-1.0.17"
+      sources."slash-4.0.0"
       sources."sockjs-0.3.24"
       sources."source-map-js-1.0.2"
       (sources."spdy-4.0.2" // {
@@ -7301,7 +7197,6 @@ let
       sources."unicode-match-property-ecmascript-2.0.0"
       sources."unicode-match-property-value-ecmascript-2.0.0"
       sources."unicode-property-aliases-ecmascript-2.0.0"
-      sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
       sources."uri-js-4.2.2"
       (sources."url-loader-4.1.1" // {
@@ -7326,8 +7221,6 @@ let
         dependencies = [
           sources."debug-4.3.3"
           sources."eslint-scope-7.1.1"
-          sources."eslint-visitor-keys-3.3.0"
-          sources."espree-9.3.1"
           sources."estraverse-5.3.0"
           sources."ms-2.1.2"
         ];
@@ -7345,7 +7238,7 @@ let
       sources."vuex-3.6.2"
       sources."watchpack-2.3.1"
       sources."wbuf-1.7.3"
-      sources."webpack-5.72.1"
+      sources."webpack-5.73.0"
       (sources."webpack-bundle-analyzer-4.5.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -7358,7 +7251,7 @@ let
           sources."ws-7.5.5"
         ];
       })
-      (sources."webpack-cli-4.9.2" // {
+      (sources."webpack-cli-4.10.0" // {
         dependencies = [
           sources."commander-7.2.0"
         ];
@@ -7371,7 +7264,7 @@ let
           sources."schema-utils-4.0.0"
         ];
       })
-      (sources."webpack-dev-server-4.9.1" // {
+      (sources."webpack-dev-server-4.9.2" // {
         dependencies = [
           sources."ajv-8.11.0"
           sources."ajv-keywords-5.1.0"
@@ -7395,6 +7288,7 @@ let
       sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
       sources."ws-8.4.2"
+      sources."xml-name-validator-4.0.0"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;

pkgs/applications/misc/blender/darwin.patch

@@ -1,7 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
+   ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)
+   if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
+     if(APPLE)
+-      if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
++      if(FALSE)
+       # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
+       # with Xcode-11 (the Clang of which doesn't support the flag).
+         message(WARNING
 diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
 --- a/build_files/cmake/platform/platform_apple.cmake
 +++ b/build_files/cmake/platform/platform_apple.cmake
-@@ -77,7 +77,6 @@ else()
+@@ -60,7 +60,6 @@ else()
    message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
  endif()
  if(NOT EXISTS "${LIBDIR}/")
@@ -9,7 +21,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
  endif()
  
  # Prefer lib directory paths
-@@ -114,10 +113,6 @@ if(WITH_CODEC_SNDFILE)
+@@ -98,10 +97,6 @@ if(WITH_CODEC_SNDFILE)
    find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
    find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
    list(APPEND LIBSNDFILE_LIBRARIES
@@ -20,17 +32,26 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
    )
  
    print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
-@@ -134,7 +129,7 @@ if(WITH_PYTHON)
+@@ -118,7 +113,7 @@ if(WITH_PYTHON)
-     # normally cached but not since we include them with blender
+     # Normally cached but not since we include them with blender.
      set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
      set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}")
 -    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a)
 +    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.dylib)
      set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
-     # set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
    else()
-@@ -175,9 +170,7 @@ endif()
+     # Module must be compiled against Python framework.
- if(WITH_CODEC_FFMPEG)
+@@ -147,7 +142,7 @@ endif()
+ 
+ # FreeType compiled with Brotli compression for woff2.
+ find_package(Freetype REQUIRED)
+-list(APPEND FREETYPE_LIBRARIES
++message(TRACE APPEND FREETYPE_LIBRARIES
+   ${LIBDIR}/brotli/lib/libbrotlicommon-static.a
+   ${LIBDIR}/brotli/lib/libbrotlidec-static.a)
+ 
+@@ -159,9 +154,7 @@ if(WITH_CODEC_FFMPEG)
+   set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
    set(FFMPEG_FIND_COMPONENTS
      avcodec avdevice avformat avutil
 -    mp3lame ogg opus swresample swscale
@@ -40,7 +61,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
    find_package(FFmpeg)
  endif()
  
-@@ -275,7 +268,6 @@ if(WITH_BOOST)
+@@ -270,7 +263,6 @@ if(WITH_BOOST)
  endif()
  
  if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
@@ -48,12 +69,12 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
  endif()
  
  if(WITH_PUGIXML)
-@@ -476,7 +468,7 @@ else()
+@@ -399,7 +391,7 @@ endif()
-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
- endif()
  
--if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+ # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
-+if(FALSE)
+ if(WITH_OPENMP)
-   # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+-  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
-   string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
++  if(FALSE)
- endif()
+     # Use OpenMP from our precompiled libraries.
+     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
+     set(OPENMP_CUSTOM ON)

pkgs/applications/misc/blender/default.nix

@@ -76,9 +76,7 @@ stdenv.mkDerivation rec {
       : > build_files/cmake/platform/platform_apple_xcode.cmake
       substituteInPlace source/creator/CMakeLists.txt \
         --replace '${"$"}{LIBDIR}/python' \
-                  '${python}' \
+                  '${python}'
-        --replace '${"$"}{LIBDIR}/openmp' \
-                  '${llvmPackages.openmp}'
       substituteInPlace build_files/cmake/platform/platform_apple.cmake \
         --replace '${"$"}{LIBDIR}/python' \
                   '${python}' \
@@ -159,8 +157,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    # darwin.patch doesn't apply anymore, needs update
-    broken = stdenv.isDarwin;
     description = "3D Creation/Animation/Publishing System";
     homepage = "https://www.blender.org";
     # They comment two licenses: GPLv2 and Blender License, but they

pkgs/applications/misc/dunst/default.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dunst";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "dunst-project";
     repo = "dunst";
     rev = "v${version}";
-    sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU=";
+    sha256 = "sha256-fRPhu+kpwLPvdzIpXSjXFzQTfv4xewOMv/1ZqLJw3dk=";
   };
 
   nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];

pkgs/applications/misc/logseq/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logseq";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchurl {
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    sha256 = "sha256-uMlvpEEzanJ3zTEZKNE2zEfqvGC4IWL97b0AkTfwZeU=";
+    sha256 = "sha256-3YCO0pQT5vUkscQEE4+XrfEkQJro8DpQ5xDLglfqJjI=";
     name = "${pname}-${version}.AppImage";
   };
 

pkgs/applications/networking/browsers/chromium/upstream-info.json

@@ -19,9 +19,9 @@
     }
   },
   "beta": {
-    "version": "104.0.5112.20",
+    "version": "104.0.5112.29",
-    "sha256": "0adzdk3m2l4pjlk82sqavwgxf6a5darbiwchmlrsxc58p9xxag4s",
+    "sha256": "1cjqr1d2cgiwq7vlb26ilyw2r79wgyd7dkxaipmjiqyyrl4bfm6y",
-    "sha256bin64": "1cm5k4gpxc0dn0vdqf3qwwf36pc77va9pnci84zcpaxx0jih7l9b",
+    "sha256bin64": "1vbhm3pm1jgifmg6dc4aqi7xf12dx37spifjs3flq4v2lixg5r6f",
     "deps": {
       "gn": {
         "version": "2022-06-08",

pkgs/applications/networking/browsers/surf/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, fetchgit
 , pkg-config, wrapGAppsHook
 , glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk
-, xorg, dmenu, findutils, gnused, coreutils
+, xorg, dmenu, findutils, gnused, coreutils, gst_all_1
 , patches ? null
 }:
 
@@ -17,7 +17,21 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config wrapGAppsHook ];
-  buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ];
+  buildInputs = [
+    glib
+    gcr
+    glib-networking
+    gsettings-desktop-schemas
+    gtk
+    libsoup
+    webkitgtk
+  ] ++ (with gst_all_1; [
+    # Audio & video support for webkitgtk WebView
+    gstreamer
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-bad
+  ]);
 
   inherit patches;
 

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

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.8.28";
+  version = "0.8.29";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    sha256 = "sha256-Tw/FxrmBpC+FDvfvDT1xQtcQwlxUpQHDMzTs3TrugYg=";
+    sha256 = "sha256-VCscevLGRpBgqxhRNcvIkCdroE0MawG1fROVOLjZLW0=";
   };
 
   CGO_ENABLED = 0;
 
-  vendorSha256 = "sha256-E+fjDW7UIAYDiDI8Eb8atAtccEIRcV5hqYdSxRYM9fc=";
+  vendorSha256 = "sha256-CoIlqDMmhZY+B5SEabmnbP2QUu1jkFluCzLp3Y8Z7n0=";
 
   # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
   subPackages = [

pkgs/applications/networking/cluster/bosh-cli/default.nix

@@ -8,13 +8,13 @@
 buildGoModule rec {
   pname = "bosh-cli";
 
-  version = "6.4.17";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oVL7tBtdFJt6ktctSZiNZMd6g1LEWQ/Hra4rcGM6BnQ=";
+    sha256 = "sha256-CNicDFmWq2tgw3LEw8nOlwewY3cpzwS9ea4fxbwVJc0=";
   };
   vendorSha256 = null;
 

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

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.11.10";
+  version = "0.11.11";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA=";
+    sha256 = "sha256-IZMtkTKslFvbk/qwfZpFZAV6VUj66JKGFewXH1Ujxbw=";
   };
 
   vendorSha256 = null;

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

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cmctl";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "cert-manager";
     repo = "cert-manager";
     rev = "v${version}";
-    sha256 = "sha256-IR+z3+f9Pa7wQAP4EVya7fb7FnndaUY7F2ckTzpEuCA=";
+    sha256 = "sha256-sfC1acnCrcQ4A1tXXcjh47Af6xeJqjdGXy0gK21ZSFg=";
   };
 
   vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI=";

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

@@ -1,21 +1,23 @@
-{ lib, buildGoModule, fetchFromGitHub, stdenv, testers, ocm }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv, testers, ocm }:
 
 buildGoModule rec {
   pname = "ocm";
-  version = "0.1.63";
+  version = "0.1.64";
 
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
     rev = "v${version}";
-    sha256 = "sha256-wBKW2WS1+JmWOFCArmrlVfUTEqFYF7aq1OBrUo7e4ac=";
+    sha256 = "sha256-RMXiEXgf8tAdp2d97kaOzXgFCFVkaMhkJF8AHXIEJm8=";
   };
 
-  vendorSha256 = "sha256-LyQ/F+E0y1gQtpGSyPEB2z2ImorA7mjY3QjrRORakIo=";
+  vendorSha256 = "sha256-4m5Ej2Ql9+wGqrzvXQkY8fL2I9tYE6Tm6s9+qcZBHQI=";
 
   # Strip the final binary.
   ldflags = [ "-s" "-w" ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   # Tests expect the binary to be located in the root directory.
   preCheck = ''
     ln -s $GOPATH/bin/ocm ocm
@@ -24,6 +26,13 @@ buildGoModule rec {
   # Tests fail in Darwin sandbox.
   doCheck = !stdenv.isDarwin;
 
+  postInstall = ''
+    installShellCompletion --cmd ocm \
+      --bash <($out/bin/ocm completion bash) \
+      --fish <($out/bin/ocm completion fish) \
+      --zsh <($out/bin/ocm completion zsh)
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = ocm;
     command = "ocm version";
@@ -34,5 +43,6 @@ buildGoModule rec {
     license = licenses.asl20;
     homepage = "https://github.com/openshift-online/ocm-cli";
     maintainers = with maintainers; [ stehessel ];
+    platforms = platforms.all;
   };
 }

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

@@ -1,26 +1,26 @@
 { buildGoModule, lib, fetchFromGitHub }:
 buildGoModule rec {
   pname = "tgswitch";
-  version = "0.5.389";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "tgswitch";
     rev = version;
-    sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0=";
+    sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ=";
   };
 
-  vendorSha256 = null;
+  vendorSha256 = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog=";
 
   ldflags = [ "-s" "-w" ];
 
   # There are many modifications need to be done to make tests run. For example:
   # 1. Network access
   # 2. Operation on `/var/empty` not permitted on macOS
-  doCheck= false;
+  doCheck = false;
 
   meta = with lib; {
-    description = "A command line tool to switch between different versions of terragrunt";
+    description = "Command line tool to switch between different versions of terragrunt";
     homepage = "https://github.com/warrensbox/tgswitch";
     license = licenses.mit;
     maintainers = with maintainers; [ psibi ];

pkgs/applications/networking/firewalld/default.nix

@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "firewalld";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
     rev = "v${version}";
-    sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";
+    sha256 = "sha256-lLS4ISmx+BgAExiqNpYcSIFpSenRs4Kh25WyvTxPqPg=";
   };
 
   patches = [

pkgs/applications/office/autokey/default.nix

@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   # Tests appear to be broken with import errors within the project structure
   doCheck = false;
 
-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
 
   buildInputs = [
     gobject-introspection
@@ -38,19 +38,9 @@ python3Packages.buildPythonApplication rec {
     pygobject3
   ];
 
-  dontWrapGapps = true;
-
-  pythonPath = with python3Packages; requiredPythonModules [ dbus-python xlib pygobject3 ];
-
   postInstall = ''
-    rm $out/bin/autokey-qt
+    # remove Qt version which we currently do not support
-    buildPythonPath "$out $pythonPath"
+    rm $out/bin/autokey-qt $out/share/applications/autokey-qt.desktop
-    makeWrapperArgs+=(
-      "''${gappsWrapperArgs[@]}"
-      # for autokey-shell ModuleNotFoundError: No module named 'autokey'
-      --prefix "PYTHONPATH" ":" "$out/lib/${python3Packages.python.libPrefix}/site-packages"
-      --prefix "PYTHONPATH" ":" "$program_PYTHONPATH"
-    )
   '';
 
   meta = {

pkgs/applications/office/bookletimposer/configdir.patch

@@ -0,0 +1,20 @@
+diff --git a/lib/bookletimposer/config.py b/lib/bookletimposer/config.py
+index 8f107a4..d4d335d 100644
+--- a/lib/bookletimposer/config.py
++++ b/lib/bookletimposer/config.py
+@@ -45,14 +41,7 @@ def debug(msg):
+ 
+ 
+ def get_sharedir():
+-    if debug_enabled and os.path.exists(os.path.join("/", "usr", "local",
+-                                                     "share",
+-                                                     "bookletimposer")):
+-        return os.path.join("/", "usr", "local", "share")
+-    elif os.path.exists(os.path.join("/", "usr", "share", "bookletimposer")):
+-        return os.path.join("/", "usr", "share")
+-    else:
+-        return ""
++    return os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "share"))
+ 
+ 
+ def get_datadir():

pkgs/applications/office/bookletimposer/default.nix

@@ -0,0 +1,44 @@
+{ lib
+, fetchFromGitLab
+, python3
+, intltool
+, pandoc
+, gobject-introspection
+, wrapGAppsHook
+, gtk3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "bookletimposer";
+  version = "0.3.1";
+
+  src = fetchFromGitLab {
+    domain = "git.codecoop.org";
+    owner = "kjo";
+    repo = "bookletimposer";
+    rev = version;
+    sha256 = "sha256-AEpvsFBJfyqLucC0l4AN/nA2+aYBR50BEgAcNDJBSqg=";
+  };
+
+  patches = [
+    ./i18n.patch
+    ./configdir.patch
+  ];
+
+  nativeBuildInputs = [ intltool pandoc wrapGAppsHook ];
+
+  buildInputs = [ gobject-introspection ];
+
+  propagatedBuildInputs = [
+     gtk3
+     (python3.withPackages (ps: with ps; [ distutils_extra pypdf2 pygobject3 ]))
+  ];
+
+  meta = {
+    homepage = "https://kjo.herbesfolles.org/bookletimposer/";
+    description = "A utility to achieve some basic imposition on PDF documents, especially designed to work on booklets";
+    platforms = lib.platforms.linux;
+    license = "GPL-3.0-or-later";
+    maintainers = with lib.maintainers; [ afontain ];
+  };
+}

pkgs/applications/office/bookletimposer/i18n.patch

@@ -0,0 +1,19 @@
+--- a/setup.cfg	2022-06-04 17:10:10.477581502 +0200
++++ b/setup.cfg	2022-06-04 17:10:15.185594382 +0200
+@@ -1,6 +1,3 @@
+ [build]
+ icons=False
+ help=True
+-
+-[build_i18n]
+-domain=bookletimposer
+--- a/setup.py	2022-06-04 17:25:18.020872735 +0200
++++ b/setup.py	2022-06-04 17:25:23.075884898 +0200
+@@ -115,7 +115,6 @@ It allows:
+       requires = ['gtk', 'PyPDF2'],
+       cmdclass = { "build" :            build_extra.build_extra,
+                    "build_uiheaders" :  build_uiheaders,
+-                   "build_i18n" :       build_i18n.build_i18n,
+                    "build_help" :       build_help.build_help,
+                    "build_icons" :      build_icons.build_icons,
+                    "build_man" :        build_man,

pkgs/applications/radio/m17-cxx-demod/default.nix

@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, codec2 }:
+
+stdenv.mkDerivation rec {
+  pname = "m17-cxx-demod";
+  version = "2.3";
+
+  src = fetchFromGitHub {
+    owner = "mobilinkd";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-mvppkFBmmPVqvlqIqrbwGrOBih5zS5sZrV/usEhHiws=";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ codec2 boost ];
+
+  meta = with lib; {
+    description = "M17 Demodulator in C++";
+    homepage = "https://github.com/mobilinkd/m17-cxx-demod";
+    license = licenses.gpl3Only;
+    platforms = platforms.unix;
+    maintainers = teams.c3d2.members;
+  };
+}

pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch

@@ -0,0 +1,40 @@
+From 69a6ab80cf0908c2a44430c297932ef3659a1655 Mon Sep 17 00:00:00 2001
+From: Jiajie Chen <c@jia.je>
+Date: Wed, 22 Jun 2022 16:24:10 +0800
+Subject: [PATCH 1/2] Fix detection of quartz in gdk-3.0 target
+
+The GTK+3 built by Nix targets ``broadway quartz`` instead of only `quartz`,
+thus the target check is wrong. The script is modified to look up `quartz` in a
+loop. The variable name is renamed to `targets` in `gdk-3.0.pc` as well.
+
+---
+ configure | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 628a80f..9cb88d5 100755
+--- a/configure
++++ b/configure
+@@ -7361,7 +7361,10 @@ $as_echo "yes" >&6; }
+ fi
+         GTK_VER=`$PKG_CONFIG gtk+-3.0 --modversion`
+ 
+-        _gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0`
++        # gdk-3.0 may have multiple targets e.g. "broadway quartz"
++        _gdk_tgts=`$PKG_CONFIG --variable=targets gdk-3.0`
++        for _gdk_tgt in $_gdk_tgts;
++        do
+         if test "x$_gdk_tgt" = xquartz; then
+ 
+ pkg_failed=no
+@@ -7466,6 +7469,7 @@ fi
+            COCOA_GTK_LDFLAGS="-framework Cocoa -framework ApplicationServices"
+ 
+         fi
++        done
+ 
+         if test x$with_gconf = xyes; then
+ 
+-- 
+2.36.1
+

pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch

@@ -0,0 +1,101 @@
+From 6045177a0d4753bb7a6a6ffc3f1a4a3e96129c6d Mon Sep 17 00:00:00 2001
+From: Jiajie Chen <c@jia.je>
+Date: Wed, 22 Jun 2022 17:03:29 +0800
+Subject: [PATCH 2/2] Check GDK_WINDOWING_X11 macro when using GtkPlug
+
+---
+ src/main.c     |  5 +++++
+ src/twinwave.c | 12 ++++++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 81bf505..b89f629 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -2080,10 +2080,15 @@ if(!GLOBALS->socket_xid)
+ #ifdef WAVE_USE_XID
+ 	else
+ 	{
++#ifdef GDK_WINDOWING_X11
+         GLOBALS->mainwindow = gtk_plug_new(GLOBALS->socket_xid);
+         gtk_widget_show(GLOBALS->mainwindow);
+ 
+         g_signal_connect(XXX_GTK_OBJECT(GLOBALS->mainwindow), "destroy",   /* formerly was "destroy" */G_CALLBACK(plug_destroy),"Plug destroy");
++#else
++	fprintf(stderr, "GTKWAVE | GtkPlug widget is unavailable\n");
++	exit(1);
++#endif
+ 	}
+ #endif
+ }
+diff --git a/src/twinwave.c b/src/twinwave.c
+index 590c7f6..d5c60f2 100644
+--- a/src/twinwave.c
++++ b/src/twinwave.c
+@@ -143,15 +143,19 @@ if(GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default()))
+ 	use_embedded = 0;
+ 	}
+ #endif
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ 	{
+ 	xsocket[0] = gtk_socket_new ();
+ 	xsocket[1] = gtk_socket_new ();
+ 	gtk_widget_show (xsocket[0]);
+ 	gtk_widget_show (xsocket[1]);
+ 	}
++#endif
+ 
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ if(!twinwayland)
+ g_signal_connect(XXX_GTK_OBJECT(xsocket[0]), "plug-removed", G_CALLBACK(plug_removed), NULL);
++#endif
+ 
+ #if GTK_CHECK_VERSION(3,0,0)
+ main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+@@ -208,7 +212,7 @@ if(hMapFile != NULL)
+ 				memset(&pi, 0, sizeof(PROCESS_INFORMATION));
+ 
+ 				sprintf(buf, "0+%08X", shmid);
+-#ifdef MINGW_USE_XID
++#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ 				sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
+ #else
+ 				sprintf(buf2, "%x", 0);
+@@ -279,7 +283,7 @@ if(hMapFile != NULL)
+ 				memset(&pi, 0, sizeof(PROCESS_INFORMATION));
+ 
+ 				sprintf(buf, "1+%08X", shmid);
+-#ifdef MINGW_USE_XID
++#if defined(MINGW_USE_XID) && defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ 				sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
+ #else
+ 				sprintf(buf2, "%x", 0);
+@@ -429,10 +433,12 @@ if(shmid >=0)
+ 				sprintf(buf, "0+%08X", shmid);
+ 				if(use_embedded)
+ 					{
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ #ifdef MAC_INTEGRATION
+ 					sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
+ #else
+ 					sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[0])));
++#endif
+ #endif
+ 					}
+ 					else
+@@ -467,10 +473,12 @@ if(shmid >=0)
+ 			sprintf(buf, "1+%08X", shmid);
+ 			if(use_embedded)
+ 				{
++#if defined(__GTK_SOCKET_H__) && defined(GDK_WINDOWING_X11)
+ #ifdef MAC_INTEGRATION
+ 				sprintf(buf2, "%x", gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
+ #else
+ 				sprintf(buf2, "%lx", (long)gtk_socket_get_id (GTK_SOCKET(xsocket[1])));
++#endif
+ #endif
+ 				}
+ 				else
+-- 
+2.36.1
+

pkgs/applications/science/electronics/gtkwave/default.nix

@@ -3,6 +3,7 @@
 , glib
 , gperf
 , gtk3
+, gtk-mac-integration
 , judy
 , lib
 , pkg-config
@@ -23,7 +24,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config wrapGAppsHook ];
-  buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ];
+  buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ]
+    ++ lib.optional stdenv.isDarwin gtk-mac-integration;
+
+  # fix compilation under Darwin
+  # remove these patches upon next release
+  # https://github.com/gtkwave/gtkwave/pull/136
+  patches = [
+    ./0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
+    ./0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
+  ];
 
   configureFlags = [
     "--with-tcl=${tcl}/lib"
@@ -36,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "VCD/Waveform viewer for Unix and Win32";
     homepage = "http://gtkwave.sourceforge.net";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ thoughtpolice ];
+    maintainers = with lib.maintainers; [ thoughtpolice jiegec ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

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

@@ -1,10 +1,9 @@
 { lib
 , callPackage
 , fetchFromGitHub
-, fetchpatch
 , cmake
-, llvmPackages_9
+, llvmPackages_11
-, clang_9
+, clang
 , python3
 , zlib
 , z3
@@ -36,31 +35,43 @@
 }:
 
 let
+
   # Python used for KLEE tests.
   kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
 
   # The klee-uclibc derivation.
   kleeuClibc = callPackage ./klee-uclibc.nix {
-    inherit clang_9 llvmPackages_9 extraKleeuClibcConfig debugRuntime runtimeAsserts;
+    inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts;
   };
+
 in
-clang_9.stdenv.mkDerivation rec {
+clang.stdenv.mkDerivation rec {
+
   pname = "klee";
-  version = "2.2";
+  version = "2.3";
+
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee";
     rev = "v${version}";
-    sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M=";
+    sha256 = "sha256-E1c6K6Q+LAWm342W8I00JI6+LMvqmULHZLkv9Kj5RmY=";
   };
+
   buildInputs = [
-    llvmPackages_9.llvm
+    cryptominisat
-    z3 stp cryptominisat
+    gperftools
-    gperftools sqlite
+    lit # Configure phase checking for lit
+    llvmPackages_11.llvm
+    sqlite
+    stp
+    z3
   ];
+
   nativeBuildInputs = [
-    cmake clang_9
+    clang
+    cmake
   ];
+
   checkInputs = [
     gtest
 
@@ -94,34 +105,7 @@ clang_9.stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  patches = map fetchpatch [
-    /* This patch is currently necessary for the unit test suite to run correctly.
-     * See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html
-     * and https://github.com/klee/klee/pull/1458 for more information.
-     */
-    {
-      name = "fix-gtest";
-      sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4=";
-      url = "https://github.com/klee/klee/pull/1458.patch";
-    }
-
-    # This patch fixes test compile issues with glibc 2.33+.
-    {
-      name = "fix-glibc-2.33";
-      sha256 = "PzxqtFyLy9KF1eA9AAKg1tu+ggRdvu7leuvXifayIcc=";
-      url = "https://github.com/klee/klee/pull/1385.patch";
-    }
-
-    # /etc/mtab doesn't exist in the Nix build sandbox.
-    {
-      name = "fix-etc-mtab-in-tests";
-      sha256 = "2Yb/rJA791esNNqq8uAXV+MML4YXIjPKkHBOufvyRoQ=";
-      url = "https://github.com/klee/klee/pull/1471.patch";
-    }
-  ];
-
   doCheck = true;
-  checkTarget = "check";
 
   passthru = {
     # Let the user depend on `klee.uclibc` for klee-uclibc

pkgs/applications/science/logic/klee/klee-uclibc.nix

@@ -3,9 +3,10 @@
 , fetchFromGitHub
 , which
 , linuxHeaders
-, clang_9
+, clang
-, llvmPackages_9
+, llvmPackages_11
 , python3
+, curl
 , debugRuntime ? true
 , runtimeAsserts ? false
 , extraKleeuClibcConfig ? {}
@@ -23,18 +24,20 @@ let
     "DEVEL_PREFIX" = "/";
   });
 in
-clang_9.stdenv.mkDerivation rec {
+clang.stdenv.mkDerivation rec {
   pname = "klee-uclibc";
-  version = "1.2";
+  version = "1.3";
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee-uclibc";
     rev = "klee_uclibc_v${version}";
-    sha256 = "qdrGMw+2XwpDsfxdv6swnoaoACcF5a/RWgUxUYbtPrI=";
+    sha256 = "sha256-xQ8GWa0Gmd3lbwKodJhrsZeuR4j7NT4zIUh+kNhVY/w=";
   };
+
   nativeBuildInputs = [
-    clang_9
+    clang
-    llvmPackages_9.llvm
+    curl
+    llvmPackages_11.llvm
     python3
     which
   ];
@@ -44,7 +47,7 @@ clang_9.stdenv.mkDerivation rec {
 
   # HACK: needed for cross-compile.
   # See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html
-  KLEE_CFLAGS = "-idirafter ${clang_9}/resource-root/include";
+  KLEE_CFLAGS = "-idirafter ${clang}/resource-root/include";
 
   prePatch = ''
     patchShebangs ./configure

pkgs/applications/version-management/gitlab-triage/Gemfile.lock

@@ -1,36 +1,38 @@
+GEM
+  specs:
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
-    gitlab-triage (1.20.0)
+    gitlab-triage (1.23.1)
-      activesupport (~> 5.1)
+      activesupport (>= 5.1)
       globalid (~> 0.4)
       graphql-client (~> 0.16)
       httparty (~> 0.17)
-    globalid (0.5.2)
+    globalid (0.6.0)
       activesupport (>= 5.0)
-    graphql (1.12.14)
+    graphql (2.0.11)
-    graphql-client (0.16.0)
+    graphql-client (0.18.0)
       activesupport (>= 3.0)
-      graphql (~> 1.8)
+      graphql
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2022.0105)
-    minitest (5.14.4)
+    minitest (5.16.2)
     multi_xml (0.6.0)
-    thread_safe (0.3.6)
+    tzinfo (2.0.4)
-    tzinfo (1.2.9)
+      concurrent-ruby (~> 1.0)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -40,4 +42,4 @@ DEPENDENCIES
   gitlab-triage!
 
 BUNDLED WITH
-   2.1.4
+   2.3.9

pkgs/applications/version-management/gitlab-triage/default.nix

@@ -1,10 +1,12 @@
-{ lib, bundlerApp }:
+{ lib, bundlerApp, bundlerUpdateScript }:
 
 bundlerApp {
   pname = "gitlab-triage";
   gemdir = ./.;
   exes = [ "gitlab-triage" ];
 
+  passthru.updateScript = bundlerUpdateScript "gitlab-triage";
+
   meta = with lib; {
     description = "GitLab's issues and merge requests triage, automated!";
     homepage = "https://gitlab.com/gitlab-org/gitlab-triage";

pkgs/applications/version-management/gitlab-triage/gemset.nix

@@ -5,20 +5,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
+      sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj";
       type = "gem";
     };
-    version = "5.2.6";
+    version = "7.0.3";
   };
   concurrent-ruby = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
       type = "gem";
     };
-    version = "1.1.9";
+    version = "1.1.10";
   };
   gitlab-triage = {
     dependencies = ["activesupport" "globalid" "graphql-client" "httparty"];
@@ -26,10 +26,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "sha256-sg/YgRnp1+EcTcBqsm8vZrV0YuHTSJEFk/whhW8An6g=";
+      sha256 = "1vs120wyqm12xy66nv0723cy3m66g5lhhdd37izbc9qwyq03m729";
       type = "gem";
     };
-    version = "1.20.0";
+    version = "1.23.1";
   };
   globalid = {
     dependencies = ["activesupport"];
@@ -37,20 +37,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm";
+      sha256 = "1xk28839pi36yzlqgh7k5wqmiphz7wg2c2r2wzfvs2s7g63hy3nv";
       type = "gem";
     };
-    version = "0.5.2";
+    version = "0.6.0";
   };
   graphql = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "sha256-iweRDvp7EWY02B52iwbebEpiwL7Mj9E9RyeHYMuqc/o=";
+      sha256 = "18k3wh73mb7rs469wfn4m10d1rlg2v9chd89nf7vy8z3yjbf9nl4";
       type = "gem";
     };
-    version = "1.12.14";
+    version = "2.0.11";
   };
   graphql-client = {
     dependencies = ["activesupport" "graphql"];
@@ -58,10 +58,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4";
+      sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq";
       type = "gem";
     };
-    version = "0.16.0";
+    version = "0.18.0";
   };
   httparty = {
     dependencies = ["mime-types" "multi_xml"];
@@ -69,10 +69,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17gpnbf2a7xkvsy20jig3ljvx8hl5520rqm9pffj2jrliq1yi3w7";
+      sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9";
       type = "gem";
     };
-    version = "0.18.1";
+    version = "0.20.0";
   };
   i18n = {
     dependencies = ["concurrent-ruby"];
@@ -80,10 +80,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
+      sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
       type = "gem";
     };
-    version = "1.8.10";
+    version = "1.10.0";
   };
   mime-types = {
     dependencies = ["mime-types-data"];
@@ -91,30 +91,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.4.1";
   };
   mime-types-data = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy";
+      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
       type = "gem";
     };
-    version = "3.2021.0704";
+    version = "3.2022.0105";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
+      sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1";
       type = "gem";
     };
-    version = "5.14.4";
+    version = "5.16.2";
   };
   multi_xml = {
     groups = ["default"];
@@ -126,25 +126,15 @@
     };
     version = "0.6.0";
   };
-  thread_safe = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
-      type = "gem";
-    };
-    version = "0.3.6";
-  };
   tzinfo = {
-    dependencies = ["thread_safe"];
+    dependencies = ["concurrent-ruby"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
+      sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
       type = "gem";
     };
-    version = "1.2.9";
+    version = "2.0.4";
   };
 }

pkgs/applications/version-management/pijul/default.nix

@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pijul";
-  version = "1.0.0-beta.1";
+  version = "1.0.0-beta.2";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "sha256-XdbZFWtHKXjcGV1vYn7MYdevW+Vc/IKON1DOU49Kzlo=";
+    sha256 = "sha256-78nzCOR+AZuiAA1OpKKW4kfdUnlN8+qVaO3dknMck58=";
   };
 
-  cargoSha256 = "sha256-9kPeJ0tOhA4oqFOdwGDkXMnNViklMlNO7VbbWXYrk3I=";
+  cargoSha256 = "sha256-IhjN0HjIIuP+P8yfZ3NmZpVZBAuetOr4OVZoI8Qfspo=";
 
   doCheck = false;
   nativeBuildInputs = [ pkg-config ];

pkgs/applications/video/anime-downloader/default.nix

@@ -11,12 +11,6 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o=";
   };
 
-  buildInputs = with python3.pkgs; [
-    jsbeautifier
-    pycryptodome
-    requests
-  ];
-
   propagatedBuildInputs = [
     aria2
     mpv
@@ -27,8 +21,11 @@ python3.pkgs.buildPythonApplication rec {
     click
     coloredlogs
     fuzzywuzzy
+    jsbeautifier
+    pycryptodome
     pySmartDL
     pyqt5
+    requests
     requests-cache
     selenium
     tabulate

pkgs/applications/virtualization/virtualbox/default.nix

@@ -3,6 +3,7 @@
 , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
+, fetchpatch
 # If open-watcom-bin is not passed, VirtualBox will fall back to use
 # the shipped alternative sources (assembly).
 , open-watcom-bin
@@ -98,8 +99,12 @@ in stdenv.mkDerivation {
     # https://github.com/NixOS/nixpkgs/issues/123851
     ./fix-audio-driver-loading.patch
     # NOTE: both patches below should be removed when updating to 6.1.35
-    # https://www.virtualbox.org/ticket/20914#comment:6
+    # https://www.virtualbox.org/ticket/20914#comment:15
-    ./linux518.patch
+    (fetchpatch {
+      url = "https://www.virtualbox.org/raw-attachment/ticket/20914/vbox-linux-5.19.patch";
+      hash = "sha512-NNiMf8kUuM/PimrQCOacYLkrf7UFPh6ZdPsXKyLlsqWfWQXkG92Fv3qZXvg8weE1Z/SBsFTuHICEI4b4l1wZFw==";
+      extraPrefix = "/";
+    })
     # https://www.virtualbox.org/ticket/20904#comment:22
     ./ffreestanding.patch
   ];

pkgs/applications/virtualization/virtualbox/linux518.patch

@@ -1,285 +0,0 @@
-Index: include/VBox/sup.h
-===================================================================
---- trunk/include/VBox/sup.h	(revision 151556)
-+++ trunk/include/VBox/sup.h	(working copy)
-@@ -2142,6 +2142,26 @@
-  */
- SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void);
- 
-+/**
-+ * Notification from R0 VMM prior to loading the guest-FPU register state.
-+ *
-+ * @returns Whether the host-FPU register state has been saved by the host kernel.
-+ * @param   fCtxHook    Whether thread-context hooks are enabled.
-+ *
-+ * @remarks Called with preemption disabled.
-+ */
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook);
-+
-+/**
-+ * Notification from R0 VMM prior to saving the guest-FPU register state (and
-+ * potentially restoring the host-FPU register state) in ring-0.
-+ *
-+ * @param   fCtxHook    Whether thread-context hooks are enabled.
-+ *
-+ * @remarks Called with preemption disabled.
-+ */
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook);
-+
- /** @copydoc RTLogGetDefaultInstanceEx
-  * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */
- SUPR0DECL(struct RTLOGGER *) SUPR0GetDefaultLogInstanceEx(uint32_t fFlagsAndGroup);
-Index: src/VBox/Additions/linux/sharedfolders/regops.c
-===================================================================
---- trunk/src/VBox/Additions/linux/sharedfolders/regops.c	(revision 151556)
-+++ trunk/src/VBox/Additions/linux/sharedfolders/regops.c	(working copy)
-@@ -3823,7 +3823,9 @@
-     .readpage       = vbsf_readpage,
-     .writepage      = vbsf_writepage,
-     /** @todo Need .writepages if we want msync performance...  */
--#if RTLNX_VER_MIN(2,5,12)
-+#if RTLNX_VER_MIN(5,18,0)
-+    .dirty_folio = filemap_dirty_folio,
-+#elif RTLNX_VER_MIN(2,5,12)
-     .set_page_dirty = __set_page_dirty_buffers,
- #endif
- #if RTLNX_VER_MIN(5,14,0)
-Index: src/VBox/Additions
-===================================================================
---- trunk/src/VBox/Additions	(revision 151556)
-+++ trunk/src/VBox/Additions	(working copy)
-
-Property changes on: src/VBox/Additions
-___________________________________________________________________
-Modified: svn:mergeinfo
-## -0,0 +0,1 ##
-   Merged /trunk/src/VBox/Additions:r150844
-Index: src/VBox/HostDrivers/Support/SUPDrv.cpp
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(working copy)
-@@ -98,6 +98,18 @@
- # endif
- #endif
- 
-+#if defined(RT_OS_LINUX) && !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
-+/* In Linux 5.18-rc1, memcpy became a wrapper which does fortify checks
-+ * before triggering __underlying_memcpy() call. We do not pass these checks here,
-+ * so bypass them for now.  */
-+# if RTLNX_VER_MIN(5,18,0)
-+#  define SUPDRV_MEMCPY __underlying_memcpy
-+# else
-+# define SUPDRV_MEMCPY  memcpy
-+# endif
-+#else
-+# define SUPDRV_MEMCPY  memcpy
-+#endif
- 
- /*
-  * Logging assignments:
-@@ -266,6 +278,8 @@
-     SUPEXP_STK_BACK(    2,  SUPR0ContFree),
-     SUPEXP_STK_BACK(    2,  SUPR0ChangeCR4),
-     SUPEXP_STK_BACK(    1,  SUPR0EnableVTx),
-+    SUPEXP_STK_OKAY(    1,  SUPR0FpuBegin),
-+    SUPEXP_STK_OKAY(    1,  SUPR0FpuEnd),
-     SUPEXP_STK_BACK(    0,  SUPR0SuspendVTxOnCpu),
-     SUPEXP_STK_BACK(    1,  SUPR0ResumeVTxOnCpu),
-     SUPEXP_STK_OKAY(    1,  SUPR0GetCurrentGdtRw),
-@@ -1742,7 +1756,7 @@
- 
-             /* execute */
-             pReq->u.Out.cFunctions = RT_ELEMENTS(g_aFunctions);
--            memcpy(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
-+            SUPDRV_MEMCPY(&pReq->u.Out.aFunctions[0], g_aFunctions, sizeof(g_aFunctions));
-             pReq->Hdr.rc = VINF_SUCCESS;
-             return 0;
-         }
-Index: src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp	(working copy)
-@@ -2002,6 +2002,18 @@
- }
- 
- 
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
- /*
-  *
-  * org_virtualbox_SupDrv
-Index: src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c	(working copy)
-@@ -640,3 +640,16 @@
-     return 0;
- }
- 
-+
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-Index: src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c	(working copy)
-@@ -1454,6 +1454,31 @@
- }
- 
- 
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+#if RTLNX_VER_MIN(5,18,0)
-+    kernel_fpu_begin();
-+    /* if (fCtxHook) */
-+        preempt_enable();  /* HACK ALERT! undo the implicit preempt_disable() in kernel_fpu_begin(). */
-+    return true;
-+#else
-+    return false;
-+#endif
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+#if RTLNX_VER_MIN(5,18,0)
-+    /* if (fCtxHook) */
-+        preempt_disable();  /* HACK ALERT! undo the implicit preempt_enable() in SUPR0FpuBegin(). */
-+    kernel_fpu_end();
-+#endif
-+}
-+
-+
- int VBOXCALL    supdrvOSGetCurrentGdtRw(RTHCUINTPTR *pGdtRw)
- {
- #if RTLNX_VER_MIN(4,12,0)
-Index: src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp	(working copy)
-@@ -541,3 +541,16 @@
-     return 0;
- }
- 
-+
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-Index: src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(working copy)
-@@ -1309,3 +1309,16 @@
-     return 0;
- }
- 
-+
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-Index: src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
-===================================================================
---- trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp	(working copy)
-@@ -2704,6 +2704,19 @@
- }
- 
- 
-+SUPR0DECL(bool) SUPR0FpuBegin(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+    return false;
-+}
-+
-+
-+SUPR0DECL(void) SUPR0FpuEnd(bool fCtxHook)
-+{
-+    RT_NOREF(fCtxHook);
-+}
-+
-+
- SUPR0DECL(int) SUPR0IoCtlSetupForHandle(PSUPDRVSESSION pSession, intptr_t hHandle, uint32_t fFlags, PSUPR0IOCTLCTX *ppCtx)
- {
-     /*
-Index: src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-===================================================================
---- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	(revision 151556)
-+++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	(working copy)
-@@ -2311,7 +2311,13 @@
-                 vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
-                 Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
-                 Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
-+#if RTLNX_VER_MIN(5,18,0)
-+                local_bh_disable();
-+                err = netif_rx(pBuf);
-+                local_bh_enable();
-+#else
-                 err = netif_rx_ni(pBuf);
-+#endif
-                 if (err)
-                     rc = RTErrConvertFromErrno(err);
-             }
-Index: src/VBox/VMM/VMMR0/CPUMR0.cpp
-===================================================================
---- trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp	(revision 151556)
-+++ trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp	(working copy)
-@@ -440,6 +440,9 @@
-     Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST));
-     Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_SYNC_FPU_STATE));
- 
-+    /* Notify the support driver prior to loading the guest-FPU register state. */
-+    SUPR0FpuBegin(false /* unused */);
-+
-     if (!pVM->cpum.s.HostFeatures.fLeakyFxSR)
-     {
-         Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE));
-@@ -484,6 +487,9 @@
-     Assert(ASMGetCR4() & X86_CR4_OSFXSR);
-     if (pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU_GUEST | CPUM_USED_FPU_HOST))
-     {
-+        /* Notify the support driver prior to loading the host-FPU register state. */
-+        SUPR0FpuEnd(false /* unused */);
-+
-         fSavedGuest = RT_BOOL(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST);
-         if (!(pVCpu->cpum.s.fUseFlags & CPUM_USED_MANUAL_XMM_RESTORE))
-             cpumR0SaveGuestRestoreHostFPUState(&pVCpu->cpum.s);

pkgs/build-support/docker/default.nix

@@ -332,7 +332,7 @@ rec {
     , # JSON containing configuration and metadata for this layer.
       baseJson
     , # Files to add to the layer.
-      contents ? null
+      copyToRoot ? null
     , # When copying the contents into the image, preserve symlinks to
       # directories (see `rsync -K`).  Otherwise, transform those symlinks
       # into directories.
@@ -344,7 +344,8 @@ rec {
     }:
     runCommand "docker-layer-${name}"
       {
-        inherit baseJson contents extraCommands;
+        inherit baseJson extraCommands;
+        contents = copyToRoot;
         nativeBuildInputs = [ jshon rsync tarsum ];
       }
       ''
@@ -390,7 +391,8 @@ rec {
     , # Script to run as root. Bash.
       runAsRoot
     , # Files to add to the layer. If null, an empty layer will be created.
-      contents ? null
+      # To add packages to /bin, use `buildEnv` or similar.
+      copyToRoot ? null
     , # When copying the contents into the image, preserve symlinks to
       # directories (see `rsync -K`).  Otherwise, transform those symlinks
       # into directories.
@@ -418,9 +420,9 @@ rec {
 
       inherit fromImage fromImageName fromImageTag diskSize;
 
-      preMount = lib.optionalString (contents != null && contents != [ ]) ''
+      preMount = lib.optionalString (copyToRoot != null && copyToRoot != [ ]) ''
         echo "Adding contents..."
-        for item in ${escapeShellArgs (map (c: "${c}") (toList contents))}; do
+        for item in ${escapeShellArgs (map (c: "${c}") (toList copyToRoot))}; do
           echo "Adding $item..."
           rsync -a${if keepContentsDirlinks then "K" else "k"} --chown=0:0 $item/ layer/
         done
@@ -500,7 +502,7 @@ rec {
     , # Tag of the parent image; will be read from the image otherwise.
       fromImageTag ? null
     , # Files to put on the image (a nix store path or list of paths).
-      contents ? null
+      copyToRoot ? null
     , # When copying the contents into the image, preserve symlinks to
       # directories (see `rsync -K`).  Otherwise, transform those symlinks
       # into directories.
@@ -517,10 +519,20 @@ rec {
       diskSize ? 1024
     , # Time of creation of the image.
       created ? "1970-01-01T00:00:01Z"
+    , # Deprecated.
+      contents ? null
     ,
     }:
 
     let
+      checked =
+        lib.warnIf (contents != null)
+          "in docker image ${name}: The contents parameter is deprecated. Change to copyToRoot if the contents are designed to be copied to the root filesystem, such as when you use `buildEnv` or similar between contents and your packages. Use copyToRoot = buildEnv { ... }; or similar if you intend to add packages to /bin."
+        lib.throwIf (contents != null && copyToRoot != null) "in docker image ${name}: You can not specify both contents and copyToRoot."
+        ;
+
+      rootContents = if copyToRoot == null then contents else copyToRoot;
+
       baseName = baseNameOf name;
 
       # Create a JSON blob of the configuration. Set the date to unix zero.
@@ -545,13 +557,15 @@ rec {
           mkPureLayer
             {
               name = baseName;
-              inherit baseJson contents keepContentsDirlinks extraCommands uid gid;
+              inherit baseJson keepContentsDirlinks extraCommands uid gid;
+              copyToRoot = rootContents;
             } else
           mkRootLayer {
             name = baseName;
             inherit baseJson fromImage fromImageName fromImageTag
-              contents keepContentsDirlinks runAsRoot diskSize
+              keepContentsDirlinks runAsRoot diskSize
               extraCommands;
+            copyToRoot = rootContents;
           };
       result = runCommand "docker-image-${baseName}.tar.gz"
         {
@@ -715,7 +729,7 @@ rec {
       '';
 
     in
-    result;
+    checked result;
 
   # Merge the tarballs of images built with buildImage into a single
   # tarball that contains all images. Running `docker load` on the resulting
@@ -776,12 +790,14 @@ rec {
   # contents. The main purpose is to be able to use nix commands in
   # the container.
   # Be careful since this doesn't work well with multilayer.
-  buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: (
+  # TODO: add the dependencies of the config json.
+  buildImageWithNixDb = args@{ copyToRoot ? contents, contents ? null, extraCommands ? "", ... }: (
     buildImage (args // {
-      extraCommands = (mkDbExtraCommand contents) + extraCommands;
+      extraCommands = (mkDbExtraCommand copyToRoot) + extraCommands;
     })
   );
 
+  # TODO: add the dependencies of the config json.
   buildLayeredImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: (
     buildLayeredImage (args // {
       extraCommands = (mkDbExtraCommand contents) + extraCommands;

pkgs/build-support/docker/examples.nix

@@ -24,7 +24,11 @@ rec {
   bash = buildImage {
     name = "bash";
     tag = "latest";
-    contents = pkgs.bashInteractive;
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      paths = [ pkgs.bashInteractive ];
+      pathsToLink = [ "/bin" ];
+    };
   };
 
   # 2. service example, layered on another image
@@ -36,7 +40,12 @@ rec {
     fromImage = bash;
     # fromImage = debian;
 
-    contents = pkgs.redis;
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      paths = [ pkgs.redis ];
+      pathsToLink = [ "/bin" ];
+    };
+
     runAsRoot = ''
       mkdir -p /data
     '';
@@ -118,13 +127,17 @@ rec {
   # 5. example of multiple contents, emacs and vi happily coexisting
   editors = buildImage {
     name = "editors";
-    contents = [
+    copyToRoot = pkgs.buildEnv {
-      pkgs.coreutils
+      name = "image-root";
-      pkgs.bash
+      pathsToLink = [ "/bin" ];
-      pkgs.emacs
+      paths = [
-      pkgs.vim
+        pkgs.coreutils
-      pkgs.nano
+        pkgs.bash
-    ];
+        pkgs.emacs
+        pkgs.vim
+        pkgs.nano
+      ];
+    };
   };
 
   # 6. nix example to play with the container nix store
@@ -132,13 +145,17 @@ rec {
   nix = buildImageWithNixDb {
     name = "nix";
     tag = "latest";
-    contents = [
+    copyToRoot = pkgs.buildEnv {
-      # nix-store uses cat program to display results as specified by
+      name = "image-root";
-      # the image env variable NIX_PAGER.
+      pathsToLink = [ "/bin" ];
-      pkgs.coreutils
+      paths = [
-      pkgs.nix
+        # nix-store uses cat program to display results as specified by
-      pkgs.bash
+        # the image env variable NIX_PAGER.
-    ];
+        pkgs.coreutils
+        pkgs.nix
+        pkgs.bash
+      ];
+    };
     config = {
       Env = [
         "NIX_PAGER=cat"
@@ -155,7 +172,11 @@ rec {
     name = "onTopOfPulledImage";
     tag = "latest";
     fromImage = nixFromDockerHub;
-    contents = [ pkgs.hello ];
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ pkgs.hello ];
+    };
   };
 
   # 8. regression test for erroneous use of eval and string expansion.
@@ -163,7 +184,11 @@ rec {
   runAsRootExtraCommands = pkgs.dockerTools.buildImage {
     name = "runAsRootExtraCommands";
     tag = "latest";
-    contents = [ pkgs.coreutils ];
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ pkgs.coreutils ];
+    };
     # The parens here are to create problematic bash to embed and eval. In case
     # this is *embedded* into the script (with nix expansion) the initial quotes
     # will close the string and the following parens are unexpected
@@ -176,7 +201,11 @@ rec {
   unstableDate = pkgs.dockerTools.buildImage {
     name = "unstable-date";
     tag = "latest";
-    contents = [ pkgs.coreutils ];
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ pkgs.coreutils ];
+    };
     created = "now";
   };
 
@@ -265,7 +294,11 @@ rec {
     name = "l3";
     fromImage = l2;
     tag = "latest";
-    contents = [ pkgs.coreutils ];
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ pkgs.coreutils ];
+    };
     extraCommands = ''
       mkdir -p tmp
       echo layer3 > tmp/layer3
@@ -290,7 +323,11 @@ rec {
     name = "child";
     fromImage = environmentVariablesParent;
     tag = "latest";
-    contents = [ pkgs.coreutils ];
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ pkgs.coreutils ];
+    };
     config = {
       Env = [
         "FROM_CHILD=true"
@@ -424,7 +461,11 @@ rec {
         name = "layers-unpack-order-${layerName}";
         tag = "latest";
         fromImage = parent;
-        contents = [ pkgs.coreutils ];
+        copyToRoot = pkgs.buildEnv {
+          name = "image-root";
+          pathsToLink = [ "/bin" ];
+          paths = [ pkgs.coreutils ];
+        };
         runAsRoot = ''
           #!${pkgs.runtimeShell}
           echo -n "${layerName}" >> /layer-order
@@ -441,7 +482,8 @@ rec {
   # buildImage without explicit tag
   bashNoTag = pkgs.dockerTools.buildImage {
     name = "bash-no-tag";
-    contents = pkgs.bashInteractive;
+    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
+    copyToRoot = pkgs.bashInteractive;
   };
 
   # buildLayeredImage without explicit tag
@@ -501,7 +543,11 @@ rec {
   in crossPkgs.dockerTools.buildImage {
     name = "hello-cross";
     tag = "latest";
-    contents = crossPkgs.hello;
+    copyToRoot = pkgs.buildEnv {
+      name = "image-root";
+      pathsToLink = [ "/bin" ];
+      paths = [ crossPkgs.hello ];
+    };
   };
 
   # layered image where a store path is itself a symlink
@@ -643,7 +689,8 @@ rec {
   build-image-with-path = buildImage {
     name = "build-image-with-path";
     tag = "latest";
-    contents = [ pkgs.bashInteractive ./test-dummy ];
+    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
+    copyToRoot = [ pkgs.bashInteractive ./test-dummy ];
   };
 
   layered-image-with-path = pkgs.dockerTools.streamLayeredImage {

pkgs/data/icons/elementary-xfce-icon-theme/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-xfce-icon-theme";
-  version = "0.16";
+  version = "0.17";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
     rev = "v${version}";
-    sha256 = "sha256-p6HQhYf+rw3obrc6e5lYqC02i4dK+5eXGwnTJj0+D+k=";
+    sha256 = "sha256-9WdVUCwHFX6wlu3++QqzV0RgTDYDnUYqK7yUl83liko=";
   };
 
   nativeBuildInputs = [

pkgs/data/misc/papirus-folders/default.nix

@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "papirus-folders";
+  version = "1.12.0";
+
+  src = fetchFromGitHub {
+    owner = "PapirusDevelopmentTeam";
+    repo = "papirus-folders";
+    rev = "v${version}";
+    sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY=";
+  };
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  meta = with lib; {
+    description = "A tool to change papirus icon theme color";
+    longDescription = ''
+      papirus-folders is a bash script that allows changing the color of
+      folders in Papirus icon theme and its forks (which based on version 20171007 and newer).
+    '';
+    homepage = "https://github.com/PapirusDevelopmentTeam/papirus-folders";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.aacebedo ];
+  };
+}

pkgs/desktops/mate/caja/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "caja";
-  version = "1.26.0";
+  version = "1.26.1";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1m0ai2r8b2mvlr8bqj9n6vg1pwzlwa46fqpq206wgyx5sgxac052";
+    sha256 = "MP1ubwCjggD24uiYrX+nl4drsGDx0DQd0vc5MnnhTAc=";
   };
 
   nativeBuildInputs = [

pkgs/desktops/plasma-5/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.2/ -A '*.tar.xz' )

pkgs/desktops/plasma-5/srcs.nix

@@ -4,427 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/bluedevil-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/bluedevil-5.25.2.tar.xz";
-      sha256 = "1fdbxz2lk43svp6f0srjhpfhipfimf0nqjnvv62bqzpasv74p13g";
+      sha256 = "0sx8qbmig787jmfixmv6ajawv6j846gcbj67szkfw4r4yqpsagr1";
-      name = "bluedevil-5.25.1.tar.xz";
+      name = "bluedevil-5.25.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/breeze-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/breeze-5.25.2.tar.xz";
-      sha256 = "13qwxvbdmf3qx7nfarr33q22rn43xsby7l8bjjfn6862l7pqhash";
+      sha256 = "198vzmhljbwrzn48x7g8caj2qwj3q82n6xlj50lpvxcmc0cv740w";
-      name = "breeze-5.25.1.tar.xz";
+      name = "breeze-5.25.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/breeze-grub-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/breeze-grub-5.25.2.tar.xz";
-      sha256 = "11ic3cjfvgs2jkwbkzr2xd568ym7x2l99w488qhdhw9fzkk56rrh";
+      sha256 = "1fnqfmjzlhw1lizax0225qypdm7k4zpxc90s57f2n2173qgi3qfc";
-      name = "breeze-grub-5.25.1.tar.xz";
+      name = "breeze-grub-5.25.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/breeze-gtk-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/breeze-gtk-5.25.2.tar.xz";
-      sha256 = "0lzh7lrqiw537phfkz6bvqfbyqc4h4rb5bkxcb4s1ryynamy36yh";
+      sha256 = "0vzl0nf39ky3f4jdsmm7hz9kj6yacjjx5mawgzv417zaa6khg8id";
-      name = "breeze-gtk-5.25.1.tar.xz";
+      name = "breeze-gtk-5.25.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/breeze-plymouth-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/breeze-plymouth-5.25.2.tar.xz";
-      sha256 = "0xprjl0bszs2dmn27pvklwxx5qbcsdmrr256jlvljvq5hs5vd9ly";
+      sha256 = "026np3kkh6sd0rji7bl2x84za0bpgsljl2dmb3lhwydn93vpv9n1";
-      name = "breeze-plymouth-5.25.1.tar.xz";
+      name = "breeze-plymouth-5.25.2.tar.xz";
     };
   };
   discover = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/discover-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/discover-5.25.2.tar.xz";
-      sha256 = "1cpmi4qfxlprvj5qamjkxj4lq8038fv1fyldsfhnyi9s4zw6ww9s";
+      sha256 = "1cgalkajbpnpn6vzr84sqkvfdvsanx5l9pxhdkrd94s27gbr9l8c";
-      name = "discover-5.25.1.tar.xz";
+      name = "discover-5.25.2.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/drkonqi-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/drkonqi-5.25.2.tar.xz";
-      sha256 = "147azxas0idb0ymcwg15davb5p84czysmsfxmcbrcqlxjkby3dy0";
+      sha256 = "1a9y88vkq6qiaiabwy1a13cycj4n79ikn4zdk10zrkgqlnvbyq3y";
-      name = "drkonqi-5.25.1.tar.xz";
+      name = "drkonqi-5.25.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kactivitymanagerd-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kactivitymanagerd-5.25.2.tar.xz";
-      sha256 = "1jjby09p8hak52syjzaf4wz9hyjz8rylz4jzranrkk3n85znqwk0";
+      sha256 = "06arr36kapjq0gbvk7wnwdgzn8bj64h2cpcrhvzjwmgh4azsz2ww";
-      name = "kactivitymanagerd-5.25.1.tar.xz";
+      name = "kactivitymanagerd-5.25.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kde-cli-tools-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kde-cli-tools-5.25.2.tar.xz";
-      sha256 = "03v7ws48ywjkaqj87zcw7d0dfi36abpz9bnv9s9qp2y4mnk9x198";
+      sha256 = "1s6v8xnx1d51lax02fkrx191jxiw6mbsixiw4hvh91viwdckmwr3";
-      name = "kde-cli-tools-5.25.1.tar.xz";
+      name = "kde-cli-tools-5.25.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kde-gtk-config-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kde-gtk-config-5.25.2.tar.xz";
-      sha256 = "17sqznjz5sn3xih6l83sx62p0s2sk3p1svqg297x3jq67a9299yj";
+      sha256 = "1v5j2jy90mi309v43fgn3fadk0gapzvn48zizns6avc9v6h9kgvq";
-      name = "kde-gtk-config-5.25.1.tar.xz";
+      name = "kde-gtk-config-5.25.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kdecoration-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kdecoration-5.25.2.tar.xz";
-      sha256 = "15gik2c0370f2rmd7jv3pbxbsjng25g6cwzamq3xaa3gqh6l2b33";
+      sha256 = "1ynghykyv0h4g3micdc3qf8xxy3vxrdd01gy31jskisksgjkyvw7";
-      name = "kdecoration-5.25.1.tar.xz";
+      name = "kdecoration-5.25.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kdeplasma-addons-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kdeplasma-addons-5.25.2.tar.xz";
-      sha256 = "14p69kpyaszir8y4zxnyhxmall291rwcy770w4d0mlc04difki8d";
+      sha256 = "04n00s6z2cvwax1i8vs1f3by72qzpicsyw3c366kxnaiz3lklqzk";
-      name = "kdeplasma-addons-5.25.1.tar.xz";
+      name = "kdeplasma-addons-5.25.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kgamma5-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kgamma5-5.25.2.tar.xz";
-      sha256 = "1pc8abx3j91iqb93rsc13bq8sr610zxa91dhy8hr301fmvv9dbg2";
+      sha256 = "0z784j2lyrwl0rlxivgcb91rcpziqnvvfhxzdjk8mkc7j9cxznkx";
-      name = "kgamma5-5.25.1.tar.xz";
+      name = "kgamma5-5.25.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/khotkeys-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/khotkeys-5.25.2.tar.xz";
-      sha256 = "14i9bdqjf5myacybsplsais70x3rnjnfj9807xxgwnqy5dqbz8hg";
+      sha256 = "1yr0zydpsl26gmn4n72lql9n4fxrfbzi405srd2694yaxl5xyzl1";
-      name = "khotkeys-5.25.1.tar.xz";
+      name = "khotkeys-5.25.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kinfocenter-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kinfocenter-5.25.2.tar.xz";
-      sha256 = "0pyirq0zz8y1pvznw5idjsxwslp0bchfjp72l855z5bwfwh7dmfq";
+      sha256 = "004sgb89h0024bliha0bzfzx82d0qi62zicnq68jqngbj5hkmaqm";
-      name = "kinfocenter-5.25.1.tar.xz";
+      name = "kinfocenter-5.25.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kmenuedit-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kmenuedit-5.25.2.tar.xz";
-      sha256 = "0v7k9dcawylgdbjklmjn4mv10z6cm6hhp3za9ni88wlgb2vh9mmk";
+      sha256 = "0d9ldili1zjv4ri1b779zl0kyfxl818n3r7j8cqd3jyfrmh45jgi";
-      name = "kmenuedit-5.25.1.tar.xz";
+      name = "kmenuedit-5.25.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kscreen-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kscreen-5.25.2.tar.xz";
-      sha256 = "1dflaaba001wk5r9n523b1mxib7pd0x5b6dnhis62zn9v5apqhaa";
+      sha256 = "0llassqfn24vkc88pagd0haqdlblg5ha09rw5q4cc6irvqwrvaxa";
-      name = "kscreen-5.25.1.tar.xz";
+      name = "kscreen-5.25.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kscreenlocker-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kscreenlocker-5.25.2.tar.xz";
-      sha256 = "1bhl8a1jhzr2iycq6fzkj1sb4bybyqlnxs8rnfw0s4mmcs17lmm7";
+      sha256 = "15zkmxwcv9cdaczxvjpipngv77dqhn0s26678831axfjzh7v89iy";
-      name = "kscreenlocker-5.25.1.tar.xz";
+      name = "kscreenlocker-5.25.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/ksshaskpass-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/ksshaskpass-5.25.2.tar.xz";
-      sha256 = "1mxmjiprcckqn4sgqyj9nk32prvgymscmpv0kfkcsg60phqyz91m";
+      sha256 = "1zwhrzclbg3mxdwif13f9avv01kykwi8b3j9qk4ycfrwdvwidnd6";
-      name = "ksshaskpass-5.25.1.tar.xz";
+      name = "ksshaskpass-5.25.2.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/ksystemstats-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/ksystemstats-5.25.2.tar.xz";
-      sha256 = "0cp6hsy24g2yhijiyavx5av5djdrypvwrcpzswp8mr86p6b1ii8n";
+      sha256 = "1i6sg5j97w4nl508yl80v2rnr9zmb5f6ymvjvvkfbigp62yz8gcf";
-      name = "ksystemstats-5.25.1.tar.xz";
+      name = "ksystemstats-5.25.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kwallet-pam-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kwallet-pam-5.25.2.tar.xz";
-      sha256 = "1n9bnlsm4l051hp73hsp9wa14q77pplr855w3j620qz0az2zxwwx";
+      sha256 = "0pffi0jkfib01aqqif5401avkljxsi468wg5nva1fg3h8w9i7xqd";
-      name = "kwallet-pam-5.25.1.tar.xz";
+      name = "kwallet-pam-5.25.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kwayland-integration-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kwayland-integration-5.25.2.tar.xz";
-      sha256 = "1r80rj7f8xskiwp7lfzxp92q39gm2y6xy3ip4hv0sgjr2014fb21";
+      sha256 = "1praxpzsbwb7b1p6rsnrmv9wdn5p0j28vch6ydj2qc25f8h7nvfj";
-      name = "kwayland-integration-5.25.1.tar.xz";
+      name = "kwayland-integration-5.25.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kwin-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kwin-5.25.2.tar.xz";
-      sha256 = "1srwdx1pw8kjcdmj531f43789fqsa0wj1kkhp0g42wbwj0y9af8x";
+      sha256 = "1mskwppqv3ismlg4r8fmlrya455mds8ng36lma4acj13vsh1wx2l";
-      name = "kwin-5.25.1.tar.xz";
+      name = "kwin-5.25.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/kwrited-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/kwrited-5.25.2.tar.xz";
-      sha256 = "0gpql9kzwvv0n2ccq6jwwf9agd1abxc8q45plj48sv09b31bxvhz";
+      sha256 = "02c24ywwrzyz5k54ywh32lx2yrjd0xydn1f20h9h6cx16fmlwdq3";
-      name = "kwrited-5.25.1.tar.xz";
+      name = "kwrited-5.25.2.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/layer-shell-qt-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/layer-shell-qt-5.25.2.tar.xz";
-      sha256 = "0lh1dy1z08k6c40xdxcbmpdzzm18dq98gb14q6b6snh1jcrvg95c";
+      sha256 = "14xk9hjxm267dfb8dxgwdjmws95nqc9ygr51mdzsyxqwis9v1i4m";
-      name = "layer-shell-qt-5.25.1.tar.xz";
+      name = "layer-shell-qt-5.25.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/libkscreen-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/libkscreen-5.25.2.tar.xz";
-      sha256 = "1zbdbacmbnczskk8cpr99ph9cn28izvr25x5v5l455dk077qf25g";
+      sha256 = "0jy2p87jj39c75jmj95jqpilphwhzqf7m1qljhbrjgr2w1adnz9p";
-      name = "libkscreen-5.25.1.tar.xz";
+      name = "libkscreen-5.25.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/libksysguard-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/libksysguard-5.25.2.tar.xz";
-      sha256 = "1xn454ch9ggx67c69hjvhhykprrdys38ych1ap8l3b1j2731vyn6";
+      sha256 = "020wxlkj03sj0d81r1f8axw4i78gg45cm3zf6ikhyvka9hbh5xcy";
-      name = "libksysguard-5.25.1.tar.xz";
+      name = "libksysguard-5.25.2.tar.xz";
     };
   };
   milou = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/milou-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/milou-5.25.2.tar.xz";
-      sha256 = "0al6d26b96j3kx37p34gmqamc1pz7l3shyqf7dxf7j71hh0mrk09";
+      sha256 = "15gf3mgbx8z4cahw6w978r5inpn9rfhzj7x5sfhi6w631nasd1yl";
-      name = "milou-5.25.1.tar.xz";
+      name = "milou-5.25.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/oxygen-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/oxygen-5.25.2.tar.xz";
-      sha256 = "1ax0vw7mzlln09aajis5vc78snbi3508lg6qbx6vw9m59lpq140v";
+      sha256 = "0d7705s5lp4lac7rn7q7sy2l0n5519zqfpx6746434z505zc1krc";
-      name = "oxygen-5.25.1.tar.xz";
+      name = "oxygen-5.25.2.tar.xz";
     };
   };
   oxygen-sounds = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/oxygen-sounds-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/oxygen-sounds-5.25.2.tar.xz";
-      sha256 = "14z23yzqcvwjyy0qbm20xgijrndiw8pk1xf4wdbslny454k0l1q7";
+      sha256 = "13hhvfndz57gsdb70jnb12vcich4bfrm0rvb12zaza5j1qk939k7";
-      name = "oxygen-sounds-5.25.1.tar.xz";
+      name = "oxygen-sounds-5.25.2.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-browser-integration-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-browser-integration-5.25.2.tar.xz";
-      sha256 = "140j74dbsx0jicz1407h4n1hqsnnvh3mk07w4y7slvf3392fqp6i";
+      sha256 = "0fyqd160c0ap3z8k2p16x4k8hvbdmnfp2hbx0p93d3acpi9vpqa3";
-      name = "plasma-browser-integration-5.25.1.tar.xz";
+      name = "plasma-browser-integration-5.25.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-desktop-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-desktop-5.25.2.tar.xz";
-      sha256 = "1j1d0j4sdnyfcpv9z4ch6z5z0d7ylkbqcwkhwx0qqs7if8p6f355";
+      sha256 = "09pnxh29xzag90sxdcjw8jafwrlpm8d4bl0xws74df94kqkcira1";
-      name = "plasma-desktop-5.25.1.tar.xz";
+      name = "plasma-desktop-5.25.2.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-disks-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-disks-5.25.2.tar.xz";
-      sha256 = "1ji4gkm36zk4ybdnqzynni0q66nniryfa4p60wqmqr7x97h4376s";
+      sha256 = "1fvka372hjqb2m6m5479g9w9z96hygiaqm2jzh9f5qn6aj4baq84";
-      name = "plasma-disks-5.25.1.tar.xz";
+      name = "plasma-disks-5.25.2.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-firewall-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-firewall-5.25.2.tar.xz";
-      sha256 = "0vip17v0860grmqh9sv7vjisnxgpxqs5hw8yw0fdign0dp3yjn33";
+      sha256 = "0gciy4nl7dcghgwcy7kx3zbsgvygs90wfrzr1nkk2vgphgvr4c6c";
-      name = "plasma-firewall-5.25.1.tar.xz";
+      name = "plasma-firewall-5.25.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-integration-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-integration-5.25.2.tar.xz";
-      sha256 = "09xpbjp5k28bjvs8nszkzk9mw72zv0v171y495ffn8af6yq35cgj";
+      sha256 = "1mvzxasr3m2jf7kvx5df0ijilbs7nvw3kxpsa543c2bmp6ib9zla";
-      name = "plasma-integration-5.25.1.tar.xz";
+      name = "plasma-integration-5.25.2.tar.xz";
     };
   };
   plasma-mobile = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-mobile-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-mobile-5.25.2.tar.xz";
-      sha256 = "04dg6xyzj9zg9g80f6l1chg8f9pj0wz4c8szj3mx1cs98lp3bvcy";
+      sha256 = "0jgrw9wp0l289sygpr0mg7zcjg97bdgl039vdabf4ixd721swmz8";
-      name = "plasma-mobile-5.25.1.tar.xz";
+      name = "plasma-mobile-5.25.2.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-nano-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-nano-5.25.2.tar.xz";
-      sha256 = "0acdz8qqkk4rwsfglk06am8s89zyz0jafhqq574bw83znq13xhfy";
+      sha256 = "1byhcnbjy691jkmhd7pch0rxhi6bbrzhzx47c97mqgxid5a8j0bk";
-      name = "plasma-nano-5.25.1.tar.xz";
+      name = "plasma-nano-5.25.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-nm-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-nm-5.25.2.tar.xz";
-      sha256 = "011i4d612ljvy2b9vv4lqr2ad5yq0qv18nqqjdy3wmj7w1nm4ww9";
+      sha256 = "1hwxsprrwxap5q707jv9w8i7l3rql33dwh66fwqrjjm5v3ncac48";
-      name = "plasma-nm-5.25.1.tar.xz";
+      name = "plasma-nm-5.25.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-pa-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-pa-5.25.2.tar.xz";
-      sha256 = "1nrsw3f2dj1sd3ibyym7142shwxnsi72j4nkhx02206fcjm5p9d1";
+      sha256 = "1k925flcmgi78rln7nb0vh43gdf1001wk68n3zdx6wmhscpbjwwd";
-      name = "plasma-pa-5.25.1.tar.xz";
+      name = "plasma-pa-5.25.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-sdk-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-sdk-5.25.2.tar.xz";
-      sha256 = "1cy9c4h6yxqjnylnpy2ai7vsx3c1b9p6ga3771jdb1zgqw55lgg7";
+      sha256 = "15iaw4lggsmd4hhgdkwcp4q3j1y9rxjngc5gxh7ah28ijmq6fnr1";
-      name = "plasma-sdk-5.25.1.tar.xz";
+      name = "plasma-sdk-5.25.2.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-systemmonitor-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-systemmonitor-5.25.2.tar.xz";
-      sha256 = "1l6m5jnqk56r20mv24s567qj4fbv6ixnzsw75pssngn5zmccm6xy";
+      sha256 = "02jw59b7190wqkhyz4w8zcdydxpp9kq1dxd9x51wy0wpcp6igina";
-      name = "plasma-systemmonitor-5.25.1.tar.xz";
+      name = "plasma-systemmonitor-5.25.2.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-tests-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-tests-5.25.2.tar.xz";
-      sha256 = "1vdvyirk53xv77mdj9kd3n8sk9rfgrz7c31h93bs1hybpbkqbc4g";
+      sha256 = "0zq4w8js35b9p0gih7x92iscmm2snwgm7bclrh29gvxyfsjir8wa";
-      name = "plasma-tests-5.25.1.tar.xz";
+      name = "plasma-tests-5.25.2.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-thunderbolt-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-thunderbolt-5.25.2.tar.xz";
-      sha256 = "19wjs5sapq4v4wwmhd4fk1pdc4zkn0p0w91vc29mzw7vy51id5w0";
+      sha256 = "1mjh14yfap7jr181xvkar9hgmqzvghb4rs2d45b1ddwz3n340ak6";
-      name = "plasma-thunderbolt-5.25.1.tar.xz";
+      name = "plasma-thunderbolt-5.25.2.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-vault-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-vault-5.25.2.tar.xz";
-      sha256 = "15pad4p9lf6z4nkm0zk82k1zn0x724l68hajvwrhw4qjrr8p2p68";
+      sha256 = "12z4kcrsp5jy16x4kssc9l7d2acbkg30jyg6f77jqh1ra671y1a5";
-      name = "plasma-vault-5.25.1.tar.xz";
+      name = "plasma-vault-5.25.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-5.25.2.tar.xz";
-      sha256 = "1pin9x3sz0x39af0cvfna518sx383sr2564f85c7znvyw4qdys0k";
+      sha256 = "16chbhmby9ixyh46xqsa0nd6yhpf3xlk2sv43g34my1hkhp63r6w";
-      name = "plasma-workspace-5.25.1.tar.xz";
+      name = "plasma-workspace-5.25.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-wallpapers-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-wallpapers-5.25.2.tar.xz";
-      sha256 = "0cpqgp45rbsaynasf1k974fvwwrfv93r68hn6bvka99nh6j4vpki";
+      sha256 = "12r2zfz63xgfv0sxv1px7hbwan9pv3ik5h7lkfhcjbi9bhav2pyr";
-      name = "plasma-workspace-wallpapers-5.25.1.tar.xz";
+      name = "plasma-workspace-wallpapers-5.25.2.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/plymouth-kcm-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/plymouth-kcm-5.25.2.tar.xz";
-      sha256 = "08sf692fsdffaj91kgw3mg4bgxyy080kx992zb6drnkjmxq6pi93";
+      sha256 = "04wfd5a63zbnvsngxpj0jvvhjhcchk2nd0ln8i2zdhhr0xlsbiw1";
-      name = "plymouth-kcm-5.25.1.tar.xz";
+      name = "plymouth-kcm-5.25.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.25.1";
+    version = "1-5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/polkit-kde-agent-1-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/polkit-kde-agent-1-5.25.2.tar.xz";
-      sha256 = "0aawaq09l1ifn7wd9ggj50vv19vj30w8bmfdzwjhj9zgym2s8dc4";
+      sha256 = "1hcyw7qzryvqlszqv7lmhmhz7fbjd4961xq7hh18glm53rrz3z31";
-      name = "polkit-kde-agent-1-5.25.1.tar.xz";
+      name = "polkit-kde-agent-1-5.25.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/powerdevil-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/powerdevil-5.25.2.tar.xz";
-      sha256 = "0m57mp577liv3cmd4afm834mif688akdir9i89xjmvwdg8cws7n4";
+      sha256 = "1ahq10mrnryq87ihj5b6a1ifjnyam7sxcgbr3avc2jpb4q8njmb6";
-      name = "powerdevil-5.25.1.tar.xz";
+      name = "powerdevil-5.25.2.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/qqc2-breeze-style-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/qqc2-breeze-style-5.25.2.tar.xz";
-      sha256 = "00ij7ci9xh125g9n8f1qmlpjjy93hydqi3gf29bfz4vh2lnvfd4l";
+      sha256 = "1l8133qlqhdq8y42yiy0njgfv9lzxlc6fdicfmr21bfvj3aj20mk";
-      name = "qqc2-breeze-style-5.25.1.tar.xz";
+      name = "qqc2-breeze-style-5.25.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/sddm-kcm-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/sddm-kcm-5.25.2.tar.xz";
-      sha256 = "1m371dqj72f3lxyn8bjz0bgxycrz5ik1byzqqhrjkfy3an68vs36";
+      sha256 = "0idr9ckrbyh66m0lbza66z2v24pfzwx04np84242p79kyqgjlljf";
-      name = "sddm-kcm-5.25.1.tar.xz";
+      name = "sddm-kcm-5.25.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/systemsettings-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/systemsettings-5.25.2.tar.xz";
-      sha256 = "1kichbhmsnr3kmlzic4dp3ajbkwrn8q9idjwwffnr48rz1pnb3j3";
+      sha256 = "1bz00nnrmpm2kjcapzaxkhx0j4a2vn0nhshgch65h7f3kjp4z0nm";
-      name = "systemsettings-5.25.1.tar.xz";
+      name = "systemsettings-5.25.2.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.25.1";
+    version = "5.25.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.1/xdg-desktop-portal-kde-5.25.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.2/xdg-desktop-portal-kde-5.25.2.tar.xz";
-      sha256 = "15b9wradlqlcipn9q09czc698xsb4q7j6pwgnv8fbaq5na6xgh0s";
+      sha256 = "1sjm15z83s6vna78ffn390sdr4pnyw5yl8lq0jz79mkxyz2w4y2h";
-      name = "xdg-desktop-portal-kde-5.25.1.tar.xz";
+      name = "xdg-desktop-portal-kde-5.25.2.tar.xz";
     };
   };
 }

pkgs/development/libraries/aml/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aml";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m911n3rd41ch4yk3k9k1lz29xp3h54k6jx122abq5kmngy9znqw";
+    sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE=";
   };
 
   nativeBuildInputs = [ meson pkg-config ninja ];

pkgs/development/libraries/arb/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arb";
-  version = "2.22.1";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "fredrik-johansson";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Xd3dy7zr4i3pULLFOYtedpS5Yj9Ljwyu6r4kfhRynmE=";
+    sha256 = "sha256-dt9PZ3Xfn60rhmnxYo7CEzNTEUN/wMVAXe8U5PzUO9U=";
   };
 
   buildInputs = [ mpir gmp mpfr flint ];

pkgs/development/libraries/codec2/default.nix

@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  # Install a binary that is used by openwebrx
+  postInstall = ''
+    install -Dm0755 src/freedv_rx -t $out/bin/
+  '';
+
   # Swap keyword order to satisfy SWIG parser
   postFixup = ''
     sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h

pkgs/development/libraries/cpp-utilities/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.16.0";
+  version = "5.17.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-B/pWdfK3KddAIppJXQRohiIK8mouAQjXRHic75IzY/Q=";
+    sha256 = "sha256-1NjdVflLapuNeYKgRgO7zJxJN1rXjGjQO1m+xUfTeEI=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/gamenetworkingsockets/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "GameNetworkingSockets";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1d3k1ciw8c8rznxsr4bfmw0f0srblpflv8xqavhcxx2zwvaya78c";
+    sha256 = "12741wmpvy7mcvqqmjg4a7ph75rwliwgclhk4imjijqf2qkvsphd";
   };
 
   nativeBuildInputs = [ cmake ninja go ];

pkgs/development/libraries/openvdb/default.nix

@@ -1,50 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
+{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
 
 stdenv.mkDerivation rec
 {
   pname = "openvdb";
-  version = "7.0.0";
+  version = "9.1.0";
 
   src = fetchFromGitHub {
     owner = "dreamworksanimation";
     repo = "openvdb";
     rev = "v${version}";
-    sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl";
+    sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY=";
   };
 
-  outputs = [ "out" ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
 
-  setSourceRoot = ''
-    sourceRoot=$(echo */openvdb)
-  '';
-
-  installTargets = [ "install_lib" ];
-
-  enableParallelBuilding = true;
-
-  buildFlags = [
-    "lib"
-    "DESTDIR=$(out)"
-    "HALF_LIB=-lHalf"
-    "TBB_LIB=-ltbb"
-    "BLOSC_LIB=-lblosc"
-    "LOG4CPLUS_LIB="
-    "BLOSC_INCLUDE_DIR=${c-blosc}/include/"
-    "BLOSC_LIB_DIR=${c-blosc}/lib/"
-  ];
-
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/";
-  NIX_LDFLAGS="-lboost_iostreams";
-
   meta = with lib; {
     description = "An open framework for voxel";
     homepage = "https://www.openvdb.org";
     maintainers = [ maintainers.guibou ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.mpl20;
   };
 }

pkgs/development/libraries/physics/geant4/datasets.nix

@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchurl, geant_version }:
+{ lib, stdenv, fetchurl, geant4 }:
 
 let
   mkDataset = { pname, version, sha256, envvar }:
     stdenv.mkDerivation {
       inherit pname version;
-      inherit geant_version;
+      geant_version = geant4.version;
 
       src = fetchurl {
         url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz";
@@ -15,7 +15,7 @@ let
       dontBuild = true;
       dontConfigure = true;
 
-      datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}";
+      datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}";
       installPhase = ''
         mkdir -p $datadir
         mv ./* $datadir

pkgs/development/libraries/physics/geant4/default.nix

@@ -1,8 +1,7 @@
 { enableMultiThreading ? true
-, enableG3toG4         ? false
 , enableInventor       ? false
-, enableGDML           ? false
+, enableQT             ? false # deprecated name
-, enableQT             ? false
+, enableQt             ? enableQT
 , enableXM             ? false
 , enableOpenGLX11      ? true
 , enablePython         ? false
@@ -11,15 +10,12 @@
 # Standard build environment with cmake.
 , lib, stdenv, fetchurl, fetchpatch, cmake
 
-# Optional system packages, otherwise internal GEANT4 packages are used.
 , clhep ? null # not packaged currently
 , expat
+, xercesc
 , zlib
 
-# For enableGDML.
+# For enableQt.
-, xercesc
-
-# For enableQT.
 , qtbase
 , wrapQtAppsHook
 
@@ -31,7 +27,7 @@
 , soxt
 , libXpm
 
-# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
+# For enableQt, enableXM, enableOpenGLX11, enableRaytracerX11.
 , libGLU, libGL
 , xlibsWrapper
 , libXmu
@@ -48,6 +44,8 @@ let
   boost_python = boost.override { enablePython = true; python = python3; };
 in
 
+lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt"
+
 stdenv.mkDerivation rec {
   version = "11.0.0";
   pname = "geant4";
@@ -59,17 +57,17 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DGEANT4_INSTALL_DATA=OFF"
-    "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
+    "-DGEANT4_USE_GDML=ON"
-    "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
+    "-DGEANT4_USE_G3TOG4=ON"
-    "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+    "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}"
     "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
     "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
     "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
     "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
     "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
     "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
-    "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
+    "-DGEANT4_USE_SYSTEM_EXPAT=ON"
-    "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+    "-DGEANT4_USE_SYSTEM_ZLIB=ON"
     "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
   ] ++ lib.optionals stdenv.isDarwin [
     "-DXQuartzGL_INCLUDE_DIR=${libGL.dev}/include"
@@ -83,37 +81,36 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs =  [
     cmake
-  ] ++ lib.optionals enableQT [
-    wrapQtAppsHook
   ];
 
-  dontWrapQtApps = !enableQT;
+  propagatedNativeBuildInputs = lib.optionals enableQt [
+    wrapQtAppsHook
+  ];
+  dontWrapQtApps = true; # no binaries
 
   buildInputs = [ libGLU xlibsWrapper libXmu ]
     ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
     ++ lib.optionals enablePython [ boost_python python3 ];
 
-  propagatedBuildInputs = [ clhep expat zlib libGL ]
+  propagatedBuildInputs = [ clhep expat xercesc zlib libGL ]
-    ++ lib.optionals enableGDML [ xercesc ]
     ++ lib.optionals enableXM [ motif ]
-    ++ lib.optionals enableQT [ qtbase ];
+    ++ lib.optionals enableQt [ qtbase ];
 
   postFixup = ''
     # Don't try to export invalid environment variables.
     sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
-  '' + lib.optionalString enableQT ''
+  '' + lib.optionalString enableQt ''
     wrapQtAppsHook
   '';
 
   setupHook = ./geant4-hook.sh;
 
   passthru = {
-    data = import ./datasets.nix {
+    data = callPackage ./datasets.nix {};
-          inherit lib stdenv fetchurl;
-          geant_version = version;
-      };
 
     tests = callPackage ./tests.nix {};
+
+    inherit enableQt;
   };
 
   # Set the myriad of envars required by Geant4 if we use a nix-shell.

pkgs/development/libraries/pipewire/wireplumber.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, fetchpatch
 , nix-update-script
 , # base build deps
   meson
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-3NrzOsL0MekxMMXCFubEkazzSWFNsjUsX8n2ECcr7yY=";
   };
 
+  patches = [
+    # fix sound not working in VMs
+    # FIXME: drop in next release
+    (fetchpatch {
+      url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253.patch";
+      sha256 = "sha256-xhhAlhOovwIjwAxXxvHRTG4GzpIPYvKQE2F4ZP1Udq8=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     pkg-config

pkgs/development/libraries/science/math/wcpg/default.nix

@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, blas
+, gmp
+, lapack
+, libf2c
+, mpfi
+, mpfr
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wcpg";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner = "fixif";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-uA/ENjf4urEO+lqebkp/k54199o2434FYgPSmYCG4UA=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    blas
+    gmp
+    lapack
+    libf2c
+    mpfi
+    mpfr
+  ];
+
+  meta = with lib; {
+    description = "Worst-Case Peak-Gain library";
+    homepage = "https://github.com/fixif/WCPG";
+    license = licenses.cecill-b;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wegank ];
+  };
+}

pkgs/development/ocaml-modules/cohttp/async.nix

@@ -7,6 +7,7 @@
 , async_unix
 , cohttp
 , conduit-async
+, core_unix
 , uri
 , uri-sexp
 , logs
@@ -25,8 +26,6 @@ buildDunePackage {
   inherit (cohttp)
     version
     src
-    minimumOCamlVersion
-    useDune2
     ;
 
   buildInputs = [ ppx_sexp_conv ];
@@ -38,6 +37,7 @@ buildDunePackage {
     async_unix
     async
     base
+    core_unix
     magic-mime
     logs
     fmt

pkgs/development/ocaml-modules/cohttp/default.nix

@@ -1,27 +1,26 @@
 { lib, fetchurl, buildDunePackage
 , ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp
 , ocaml, fmt, alcotest
+, crowbar
 }:
 
 buildDunePackage rec {
   pname = "cohttp";
-  version = "4.0.0";
+  version = "5.0.0";
 
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
-
-  minimumOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
+    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
-    sha256 = "bd7aa4cd2c82744990ed7c49e3ee7a40324c64cb3d8509804809155e2bacd1d2";
+    sha256 = "sha256-/W/0uGyBg1XWGzoIYoWW2/UX1qfabo7exIG7BlPKWgU=";
   };
 
   buildInputs = [ jsonm ppx_sexp_conv ];
 
   propagatedBuildInputs = [ base64 re stringext uri-sexp ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  doCheck = true;
-  checkInputs = [ fmt alcotest ];
+  checkInputs = [ fmt alcotest crowbar ];
 
   meta = {
     description = "HTTP(S) library for Lwt, Async and Mirage";

pkgs/development/ocaml-modules/cohttp/lwt-unix.nix

@@ -9,8 +9,6 @@ buildDunePackage {
   pname = "cohttp-lwt-unix";
   inherit (cohttp-lwt) version src;
 
-  useDune2 = true;
-
   buildInputs = [ cmdliner ppx_sexp_conv ];
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/cohttp/lwt.nix

@@ -1,18 +1,16 @@
-{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
+{ lib, buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
 
 buildDunePackage {
   pname = "cohttp-lwt";
   inherit (cohttp)
     version
     src
-    useDune2
-    minimumOCamlVersion
     ;
 
   buildInputs = [ ppx_sexp_conv ];
 
   propagatedBuildInputs = [
-    cohttp ocaml_lwt logs sexplib0 uri
+    cohttp lwt logs sexplib0 uri
   ];
 
   meta = cohttp.meta // {

pkgs/development/ocaml-modules/cohttp/mirage.nix

@@ -8,7 +8,7 @@
 buildDunePackage {
   pname = "cohttp-mirage";
 
-  inherit (cohttp) version src minimumOCamlVersion useDune2;
+  inherit (cohttp) version src;
 
   nativeBuildInputs = [ ppx_sexp_conv ];
 

pkgs/development/ocaml-modules/conduit/async.nix

@@ -7,8 +7,6 @@ buildDunePackage {
   inherit (conduit)
     version
     src
-    minimumOCamlVersion
-    useDune2
     ;
 
   buildInputs = [ ppx_sexp_conv ppx_here ];

pkgs/development/ocaml-modules/conduit/default.nix

@@ -1,21 +1,20 @@
 { lib, fetchurl, buildDunePackage
-, ppx_sexp_conv, sexplib, astring, uri, logs
+, ppx_sexp_conv, sexplib, astring, uri
 , ipaddr, ipaddr-sexp
 }:
 
 buildDunePackage rec {
   pname = "conduit";
-  version = "4.0.2";
+  version = "5.1.0";
-  useDune2 = true;
 
-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.03";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz";
+    url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
-    sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537";
+    sha256 = "sha256-5RyMPoecu+ngmYmwBZUJODLchmQgiAcuA+Wlmiojkc0=";
   };
 
-  propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ];
+  propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ];
 
   meta = {
     description = "A network connection establishment library";

pkgs/development/ocaml-modules/conduit/lwt-unix.nix

@@ -1,17 +1,17 @@
 { buildDunePackage
-, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
+, conduit-lwt, ppx_sexp_conv, lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
 , lwt_ssl, tls, lwt_log, ssl
 }:
 
 buildDunePackage {
   pname = "conduit-lwt-unix";
-  inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
+  inherit (conduit-lwt) version src;
 
   buildInputs = [ ppx_sexp_conv ];
 
   propagatedBuildInputs = [
     conduit-lwt
-    ocaml_lwt
+    lwt
     uri
     ipaddr
     ipaddr-sexp

pkgs/development/ocaml-modules/conduit/lwt.nix

@@ -1,12 +1,12 @@
-{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
+{ buildDunePackage, ppx_sexp_conv, conduit, lwt, sexplib }:
 
 buildDunePackage {
   pname = "conduit-lwt";
-  inherit (conduit) version src useDune2 minimumOCamlVersion;
+  inherit (conduit) version src;
 
   buildInputs = [ ppx_sexp_conv ];
 
-  propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
+  propagatedBuildInputs = [ conduit lwt sexplib ];
 
   meta = conduit.meta // {
     description = "A network connection establishment library for Lwt";

pkgs/development/ocaml-modules/conduit/mirage.nix

@@ -1,5 +1,5 @@
 { buildDunePackage, conduit-lwt
-, ppx_sexp_conv, sexplib, uri, cstruct, mirage-stack, mirage-flow
+, ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow
 , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
 , dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
 , tcpip, ca-certs-nss
@@ -8,12 +8,12 @@
 buildDunePackage {
   pname = "conduit-mirage";
 
-  inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
+  inherit (conduit-lwt) version src;
 
   nativeBuildInputs = [ ppx_sexp_conv ];
 
   propagatedBuildInputs = [
-    sexplib uri cstruct mirage-stack mirage-clock mirage-flow
+    sexplib uri cstruct mirage-clock mirage-flow
     mirage-flow-combinators mirage-random mirage-time
     dns-client conduit-lwt vchan xenstore tls tls-mirage
     ipaddr ipaddr-sexp tcpip ca-certs-nss

pkgs/development/ocaml-modules/dns/certify.nix

@@ -1,12 +1,13 @@
 { buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509
-, mirage-random, mirage-time, mirage-clock, mirage-stack
+, mirage-random, mirage-time, mirage-clock
 , logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt
+, tcpip
 }:
 
 buildDunePackage {
   pname = "dns-certify";
 
-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;
 
   propagatedBuildInputs = [
     dns
@@ -17,12 +18,12 @@ buildDunePackage {
     mirage-random
     mirage-time
     mirage-clock
-    mirage-stack
     logs
     mirage-crypto-pk
     mirage-crypto-rng
     mirage-crypto-ec
     lwt
+    tcpip
   ];
 
   doCheck = true;

pkgs/development/ocaml-modules/dns/cli.nix

@@ -1,5 +1,5 @@
 { buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
-, rresult, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
+, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
 , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
 , randomconv, alcotest
 }:
@@ -7,9 +7,9 @@
 buildDunePackage {
   pname = "dns-cli";
 
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
 
-  inherit (dns) version src useDune2;
+  inherit (dns) version src;
 
   # no need to propagate as this is primarily
   # an executable package
@@ -19,7 +19,6 @@ buildDunePackage {
     dns-client
     dns-server
     dns-certify
-    rresult
     bos
     cmdliner
     fpath

pkgs/development/ocaml-modules/dns/client.nix

@@ -1,15 +1,19 @@
-{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
+{ lib, buildDunePackage, dns, lwt, mirage-clock, mirage-time
-, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv
+, mirage-random, mirage-crypto-rng, mtime, randomconv
-, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }:
+, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
+, ca-certs, ca-certs-nss
+, happy-eyeballs
+, tcpip
+, tls, tls-mirage
+}:
 
 buildDunePackage {
   pname = "dns-client";
   inherit (dns) src version;
 
-  useDune2 = true;
+  propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
-
+                            lwt mirage-random mirage-time mirage-clock
-  propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr
+                            ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage
-                            ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock
                             mtime mirage-crypto-rng ];
   checkInputs = [ alcotest ];
   doCheck = true;

pkgs/development/ocaml-modules/dns/default.nix

@@ -1,23 +1,22 @@
 { lib, buildDunePackage, fetchurl, alcotest
-, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt
+, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
 }:
 
 buildDunePackage rec {
   pname = "dns";
-  version = "5.0.1";
+  version = "6.1.4";
 
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
-  minimumOCamlVersion = "4.07";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
+    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    sha256 = "72c0a1a91c8e409bd448c8e0ea28d16d13177c326aea403ee1c30ddcb5969adc";
+    sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY=";
   };
 
-  propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
+  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
 
   doCheck = true;
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
   meta = {
     description = "An Domain Name System (DNS) library";

pkgs/development/ocaml-modules/dns/mirage.nix

@@ -1,15 +1,15 @@
-{ buildDunePackage, dns, mirage-stack, ipaddr, lwt }:
+{ buildDunePackage, dns, ipaddr, lwt, tcpip }:
 
 buildDunePackage {
   pname = "dns-mirage";
 
-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;
 
   propagatedBuildInputs = [
     dns
-    mirage-stack
     ipaddr
     lwt
+    tcpip
   ];
 
   meta = dns.meta // {

pkgs/development/ocaml-modules/dns/resolver.nix

@@ -1,12 +1,13 @@
 { buildDunePackage, dns, dns-server, dns-mirage, lru, duration
 , randomconv, lwt, mirage-time, mirage-clock, mirage-random
+, tcpip, tls, tls-mirage
 , alcotest
 }:
 
 buildDunePackage {
   pname = "dns-resolver";
 
-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;
 
   propagatedBuildInputs = [
     dns
@@ -19,6 +20,9 @@ buildDunePackage {
     mirage-time
     mirage-clock
     mirage-random
+    tcpip
+    tls
+    tls-mirage
   ];
 
   doCheck = true;

pkgs/development/ocaml-modules/dns/server.nix

@@ -1,12 +1,12 @@
 { buildDunePackage, dns, dns-mirage, randomconv, duration, lwt
-, mirage-time, mirage-clock, mirage-stack, metrics
+, mirage-time, mirage-clock, metrics
 , alcotest, mirage-crypto-rng, dns-tsig, base64
 }:
 
 buildDunePackage {
   pname = "dns-server";
 
-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;
 
   propagatedBuildInputs = [
     dns
@@ -16,7 +16,6 @@ buildDunePackage {
     lwt
     mirage-time
     mirage-clock
-    mirage-stack
     metrics
   ];
 

pkgs/development/ocaml-modules/dns/stub.nix

@@ -1,12 +1,12 @@
 { buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig
 , dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
-, mirage-random, mirage-stack, metrics
+, mirage-random, tcpip, metrics
 }:
 
 buildDunePackage {
   pname = "dns-stub";
 
-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;
 
   propagatedBuildInputs = [
     dns
@@ -21,7 +21,7 @@ buildDunePackage {
     mirage-time
     mirage-clock
     mirage-random
-    mirage-stack
+    tcpip
     metrics
   ];
 

pkgs/development/ocaml-modules/dns/tsig.nix

@@ -3,7 +3,7 @@
 buildDunePackage {
   pname = "dns-tsig";
 
-  inherit (dns) version src useDune2 minimumOCamlVersion;
+  inherit (dns) version src;
 
   propagatedBuildInputs = [
     mirage-crypto

pkgs/development/ocaml-modules/happy-eyeballs/default.nix

@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl
+, domain-name, duration, fmt, ipaddr, logs
+}:
+
+buildDunePackage rec {
+  pname = "happy-eyeballs";
+  version = "0.1.3";
+
+  minimalOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
+    sha256 = "sha256:0ns1bxcmx0rkq4am6vl2aargdzkfhria8sfmgnh8dgzvvj93cc1c";
+  };
+
+  propagatedBuildInputs = [
+    domain-name
+    duration
+    fmt
+    ipaddr
+    logs
+  ];
+
+  meta = {
+    description = "Connecting to a remote host via IP version 4 or 6";
+    homepage = "https://github.com/roburio/happy-eyeballs";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}

pkgs/development/ocaml-modules/mirage-random/default.nix

@@ -2,13 +2,11 @@
 
 buildDunePackage rec {
   pname = "mirage-random";
-  version = "2.0.0";
+  version = "3.0.0";
-
-  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz";
-    sha256 = "0qj41d5smkkkbjwsnz71bhhj94d2cwv53rf3j4rhky0pqbkidnv1";
+    sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8=";
   };
 
   propagatedBuildInputs = [ cstruct ];

pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch

@@ -0,0 +1,31 @@
+diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml
+index 4363cff7..b0cc0c53 100644
+--- a/src/server/ocsigen_cohttp.ml
++++ b/src/server/ocsigen_cohttp.ml
+@@ -14,25 +14,13 @@ exception Ext_http_error of
+ 
+ let _print_request fmt request =
+ 
+-  let print_list print_data out_ch lst =
+-    let rec aux = function
+-      | [] -> ()
+-      | [ x ] -> print_data out_ch x
+-      | x :: r -> print_data out_ch x; aux r
+-    in aux lst
+-  in
+-
+   Format.fprintf fmt "%s [%s/%s]:\n"
+     (Uri.to_string (Cohttp.Request.uri request))
+     Cohttp.(Code.string_of_version (Request.version request))
+     Cohttp.(Code.string_of_method (Request.meth request));
+ 
+   Cohttp.Header.iter
+-    (fun key values ->
+-       (print_list
+-          (fun fmt value -> Format.fprintf fmt "\t%s = %s\n" key value)
+-          fmt
+-          values))
++    (Format.fprintf fmt "\t%s = %s\n")
+     (Cohttp.Request.headers request)
+ 
+ let connections = Hashtbl.create 256

pkgs/development/ocaml-modules/ocsigen-server/default.nix

@@ -37,6 +37,8 @@ buildDunePackage rec {
     ocaml_pcre xml-light
   ];
 
+  patches = [ ./cohttp-5.patch ];
+
   configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ];
 
   dontAddPrefix = true;

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

@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, chacha20poly1305-reuseable
 , commentjson
 , cryptography
 , fetchFromGitHub
@@ -12,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "0.7.17";
+  version = "0.7.20";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +22,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-vgRiqA3xNvuw3nIzl45RXdmcbDW6OTxvReSH5SVcNEs=";
+    sha256 = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4=";
   };
 
   nativeBuildInputs = [
@@ -29,6 +30,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    chacha20poly1305-reuseable
     commentjson
     cryptography
     zeroconf

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

@@ -5,7 +5,6 @@
 , buildPythonPackage
 , docutils
 , fetchFromGitHub
-, fetchpatch
 , imaplib2
 , mock
 , nose
@@ -17,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioimaplib";
-  version = "0.9.0";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -26,17 +25,9 @@ buildPythonPackage rec {
     owner = "bamthomas";
     repo = pname;
     rev = version;
-    sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY=";
+    hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0=";
   };
 
-  patches = [
-    # https://github.com/bamthomas/aioimaplib/pull/76
-    (fetchpatch {
-      url = "https://github.com/bamthomas/aioimaplib/commit/03f796f45b60a163ad0f3d52166d58f280de7065.patch";
-      hash = "sha256-9staxkw/EfGoBz/uyrNKBvQ0KfN+za4rTGRyqrAJSd8=";
-    })
-  ];
-
   checkInputs = [
     asynctest
     docutils
@@ -49,6 +40,11 @@ buildPythonPackage rec {
     tzlocal
   ];
 
+  disabledTests = [
+    # https://github.com/bamthomas/aioimaplib/issues/77
+    "test_get_quotaroot"
+  ];
+
   pythonImportsCheck = [ "aioimaplib" ];
 
   meta = with lib; {

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

@@ -3,6 +3,7 @@
 , aioresponses
 , buildPythonPackage
 , fetchFromGitHub
+, orjson
 , pytest-aiohttp
 , pytest-asyncio
 , pytestCheckHook
@@ -11,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aiounifi";
-  version = "33";
+  version = "34";
 
   disabled = pythonOlder "3.9";
 
@@ -19,11 +20,12 @@ buildPythonPackage rec {
     owner = "Kane610";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-MXzUQOC5Y33RgRKf5BPbA9VfQKKdRjawF9kW4QmSHkU=";
+    hash = "sha256-NxxM1rU781QTfNWfE6maNovPZNDwU54ST1lxhTKmmBA=";
   };
 
   propagatedBuildInputs = [
     aiohttp
+    orjson
   ];
 
   checkInputs = [

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aresponses";
-  version = "2.1.5";
+  version = "2.1.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "CircleUp";
     repo = pname;
     rev = version;
-    sha256 = "sha256-9ZzIrj87TwxQi0YMlTHFPAp0V1oxfuL0+RMGXxUxFoE=";
+    sha256 = "sha256-Ui9ZpWaVBfCbDlZH3EgHX32FIZtyTHnc/UXqtoEyFcw=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/async-upnp-client/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.31.1";
+  version = "0.31.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "StevenLooman";
     repo = "async_upnp_client";
     rev = version;
-    sha256 = "sha256-edoP4YvMp9ImfeS9bUwNBdx6eAUj5/J1tLymkOc6jwQ=";
+    sha256 = "sha256-/8gSx1oe2ljBGIPddzBLXuH3LiuHpUXi4/vO7stm5FY=";
   };
 
   propagatedBuildInputs = [

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

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "bellows";
-  version = "0.30.0";
+  version = "0.31.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "bellows";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-epsE/VKK6LwMVbkx5PWgAxZ62PO4udCFr3jYi0MrUpI=";
+    sha256 = "sha256-8pw139TNY7LE7x13JfgxcUVWFIXVj4FiEvqdUh+xcl8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix

@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+
+# build
+, poetry-core
+
+# propagates
+, cryptography
+
+# tests
+, pytestCheckHook
+}:
+
+let
+  pname = "chacha20poly1305-reuseable";
+  version = "0.0.4";
+in
+
+buildPythonPackage {
+  inherit pname version;
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "bdraco";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-iOGDTQyiznjYblT/NfHxewIwEZsPnp7bdNVD1p9/H1M=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    cryptography
+  ];
+
+  pythonImportsCheck = [
+    "chacha20poly1305_reuseable"
+  ];
+
+  preCheck = ''
+    substituteInPlace pyproject.toml \
+      --replace "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" ""
+  '';
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "ChaCha20Poly1305 that is reuseable for asyncio";
+    homepage = "https://github.com/bdraco/chacha20poly1305-reuseable";
+    changelog = "https://github.com/bdraco/chacha20poly1305-reuseable/blob/main/CHANGELOG.md";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}

pkgs/development/python-modules/cron-descriptor/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "cron_descriptor";
-  version = "1.2.27";
+  version = "1.2.30";
 
   src = fetchFromGitHub {
     owner = "Salamek";
     repo = "cron-descriptor";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-ycpBbXVUl7mIPx6p4DoVq51T86Im9bkF6LQFSYUL4uk=";
+    sha256 = "sha256-Qei9f0HlIu5sautMEASvxdUqZyXKvHDWJgd3oST1gJo=";
   };
 
   # remove tests_require, as we don't do linting anyways

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

@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bhHGvUGzXrk7snMzv+R0fd/gnZTFJ3xfse5i2Krpl3I=";
+    sha256 = "sha256-mEbF/fOtw0cU/bx7DgQcmmJ/yqal8Hs/1KaLGC3e4/c=";
   };
 
   nativeBuildInputs = [ pkg-config ];