Merge master into haskell-updates

2022-03-23 00:11:32 +00:00 · 2022-03-23 00:11:32 +00:00 · b86264453e
commit b86264453e
parent 8b791af7b1 17692eb19f
66 changed files with 3968 additions and 5813 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -77,6 +77,12 @@
 # NixOS integration test driver
 /nixos/lib/test-driver  @tfc

+# Systemd
+/nixos/modules/system/boot/systemd.nix      @NixOS/systemd
+/nixos/modules/system/boot/systemd          @NixOS/systemd
+/nixos/lib/systemd-*.nix                    @NixOS/systemd
+/pkgs/os-specific/linux/systemd             @NixOS/systemd
+
 # Updaters
 ## update.nix
 /maintainers/scripts/update.nix   @jtojnar
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@ -347,7 +347,14 @@ rec {

    Type: bool -> string -> a -> a
  */
-  warnIf = cond: msg: if cond then warn msg else id;
+  warnIf = cond: msg: if cond then warn msg else x: x;
+
+  /*
+    Like warnIf, but negated (warn if the first argument is `false`).
+
+    Type: bool -> string -> a -> a
+  */
+  warnIfNot = cond: msg: if cond then x: x else warn msg;

  /*
    Like the `assert b; e` expression, but with a custom error message and
@ -371,6 +378,13 @@ rec {
  */
  throwIfNot = cond: msg: if cond then x: x else throw msg;

+  /*
+    Like throwIfNot, but negated (throw if the first argument is `true`).
+
+    Type: bool -> string -> a -> a
+  */
+  throwIf = cond: msg: if cond then throw msg else x: x;
+
  /* Check if the elements in a list are valid values from a enum, returning the identity function, or throwing an error message otherwise.

     Example:
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@ -91,6 +91,10 @@
    <option>--flake</option> <replaceable>flake-uri</replaceable>
   </arg>

+   <arg>
+    <option>--no-flake</option>
+   </arg>
+
   <arg>
    <option>--override-input</option> <replaceable>input-name</replaceable> <replaceable>flake-uri</replaceable>
   </arg>
@ -594,6 +598,20 @@
    </listitem>
   </varlistentry>

+   <varlistentry>
+    <term>
+     <option>--no-flake</option>
+    </term>
+    <listitem>
+     <para>
+      Do not imply <option>--flake</option> if
+      <filename>/etc/nixos/flake.nix</filename> exists. With this
+      option, it is possible to build non-flake NixOS configurations
+      even if the current NixOS systems uses flakes.
+     </para>
+    </listitem>
+   </varlistentry>
+
  </variablelist>

  <para>
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@ -59,7 +59,7 @@ import ./make-test-python.nix {
    two.succeed("test `wc -l < out` -gt 0")

    # More DNS-SD.
-    one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 &')
+    one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 >&2 &')
    one.sleep(5)
    two.succeed("avahi-browse -r -t _test._tcp | tee out >&2")
    two.succeed("test `wc -l < out` -gt 0")
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@ -2,12 +2,12 @@

 let
  pname = "plexamp";
-  version = "4.0.3";
+  version = "4.1.0";

  src = fetchurl {
    url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
    name="${pname}-${version}.AppImage";
-    sha512 = "Nh0+/ibZnjcGXgQUe+QvukWpaX6/0nNPR4NIK0i2Bn6kBkihv9bkfF9xGpgqeE6H3CK+4e6ywg8y9RR+pJBBSA==";
+    sha512 = "N+WkH6n7MWfRd2rsk/2b/rABL6pcjpKa1iBZSHslIOEc5fYWjGAxjwwTU0RgSaqptS1DyPeCUeWuphWPZJsQgw==";
  };

  appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
  meta = with lib; {
    description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
    homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/41";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/42";
    license = licenses.unfree;
    maintainers = with maintainers; [ killercup synthetica ];
    platforms = [ "x86_64-linux" ];
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@ -4,7 +4,11 @@
 , fetchFromGitHub
 , fftwSinglePrec
 , ruby
+, erlang
 , aubio
+, alsa-lib
+, rtmidi
+, libsndfile
 , cmake
 , pkg-config
 , boost
@ -12,25 +16,43 @@
 , jack2
 , supercollider
 , qwt
-, osmid
 }:

 let

  supercollider_single_prec = supercollider.override {  fftw = fftwSinglePrec; };

+  pname = "sonic-pi";
+  version = "3.3.1";
+  src = fetchFromGitHub {
+    owner = "sonic-pi-net";
+    repo = "sonic-pi";
+    rev = "v${version}";
+    sha256 = "sha256-AE7iuSNnW1SAtBMplReGzXKcqD4GG23i10MIAWnlcPo=";
+  };
+
+  # sonic pi uses it's own aubioonset with hardcoded parameters but will compile a whole aubio for it
+  # let's just build the aubioonset instead and link against aubio from nixpkgs
+  aubioonset = mkDerivation {
+    name = "aubioonset";
+    src = src;
+    sourceRoot = "source/app/external/aubio/examples";
+    buildInputs = [jack2 aubio libsndfile];
+    patchPhase = ''
+      sed -i "s@<aubio.h>@<aubio/aubio.h>@" jackio.c utils.h
+    '';
+    buildPhase = ''
+      gcc -o aubioonset -laubio jackio.c utils.c aubioonset.c
+    '';
+    installPhase = ''
+      install -D aubioonset $out/aubioonset
+    '';
+  };
+
 in

 mkDerivation rec {
-  version = "3.2.2";
-  pname = "sonic-pi";
-
-  src = fetchFromGitHub {
-    owner = "samaaron";
-    repo = "sonic-pi";
-    rev = "v${version}";
-    sha256 = "1nlkpkpg9iz2hvf5pymvk6lqhpdpjbdrvr0hrnkc3ymj7llvf1cm";
-  };
+  inherit pname version src;

  buildInputs = [
    bash
@ -42,42 +64,36 @@ mkDerivation rec {
    aubio
    supercollider_single_prec
    boost
+    erlang
+    alsa-lib
+    rtmidi
  ];

  dontUseCmakeConfigure = true;

-  preConfigure = ''
-    patchShebangs .
-    substituteInPlace app/gui/qt/mainwindow.cpp \
-      --subst-var-by ruby "${ruby}/bin/ruby" \
-      --subst-var out
+  prePatch = ''
+    sed -i '/aubio/d' app/external/linux_build_externals.sh
+    sed -i '/aubio/d' app/linux-prebuild.sh
+    patchShebangs app
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+
+    ./app/linux-prebuild.sh
+    ./app/linux-config.sh
+
+    runHook postConfigure
  '';

  buildPhase = ''
-    export SONIC_PI_HOME=$TMPDIR
-    export AUBIO_LIB=${aubio}/lib/libaubio.so
-    export OSMID_DIR=app/server/native/osmid
+    runHook preBuild

-    mkdir -p $OSMID_DIR
-    cp ${osmid}/bin/{m2o,o2m} $OSMID_DIR
-
-    pushd app/server/ruby/bin
-      ./compile-extensions.rb
-      ./i18n-tool.rb -t
+    pushd app/build
+    cmake --build . --config Release
    popd

-    pushd app/gui/qt
-      cp -f utils/ruby_help.tmpl utils/ruby_help.h
-      ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h
-
-      lrelease lang/*.ts
-
-      mkdir build
-      pushd build
-        cmake -G "Unix Makefiles" ..
-        make
-      popd
-    popd
+    runHook postBuild
  '';

  installPhase = ''
@ -90,10 +106,14 @@ mkDerivation rec {
    mkdir -p $out/app
    cp -r app/server $out/app/

+    # We didn't build this during linux-prebuild.sh so copy from the separate derivation
+    cp ${aubioonset}/aubioonset $out/app/server/native/
+
    # Copy only necessary files for the gui app.
-    mkdir -p $out/app/gui/qt/build
+    mkdir -p $out/app/gui/qt
    cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/
-    cp app/gui/qt/build/sonic-pi $out/app/gui/qt/build/sonic-pi
+    mkdir -p $out/app/build/gui/qt
+    cp app/build/gui/qt/sonic-pi $out/app/build/gui/qt/sonic-pi

    runHook postInstall
  '';
@ -102,20 +122,18 @@ mkDerivation rec {
  dontWrapQtApps = true;
  preFixup = ''
    wrapQtApp "$out/bin/sonic-pi" \
-      --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \
-      --set AUBIO_LIB "${aubio}/lib/libaubio.so"
+      --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang] }
    makeWrapper \
      $out/app/server/ruby/bin/sonic-pi-server.rb \
      $out/bin/sonic-pi-server \
-      --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \
-      --set AUBIO_LIB "${aubio}/lib/libaubio.so"
+      --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang ] }
  '';

  meta = {
    homepage = "https://sonic-pi.net/";
    description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict ];
+    maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt ];
    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@ -69,14 +69,14 @@ let
    six
  ];
 in mkDerivation rec {
-  version = "3.22.4";
+  version = "3.22.5";
  pname = "qgis-ltr-unwrapped";

  src = fetchFromGitHub {
    owner = "qgis";
    repo = "QGIS";
    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-z2dCdaIJUKpZgJHtn1/qA07uMJpAWKL0cDx6B/n1Oxg=";
+    sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o=";
  };

  passthru = {
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@ -69,14 +69,14 @@ let
    six
  ];
 in mkDerivation rec {
-  version = "3.24.0";
+  version = "3.24.1";
  pname = "qgis-unwrapped";

  src = fetchFromGitHub {
    owner = "qgis";
    repo = "QGIS";
    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-EPF8sXAH7UAttLutxXGFovog3+XpXP0GXg2tu0mSU2s=";
+    sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg=";
  };

  passthru = {
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@ -5,13 +5,13 @@ buildGoModule rec {
  /* Do not use "dev" as a version. If you do, Tilt will consider itself
    running in development environment and try to serve assets from the
    source tree, which is not there once build completes.  */
-  version = "0.25.3";
+  version = "0.26.2";

  src = fetchFromGitHub {
    owner  = "tilt-dev";
    repo   = pname;
    rev    = "v${version}";
-    sha256 = "sha256-YB2oKyO+pJSzx/ZgPFhP8+5auKxX/4sQyv1qW9B5PGg=";
+    sha256 = "sha256-UYvTsoNJwH8DOa/Ns9QlckcMVf/+k9/5UX8gO/el0jw=";
  };
  vendorSha256 = null;

--- a/pkgs/applications/networking/misc/zammad/default.nix
+++ b/pkgs/applications/networking/misc/zammad/default.nix
@ -10,6 +10,8 @@
 , ruby_2_7
 , postgresql
 , imlib2
+, jq
+, moreutils
 , nodejs
 , yarn
 , yarn2nix-moretea
@ -19,7 +21,7 @@

 let
  pname = "zammad";
-  version = "5.0.2";
+  version = "5.1.0";

  src = applyPatches {

@ -31,6 +33,7 @@ let
      sed -i -e "s|ruby '2.7.4'|ruby '${ruby_2_7.version}'|" Gemfile
      sed -i -e "s|ruby 2.7.4p191|ruby ${ruby_2_7.version}|" Gemfile.lock
      sed -i -e "s|2.7.4|${ruby_2_7.version}|" .ruby-version
+      ${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
    '';
  };

@ -70,6 +73,7 @@ let
      };
      rszr = attrs: {
        buildInputs = [ imlib2 imlib2.dev ];
+        buildFlags = [ "--without-imlib2-config" ];
      };
      mini_racer = attrs: {
        buildFlags = [
--- a/pkgs/applications/networking/misc/zammad/gemset.nix
+++ b/pkgs/applications/networking/misc/zammad/gemset.nix
--- a/pkgs/applications/networking/misc/zammad/package.json
+++ b/pkgs/applications/networking/misc/zammad/package.json
@ -1,14 +1,18 @@
 {
-  "name": "Zammad",
-  "version": "1.0.0",
+  "scripts": {
+    "lint:css": "stylelint \"**/*.{css,scss}\"",
+    "lint:css:fix": "stylelint \"**/*.{css,scss}\" --fix"
+  },
  "devDependencies": {
-    "gulp": "^3.8.11",
-    "gulp-cheerio": "^0.6.2",
-    "gulp-rename": "^1.2.2",
-    "gulp-svgmin": "^1.1.2",
-    "gulp-svgstore": "^5.0.1",
-    "gulp-util": "^3.0.4",
-    "gulp-watch": "^4.2.4",
-    "through2": "^0.6.5"
-  }
+    "postcss": "^8.4.4",
+    "postcss-html": "^1.3.0",
+    "prettier": "2.5.0",
+    "stylelint": "^14.1.0",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-standard": "^24.0.0",
+    "stylelint-config-standard-scss": "^3.0.0",
+    "stylelint-prettier": "^2.0.0"
+  },
+  "name": "Zammad",
+  "version": "5.1.0"
 }
--- a/pkgs/applications/networking/misc/zammad/source.json
+++ b/pkgs/applications/networking/misc/zammad/source.json
@ -1,7 +1,7 @@
 {
-    "owner": "zammad",
-    "repo": "zammad",
-    "rev": "ad12ad4e01f5e6d1d58da019107b66e562ae463c",
-    "sha256": "i50A0/dBsdvv7L/fZiA1LvJEcO3OghjjgwS/7oFjk2o=",
-    "fetchSubmodules": true
+  "owner": "zammad",
+  "repo": "zammad",
+  "rev": "eefae45c2ad6e6a96b8df631d2f50f290ecbd27d",
+  "sha256": "EjowvM//+UsAfEH9/0jgLkiD7EWH34M1NQ9U2DotBqc=",
+  "fetchSubmodules": true
 }
--- a/pkgs/applications/networking/misc/zammad/update.nix
+++ b/pkgs/applications/networking/misc/zammad/update.nix
@ -3,6 +3,7 @@
 , makeWrapper
 , bundix
 , common-updater-scripts
+, jq
 , nix-prefetch-github
 , yarn
 , yarn2nix
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    bundix
    common-updater-scripts
+    jq
    nix-prefetch-github
    yarn
    yarn2nix
--- a/pkgs/applications/networking/misc/zammad/update.sh
+++ b/pkgs/applications/networking/misc/zammad/update.sh
@ -38,7 +38,7 @@ trap cleanup EXIT
 pushd $WORK_DIR

 echo ":: Creating source.json"
-nix-prefetch-github zammad zammad --rev $VERSION --json > $TARGET_DIR/source.json
+nix-prefetch-github zammad zammad --rev $VERSION --json --fetch-submodules | jq 'del(.leaveDotGit) | del(.deepClone)' > $TARGET_DIR/source.json
 echo >> $TARGET_DIR/source.json

 echo ":: Fetching source"
@ -61,7 +61,7 @@ cp yarn.lock $TARGET_DIR
 yarn2nix > $TARGET_DIR/yarn.nix

 # needed to avoid import from derivation
-cp package.json $TARGET_DIR
+jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json

 popd
 popd
--- a/pkgs/applications/networking/misc/zammad/yarn.lock
+++ b/pkgs/applications/networking/misc/zammad/yarn.lock
--- a/pkgs/applications/networking/misc/zammad/yarn.nix
+++ b/pkgs/applications/networking/misc/zammad/yarn.nix
--- a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch
+++ b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch
@ -1,19 +0,0 @@
-diff --git a/database/DBio.c b/database/DBio.c
-index 93c4b0b..292ea5f 100644
--- a/database/DBio.c
-+++ b/database/DBio.c
-@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f)
- 
- #define FPRINTF(f,s)\
- {\
-     if (fprintf(f,s) == EOF) goto ioerror;\
-+     if (fprintf(f,"%s",s) == EOF) goto ioerror;\
-      DBFileOffset += strlen(s);\
- }
- #define FPRINTR(f,s)\
- {\
-     if (fprintf(f,s) == EOF) return 1;\
-+     if (fprintf(f,"%s",s) == EOF) return 1;\
-      DBFileOffset += strlen(s);\
- }
- 
--- a/pkgs/applications/science/electronics/magic-vlsi/default.nix
+++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "magic-vlsi";
-  version = "8.3.109";
+  version = "8.3.277";

  src = fetchurl {
    url    = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
-    sha256 = "sha256-ZK4OF5XwjW1OJmOVUFqLklfpM10eIwCILygqIyjRbEQ=";
+    sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY=";
  };

  nativeBuildInputs = [ python3 ];
@ -48,7 +48,6 @@ stdenv.mkDerivation rec {

  patches = [
    ./0001-strip-bin-prefix.patch
-    ./0002-fix-format-security.patch
  ];

  meta = with lib; {
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@ -10,11 +10,11 @@ in

 stdenv.mkDerivation rec {
  pname = "filebot";
-  version = "4.9.5";
+  version = "4.9.6";

  src = fetchurl {
-    url = "https://web.archive.org/web/20220226124706/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
-    sha256 = "sha256-LNvfAueDMd2TedK6bqnNG+J/4YhhbmUca9iyUkoUNkE=";
+    url = "https://web.archive.org/web/20220305095926/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
+    sha256 = "sha256-3j0WmmamE9KUNwjOVZvrdFH5dS/9FHSdbLfcAsOzQOo=";
  };

  unpackPhase = "tar xvf $src";
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -136,6 +136,15 @@ stdenv.mkDerivation rec {
      url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch";
      sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo=";
    })
+    # The next two commits are to make Linux v5.17 work on aarch64-darwin. These are included in QEMU v7.
+    (fetchpatch {
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/ad99f64f1cfff7c5e7af0e697523d9b7e45423b6.patch";
+      sha256 = "sha256-e6WtfQIPEiXhWucd5ab7UIoccbWEAv3bwksn4hR85CY=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/7f6c295cdfeaa229c360cac9a36e4e595aa902ae.patch";
+      sha256 = "sha256-mORtgfU1CYQFKO5UrXgM9cJyZxeF2bz8iAoq0UlFQeY=";
+    })
    ./allow-virtfs-on-darwin.patch
    # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin
    # support on nix requires utimensat fallback. The patch adding this fallback
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "i3wsr";
-  version = "2.1.0";
+  version = "2.1.1";

  src = fetchFromGitHub {
    owner = "roosta";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-mwPU700eqyFYihWP1m3y56zXnX16sjSNzB6XNlCttBU=";
+    sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU=";
  };

-  cargoSha256 = "sha256-f0Yby/2g7apkqx0iCcd/QkQgMVYZDUQ1vWw8RCXQ9Z4=";
+  cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";

  nativeBuildInputs = [ python3 ];
  buildInputs = [ libxcb ];
--- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
+++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
@ -97,18 +97,21 @@ let
      if [[ -d  $out/share/gsettings-schemas/ ]]; then
          # Recreate the standard schemas directory if its a symlink to make it writable
          if [[ -L $out/share/glib-2.0 ]]; then
-              ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old
-              rm -rf $out/share/glib-2.0
+              target=$(readlink $out/share/glib-2.0)
+              rm $out/share/glib-2.0
+              mkdir $out/share/glib-2.0
+              ln -fs $target/* $out/share/glib-2.0
+          fi
+
+          if [[ -L $out/share/glib-2.0/schemas ]]; then
+              target=$(readlink $out/share/glib-2.0/schemas)
+              rm $out/share/glib-2.0/schemas
+              mkdir $out/share/glib-2.0/schemas
+              ln -fs $target/* $out/share/glib-2.0/schemas
          fi

          mkdir -p $out/share/glib-2.0/schemas

-          # symlink any schema files or overrides to the standard schema directory
-          if [[ -e $out/share/glib-2.0.old/schemas ]]; then
-              ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas
-              ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas
-          fi
-
          for d in $out/share/gsettings-schemas/*; do
              # Force symlink, in case there are duplicates
              ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@ -138,18 +138,21 @@ let
      if [[ -d  $out/share/gsettings-schemas/ ]]; then
          # Recreate the standard schemas directory if its a symlink to make it writable
          if [[ -L $out/share/glib-2.0 ]]; then
-              ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old
-              rm -rf $out/share/glib-2.0
+              target=$(readlink $out/share/glib-2.0)
+              rm $out/share/glib-2.0
+              mkdir $out/share/glib-2.0
+              ln -fs $target/* $out/share/glib-2.0
+          fi
+
+          if [[ -L $out/share/glib-2.0/schemas ]]; then
+              target=$(readlink $out/share/glib-2.0/schemas)
+              rm $out/share/glib-2.0/schemas
+              mkdir $out/share/glib-2.0/schemas
+              ln -fs $target/* $out/share/glib-2.0/schemas
          fi

          mkdir -p $out/share/glib-2.0/schemas

-          # symlink any schema files or overrides to the standard schema directory
-          if [[ -e $out/share/glib-2.0.old/schemas ]]; then
-              ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas
-              ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas
-          fi
-
          for d in $out/share/gsettings-schemas/*; do
              # Force symlink, in case there are duplicates
              ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
--- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
+++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix
@ -11,6 +11,9 @@
 , kitemviews
 , knewstuff
 , libksysguard
+, kquickcharts
+, ksystemstats
+, qqc2-desktop-style
 , qtbase
 }:

@ -27,5 +30,8 @@ mkDerivation {
    knewstuff
    kiconthemes
    libksysguard
+    kquickcharts
+    ksystemstats
+    qqc2-desktop-style
  ];
 }
--- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix
@ -12,7 +12,7 @@
 , zlib
 , debugVersion ? false
 , enableManpages ? false
-, enableSharedLibraries ? !stdenv.hostPlatform.isStatic
+, enableSharedLibraries ? false

 , version
 , src
@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
  ];

-  postPatch = ''
+  postPatch = lib.optional enableSharedLibraries ''
    substitute '${./outputs.patch}' ./outputs.patch --subst-var lib
    patch -p1 < ./outputs.patch
  '';
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@ -1,45 +1,197 @@
-{ lib, stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
-, libpthreadstubs, pango, pkg-config, libpulseaudio, which }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip
+, autoconf, automake, autoreconfHook, bash, clang, dos2unix, file, gzip, perl
+, pkg-config
+, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool
+, libuuid, openssl, pango, xorg
+, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null
+, squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null
+, squeakVmVersion ? null
+} @ args:

-stdenv.mkDerivation rec {
+let
+  inherit (builtins) elemAt;
+  nullableOr = o: default: if o == null then default else o;
+
+  bits = stdenv.hostPlatform.parsed.cpu.bits;
+
+  squeakVersion = nullableOr args.squeakVersion or null "5.3-19459";
+  squeakVersionSplit = builtins.split "-" squeakVersion;
+  squeakVersionBase = elemAt squeakVersionSplit 0;
+  squeakVersionBaseSplit = lib.splitVersion squeakVersionBase;
+  squeakVersionMajor = elemAt squeakVersionBaseSplit 0;
+  squeakVersionMinor = elemAt squeakVersionBaseSplit 1;
+
+  squeakImageVersion = elemAt squeakVersionSplit 2;
+
+  squeakSourcesVersion = nullableOr args.squeakSourcesVersion or null "50";
+
+  squeakVmVersion = nullableOr args.squeakVmVersion or null "5.0-202003021730";
+  squeakVmVersionSplit = builtins.split "-" squeakVmVersion;
+  squeakVmVersionBase = elemAt squeakVmVersionSplit 0;
+  squeakVmVersionBaseSplit = lib.splitVersion squeakVmVersionBase;
+  squeakVmVersionMajor = elemAt squeakVmVersionBaseSplit 0;
+  squeakVmVersionMinor = elemAt squeakVmVersionBaseSplit 1;
+  squeakVmVersionRelease = elemAt squeakVmVersionSplit 2;
+
+  squeakVmCommitHash = nullableOr args.squeakVmCommitHash or null (fetchurl {
+    url = "https://api.github.com/repos/OpenSmalltalk/opensmalltalk-vm/commits/${squeakVmVersionRelease}";
+    curlOpts = "--header Accept:application/vnd.github.v3.sha";
+    hash = nullableOr args.squeakVmCommitHashHash or null
+      "sha256-quwmhpJlb2fp0fI9b03fBxSR44j1xmHPW20wkSqTOhQ=";
+  });
+in stdenv.mkDerivation {
  pname = "squeak";
-  version = "4.10.2.2614";
+  version = squeakVersion;

-  src = fetchurl {
-    sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix";
-    url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz";
+  vmVersionRelease = squeakVmVersionRelease; # "202003021730"
+  vmHash = squeakVmCommitHash;
+
+  vmSrcUrl = "https://github.com/OpenSmalltalk/opensmalltalk-vm.git";
+  src = fetchFromGitHub {
+    owner = "OpenSmalltalk";
+    repo = "opensmalltalk-vm";
+    rev = squeakVmVersionRelease;
+    hash = nullableOr args.squeakVmHash or null
+      "sha256-rNJn5ya+7ggC21MpwSrl2ByJDjVycONKHADboH7dQLM=";
+  };
+  imageSrc = let
+    squeakImageName = "Squeak${squeakVersionBase}-${squeakImageVersion}-${toString bits}bit";
+  in fetchzip {
+    url = "https://files.squeak.org/${squeakVersionBase}/${squeakImageName}/${squeakImageName}.zip";
+    name = "source";
+    stripRoot = false;
+    hash = nullableOr args.squeakImageHash or null
+      "sha256-wDuRyc/DNqG1D4DzyBkUvrzFkBlXBtbpnANZlRV/Fas=";
+  };
+  sourcesSrc = fetchurl {
+    url = "https://files.squeak.org/sources_files/SqueakV${squeakSourcesVersion}.sources.gz";
+    hash = nullableOr args.squeakSourcesHash or null
+      "sha256-ZViZ1VgI32LwLTEyw7utp8oaAK3UmCNJnHqsGm1IKYE=";
  };

-  buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
-    pango libpulseaudio which ];
-  nativeBuildInputs = [ cmake pkg-config ];
+  vmBuild = "linux64x64";

-  postPatch = ''
-    for i in squeak.in squeak.sh.in; do
-      substituteInPlace unix/cmake/$i --replace "PATH=" \
-        "PATH=${lib.makeBinPath [ coreutils gnused which ]} #"
+  nativeBuildInputs = [
+    autoconf
+    automake
+    autoreconfHook
+    bash
+    clang
+    dos2unix
+    file
+    gzip
+    perl
+    pkg-config
+  ];
+  buildInputs = [
+    alsa-lib
+    coreutils
+    freetype
+    glib
+    glibc
+    gnugrep
+    libpulseaudio
+    libtool
+    libuuid
+    openssl
+    pango
+    xorg.libX11
+  ];
+
+  postUnpack = ''
+    for file in "$imageSrc"/*.{image,changes}; do
+      gzip -c "$file" > "$sourceRoot/''${file##"$imageSrc"/}.gz"
    done
  '';

-  configurePhase = ''
-    unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads}
+  prePatch = ''
+    dos2unix platforms/unix/plugins/*/{Makefile.inc,acinclude.m4}
  '';

-  hardeningDisable = [ "format" ];
+  patches = [
+    ./squeak-configure-version.patch
+    ./squeak-plugins-discovery.patch
+    ./squeak-squeaksh-nixpkgs.patch
+  ];
+
+  postPatch = ''
+    vmVersionDate=$(sed 's/\([0-9][0-9][0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)/\1-\2-\3T\4:\5+0000/' <<< "$vmVersionRelease")
+    vmVersionDate=$(date -u '+%a %b %-d %T %Y %z' -d "$vmVersionDate")
+    vmVersionFiles=$(sed -n 's/^versionfiles="\(.*\)"/\1/p' ./scripts/updateSCCSVersions)
+    vmHash=$(< "$vmHash")
+    vmAbbrevHash=''${vmHash:0:12}
+    printf '%s\n' "$vmAbbrevHash"
+    for vmVersionFile in $vmVersionFiles; do
+      substituteInPlace "$vmVersionFile" \
+        --replace "\$Date\$" "\$Date: ''${vmVersionDate} \$" \
+        --replace "\$URL\$" "\$URL: ''${vmSrcUrl} \$" \
+        --replace "\$Rev\$" "\$Rev: ''${vmVersionRelease} \$" \
+        --replace "\$CommitHash\$" "\$CommitHash: ''${vmAbbrevHash} \$"
+    done
+    patchShebangs --build ./"build.$vmBuild"/squeak.cog.spur ./scripts
+    for squeaksh in ./platforms/unix/config/{,bin.}squeak.sh.in; do
+      substituteInPlace "$squeaksh" \
+        --subst-var-by 'glibc' ${lib.escapeShellArg (lib.getBin glibc)} \
+        --subst-var-by 'gnugrep' ${lib.escapeShellArg (lib.getBin gnugrep)}
+    done
+    substituteInPlace ./platforms/unix/config/mkmf \
+      --replace '/bin/rm ' '${coreutils}/bin/rm '
+  '';
+
+  preAutoreconf = ''
+    pushd ./platforms/unix/config > /dev/null
+    ./mkacinc > ./acplugins.m4
+  '';
+  postAutoreconf = ''
+    rm ./acplugins.m4
+    popd > /dev/null
+  '';
+
+  preConfigure = ''
+    if [ -z "''${dontFixLibtool:-}" ]; then
+        local i
+        find ./platforms/unix/config -iname "ltmain.sh" -print0 | while IFS=''' read -r -d ''' i; do
+            echo "fixing libtool script $i"
+            fixLibtool "$i"
+        done
+    fi
+
+    substituteInPlace ./platforms/unix/config/configure \
+      --replace "/usr/bin/file" "${file}/bin/file"
+    cd ./"build.$vmBuild"/squeak.cog.spur/build
+    substituteInPlace ./mvm \
+      --replace 'read a' 'a=y' \
+      --replace $'if [ $# -ge 1 ]; then\n\tINSTALLDIR="$1"; shift\nfi\n' "" \
+      --replace 'config/configure' 'config/configure "$@"' \
+      --replace 'make install' '# make install'
+  '';
+
+  configureFlags = [
+    "--disable-dynamicopenssl"
+    "SQ_MAJOR=${squeakVersionMajor}"
+    "SQ_MINOR=${squeakVersionMinor}"
+    "SQ_UPDATE=${squeakImageVersion}"
+    "SQ_VERSION=${squeakVersion}-${toString bits}bit"
+    "SQ_SRC_VERSION=${squeakSourcesVersion}"
+    "VM_MAJOR=${squeakVmVersionMajor}"
+    "VM_MINOR=${squeakVmVersionMinor}"
+    "VM_RELEASE=${squeakVmVersionRelease}"
+    "VM_VERSION=${squeakVmVersion}"
+  ];
+  configureScript = "./mvm";
+
+  installTargets = [ "install" "install-image" ];
+
+  postInstall = ''
+    rm "$out/squeak"
+    cp --no-preserve mode "$sourcesSrc" "$out"/lib/squeak/SqueakV${lib.escapeShellArg squeakSourcesVersion}.sources
+  '';

  meta = with lib; {
-    description = "Smalltalk programming language and environment";
-    longDescription = ''
-      Squeak is a full-featured implementation of the Smalltalk programming
-      language and environment based on (and largely compatible with) the
-      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
-      graphics, sound, video, MIDI, animation and other multimedia
-      capabilities. It also includes a customisable framework for creating
-      dynamic HTTP servers and interactively extensible Web sites.
-    '';
-    homepage = "http://squeakvm.org/";
-    downloadPage = "http://squeakvm.org/unix/index.html";
+    description = "Squeak virtual machine";
+    homepage = "https://opensmalltalk.org/";
    license = with licenses; [ asl20 mit ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ ehmry ];
+    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/development/compilers/squeak/squeak-configure-version.patch
+++ b/pkgs/development/compilers/squeak/squeak-configure-version.patch
@ -0,0 +1,94 @@
+--- a/platforms/unix/config/Makefile.install
+++ b/platforms/unix/config/Makefile.install
+@@ -101,10 +101,10 @@ uninstall-image : getversion
+ 
+ install-sources :
+ 	$(MKINSTALLDIRS) $(ROOT)$(imgdir)
+-	$(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir)
+	$(INSTALL_DATA) $(topdir)/SqueakV$(SQ_SRC_VERSION).sources $(ROOT)$(imgdir)
+ 
+ uninstall-sources :
+-	@$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
+	@$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_SRC_VERSION).sources
+ 
+ # npsqueak
+ 
+--- a/platforms/unix/config/configure.ac
+++ b/platforms/unix/config/configure.ac
+@@ -122,7 +122,7 @@ AC_SUBST(vmpdir)
+ AC_SUBST(vmmcfg)
+ AC_SUBST(blddir)
+ 
+-SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
+AS_VAR_SET_IF([SQ_VERSION], [], [SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}])
+ 
+ AC_DEFINE_UNQUOTED(SQ_VERSION, "${SQ_VERSION}", [Squeak version])
+ 
+@@ -131,21 +131,24 @@ AC_SUBST(SQ_MINOR)
+ AC_SUBST(SQ_UPDATE)
+ AC_SUBST(SQ_VERSION)
+ 
+AS_VAR_SET_IF([SQ_SRC_VERSION], [], [SQ_SRC_VERSION=${SQ_MAJOR}])
+AC_SUBST(SQ_SRC_VERSION)
+
+ #VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE}
+ 
+ #AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}", [VM version])
+ 
+-#AC_SUBST(VM_MAJOR)
+-#AC_SUBST(VM_MINOR)
+-#AC_SUBST(VM_RELEASE)
+-#AC_SUBST(VM_VERSION)
+AC_SUBST(VM_MAJOR)
+AC_SUBST(VM_MINOR)
+AC_SUBST(VM_RELEASE)
+AC_SUBST(VM_VERSION)
+ 
+ # libdir contains ${exec_prefix}, so we have to default and expand early
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ imgdir=`eval echo ${libdir}/squeak`
+ expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}`
+-plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`'
+plgdir=`eval echo '${imgdir}'/${VM_VERSION}`
+ 
+ AC_SUBST(imgdir)
+ AC_SUBST(expanded_relative_imgdir)
+--- a/platforms/unix/config/inisqueak.in
+++ b/platforms/unix/config/inisqueak.in
+@@ -32,6 +32,7 @@
+ 
+ MAJOR=@SQ_MAJOR@
+ VERSION=@SQ_VERSION@
+SRC_VERSION=@SQ_SRC_VERSION@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+@@ -77,7 +78,7 @@ if test "$1" != ""; then
+ fi
+ 
+ SQUEAK=${bindir}/squeak
+-SOURCES=SqueakV${MAJOR}.sources
+SOURCES=SqueakV${SRC_VERSION}.sources
+ IMAGE=squeak.image.gz
+ CHANGES=squeak.changes.gz
+ 
+--- a/platforms/unix/config/make.cfg.in
+++ b/platforms/unix/config/make.cfg.in
+@@ -96,6 +96,16 @@ X_INCLUDES=	@X_INCLUDES@
+ X_LIBS=		@X_LIBS@
+ 
+ 
+SQ_MAJOR=	@SQ_MAJOR@
+SQ_MINOR=	@SQ_MINOR@
+SQ_UPDATE=	@SQ_UPDATE@
+SQ_VERSION=	@SQ_VERSION@
+SQ_SRC_VERSION=	@SQ_SRC_VERSION@
+VM_MAJOR=	@VM_MAJOR@
+VM_MINOR=	@VM_MINOR@
+VM_RELEASE=	@VM_RELEASE@
+VM_VERSION=	@VM_VERSION@
+
+ INTERP=		@INTERP@
+ 
+ VM_APP_ICONS=	@VM_APP_ICONS@
--- a/pkgs/development/compilers/squeak/squeak-plugins-discovery.patch
+++ b/pkgs/development/compilers/squeak/squeak-plugins-discovery.patch
@ -0,0 +1,34 @@
+--- a/platforms/unix/plugins/UnicodePlugin/Makefile.inc
+++ b/platforms/unix/plugins/UnicodePlugin/Makefile.inc
+@@ -1,2 +1,2 @@
+-XCPPFLAGS=	-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0  -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include
+XCPPFLAGS=	[unicode_plugin_cflags]
+-XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0
+XLDFLAGS=	[unicode_plugin_libs]
+--- a/platforms/unix/plugins/UnicodePlugin/acinclude.m4
+++ b/platforms/unix/plugins/UnicodePlugin/acinclude.m4
+@@ -2,9 +2,14 @@
+ 
+ AC_MSG_CHECKING([for PangoCairo libraries])
+ save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include"
+CPPFLAGS=`pkg-config --cflags glib-2.0 pangocairo`
+ AC_TRY_COMPILE([#include <pango/pangocairo.h>],[{}],[
+   AC_MSG_RESULT(yes)
+  PKG_CHECK_MODULES([UNICODE_PLUGIN],[glib-2.0 pangocairo])
+  AC_SUBST([UNICODE_PLUGIN_CFLAGS])
+  AC_SUBST([UNICODE_PLUGIN_LIBS])
+  AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_cflags],[$UNICODE_PLUGIN_CFLAGS])
+  AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_libs],[$UNICODE_PLUGIN_LIBS])
+ ],[
+   AC_MSG_RESULT(no)
+   AC_PLUGIN_DISABLE
+--- a/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4
+++ b/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4
+@@ -1,5 +1,3 @@
+ # Require X11
+ 
+-AC_CHECK_LIB(X11,XOpenDisplay,
+-  [AC_PLUGIN_USE_LIB(X11)],
+-  [AC_PLUGIN_DISABLE])
+AC_PLUGIN_CHECK_LIB(X11,XOpenDisplay)
--- a/pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch
+++ b/pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch
@ -0,0 +1,40 @@
+--- a/platforms/unix/config/bin.squeak.sh.in
+++ b/platforms/unix/config/bin.squeak.sh.in
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
+ # if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
+-BIN=`/usr/bin/dirname "$0"`/../@expanded_relative_imgdir@
+BIN=`dirname "$0"`/../@expanded_relative_imgdir@
+ GDB=
+ if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
+        export SQUEAK_PLUGINS="$BIN"
+@@ -26,7 +26,7 @@ fi
+ # libc (e.g. through the FFI) then it must use the same version that the VM uses
+ # and so it should take precedence over /lib libc.  This is done by setting
+ # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
+-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
+LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
+ PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
+ 
+ if [ "$PLATFORMLIBDIR" = "" ]; then
+--- a/platforms/unix/config/squeak.sh.in
+++ b/platforms/unix/config/squeak.sh.in
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
+ # if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
+-BIN=`/usr/bin/dirname "$0"`/@expanded_relative_imgdir@
+BIN=`dirname "$0"`/@expanded_relative_imgdir@
+ GDB=
+ if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
+        export SQUEAK_PLUGINS="$BIN"
+@@ -26,7 +26,7 @@ fi
+ # libc (e.g. through the FFI) then it must use the same version that the VM uses
+ # and so it should take precedence over /lib libc.  This is done by setting
+ # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
+-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
+LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
+ PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
+ 
+ if [ "$PLATFORMLIBDIR" = "" ]; then
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@ -46,6 +46,13 @@ buildPackages.stdenv.mkDerivation {
  name = "hoogle-with-packages";
  buildInputs = [ghc hoogle];

+  # compiling databases takes less time than copying the results
+  # between machines.
+  preferLocalBuild = true;
+  # Plus, you need a complete database for each possible combination
+  # of dependencies, caching them does not make sense.
+  allowSubstitutes = false;
+
  inherit docPackages;

  passAsFile = ["buildCommand"];
--- a/pkgs/development/interpreters/spidermonkey/78.nix
+++ b/pkgs/development/interpreters/spidermonkey/78.nix
@ -15,7 +15,6 @@
 , rustc
 , rust-cbindgen
 , yasm
-, llvmPackages_12
 , nspr
 }:

@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    autoconf213
    cargo
-    llvmPackages_12.llvm # for llvm-objdump
+    rustc.llvmPackages.llvm # for llvm-objdump
    perl
    pkg-config
    python3
--- a/pkgs/development/interpreters/spidermonkey/91.nix
+++ b/pkgs/development/interpreters/spidermonkey/91.nix
@ -13,7 +13,6 @@
 , rustc
 , rust-cbindgen
 , yasm
-, llvmPackages_latest
 , nspr
 , m4
 }:
@ -32,7 +31,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    cargo
-    llvmPackages_latest.llvm # for llvm-objdump
+    rustc.llvmPackages.llvm # for llvm-objdump
    perl
    pkg-config
    python3
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, fixDarwinDylibNames }:

 stdenv.mkDerivation rec {
  pname = "libnatpmp";
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
    "CC:=$(CC)"
  ];

+  nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
  postFixup = ''
    chmod +x $out/lib/*
  '';
--- a/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/pkgs/development/libraries/prometheus-cpp/default.nix
@ -21,22 +21,20 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ cmake ];
-  buildInputs = [ gbenchmark civetweb gtest zlib curl ];
-
+  buildInputs = [ gbenchmark gtest zlib curl ];
+  propagatedBuildInputs = [ civetweb ];
  strictDeps = true;

  cmakeFlags = [
    "-DUSE_THIRDPARTY_LIBRARIES=OFF"
-    "-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include"
-    "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}"
    "-DBUILD_SHARED_LIBS=ON"
  ];

-  NIX_LDFLAGS = "-ldl";
+  outputs = [ "out" "dev" ];

  postInstall = ''
-    mkdir -p $out/lib/pkgconfig
-    substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc
+    mkdir -p $dev/lib/pkgconfig
+    substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc
  '';

  meta = {
--- a/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/pkgs/development/libraries/rocm-comgr/default.nix
@ -27,15 +27,6 @@ stdenv.mkDerivation rec {
    "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\""
  ];

-  # The comgr build tends to link against the static LLVM libraries
-  # *and* the dynamic library. Linking against both causes errors
-  # about command line options being registered twice. This patch
-  # removes the static library linking.
-  patchPhase = ''
-    sed -e '/^llvm_map_components_to_libnames/,/[[:space:]]*Symbolize)/d' \
-        -i CMakeLists.txt
-  '';
-
  passthru.updateScript = writeScript "update.sh" ''
    #!/usr/bin/env nix-shell
    #!nix-shell -i bash -p curl jq common-updater-scripts
--- a/pkgs/development/libraries/ucx/default.nix
+++ b/pkgs/development/libraries/ucx/default.nix
@ -13,13 +13,13 @@ let

 in stdenv.mkDerivation rec {
  pname = "ucx";
-  version = "1.12.0";
+  version = "1.12.1";

  src = fetchFromGitHub {
    owner = "openucx";
    repo = "ucx";
    rev = "v${version}";
-    sha256 = "0jwza9ivfnhkfwg4c58pxalkga5scz803k631xw4hcliy62gk53w";
+    sha256 = "08ajhbhzwkfzhkhswk56zx17q18ii67dg1ca1f5grl9qjgj3mmyw";
  };

  nativeBuildInputs = [ autoreconfHook doxygen ];
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@ -10,13 +10,13 @@

 buildPythonPackage rec {
  pname = "flake8-bugbear";
-  version = "22.1.11";
+  version = "22.3.20";

  src = fetchFromGitHub {
    owner = "PyCQA";
    repo = pname;
    rev = version;
-    sha256 = "sha256-sTg69Hgvi77wtLWEH4JtcIAMFk7exr5CBXmyS0nE5Vc=";
+    sha256 = "sha256-tq008SNytZCttnVY1NLf9/2aeqP+iPLUNsRLZu0k3Uk=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "pubnub";
-  version = "6.1.0";
+  version = "6.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = "python";
    rev = "v${version}";
-    hash = "sha256-rAeZxCaSY9tgoMk7l+mlqqiZfD2yIGoywITC0Y2z7oI=";
+    hash = "sha256-QOOPcWhhEqg7c0INQv88+eOP0povN8W4lLoaly9TGu0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/zipstream-ng/default.nix
+++ b/pkgs/development/python-modules/zipstream-ng/default.nix
@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "zipstream-ng";
+  version = "1.3.4";
+
+  disabled = pythonOlder "3.7";
+  src = fetchFromGitHub {
+    owner = "pR0Ps";
+    repo = "zipstream-ng";
+    rev = "v${version}";
+    sha256 = "NTsnGCddGDUxdHbEoM2ew756psboex3sb6MkYKtaSjQ=";
+  };
+
+  pythonImportsCheck = [
+    "zipstream"
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Library to generate streamable zip files";
+    longDescription = ''
+      A modern and easy to use streamable zip file generator. It can package and stream many files
+      and folders on the fly without needing temporary files or excessive memory
+    '';
+    homepage = "https://github.com/pR0Ps/zipstream-ng";
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ gador ];
+  };
+}
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-tarpaulin";
-  version = "0.19.1";
+  version = "0.20.0";

  src = fetchFromGitHub {
    owner = "xd009642";
    repo = "tarpaulin";
    rev = version;
-    sha256 = "sha256-H/EQTS+d317icCZdOWTvykzIFQC7ia7/jYFkImgogps=";
+    sha256 = "sha256-LMHaRGZZqFUCbrChzlLA/gUArlGC5DUI2fc1bkLU2CA=";
  };

  nativeBuildInputs = [
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ]
    ++ lib.optionals stdenv.isDarwin [ curl Security ];

-  cargoSha256 = "sha256-A3J5od6yT7eVU66WfvG/umne0RDBZCf8IvQpW6OTZSE=";
+  cargoSha256 = "sha256-ei+ilmrlJYmt08A+aV2Rc5pn5dkuEBgfm9kyLkfFe9A=";
  #checkFlags = [ "--test-threads" "1" ];
  doCheck = false;

--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitLab, fetchurl }:

 let
-  version = "14.8.2";
+  version = "14.9.0";
 in
 buildGoModule rec {
  inherit version;
@ -14,17 +14,18 @@ buildGoModule rec {
    "-X ${commonPackagePath}.REVISION=v${version}"
  ];

-  vendorSha256 = "1aa04hbavr0bclddp5adjwwj21sp46gbhjydxc3w7vs1siw0ivq2";
+  vendorSha256 = "0ag3pmcrxksgikdcvl9rv2s3kn7l0dj41pf2m9dq0g2a1j45nydn";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-runner";
    rev = "v${version}";
-    sha256 = "1zwr09lrrc3xx3sp00vs30ks0n77d7v0xkz0mz9jy2qdls9nfmrv";
+    sha256 = "0qqwg2k50cq7bc7k1389knrjq6xdbmlxd5kavyj7pg4sfapa3i8l";
  };

  patches = [
    ./fix-shell-path.patch
+    ./remove-bash-test.patch
  ];

  prePatch = ''
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
@ -1,5 +1,5 @@
 diff --git a/shells/bash.go b/shells/bash.go
-index bd99eca1a..9873dff6b 100644
+index 18d608445..f158ffc0b 100644
 --- a/shells/bash.go
 +++ b/shells/bash.go
@@ -3,6 +3,7 @@ package shells
@ -10,16 +10,16 @@ index bd99eca1a..9873dff6b 100644
 	"path"
 	"runtime"
 	"strconv"
-@@ -300,7 +301,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell
- 	if info.User != "" {
- 		script.Command = "su"
- 		if runtime.GOOS == "linux" {
-			script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)
-+			shellPath, err := exec.LookPath(b.Shell)
-+			if err != nil {
-+				shellPath = "/bin/" + b.Shell
-+			}
-+			script.Arguments = append(script.Arguments, "-s", shellPath)
- 		}
- 		script.Arguments = append(
- 			script.Arguments,
+@@ -307,7 +308,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell
+
+ 	script.Command = "su"
+ 	if runtime.GOOS == OSLinux {
+-		script.Arguments = []string{"-s", "/bin/" + b.Shell, info.User, "-c", script.CmdLine}
+		shellPath, err := exec.LookPath(b.Shell)
+		if err != nil {
+			shellPath = "/bin/" + b.Shell
+		}
+		script.Arguments = []string{"-s", shellPath, info.User, "-c", script.CmdLine}
+ 	} else {
+ 		script.Arguments = []string{info.User, "-c", script.CmdLine}
+ 	}
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
@ -0,0 +1,80 @@
+diff --git a/shells/bash_test.go b/shells/bash_test.go
+index b8a48f85e..0e3173fc3 100644
+--- a/shells/bash_test.go
+++ b/shells/bash_test.go
+@@ -4,12 +4,9 @@
+ package shells
+ 
+ import (
+-	"runtime"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/assert"
+-	"github.com/stretchr/testify/require"
+-	"gitlab.com/gitlab-org/gitlab-runner/common"
+ )
+ 
+ func TestBash_CommandShellEscapesLegacy(t *testing.T) {
+@@ -84,62 +81,3 @@ func TestBash_CheckForErrors(t *testing.T) {
+ 		})
+ 	}
+ }
+-
+-func TestBash_GetConfiguration(t *testing.T) {
+-	tests := map[string]struct {
+-		info common.ShellScriptInfo
+-		cmd  string
+-		args []string
+-		os   string
+-	}{
+-		`bash`: {
+-			info: common.ShellScriptInfo{Shell: "bash", Type: common.NormalShell},
+-			cmd:  "bash",
+-		},
+-		`bash -l`: {
+-			info: common.ShellScriptInfo{Shell: "bash", Type: common.LoginShell},
+-			cmd:  "bash",
+-			args: []string{"-l"},
+-		},
+-		`su -s /bin/bash foobar -c bash`: {
+-			info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.NormalShell},
+-			cmd:  "su",
+-			args: []string{"-s", "/bin/bash", "foobar", "-c", "bash"},
+-			os:   OSLinux,
+-		},
+-		`su -s /bin/bash foobar -c $'bash -l'`: {
+-			info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.LoginShell},
+-			cmd:  "su",
+-			args: []string{"-s", "/bin/bash", "foobar", "-c", "bash -l"},
+-			os:   OSLinux,
+-		},
+-		`su -s /bin/sh foobar -c $'sh -l'`: {
+-			info: common.ShellScriptInfo{Shell: "sh", User: "foobar", Type: common.LoginShell},
+-			cmd:  "su",
+-			args: []string{"-s", "/bin/sh", "foobar", "-c", "sh -l"},
+-			os:   OSLinux,
+-		},
+-		`su foobar -c $'bash -l'`: {
+-			info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.LoginShell},
+-			cmd:  "su",
+-			args: []string{"foobar", "-c", "bash -l"},
+-			os:   "darwin",
+-		},
+-	}
+-
+-	for tn, tc := range tests {
+-		t.Run(tn, func(t *testing.T) {
+-			if tc.os != "" && tc.os != runtime.GOOS {
+-				t.Skipf("test only runs on %s", tc.os)
+-			}
+-
+-			sh := BashShell{Shell: tc.info.Shell}
+-			config, err := sh.GetConfiguration(tc.info)
+-			require.NoError(t, err)
+-
+-			assert.Equal(t, tc.cmd, config.Command)
+-			assert.Equal(t, tc.args, config.Arguments)
+-			assert.Equal(t, tn, config.CmdLine)
+-		})
+-	}
+-}
--- a/pkgs/development/tools/fq/default.nix
+++ b/pkgs/development/tools/fq/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "fq";
-  version = "0.0.4";
+  version = "0.0.6";

  src = fetchFromGitHub {
    owner = "wader";
    repo = "fq";
    rev = "v${version}";
-    sha256 = "sha256-mnb/9zcFSeBasGPYSGWoBhnldljGW3VK070zTO8M/uk=";
+    sha256 = "sha256-/9TBnhFGYNOcCsQKUF0uuJEgnF+qRGly/5z1s3sYhqY=";
  };

-  vendorSha256 = "sha256-KPIO/ZuiwxlnjGLaEuClkDsJnx/fwW0jPDBc7aTT68A=";
+  vendorSha256 = "sha256-zvtYyNJO4QoTes3vf6CFa3dYMJqkp0PG9pnOk+aO97Y=";

  ldflags = [
    "-s"
@ -24,6 +24,8 @@ buildGoModule rec {
    "-X main.version=${version}"
  ];

+  subPackages = [ "." ];
+
  passthru.tests = testVersion { package = fq; };

  meta = with lib; {
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "gofumpt";
-  version = "0.3.0";
+  version = "0.3.1";

  src = fetchFromGitHub {
    owner = "mvdan";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-S6IF/MtNCkhPHHdaQJyT78j2z4xdf4z/xLfXDmCWR2Y=";
+    sha256 = "sha256-uXRYVLFDyRZ83mth8Fh+MG9fNv2lUfE3BTljM9v9rjI=";
  };

-  vendorSha256 = "sha256-LhiCxpjySEezhcgICfgD+mABd1QXyZn3uI1Fj+eWiyo=";
+  vendorSha256 = "sha256-Il1E1yOejLEdKRRMqelGeJbHRjx4qFymf7N98BEdFzg=";

  doCheck = false;

--- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix
+++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix
@ -2,14 +2,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-supply-chain";
-  version = "0.2.0";
+  version = "0.3.1";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-zjDZJOUjnEQ03rmo5CdSY1emE6YohOPlf7SKuvNLuV0=";
+    sha256 = "sha256-2iOAa0f0C3tS4oLrSJYjGnuoziPFxcQzXZLqENQq5PY=";
  };

-  cargoSha256 = "sha256-xSJ5rx8k+my0NeGYHZyvDzbM7uMdbViT7Ou9a9JACfs=";
+  cargoSha256 = "sha256-7wjaakyh27U7jjQQ6wNKR4lKQ7Y/+EEfLCfjVojk3TU=";

  buildInputs = lib.optional stdenv.isDarwin Security;

--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@ -16,11 +16,11 @@

 stdenv.mkDerivation rec {
  pname = "cypress";
-  version = "9.4.1";
+  version = "9.5.1";

  src = fetchzip {
    url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "JoHfXhN5mXJoPwnUf7cKK5FduxqP9bSaGUU8yNfg29Y=";
+    sha256 = "fG93H3ADNOu9/Dz25/7b1iNVns/WselaxDG+WmLCQkI=";
  };

  # don't remove runtime deps
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@ -32,6 +32,7 @@ buildHost=localhost
 targetHost=
 remoteSudo=
 verboseScript=
+noFlake=
 # comma separated list of vars to preserve when using sudo
 preservedSudoVars=NIXOS_INSTALL_BOOTLOADER

@ -65,14 +66,14 @@ while [ "$#" -gt 0 ]; do
        upgrade=1
        upgrade_all=1
        ;;
-      -s|--use-substitutes)
+      --use-substitutes|-s)
        copyClosureFlags+=("$i")
        ;;
-      --max-jobs|-j|--cores|-I|--builders)
+      -I|--max-jobs|-j|--cores|--builders)
        j="$1"; shift 1
        extraBuildFlags+=("$i" "$j")
        ;;
-      --show-trace|--keep-failed|-K|--keep-going|-k|--fallback|--repair|--no-build-output|-Q|-j*|-L|--print-build-logs|--refresh|--no-net|--offline|--impure)
+      -j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net)
        extraBuildFlags+=("$i")
        ;;
      --verbose|-v|-vv|-vvv|-vvvv|-vvvvv)
@ -115,6 +116,9 @@ while [ "$#" -gt 0 ]; do
        flakeFlags=(--extra-experimental-features 'nix-command flakes')
        shift 1
        ;;
+      --no-flake)
+        noFlake=1
+        ;;
      --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)
        lockFlags+=("$i")
        ;;
@ -339,7 +343,7 @@ fi

 # Use /etc/nixos/flake.nix if it exists. It can be a symlink to the
 # actual flake.
-if [[ -z $flake && -e /etc/nixos/flake.nix ]]; then
+if [[ -z $flake && -e /etc/nixos/flake.nix && -z $noFlake ]]; then
    flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")"
 fi

--- a/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation {
  pname = "rtl8814au";
-  version = "${kernel.version}-unstable-2021-10-25";
+  version = "${kernel.version}-unstable-2022-02-21";

  src = fetchFromGitHub {
    owner = "morrownr";
    repo = "8814au";
-    rev = "d36c0874716b0776ac6c7dcd6110598ef0f6dd53";
-    sha256 = "0lk3ldff489ggbqmlfi4zvnp1cvxj1b06m0fhpzai82070klzzmj";
+    rev = "a538e3878c4b7b0b012f2d2fe7804390caaebd90";
+    sha256 = "sha256-xBGbcy/WonFrNflMlFCD/JQOFKhPrv0J3j2XcXWc6hk=";
  };

  nativeBuildInputs = kernel.moduleBuildDependencies;
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@ -16,13 +16,13 @@ in
 with python3Packages; buildPythonApplication rec {

  pname = "isso";
-  version = "0.12.5";
+  version = "0.12.6.1";

  src = fetchFromGitHub {
    owner = "posativ";
    repo = pname;
    rev = version;
-    sha256 = "12ccfba2kwbfm9h4zhlxrcigi98akbdm4qi89iglr4z53ygzpay5";
+    sha256 = "sha256-b2iJmOOsaI4lqJ5//jmHflXRx4yFDaAoKZixXoWIyZg=";
  };

  propagatedBuildInputs = [
@ -47,10 +47,13 @@ with python3Packages; buildPythonApplication rec {
    make js
  '';

-  checkInputs = [ nose ];
+  checkInputs = [
+    pytest
+    pytest-cov
+  ];

  checkPhase = ''
-    ${python.interpreter} setup.py nosetests
+    pytest
  '';

  passthru.tests = { inherit (nixosTests) isso; };
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@ -11,11 +11,11 @@ in
 with python3.pkgs;
 buildPythonApplication rec {
  pname = "matrix-synapse";
-  version = "1.54.0";
+  version = "1.55.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-TmUu6KpL111mjd4Dgm/kYnKpDZjw9rWrpMQ5isXmWRo=";
+    sha256 = "sha256-IfLyp6IexNTMrq795qUMAPQ62mrMPwFyLE1yL8cu0T0=";
  };

  buildInputs = [ openssl ];
--- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
+++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "matrix-synapse-mjolnir-antispam";
-  version = "1.3.2";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "matrix-org";
    repo = "mjolnir";
    rev = "v${version}";
-    sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
+    sha256 = "sha256-zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
  };

  sourceRoot = "./source/synapse_antispam";
--- a/pkgs/servers/mjolnir/default.nix
+++ b/pkgs/servers/mjolnir/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "mjolnir";
-  version = "1.3.2";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "matrix-org";
    repo = "mjolnir";
    rev = "v${version}";
-    sha256 = "HDfLndiFm9ayCmixuv4MYBbQ76mzCtTS+4UuBRdpP0E=";
+    sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/mjolnir/node-deps.nix
+++ b/pkgs/servers/mjolnir/node-deps.nix
@ -148,13 +148,22 @@ let
        sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==";
      };
    };
-    "@types/html-to-text-8.0.1" = {
+    "@types/html-to-text-8.1.0" = {
      name = "_at_types_slash_html-to-text";
      packageName = "@types/html-to-text";
-      version = "8.0.1";
+      version = "8.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.0.1.tgz";
-        sha512 = "0B/OifmJYmk5r9z9+KJtGWOF0LEjbTN4D2QeCh+mAw81JkJwC83NvNWUZFEqRT5PpnjX7vX0ab1SMGcwCs3Lag==";
+        url = "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.1.0.tgz";
+        sha512 = "54YF2fGmN4g62/w+T85uQ8n0FyBhMY5cjKZ1imsbIh4Pgbeno1mAaQktC/pv/+C2ToUYkTZis9ADgn9GRRz9nQ==";
+      };
+    };
+    "@types/humanize-duration-3.27.1" = {
+      name = "_at_types_slash_humanize-duration";
+      packageName = "@types/humanize-duration";
+      version = "3.27.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/humanize-duration/-/humanize-duration-3.27.1.tgz";
+        sha512 = "K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==";
      };
    };
    "@types/istanbul-lib-coverage-2.0.4" = {
@ -220,13 +229,13 @@ let
        sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==";
      };
    };
-    "@types/node-16.11.25" = {
+    "@types/node-16.11.26" = {
      name = "_at_types_slash_node";
      packageName = "@types/node";
-      version = "16.11.25";
+      version = "16.11.26";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz";
-        sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz";
+        sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ==";
      };
    };
    "@types/parse5-6.0.3" = {
@ -265,6 +274,15 @@ let
        sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==";
      };
    };
+    "@types/shell-quote-1.7.1" = {
+      name = "_at_types_slash_shell-quote";
+      packageName = "@types/shell-quote";
+      version = "1.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/shell-quote/-/shell-quote-1.7.1.tgz";
+        sha512 = "SWZ2Nom1pkyXCDohRSrkSKvDh8QOG9RfAsrt5/NsPQC4UQJ55eG0qClA40I+Gkez4KTQ0uDUT8ELRXThf3J5jw==";
+      };
+    };
    "@types/stack-utils-2.0.1" = {
      name = "_at_types_slash_stack-utils";
      packageName = "@types/stack-utils";
@ -292,13 +310,13 @@ let
        sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==";
      };
    };
-    "@types/yargs-parser-20.2.1" = {
+    "@types/yargs-parser-21.0.0" = {
      name = "_at_types_slash_yargs-parser";
      packageName = "@types/yargs-parser";
-      version = "20.2.1";
+      version = "21.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz";
-        sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==";
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz";
+        sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==";
      };
    };
    "@ungap/promise-all-settled-1.1.2" = {
@ -931,6 +949,15 @@ let
        sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==";
      };
    };
+    "debug-4.3.4" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz";
+        sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==";
+      };
+    };
    "decamelize-4.0.0" = {
      name = "decamelize";
      packageName = "decamelize";
@ -1093,13 +1120,13 @@ let
        sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==";
      };
    };
-    "domhandler-4.3.0" = {
+    "domhandler-4.3.1" = {
      name = "domhandler";
      packageName = "domhandler";
-      version = "4.3.0";
+      version = "4.3.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz";
-        sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==";
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz";
+        sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==";
      };
    };
    "domutils-2.8.0" = {
@ -1597,13 +1624,13 @@ let
        sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
      };
    };
-    "globals-13.12.1" = {
+    "globals-13.13.0" = {
      name = "globals";
      packageName = "globals";
-      version = "13.12.1";
+      version = "13.13.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz";
-        sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==";
+        url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz";
+        sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==";
      };
    };
    "graceful-fs-4.2.9" = {
@ -1777,6 +1804,24 @@ let
        sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==";
      };
    };
+    "humanize-duration-3.27.1" = {
+      name = "humanize-duration";
+      packageName = "humanize-duration";
+      version = "3.27.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz";
+        sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA==";
+      };
+    };
+    "humanize-duration-ts-2.1.1" = {
+      name = "humanize-duration-ts";
+      packageName = "humanize-duration-ts";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-duration-ts/-/humanize-duration-ts-2.1.1.tgz";
+        sha512 = "TibNF2/fkypjAfHdGpWL/dmWUS0G6Qi+3mKyiB6LDCowbMy+PtzbgPTnFMNTOVAJXDau01jYrJ3tFoz5AJSqhA==";
+      };
+    };
    "iconv-lite-0.4.24" = {
      name = "iconv-lite";
      packageName = "iconv-lite";
@ -2101,13 +2146,13 @@ let
        sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
      };
    };
-    "json5-2.2.0" = {
+    "json5-2.2.1" = {
      name = "json5";
      packageName = "json5";
-      version = "2.2.0";
+      version = "2.2.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz";
-        sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==";
+        url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz";
+        sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==";
      };
    };
    "jsprim-1.4.2" = {
@ -2272,22 +2317,22 @@ let
        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
      };
    };
-    "mime-db-1.51.0" = {
+    "mime-db-1.52.0" = {
      name = "mime-db";
      packageName = "mime-db";
-      version = "1.51.0";
+      version = "1.52.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz";
-        sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz";
+        sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==";
      };
    };
-    "mime-types-2.1.34" = {
+    "mime-types-2.1.35" = {
      name = "mime-types";
      packageName = "mime-types";
-      version = "2.1.34";
+      version = "2.1.35";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz";
-        sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz";
+        sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==";
      };
    };
    "minimalistic-assert-1.0.1" = {
@ -2299,15 +2344,6 @@ let
        sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
      };
    };
-    "minimatch-3.0.4" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
-      };
-    };
    "minimatch-3.1.2" = {
      name = "minimatch";
      packageName = "minimatch";
@ -2317,13 +2353,22 @@ let
        sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
      };
    };
-    "minimist-1.2.5" = {
+    "minimatch-4.2.1" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz";
+        sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==";
+      };
+    };
+    "minimist-1.2.6" = {
      name = "minimist";
      packageName = "minimist";
-      version = "1.2.5";
+      version = "1.2.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz";
+        sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==";
      };
    };
    "mkdirp-0.5.5" = {
@ -2344,13 +2389,13 @@ let
        sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
      };
    };
-    "mocha-9.2.1" = {
+    "mocha-9.2.2" = {
      name = "mocha";
      packageName = "mocha";
-      version = "9.2.1";
+      version = "9.2.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz";
-        sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==";
+        url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz";
+        sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==";
      };
    };
    "moo-0.5.1" = {
@ -2398,15 +2443,6 @@ let
        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
      };
    };
-    "nanoid-3.2.0" = {
-      name = "nanoid";
-      packageName = "nanoid";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz";
-        sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==";
-      };
-    };
    "nanoid-3.3.1" = {
      name = "nanoid";
      packageName = "nanoid";
@ -2542,6 +2578,15 @@ let
        sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
      };
    };
+    "parse-duration-1.0.2" = {
+      name = "parse-duration";
+      packageName = "parse-duration";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.2.tgz";
+        sha512 = "Dg27N6mfok+ow1a2rj/nRjtCfaKrHUZV2SJpEn/s8GaVUSlf4GGRCRP1c13Hj+wfPKVMrFDqLMLITkYKgKxyyg==";
+      };
+    };
    "parse-srcset-1.0.2" = {
      name = "parse-srcset";
      packageName = "parse-srcset";
@ -2659,13 +2704,13 @@ let
        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
      };
    };
-    "postcss-8.4.6" = {
+    "postcss-8.4.12" = {
      name = "postcss";
      packageName = "postcss";
-      version = "8.4.6";
+      version = "8.4.12";
      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz";
-        sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz";
+        sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==";
      };
    };
    "prelude-ls-1.1.2" = {
@ -3037,6 +3082,15 @@ let
        sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==";
      };
    };
+    "shell-quote-1.7.3" = {
+      name = "shell-quote";
+      packageName = "shell-quote";
+      version = "1.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz";
+        sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==";
+      };
+    };
    "sigmund-1.0.1" = {
      name = "sigmund";
      packageName = "sigmund";
@ -3307,13 +3361,13 @@ let
        sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==";
      };
    };
-    "tsconfig-paths-3.12.0" = {
+    "tsconfig-paths-3.14.0" = {
      name = "tsconfig-paths";
      packageName = "tsconfig-paths";
-      version = "3.12.0";
+      version = "3.14.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz";
-        sha512 = "e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==";
+        url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz";
+        sha512 = "cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g==";
      };
    };
    "tslib-1.14.1" = {
@ -3397,13 +3451,13 @@ let
        sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
      };
    };
-    "typescript-4.5.5" = {
+    "typescript-4.6.2" = {
      name = "typescript";
      packageName = "typescript";
-      version = "4.5.5";
+      version = "4.6.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz";
-        sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz";
+        sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==";
      };
    };
    "typescript-formatter-7.2.2" = {
@ -3698,8 +3752,8 @@ let
  args = {
    name = "mjolnir";
    packageName = "mjolnir";
-    version = "1.3.2";
-    src = ../../../../../../../nix/store/yikp7bs3z15vp8rpaghdqc9kpngsfvyj-source;
+    version = "1.4.1";
+    src = ../../../../../../../nix/store/lb7jkhbcx6z00m9j6ck8pa237c26bhi0-source;
    dependencies = [
      sources."@babel/code-frame-7.12.11"
      sources."@babel/helper-validator-identifier-7.16.7"
@ -3717,14 +3771,14 @@ let
      (sources."@eslint/eslintrc-0.4.3" // {
        dependencies = [
          sources."argparse-1.0.10"
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."js-yaml-3.14.1"
          sources."ms-2.1.2"
        ];
      })
      (sources."@humanwhocodes/config-array-0.5.0" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
@ -3738,7 +3792,8 @@ let
      sources."@types/crypto-js-4.1.1"
      sources."@types/express-4.17.13"
      sources."@types/express-serve-static-core-4.17.28"
-      sources."@types/html-to-text-8.0.1"
+      sources."@types/html-to-text-8.1.0"
+      sources."@types/humanize-duration-3.27.1"
      sources."@types/istanbul-lib-coverage-2.0.4"
      sources."@types/istanbul-lib-report-3.0.0"
      sources."@types/istanbul-reports-3.0.1"
@ -3746,15 +3801,16 @@ let
      sources."@types/json5-0.0.29"
      sources."@types/mime-1.3.2"
      sources."@types/mocha-9.1.0"
-      sources."@types/node-16.11.25"
+      sources."@types/node-16.11.26"
      sources."@types/parse5-6.0.3"
      sources."@types/qs-6.9.7"
      sources."@types/range-parser-1.2.4"
      sources."@types/serve-static-1.13.10"
+      sources."@types/shell-quote-1.7.1"
      sources."@types/stack-utils-2.0.1"
      sources."@types/tough-cookie-4.0.1"
      sources."@types/yargs-16.0.4"
-      sources."@types/yargs-parser-20.2.1"
+      sources."@types/yargs-parser-21.0.0"
      sources."@ungap/promise-all-settled-1.1.2"
      sources."abab-2.0.5"
      sources."accepts-1.3.8"
@ -3768,7 +3824,7 @@ let
      sources."acorn-walk-7.2.0"
      (sources."agent-base-6.0.2" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
@ -3850,7 +3906,7 @@ let
          sources."webidl-conversions-5.0.0"
        ];
      })
-      sources."domhandler-4.3.0"
+      sources."domhandler-4.3.1"
      sources."domutils-2.8.0"
      sources."ecc-jsbn-0.1.2"
      (sources."editorconfig-0.15.3" // {
@ -3872,7 +3928,7 @@ let
      (sources."eslint-7.32.0" // {
        dependencies = [
          sources."argparse-1.0.10"
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."js-yaml-3.14.1"
          sources."levn-0.4.1"
          sources."ms-2.1.2"
@ -3931,7 +3987,7 @@ let
      sources."glob-7.2.0"
      sources."glob-parent-5.1.2"
      sources."glob-to-regexp-0.4.1"
-      sources."globals-13.12.1"
+      sources."globals-13.13.0"
      sources."graceful-fs-4.2.9"
      sources."growl-1.10.5"
      sources."har-schema-2.0.0"
@ -3947,17 +4003,19 @@ let
      sources."http-errors-1.8.1"
      (sources."http-proxy-agent-4.0.1" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
      sources."http-signature-1.2.0"
      (sources."https-proxy-agent-5.0.0" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
+      sources."humanize-duration-3.27.1"
+      sources."humanize-duration-ts-2.1.1"
      sources."iconv-lite-0.4.24"
      sources."ignore-4.0.6"
      sources."import-fresh-3.3.0"
@ -3995,7 +4053,7 @@ let
      sources."json-schema-traverse-0.4.1"
      sources."json-stable-stringify-without-jsonify-1.0.1"
      sources."json-stringify-safe-5.0.1"
-      sources."json5-2.2.0"
+      sources."json5-2.2.1"
      sources."jsprim-1.4.2"
      sources."levn-0.3.0"
      sources."locate-path-6.0.0"
@ -4018,22 +4076,21 @@ let
      sources."methods-1.1.2"
      sources."micromatch-4.0.4"
      sources."mime-1.6.0"
-      sources."mime-db-1.51.0"
-      sources."mime-types-2.1.34"
+      sources."mime-db-1.52.0"
+      sources."mime-types-2.1.35"
      sources."minimalistic-assert-1.0.1"
      sources."minimatch-3.1.2"
-      sources."minimist-1.2.5"
+      sources."minimist-1.2.6"
      sources."mkdirp-1.0.4"
-      (sources."mocha-9.2.1" // {
+      (sources."mocha-9.2.2" // {
        dependencies = [
          (sources."debug-4.3.3" // {
            dependencies = [
              sources."ms-2.1.2"
            ];
          })
-          sources."minimatch-3.0.4"
+          sources."minimatch-4.2.1"
          sources."ms-2.1.3"
-          sources."nanoid-3.2.0"
          sources."supports-color-8.1.1"
        ];
      })
@ -4058,6 +4115,7 @@ let
      sources."p-limit-3.1.0"
      sources."p-locate-5.0.0"
      sources."parent-module-1.0.1"
+      sources."parse-duration-1.0.2"
      sources."parse-srcset-1.0.2"
      sources."parse5-6.0.1"
      sources."parseley-0.7.0"
@ -4071,7 +4129,7 @@ let
      sources."picocolors-1.0.0"
      sources."picomatch-2.3.1"
      sources."pify-3.0.0"
-      sources."postcss-8.4.6"
+      sources."postcss-8.4.12"
      sources."prelude-ls-1.1.2"
      (sources."pretty-format-27.5.1" // {
        dependencies = [
@ -4127,6 +4185,7 @@ let
      sources."setprototypeof-1.2.0"
      sources."shebang-command-2.0.0"
      sources."shebang-regex-3.0.0"
+      sources."shell-quote-1.7.3"
      sources."sigmund-1.0.1"
      sources."slash-3.0.0"
      sources."slice-ansi-4.0.0"
@ -4168,7 +4227,7 @@ let
          sources."mkdirp-0.5.5"
        ];
      })
-      (sources."tsconfig-paths-3.12.0" // {
+      (sources."tsconfig-paths-3.14.0" // {
        dependencies = [
          sources."json5-1.0.1"
        ];
@ -4196,7 +4255,7 @@ let
      sources."type-check-0.3.2"
      sources."type-fest-0.20.2"
      sources."type-is-1.6.18"
-      sources."typescript-4.5.5"
+      sources."typescript-4.6.2"
      sources."typescript-formatter-7.2.2"
      sources."universalify-0.1.2"
      sources."unpipe-1.0.0"
--- a/pkgs/servers/pr-tracker/default.nix
+++ b/pkgs/servers/pr-tracker/default.nix
@ -8,14 +8,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "pr-tracker";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchurl {
    url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";
-    sha256 = "0881ckb4y762isisf9d6xk6fh9207xi1i04kays298zx2dq6gh6h";
+    sha256 = "sha256-Tru9DsitRQLiO4Ln70J9LvkEqcj2i4A+eArBvIhd/ls=";
  };

-  cargoSha256 = "0r8pxg65s5jv95a0g8pzr693za7jfb4rv0wc739lkbpf0dssw8sr";
+  cargoSha256 = "0q3ibxnzw8gngvrgfkv4m64dr411c511xkvb6j9k63vhy9vwarz7";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl systemd ];
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@ -1,36 +1,36 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.25.1";
+  version = "3.26.1";
  pulumiPkgs = {
    x86_64-linux = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-linux-x64.tar.gz";
-        sha256 = "0p2cz6hg2xf28pj2w0avi6hz855llm9kg7v422cf0m1b94s4dsbi";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.26.1-linux-x64.tar.gz";
+        sha256 = "0iqm9mk65258f7r7i6gxahqbdcynwg4ayrbhrln6zjfw0ppv1r60";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-linux-amd64.tar.gz";
-        sha256 = "0qywihi3k8505qgpr1j5gmqzyalqrrmxxz1k48ipdank48dkxs8g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-amd64.tar.gz";
+        sha256 = "16wfnjk9y6zd2pqcn3sk2yhmwbq2zmbdg5yv3a89kdhkal9p785h";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-linux-amd64.tar.gz";
-        sha256 = "12vwwmvjsb9fwjkazvcblizdk5xx0l4499r0rg5lr97h5c1j28al";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.8.0-linux-amd64.tar.gz";
+        sha256 = "1mma4wjid806h4jk7mqqjfvs8ysv1l48sq8h9c2rvirqgjf42adk";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-linux-amd64.tar.gz";
-        sha256 = "0nkz7mcsgv1lbq0gdfs6nix4bmsn4zspn9jgji10jlawrk5l1ps4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.19.0-linux-amd64.tar.gz";
+        sha256 = "16vg56vyxqid566nzdvcnx0fm70nif31wr71mrx1n6ibk767l00i";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-linux-amd64.tar.gz";
-        sha256 = "0bcmj8z86dqchc9rgnvjy7q0k2pmmd1c155nm4ik1j87ccclia0p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.8.1-linux-amd64.tar.gz";
+        sha256 = "1phy4499vm87hf6bzwfcmn13nkzbwl9l7fj0ih8vd5gsng2bsjqd";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-linux-amd64.tar.gz";
-        sha256 = "08dvkkf153zkpjr2fz6wdrk4rqzmpfhj8nsmly7crr7d3xjhwqsc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.7.0-linux-amd64.tar.gz";
+        sha256 = "07zwhy1jfgwqcybyalrlwrqfkddk1xkqgb9g8dmgs2krx8fp9bsv";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-linux-amd64.tar.gz";
-        sha256 = "1fm0qhbs0ih1rgr2r46fz9fc6vrl1iwk9fd9q5plra93fxjdjdc4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-linux-amd64.tar.gz";
+        sha256 = "0rwkdizd1hqn86vfkxli7l4syp860rgil2m01l76pbpcx11yc7zb";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-amd64.tar.gz";
@ -41,12 +41,12 @@
        sha256 = "0m89na1gqrb41h1dg5j876g5hp0mfk4g7ij7i4md1szk9fp4820k";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-linux-amd64.tar.gz";
-        sha256 = "1s9s6a5w18zj0y78ar49mbicz8hjmqmzmw2agnwqwk9zhj35jvz8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.42.0-linux-amd64.tar.gz";
+        sha256 = "1qyw93a3n3fnr6972iw55nak1wp4kykpzr9fly3fcbiafvra9i1g";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-linux-amd64.tar.gz";
-        sha256 = "1l97awwfd5hyw1q8wjcdz81blybzqklv9wk9pv1319j0251ddzz3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.5.0-linux-amd64.tar.gz";
+        sha256 = "0d7m1jq9xanl6126iwill24jysz914ykmr59k0zlyjpafpn1l5vw";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-linux-amd64.tar.gz";
@ -69,32 +69,32 @@
        sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-linux-amd64.tar.gz";
-        sha256 = "08r3zks93jcpih6zxjmnpvqjsxvfkj3av5a2iwxb87snmsz0jixz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.1-linux-amd64.tar.gz";
+        sha256 = "0n1xqsfsqi773lwg9xbvglrd4pfb060fq8llxf06qj8h2imlxx34";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-linux-amd64.tar.gz";
-        sha256 = "0lhfxqd600rjbdw16jpj5fysdm324kangi85qpwrd6273aylyv09";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-linux-amd64.tar.gz";
+        sha256 = "10lm10affn92qwzgry2iab5ry6bcnx5iiy2cihxk9kgb6716wql3";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-amd64.tar.gz";
        sha256 = "1lni4wzmdhjbchjjx9z5iqawv4x1bixl3s541h39cr4x3y36m66m";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-amd64.tar.gz";
-        sha256 = "1zzrzsa07af7x4vwv7zgwkdrfmlhw30dcc7hqj92q4mn6valbn5q";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-linux-amd64.tar.gz";
+        sha256 = "0s1qyxdkdgy2br2kmpc0ypc6s95cryc0lbpdb9gslsl0q66gn7mk";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-amd64.tar.gz";
-        sha256 = "0cnwgr358lbrw6ssz8s7m87yniy7q2zhd6pmjhl8x41j1cljwyfa";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.17.1-linux-amd64.tar.gz";
+        sha256 = "10gvqkqyaxna1077rkvlzqq0mhx7zhz5k8x93bgcylv8slqcjx0k";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-amd64.tar.gz";
-        sha256 = "0qv3a4d6hnpga7lli7xnbwiig56h080hxrxjr8jbqsy9ymsqb39a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-linux-amd64.tar.gz";
+        sha256 = "1gfiiwgb51ylwns3mqgnbgm2knrdzvy9r9v23yx0z03ba189d3m9";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-linux-amd64.tar.gz";
-        sha256 = "1ngpaw5fdlv7hxjnns6ajzj8dqrj3gzkabr5h5hq5dws23x2c999";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.17.0-linux-amd64.tar.gz";
+        sha256 = "0xqvjqykwjgsvp379g1hjzzk64zc34xqm5da8fjhykz0l4q0cv76";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz";
@ -117,32 +117,32 @@
        sha256 = "05nfdwgfzi5f3hgj2g6dccaidqf9a9xzlv5vp3cd1rsxd159yk9j";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-linux-amd64.tar.gz";
-        sha256 = "18f30j0lmf2mrzynrrm068irlm972hc43vkp0205vkb1gvzf872m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-linux-amd64.tar.gz";
+        sha256 = "1yianshwmlxs70h4a19c9006n29rp6qz3nf6n0kb5l52psmq679m";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-linux-amd64.tar.gz";
-        sha256 = "1l4njlk616ksw29vg5jg6cmn9n31iw8f0h65iwv8f5pbvw64m3n0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-linux-amd64.tar.gz";
+        sha256 = "0a1q41cl9r93n8zvl25sd33mxvi0ysa10lz84x59sybfay4f7ppc";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-linux-amd64.tar.gz";
-        sha256 = "1b558l11r8a8xj5h2rk1lf761a83jzcbip7zvdg17f7rbyfilw56";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-linux-amd64.tar.gz";
+        sha256 = "0k230wq144bs51d9w635jc572gix5jr6dhb5ai59pmzsqjiis607";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-linux-amd64.tar.gz";
-        sha256 = "0k1l6qf85ffbi62r7xs9clgf1g8mch5afrrjagqqb7dwi8sh34xa";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.5.0-linux-amd64.tar.gz";
+        sha256 = "0hr6vb7zbxll20xq31ddqn287w4rykhswfsm56h1r3ffj9kka57y";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-linux-amd64.tar.gz";
-        sha256 = "1y67dlrkhrp7x2n0bbx7d8in9h4kwjqjdj4jkdbk1i3mfd46wh0k";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.6.0-linux-amd64.tar.gz";
+        sha256 = "12xby9dvgqli00jdwl5f8cxsk1qm1x2khhsj4bjhi5pm756p6j0c";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-linux-amd64.tar.gz";
        sha256 = "0ayb1r9snjqgmczkvz4kjbswr0a98lmpapll4nws9q0rjj2w48y7";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-linux-amd64.tar.gz";
-        sha256 = "08vfycws8gw92q43611dixnww4d80pqqjf6a3xh6zfpfn990vy97";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.3.0-linux-amd64.tar.gz";
+        sha256 = "0b340xsxb05c2mrckilmrh8s3bxq7z02rgrdgr02xyfrvv0r8whz";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-linux-amd64.tar.gz";
@ -163,32 +163,32 @@
    ];
    x86_64-darwin = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-darwin-x64.tar.gz";
-        sha256 = "0xfirm2pf765q1sx3h2by6s6d9gra95zq8cahljsj46dxm5gc7n9";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.26.1-darwin-x64.tar.gz";
+        sha256 = "0i4hs7r2gq2dwswnr1cls57lgy3m1b5n3an8mkidixyfgvv3lxmp";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-darwin-amd64.tar.gz";
-        sha256 = "0cpzgbzascmgnzjigmsjs618lv4xnyv1vl1hwab6laryp5832c4h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-darwin-amd64.tar.gz";
+        sha256 = "0bq8hjcspb8wmyjfn73rzjfqq1clxjx3cwx9yd8v7wjbr2ijrlkz";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-darwin-amd64.tar.gz";
-        sha256 = "0wm7vvbm747iqzhd8lnpq5zirlkcwcka6c3j9x59c7iwq8a3cba5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.8.0-darwin-amd64.tar.gz";
+        sha256 = "04qk7kq7d9g8i00f8fn3rsni284xqh0hcxkf4pp2mw660hm209h6";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-darwin-amd64.tar.gz";
-        sha256 = "0xp45n9mhg2x9bsxr5i9nx94vwfzvamnc427hi3p2738h2h3vika";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.19.0-darwin-amd64.tar.gz";
+        sha256 = "14skymvy5mf0509v3b8wrmi7n390la9nr859l7afbhxk4cwvq3av";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-darwin-amd64.tar.gz";
-        sha256 = "0vsjiy7sf5brdf1d83n9pb6kpfrphllfndq1f6pfsh7nq7s0xpil";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.8.1-darwin-amd64.tar.gz";
+        sha256 = "149wbmpc51qcfsxsffif2ar9pzmg91h33jd3fy23hyfjbqp6yvdz";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-darwin-amd64.tar.gz";
-        sha256 = "0kmy5hf869pp40x7jlzxx6ghl0k4bn6yhh94x82ndz9syin5q21z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.7.0-darwin-amd64.tar.gz";
+        sha256 = "0bz177xi0ifhx14jq01i94gdqgjsivikmhrf24y27k96jq7n15ld";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-darwin-amd64.tar.gz";
-        sha256 = "1fggvxi0salfhi81z9pgchm6pqcw5wh0m5hwgws22clk75x3h4pg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-darwin-amd64.tar.gz";
+        sha256 = "0qaf9q7ijkysvvnxrb942c2r6hj4y97kjfxnlwgjx1jvnv1l9859";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-amd64.tar.gz";
@ -199,12 +199,12 @@
        sha256 = "0fjynq1ilfv6njjyyadhpc9ks8izwif3nf8mnb7wfxchxn7gqbsi";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-darwin-amd64.tar.gz";
-        sha256 = "1k6pndyk6kh4db3cp92hj1vbglicx81yqxw1bis94d3cr95xr2pv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.42.0-darwin-amd64.tar.gz";
+        sha256 = "1y874pnf7mw3r37inrdiiz1qjxx4p9dam9ivdv7z7sddfw0305qn";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-darwin-amd64.tar.gz";
-        sha256 = "0is1dfv0c65sgk2hy5zng9f2jfxkvlp1pjy4ljyic039pvi80137";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.5.0-darwin-amd64.tar.gz";
+        sha256 = "0hyirx7yg53n3v0ywlq2848r64jnclv3wn8kd8mk8sznxh9qmg9n";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-darwin-amd64.tar.gz";
@ -227,32 +227,32 @@
        sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-darwin-amd64.tar.gz";
-        sha256 = "1d9q2q9br44kkpr7swn2qfg4xvbfb2wixbigixg3vjwz9n0bm4p8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.1-darwin-amd64.tar.gz";
+        sha256 = "0i3aysdy7i13fx2a2kpnvd3qpn7vmc2mbln718kks3mikiz26aii";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-darwin-amd64.tar.gz";
-        sha256 = "1200pb1ix308r5m6514s1b97q567f902c1zc1sfprr1r9psz3x16";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-darwin-amd64.tar.gz";
+        sha256 = "1sdir66pqdxy5zwbx1ssv8bl63zvbzfapl3j5dl99zgjaw4k3mgx";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-amd64.tar.gz";
        sha256 = "0i49x5s7sw69y19qmsrbrwhmjv7g07qrs5a3l1l8bsqawif5r65z";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-amd64.tar.gz";
-        sha256 = "0mqciml9rzzfpjy7wdqqak1yym2yzilnsjyrpm255q38z77f5nkr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-darwin-amd64.tar.gz";
+        sha256 = "026sh6x8jl8krq2vv0vwbrfi4yl4pbwbfliqqhidvv71xqv7igah";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-amd64.tar.gz";
-        sha256 = "1616fbs348r539kcmvwxlhzzgdszgb0j2wy7lamqvnm8xw4l53ii";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.17.1-darwin-amd64.tar.gz";
+        sha256 = "1v5dxqc9rl7m3yqxlbklg0bv20l4qvhs86g5lavc1bj46jysr8nk";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-amd64.tar.gz";
-        sha256 = "1xminhpv7b4nnvfdy5ahlcfrkan1fsmn0sp6gzkp5y4kkjd4a6vy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-darwin-amd64.tar.gz";
+        sha256 = "11r73jfqkc0wgdf66zp6pmgq5packlm4dkjp12a00z6l2s4f0w4h";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-darwin-amd64.tar.gz";
-        sha256 = "14ab1qsq22c8wyl7k7slxag9g44v3c63qjr8ip5qylbdsxsh7pp7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.17.0-darwin-amd64.tar.gz";
+        sha256 = "1x13w1j8vm3qvpn99npnsvx7kr5vac8vkrb31jii9difrgwis2wc";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz";
@ -275,32 +275,32 @@
        sha256 = "0q19sh7l1mjl40i5vdsrjfldncxnicalmlgv3yjkw5xpxkgr98z0";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-darwin-amd64.tar.gz";
-        sha256 = "11k6vbsr2lszipjvpnpspqvj8b0j330cfpmkr5ipws9b02aqpw1c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-darwin-amd64.tar.gz";
+        sha256 = "13r63s8llr3v1jvl790gcirm0n1m3nhkalrdpm9ssnhyrgfcxpj0";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-darwin-amd64.tar.gz";
-        sha256 = "1cr31yz4nmabncnim6vk8wfqihqrmsjpqgm4gmk8rsn0a21r9iry";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-darwin-amd64.tar.gz";
+        sha256 = "1wswpqliibq1kr8vv4l6kqw57cbw76nrh4fnvdzvrcl4rhpbjrc8";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-darwin-amd64.tar.gz";
-        sha256 = "0dp4jvi3bbbggg7s9lmx8qqdh9nd7iff8r827s2f6js98yakhw9g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-darwin-amd64.tar.gz";
+        sha256 = "0b0ynqd7drkycaf7xxx6s9xbm3xp8k18xsrys68hr8gh2nq8s0y9";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-darwin-amd64.tar.gz";
-        sha256 = "0nzcf84dbiw3chmnwb7d2nl82kkn1scrrjiid1ni75cgwk200m04";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.5.0-darwin-amd64.tar.gz";
+        sha256 = "01pc0qqqcmqc8al0bcnwig3741ln4dril5mv82py6wcy8brhwvyl";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-darwin-amd64.tar.gz";
-        sha256 = "1xprdbxf8fza4zc2myf9mv3hl79hda0h34fz4yqfawg4spa0q128";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.6.0-darwin-amd64.tar.gz";
+        sha256 = "0sjpvz709ij86r2qn20sagxnv5q78jwq8x7sayr0xs1na433nv16";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-darwin-amd64.tar.gz";
        sha256 = "1jzirnaxy6y862khqf29i25r8qyrpac2kmacs9ny118l77xp33il";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-darwin-amd64.tar.gz";
-        sha256 = "0rfl4hxl72n6d15klykhwzxiyscci9jyy20vprqqs5z5d825xal4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.3.0-darwin-amd64.tar.gz";
+        sha256 = "1dwv4aa5albn8yfyb430klc3w3fsy4pz07lmrppcbzg5mwf22mq1";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-darwin-amd64.tar.gz";
@ -321,32 +321,32 @@
    ];
    aarch64-linux = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-linux-arm64.tar.gz";
-        sha256 = "16vm2kdc53kf6ljb62fx74sl2asj2hg9xnksz582w88xp0mhipw2";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.26.1-linux-arm64.tar.gz";
+        sha256 = "1xnzi2lay5m01krahc42is3vxla3y7si4mwqbnva6xjjla1p9d1v";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-linux-arm64.tar.gz";
-        sha256 = "19byg31lcnh7gk2xqf5601d0xj93p0b9svz6zxvv713d9ny36839";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-arm64.tar.gz";
+        sha256 = "14g4kz6czw886znasl5pw7l2ar84h1dljkalgs9vaxszyhdr7mnw";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-linux-arm64.tar.gz";
-        sha256 = "00f38gmdk6yjbqlmfnjqlk7x9sn8c27svabivq93hr0dc8bv2hzy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.8.0-linux-arm64.tar.gz";
+        sha256 = "1j8akg227w4dxhv5hnxybabxi25i33q6cacgxrkdrd3mvw9hxmba";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-linux-arm64.tar.gz";
-        sha256 = "13gwhfl11grpv0kqdk3hd1z4mdqxj9czl9cvzkfc7idipim2wi19";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.19.0-linux-arm64.tar.gz";
+        sha256 = "1g6ymjsmxp149cv93sn5843pxlih1dbw16nvv4sn3prl360c4lxa";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-linux-arm64.tar.gz";
-        sha256 = "09475k0qqiwxzgb3xm70wx6w3gr8figrsb7iqbyficfar71mvbf7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.8.1-linux-arm64.tar.gz";
+        sha256 = "0ghgm1p79smlcx5cby34pxl8apwm33n1aqs2lxkgjz9m6895djkx";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-linux-arm64.tar.gz";
-        sha256 = "1w9mdg3jr5skdljxvm16qnssq94cnwpk24r76rbmh16wxb1l0z6x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.7.0-linux-arm64.tar.gz";
+        sha256 = "0y519wmpq6iin20kqidw7b2zkqr6zky09lfsi10klbn0gzfpwbl5";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-linux-arm64.tar.gz";
-        sha256 = "0pxfijmbgwl1srfqhny1wps3qhmjnmi3p5ixffza1a5phffnjzwd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-linux-arm64.tar.gz";
+        sha256 = "0wv7c6sp4i64wq5v90k4zpxnzyrhhv34cwa1i4g4pgqfh6ahaz56";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-arm64.tar.gz";
@ -357,12 +357,12 @@
        sha256 = "0a6bmiz6ys1h6n59mw3w7b2g8rhbnr0rb40rwidazvkni0s03yha";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-linux-arm64.tar.gz";
-        sha256 = "1q4hzzsxraw6f7z2dlqbrlrkambqixyj9bq3fk4napgv6hl77qnh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.42.0-linux-arm64.tar.gz";
+        sha256 = "1hwbmqjliw9aknp54g72mn0qlikk64l2sbvbydc06q0advsj0wic";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-linux-arm64.tar.gz";
-        sha256 = "15acmblgl5xdwrm6ikq420h8g88rvqlj34jdrngc47rlimmdh3l6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.5.0-linux-arm64.tar.gz";
+        sha256 = "03k9xkaji82vbjhm051rd85nmbqv9frjc71cbxm50c70gmam4y6c";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-linux-arm64.tar.gz";
@ -385,32 +385,32 @@
        sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-linux-arm64.tar.gz";
-        sha256 = "1dy76gsig4gyjg7xzkgb200dlhfvbq2i0zc0002c5vsykc4mji1d";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.1-linux-arm64.tar.gz";
+        sha256 = "0qpan6zvny2h2ckigwnf4dhsgmnywam1m4d2jp0nj9pm3628pldv";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-linux-arm64.tar.gz";
-        sha256 = "02gzj3zww0hmdq42d8b65wc12md9r7mygwymcix0f9lwza9gf4l2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-linux-arm64.tar.gz";
+        sha256 = "0f8n8q1in0n4z2lzd0y065ksszv05dgn2lgsa8snmxlwfkrx955h";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-arm64.tar.gz";
        sha256 = "0p8lr9iw1h9ax90aivya513bw1dipm7yycqm5094wgx08r2yfvlm";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-linux-arm64.tar.gz";
-        sha256 = "0z0ch08xqbyjmizwvgx9jysnp6g3kjjbwh11gbc6vgxacqcajgz3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-linux-arm64.tar.gz";
+        sha256 = "1d04bxq8vrxmsiix130lhqys5q1jbgwbdhyhn6rsskk0636hbf71";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-linux-arm64.tar.gz";
-        sha256 = "1v3pdsdpqzgbsg181g9w0rn3sw1xirljvgvkw0081i9hxvhwq9zq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.17.1-linux-arm64.tar.gz";
+        sha256 = "0paypln2948dyj6cic3riybl2zpps6ia0pjsv3wjpklp57gfc9h4";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-linux-arm64.tar.gz";
-        sha256 = "14xqlgy0wy223hg9wp1rc4hbj1pvxrqnzxzv901dqjf5434n6aa0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-linux-arm64.tar.gz";
+        sha256 = "1vrz3pm14i5zdmk3yibny2sghxk8kzwb2qi77mjbiyfhbvciy97q";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-linux-arm64.tar.gz";
-        sha256 = "1y3nzdnh6fil12r0040h6kyyf01dgxjghpp55z49hin3k6yclnq3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.17.0-linux-arm64.tar.gz";
+        sha256 = "0jvm3g1d3yhghcd14rz1ca7zps8cajw0cy38s1p6lh2c5f1yaqcj";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz";
@ -433,32 +433,32 @@
        sha256 = "0j2c23ii4dn9yhpw6nymij65gv82y1xp4gi8lgxxf41b1i9bpb2i";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-linux-arm64.tar.gz";
-        sha256 = "11k721ri7q36ss3kjvw07ki3snv35li167az6f8zp8h7fdhsrcn7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-linux-arm64.tar.gz";
+        sha256 = "1jac7dj7vsrhcn0fp03bkwmp3km4gxsi9mc5fzjgkmbhh5xnhw3b";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-linux-arm64.tar.gz";
-        sha256 = "1hdf0zwlrc5i3k0vkqc2x8zz0zvwc1idnnai58d4k7f5qr89hg6z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-linux-arm64.tar.gz";
+        sha256 = "15cd5g1kdjrfpcsicb4zgwb3q8q2h4xmkwdwbj0m2rys5ygayy2k";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-linux-arm64.tar.gz";
-        sha256 = "0rr2cngqnibbz6d99xswjg7wybgd5xwm8fi6dkqwj51yyrz0izrz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-linux-arm64.tar.gz";
+        sha256 = "0x1mjdaaaa40ks8glqq906dbq2x13z760agnfmd5hc3m9swvnczs";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-linux-arm64.tar.gz";
-        sha256 = "06gdrjnk5jdnzc3jvzxl7iwf6gyyp9bqk1jrljxpkzr0ck8yz01l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.5.0-linux-arm64.tar.gz";
+        sha256 = "0zqmzfv3pc6j3878c31jfa488kdahcdnra4mqan3lz97jifc3dla";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-linux-arm64.tar.gz";
-        sha256 = "1hih41dvdpxwh145kghp5xwpv5fn8r0wni8jh12qv5nl6apaa75p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.6.0-linux-arm64.tar.gz";
+        sha256 = "18cqw5rf4iqfswbdjmj1a7zc4p16dc7m4d4vl2a5wcjybpcvhn6m";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-linux-arm64.tar.gz";
        sha256 = "1275cikf75lnf3d4k4ld0by1r8hr6gq6mih09fsfg98b8f7n16kq";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-linux-arm64.tar.gz";
-        sha256 = "19iv4jp74j87p1hnqc205i9gl45c4jqc025lwgylgplfmmz9iagy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.3.0-linux-arm64.tar.gz";
+        sha256 = "0sqgdxkqrh0d1y53qigzs4wywmvjws0j6av2z19lyc2qwz3gn0hn";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-linux-arm64.tar.gz";
@ -479,32 +479,32 @@
    ];
    aarch64-darwin = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.25.1-darwin-arm64.tar.gz";
-        sha256 = "1hg6i58vb4hlrp3s08m26wivhr7dg902nd8g19rmyfvkhvdjkax5";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.26.1-darwin-arm64.tar.gz";
+        sha256 = "1mvinn9106pw2ny27l72fsxswj61c8la12mfxhqnb1q7xha8vqmz";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.4.0-darwin-arm64.tar.gz";
-        sha256 = "0z0v4i2k451fi1xz2k4w9cli8g3mc4d7a9b1gkgcs2wpgrfnifly";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-darwin-arm64.tar.gz";
+        sha256 = "0kdljrsb5kk9i1xf1fk461fsb3vbjmcvzvgkjd3yp0xij3fac6al";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.7.0-darwin-arm64.tar.gz";
-        sha256 = "0l4mqwap83rk82fnx7djc66mwnllmb49vzhr3kdavdmd5rbw5pd4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.8.0-darwin-arm64.tar.gz";
+        sha256 = "0vimh8zvds4h4r9gg72vjkqqp76kmadcq9iza0winkw3r41z5ja4";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.17.0-darwin-arm64.tar.gz";
-        sha256 = "1q9d00dp61dv4i31c7z3nk9lqpxgyb0w180xfhg4s02vsk9yc8yf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.19.0-darwin-arm64.tar.gz";
+        sha256 = "1n061d8phk6cjvr24138vqzxs5midfadqgrpmaaknbpykcd3vym3";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.6.0-darwin-arm64.tar.gz";
-        sha256 = "1wpsjm191drz8687gv2d4snv8fdrivw3lqklj5cr67jngwiqhirq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v0.8.1-darwin-arm64.tar.gz";
+        sha256 = "0i8k2z1is7iw6hfgsqfwirby469f8nkczhzvxda48fhwlix6x55d";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.6.0-darwin-arm64.tar.gz";
-        sha256 = "1ni5nlfiqpxid3s416avzgx30wjayi51j0v87hkvpmy38m4p1w18";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.7.0-darwin-arm64.tar.gz";
+        sha256 = "174dk82cx35i9x1f1kavydg3qyqax0lhl7637d2n17ca97xa7y8p";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.0-darwin-arm64.tar.gz";
-        sha256 = "1b46cksimynk4f7idp37xn95j0is15zfrxwbs4hv9b3rxayg8s30";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-darwin-arm64.tar.gz";
+        sha256 = "096xd57z12rabv5375w3nb6zxsnva3nwrvjjxsr4h0sa0yip7sh0";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-arm64.tar.gz";
@ -515,12 +515,12 @@
        sha256 = "0hlcfyxmjcq3axg35fx1dj081il60rqs7na0wx573gf028g6jj9v";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.41.0-darwin-arm64.tar.gz";
-        sha256 = "13xbscyg7s5cbrrsy5xcl63z31y6aa30r2d8gwchdgla3kqafjmm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.42.0-darwin-arm64.tar.gz";
+        sha256 = "0brsr5hlndds98yap32ccl07y2wb2r00blf3n8k9kd941gls72vk";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.4.0-darwin-arm64.tar.gz";
-        sha256 = "0848db2hv0r5brjdfq1k45bkx7iz0xpwbkmmhg47ymr3g0bhr8db";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.5.0-darwin-arm64.tar.gz";
+        sha256 = "18nb6phh9y369c8bj5q0cmari1zy7vq82qdcr2dxxm5vbcg5rvx4";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.5.0-darwin-arm64.tar.gz";
@ -543,32 +543,32 @@
        sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v3.13.0-darwin-arm64.tar.gz";
-        sha256 = "0jbgcw62hmhm5k8q4k948595nm2qslz7wic66iy0jr6ylhpm7hcz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.1-darwin-arm64.tar.gz";
+        sha256 = "0jj35mj57sivi5qsbwv8qm2jginppi192qlx6ashvgm352gia9r1";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.14.0-darwin-arm64.tar.gz";
-        sha256 = "0rh9b19aqw15wzmijyyk7dv38cgf4abp6pk5abx4bp0277vl2a76";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-darwin-arm64.tar.gz";
+        sha256 = "16llbsp06pszh4q232ly8nnj1pfr6f4p88a5k928716csh3zradq";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-arm64.tar.gz";
        sha256 = "167f7c7mpyjym0sw71adz5ffd7g8zmn87923xmjlrsz3wm6ybsq7";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.5.0-darwin-arm64.tar.gz";
-        sha256 = "0dc7cpgvb20s6qyyfm2i4hc4rbg8zdv0j92wc397pacd6i6jhvgn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-darwin-arm64.tar.gz";
+        sha256 = "0r8bvrnyspmczn38lav7hfhjgkflsiciw8slbs5k3s6z8690dxc2";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.15.0-darwin-arm64.tar.gz";
-        sha256 = "0avmwnxj1m8j3jj5w1ims64lxqgig4z8yxpi76000xrv74w625b2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.17.1-darwin-arm64.tar.gz";
+        sha256 = "0qva7r2pdbpxjd50ijjckwsbagj46h94s12z05czgj8sfslx8jpz";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.7.1-darwin-arm64.tar.gz";
-        sha256 = "0n0303423gkwi3b6dwzaqmzsbn2rh4vki6n54mmgd44a3cxbhkak";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-darwin-arm64.tar.gz";
+        sha256 = "058f1j40ar4xh860c3qrm0qaagm69fdmbw14avvrhsmw245cyyzc";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.16.0-darwin-arm64.tar.gz";
-        sha256 = "1n2dh350pwhcvk8vs9mh3g6dijxrg2vh03h9x9fq7qhpgzgxq6km";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.17.0-darwin-arm64.tar.gz";
+        sha256 = "1fz906l37kykbn725p81xpyvpg7ywvqav9r7rxrnc05d338c391d";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz";
@ -591,32 +591,32 @@
        sha256 = "1i5ipmidg0yspayxyglbjaihajhj1bsk46saxkncfrkvqnh4iq50";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.0-darwin-arm64.tar.gz";
-        sha256 = "1dx39lm57sc9j715z62v74fw1gpnr8sn71d6a38gib83iiyagl3s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-darwin-arm64.tar.gz";
+        sha256 = "12zlmihrrcwbmy4q4ysvmz6nys547g914nl8g8vnwviijqlx05df";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.4.2-darwin-arm64.tar.gz";
-        sha256 = "02x584440hw25nbkj880dd113ywdm280frfadyz2psy1sqfi949h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-darwin-arm64.tar.gz";
+        sha256 = "0gg80cg2f9d5ah4j7b1i6pxx7ffhbg4pcax319vymcsl9srh51hp";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.14.0-darwin-arm64.tar.gz";
-        sha256 = "1nl18z6i2p7dmc4f2i7wfw7ss76kmhb3jc4gfyirzp0qr2v8bs8p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-darwin-arm64.tar.gz";
+        sha256 = "14ag3gq6w4yzbrwpy0vqqbr091fs26xvhmwd0v1adjl3sxa0lcqc";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.4.1-darwin-arm64.tar.gz";
-        sha256 = "0i6hzqfvsjiyb1bzv70pwr1716scy60w7f8jkv3ayrxddaw7iwwg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.5.0-darwin-arm64.tar.gz";
+        sha256 = "0imqi4n21c4xxldkdkxc8239vb4r3l5x0fw8wps6nvpxhdnsflgc";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.5.0-darwin-arm64.tar.gz";
-        sha256 = "0bn8i1271mm3hqqqlidipsfdalxgc2fx8l4apdjin6k1zrnm44p1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.6.0-darwin-arm64.tar.gz";
+        sha256 = "09sk3z0xlsdj1lvyzfm55p07hxsvnqvc27al0q2mvkj9nmsqqid4";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.1.0-darwin-arm64.tar.gz";
        sha256 = "08dhxd39w7wjpqjfy59vxfipjl45psd6yh53h2g025y8hh80gcrs";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.2.0-darwin-arm64.tar.gz";
-        sha256 = "0aqicfci56i3i9vkpm0ikg3amkzf7is6r9p2477dqm7gjphl9wmy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.3.0-darwin-arm64.tar.gz";
+        sha256 = "13q9r819wln46hiy2anri44wvxvjigcvfj7dpr3ya69kj17kyr4n";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.2.0-darwin-arm64.tar.gz";
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@ -10,7 +10,7 @@ fi

 # Version of Pulumi from
 # https://www.pulumi.com/docs/get-started/install/versions/
-VERSION="3.25.1"
+VERSION="3.26.1"

 # An array of plugin names. The respective repository inside Pulumi's
 # Github organization is called pulumi-$name by convention.
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "steampipe";
-  version = "0.13.2";
+  version = "0.13.3";

  src = fetchFromGitHub {
    owner = "turbot";
    repo = "steampipe";
    rev = "v${version}";
-    sha256 = "sha256-Ty8yCcxdPa/z1k9xMv8iCybRXfvJKRJIT+oH7MbLWmw=";
+    sha256 = "sha256-zU/FWrlE4TQhzRNOVED7hFub+lehPFD+fEJ3v0PFGdM=";
  };

  vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c=";
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@ -31,11 +31,12 @@ buildPythonPackage rec {
    #
    #   https://github.com/ytdl-org/youtube-dl/issues/29326
    #
-    # The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30188
+    # The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30184#issuecomment-1025261055
+    # plus follow-up (1e677567) from https://github.com/ytdl-org/youtube-dl/pull/30582
    (fetchpatch {
      name = "fix-youtube-dl-speed.patch";
-      url = "https://github.com/ytdl-org/youtube-dl/pull/30188.patch";
-      sha256 = "15liban37ina2y4bnykfdywdy4rbkfff2r6vd0kqn2k7rfkcczyz";
+      url = "https://github.com/ytdl-org/youtube-dl/compare/57044eacebc6f2f3cd83c345e1b6e659a22e4773...1e677567cd083d43f55daef0cc74e5fa24575ae3.diff";
+      sha256 = "11s0j3w60r75xx20p0x2j3yc4d3yvz99r0572si8b5qd93lqs4pr";
    })
  ];

--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "stunnel";
-  version = "5.62";
+  version = "5.63";

  src = fetchurl {
    url    = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "sha256-nPW7lJAiqmbHNsEyZVTMon0GQWBaY3AnTtxJUetb0zk=";
+    sha256 = "sha256-x0xOFRRKOuNLi4kLsxyQkgcwFJC9HlG/qqX/6wqZRhc=";
    # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
    # not the output of `nix-prefetch-url`
  };
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "gitleaks";
-  version = "8.4.0";
+  version = "8.5.0";

  src = fetchFromGitHub {
    owner = "zricethezav";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-z3YGRDgBGpr2hixIayih4wxGWPtYL0EPAuTYVPByzQc=";
+    sha256 = "sha256-vd6mEjswqIX2F3GO7AF1Me4NolbeZZPwLxfyzJaNmT8=";
  };

  vendorSha256 = "sha256-J1xX+r+Mph1QkqjK87tqGDkYvPZp0lHgdRhd88WZi1c=";
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@ -4,16 +4,16 @@
 , runtimeShell, gsettings-desktop-schemas }:

 let
-  versionSuffix = "20220120174718.95a3939b3a";
+  versionSuffix = "20220216215910.c82d65a685";
 in

 stdenv.mkDerivation rec {
  pname = "keybase-gui";
-  version = "5.9.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.9.3"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages

  src = fetchurl {
    url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "sha256-Wdl5pZFIz+mDkkE0EDpLGH/eGWYoBbLV05LYJgkwpI4=";
+    hash = "sha256-JY2DaqApv6K02y3B+JIXpV4SvvMQpBhw9eqr/5Sn0cg=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/keyscope/default.nix
+++ b/pkgs/tools/security/keyscope/default.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "keyscope";
-  version = "1.1.0";
+  version = "1.2.2";

  src = fetchFromGitHub {
    owner = "spectralops";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-4ZKIukxeadzGpq2lwxbyyIKqWgbZpdHPRAT+LsyWjzk=";
+    sha256 = "sha256-SLVNzxwZhdK2Fk2Vu5P/j0d8IoUPzlb9e5hnJrZ8Qsk=";
  };

-  cargoSha256 = "sha256-aq7xUma8QDRnu74R7JSuZjrXCco7L9JrNmAZiGtTyts=";
+  cargoSha256 = "sha256-PBSQeLQ7UkWhGlRID+bv2HwzgvoiJ120t/TNKJFUY+M=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "nuclei";
-  version = "2.6.3";
+  version = "2.6.5";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-4jByNyO0EvJ2ppdg21+7YfeB9arjBZALrOm5MJlkZsg=";
+    sha256 = "sha256-g78sZDhV2+MgoFkJIrE2RbVLa/aPjbKFFRyKj594Hb0=";
  };

-  vendorSha256 = "sha256-717+jJiyqmctR9Yb/XnnKd1N+31K2+xO1XClGMKlL+k=";
+  vendorSha256 = "sha256-/umoSOQ0ehQplxU8OTGJVmTgO+8xPZxVwRBfM67zMh8=";

  modRoot = "./v2";
  subPackages = [
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -10987,6 +10987,8 @@ in {

  zipstream-new = callPackage ../development/python-modules/zipstream-new { };

+  zipstream-ng = callPackage ../development/python-modules/zipstream-ng { };
+
  zm-py = callPackage ../development/python-modules/zm-py { };

  zodb = callPackage ../development/python-modules/zodb { };