Merge master into haskell-updates

2022-09-17 00:16:02 +00:00 · 2022-09-17 00:16:02 +00:00 · 83a46ef889
parent 2921710cec d9a1414346
commit 83a46ef889
103 changed files with 2353 additions and 1644 deletions
--- a/.github/ISSUE_TEMPLATE/missing_documentation.md
+++ b/.github/ISSUE_TEMPLATE/missing_documentation.md
@ -0,0 +1,32 @@
+---
+name: Missing or incorrect documentation
+about:
+title: ''
+labels: '9.needs: documentation'
+assignees: ''
+
+---
+
+## Problem
+
+<!-- describe your problem -->
+
+## Checklist
+
+<!-- make sure this issue is not redundant or obsolete -->
+
+- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \[source][nixos-source])
+- [ ] checked [open documentation issues] for possible duplicates
+- [ ] checked [open documentation pull requests] for possible solutions
+
+[latest Nixpkgs manual]: https://nixos.org/manual/nixpkgs/unstable/
+[latest NixOS manual]: https://nixos.org/manual/nixos/unstable/
+[nixpkgs-source]: https://github.com/NixOS/nixpkgs/tree/master/doc
+[nixos-source]: https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual
+[open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22
+[open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22
+
+## Proposal
+
+<!-- propose a solution -->
+
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@ -88,3 +88,58 @@ with lib; mkCoqDerivation {
  };
 }
 ```
+
+## Three ways of overriding Coq packages {#coq-overriding-packages}
+
+There are three distinct ways of changing a Coq package by overriding one of its values: `.override`, `overrideCoqDerivation`, and `.overrideAttrs`.  This section explains what sort of values can be overridden with each of these methods.
+
+### `.override` {#coq-override}
+
+`.override` lets you change arguments to a Coq derivation.  In the case of the `multinomials` package above, `.override` would let you override arguments like `mkCoqDerivation`, `version`, `coq`, `mathcomp`, `mathcom-finmap`, etc.
+
+For example, assuming you have a special `mathcomp` dependency you want to use, here is how you could override the `mathcomp` dependency:
+
+```nix
+multinomials.override {
+  mathcomp = my-special-mathcomp;
+}
+```
+
+In Nixpkgs, all Coq derivations take a `version` argument.  This can be overridden in order to easily use a different version:
+
+```nix
+coqPackages.multinomials.override {
+  version = "1.5.1";
+}
+```
+
+Refer to [](#coq-packages-attribute-sets-coqpackages) for all the different formats that you can potentially pass to `version`, as well as the restrictions.
+
+### `overrideCoqDerivation` {#coq-overrideCoqDerivation}
+
+The `overrideCoqDerivation` function lets you easily change arguments to `mkCoqDerivation`.  These arguments are described in [](#coq-packages-attribute-sets-coqpackages).
+
+For example, here is how you could locally add a new release of the `multinomials` library, and set the `defaultVersion` to use this release:
+
+```nix
+coqPackages.lib.overrideCoqDerivation
+  {
+    defaultVersion = "2.0";
+    release."2.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkk";
+  }
+  coqPackages.multinomials
+```
+
+### `.overrideAttrs` {#coq-overrideAttrs}
+
+`.overrideAttrs` lets you override arguments to the underlying `stdenv.mkDerivation` call. Internally, `mkCoqDerivation` uses `stdenv.mkDerivation` to create derivations for Coq libraries.  You can override arguments to `stdenv.mkDerivation` with `.overrideAttrs`.
+
+For instance, here is how you could add some code to be performed in the derivation after installation is complete:
+
+```nix
+coqPackages.multinomials.overrideAttrs (oldAttrs: {
+  postInstall = oldAttrs.postInstall or "" + ''
+    echo "you can do anything you want here"
+  '';
+})
+```
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -10708,6 +10708,12 @@
      fingerprint = "48AD DE10 F27B AFB4 7BB0  CCAF 2D25 95A0 0D08 ACE0";
    }];
  };
+  posch = {
+    email = "tp@fonz.de";
+    github = "posch";
+    githubId = 146413;
+    name = "Tobias Poschwatta";
+  };
  ppenguin = {
    name = "Jeroen Versteeg";
    email = "hieronymusv@gmail.com";
@ -13257,6 +13263,12 @@
    }];
    name = "Karim Vergnes";
  };
+  thetallestjj = {
+    email = "me+nixpkgs@jeroen-jetten.com";
+    github = "thetallestjj";
+    githubId = 6579555;
+    name = "Jeroen Jetten";
+  };
  theuni = {
    email = "ct@flyingcircus.io";
    github = "ctheune";
@ -15365,4 +15377,10 @@
    githubId = 115711;
    name = "bpaulin";
  };
+  zuzuleinen = {
+    email = "andrey.boar@gmail.com";
+    name = "Andrei Boar";
+    github = "zuzuleinen";
+    githubId = 944919;
+  };
 }
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -1266,6 +1266,7 @@
  ./tasks/network-interfaces-scripted.nix
  ./tasks/scsi-link-power-management.nix
  ./tasks/snapraid.nix
+  ./tasks/stratis.nix
  ./tasks/swraid.nix
  ./tasks/trackpoint.nix
  ./tasks/powertop.nix
--- a/nixos/modules/tasks/stratis.nix
+++ b/nixos/modules/tasks/stratis.nix
@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.stratis;
+in
+{
+  options.services.stratis = {
+    enable = lib.mkEnableOption (lib.mdDoc "Stratis Storage - Easy to use local storage management for Linux");
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.stratis-cli ];
+    systemd.packages = [ pkgs.stratisd ];
+    services.dbus.packages = [ pkgs.stratisd ];
+    services.udev.packages = [ pkgs.stratisd ];
+    systemd.services.stratisd.wantedBy = [ "sysinit.target" ];
+  };
+}
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -533,6 +533,7 @@ in {
  sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
  starship = handleTest ./starship.nix {};
  step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {};
+  stratis = handleTest ./stratis {};
  strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
  stunnel = handleTest ./stunnel.nix {};
  sudo = handleTest ./sudo.nix {};
--- a/nixos/tests/stratis/default.nix
+++ b/nixos/tests/stratis/default.nix
@ -0,0 +1,7 @@
+{ system ? builtins.currentSystem
+, pkgs ? import ../../.. { inherit system; }
+}:
+
+{
+  simple = import ./simple.nix { inherit system pkgs; };
+}
--- a/nixos/tests/stratis/simple.nix
+++ b/nixos/tests/stratis/simple.nix
@ -0,0 +1,39 @@
+import ../make-test-python.nix ({ pkgs, ... }:
+  {
+    name = "stratis";
+
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ nickcao ];
+    };
+
+    nodes.machine = { pkgs, ... }: {
+      services.stratis.enable = true;
+      virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ];
+    };
+
+    testScript = ''
+      machine.wait_for_unit("stratisd")
+      # test pool creation
+      machine.succeed("stratis pool create     testpool /dev/vdb")
+      machine.succeed("stratis pool add-data   testpool /dev/vdc")
+      machine.succeed("stratis pool init-cache testpool /dev/vdd")
+      machine.succeed("stratis pool add-cache  testpool /dev/vde")
+      # test filesystem creation and rename
+      machine.succeed("stratis filesystem create testpool testfs0")
+      machine.succeed("stratis filesystem rename testpool testfs0 testfs1")
+      # test snapshot
+      machine.succeed("mkdir -p /mnt/testfs1 /mnt/testfs2")
+      machine.wait_for_file("/dev/stratis/testpool/testfs1")
+      machine.succeed("mount /dev/stratis/testpool/testfs1 /mnt/testfs1")
+      machine.succeed("echo test0 > /mnt/testfs1/test0")
+      machine.succeed("echo test1 > /mnt/testfs1/test1")
+      machine.succeed("stratis filesystem snapshot testpool testfs1 testfs2")
+      machine.succeed("echo test2 > /mnt/testfs1/test1")
+      machine.wait_for_file("/dev/stratis/testpool/testfs2")
+      machine.succeed("mount /dev/stratis/testpool/testfs2 /mnt/testfs2")
+      assert "test0" in machine.succeed("cat /mnt/testfs1/test0")
+      assert "test0" in machine.succeed("cat /mnt/testfs2/test0")
+      assert "test2" in machine.succeed("cat /mnt/testfs1/test1")
+      assert "test1" in machine.succeed("cat /mnt/testfs2/test1")
+    '';
+  })
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "cudatext";
-  version = "1.169.2";
+  version = "1.170.5";

  src = fetchFromGitHub {
    owner = "Alexey-T";
    repo = "CudaText";
    rev = version;
-    hash = "sha256-EQAoKft/L4sbdY8hOvyu+Cy+3I8Lt4g1KTxTlSYALac=";
+    hash = "sha256-B7t8Vg318ZMcodYEV/DpKEer4AsmAonHbE7cbK34kp0=";
  };

  postPatch = ''
--- a/pkgs/applications/editors/cudatext/deps.json
+++ b/pkgs/applications/editors/cudatext/deps.json
@ -11,18 +11,18 @@
  },
  "ATFlatControls": {
    "owner": "Alexey-T",
-    "rev": "2022.08.28",
-    "hash": "sha256-jkVHwPQGPtLeSRy502thPIrDWzkkwvlnyGcTzjgFgIc="
+    "rev": "2022.09.03",
+    "hash": "sha256-YxGCV6oIWZ0a7rRyCq1YjOfyO17mHcxJXgBJ2esvm1U="
  },
  "ATSynEdit": {
    "owner": "Alexey-T",
-    "rev": "2022.08.28",
-    "hash": "sha256-U/UD3vPnIdQUe/1g/mKgs5yGirsIB/uHTjD0MOouAyI="
+    "rev": "2022.09.11",
+    "hash": "sha256-lzGOcYRfaHernLGMTOe8BazpMYa41p42bjjNEmuxU/c="
  },
  "ATSynEdit_Cmp": {
    "owner": "Alexey-T",
-    "rev": "2022.08.28",
-    "hash": "sha256-/MWC4BoU/4kflvbly0phh+cfIR8rNwgWFtrXnmxk0Ks="
+    "rev": "2022.09.01",
+    "hash": "sha256-Xnh6hWzy4lTDxlNvEOsGl2YalzKgt51bDrUcMVOvtTg="
  },
  "EControl": {
    "owner": "Alexey-T",
@ -31,8 +31,8 @@
  },
  "ATSynEdit_Ex": {
    "owner": "Alexey-T",
-    "rev": "2022.07.20",
-    "hash": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU="
+    "rev": "2022.09.03",
+    "hash": "sha256-6xzYn9x5tZLUhLAT9mQ4+UmpEemg386tAjlWdK8j/Ew="
  },
  "Python-for-Lazarus": {
    "owner": "Alexey-T",
@ -41,8 +41,8 @@
  },
  "Emmet-Pascal": {
    "owner": "Alexey-T",
-    "rev": "2022.01.17",
-    "hash": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw="
+    "rev": "2022.08.28",
+    "hash": "sha256-u8+qUagpy2tKppkjTrEVvXAHQkF8AGDDNtWCNJHnKbs="
  },
  "CudaText-lexers": {
    "owner": "Alexey-T",
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@ -22,6 +22,11 @@
 , enableWayland ? stdenv.isLinux
 , wayland
 , xorg
+, xcbuild
+, Security
+, ApplicationServices
+, AppKit
+, Carbon
 }:
 rustPlatform.buildRustPackage rec {
  pname = "neovide";
@ -75,7 +80,7 @@ rustPlatform.buildRustPackage rec {
    python2 # skia-bindings
    python3 # rust-xcb
    llvmPackages.clang # skia
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ xcbuild ];

  # All tests passes but at the end cargo prints for unknown reason:
  #   error: test failed, to rerun pass '--bin neovide'
@ -98,7 +103,7 @@ rustPlatform.buildRustPackage rec {
        }))
      ];
    }))
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ Security ApplicationServices Carbon AppKit ];

  postFixup = let
    libPath = lib.makeLibraryPath ([
@ -128,7 +133,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/Kethku/neovide";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ ck3d ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
    mainProgram = "neovide";
  };
 }
--- a/pkgs/applications/editors/sublime/4/common.nix
+++ b/pkgs/applications/editors/sublime/4/common.nix
@ -2,7 +2,7 @@

 { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook
 , writeShellScript, common-updater-scripts, curl
-, openssl, bzip2, bash, unzip, zip
+, openssl_1_1, bzip2, bash, unzip, zip
 }:

 let
@ -15,7 +15,7 @@ let
  versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
  versionFile = builtins.toString ./packages.nix;

-  libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl gtk3 cairo pango curl ];
+  libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ];
 in let
  binaryPackage = stdenv.mkDerivation rec {
    pname = "${pnameBase}-bin";
@ -65,6 +65,9 @@ in let
    installPhase = ''
      runHook preInstall

+      # No need to patch these libraries, it works well with our own
+      rm libcrypto.so.1.1 libssl.so.1.1
+
      mkdir -p $out
      cp -r * $out/

--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@ -15,11 +15,11 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "03lbfl3azrjhxzkadrz632dpwnv6hyyls10mc8wzspwraz77v1m5";
-    x86_64-darwin = "1fd66fbs414lja7ca38sdgx02nw9w1qfrlxhcb52ijls5xbmbgm4";
-    aarch64-linux = "0hwzx0lvrxrzrpggpsymjzy53dq4msg0j3vrxq82308ydc5ssnzd";
-    aarch64-darwin = "0dqhi6br29bq8a97wgfxgz4d236cg0ydgaqv8j5nqjgvjwp13p9l";
-    armv7l-linux = "07qq0ic9nckl9fkk5rl9dy4gksw3l248jsy7v8ws8f3mq4l8gi49";
+    x86_64-linux = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav";
+    x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40";
+    aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6";
+    aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k";
+    armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl";
  }.${system} or throwSystem;

  sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in

    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.71.0.22245";
+    version = "1.71.2.22258";
    pname = "vscodium";

    executableName = "codium";
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, libjpeg }:

 stdenv.mkDerivation rec {
-  version = "1.4.7";
+  version = "1.5.0";
  pname = "jpegoptim";

  src = fetchFromGitHub {
    owner = "tjko";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk=";
+    sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4=";
  };

  # There are no checks, it seems.
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@ -1,8 +1,8 @@
 { buildGoModule, fetchFromGitHub, installShellFiles, lib }:

 let
-  humioCtlVersion = "0.30.0";
-  sha256 = "sha256-BwpnqaUZvttGRtsZT2xcyXfMJZ7EIsKenTPF669ktQM=";
+  humioCtlVersion = "0.30.1";
+  sha256 = "sha256-w+mZi3KdBnBRII/Mi+1SN/u4dhz2vfqn3nzU6AKk4yM=";
  vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0=";
 in buildGoModule {
    name = "humioctl-${humioCtlVersion}";
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "gpsprune";
-  version = "22";
+  version = "22.1";

  src = fetchurl {
    url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "sha256-T4lzw3UupnSF+anrdZDhg68OxSJsD7M3djK7WpKXq6Q=";
+    sha256 = "sha256-Its8w+4IAPlNnOYewrTItYWw/7IcAfCK1EnAzun4ScI=";
  };

  dontUnpack = true;
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "mob";
-  version = "3.1.5";
+  version = "3.2.0";

  src = fetchFromGitHub {
    owner = "remotemobprogramming";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-FnAocL4Lbg/WxvLJuNR8FDBXvxqD2RMkkRvaCKvka8A=";
+    sha256 = "sha256-qr6F98OVI+K0V59YH35GERiC9jgxp/YJm4N4EGvDotk=";
  };

  vendorSha256 = null;
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@ -2,6 +2,7 @@
 , lib
 , fetchurl
 , fetchpatch
+, fetchFromGitHub
 , copyDesktopItems
 , makeDesktopItem
 , desktopToDarwinBundle
@ -33,6 +34,16 @@ let
  openJpegVersion = with stdenv;
    lib.versions.majorMinor (lib.getVersion openjpeg);

+  freeglut-mupdf = freeglut.overrideAttrs (old: rec {
+    pname = "freeglut-mupdf";
+    version = "3.0.0-r${src.rev}";
+    src = fetchFromGitHub {
+      owner = "ArtifexSoftware";
+      repo = "thirdparty-freeglut";
+      rev = "13ae6aa2c2f9a7b4266fc2e6116c876237f40477";
+      hash = "sha256-0fuE0lm9rlAaok2Qe0V1uUrgP4AjMWgp3eTbw8G6PMM=";
+    };
+  });

 in
 stdenv.mkDerivation rec {
@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
    if stdenv.isDarwin then
      with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
    else
-      [ freeglut libGLU ]
+      [ freeglut-mupdf libGLU ]
  )
  ;
  outputs = [ "bin" "dev" "out" "man" "doc" ];
--- a/pkgs/applications/misc/snapmaker-luban/default.nix
+++ b/pkgs/applications/misc/snapmaker-luban/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl
 , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups
-, gtk3, nss, glib, dbus, nspr, gdk-pixbuf
+, gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa
 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
 , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, pango
 , gcc-unwrapped, udev
@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "snapmaker-luban";
-  version = "4.1.4";
+  version = "4.3.2";

  src = fetchurl {
    url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
-    sha256 = "sha256-hbqIwX6YCrUQAjvKKWFAUjHvcZycnIA6v6l6qmAMuUI=";
+    sha256 = "sha256-t8TgtzK3jK8bfXBMbOSeBjLlrmPh61E6Itlo7MfY4Pg=";
  };

  nativeBuildInputs = [
@ -29,11 +29,13 @@ stdenv.mkDerivation rec {
    cups
    gcc-unwrapped
    gtk3
+    libdrm
    libXdamage
    libX11
    libXScrnSaver
    libXtst
    libxcb
+    mesa # Required for libgbm
    nspr
    nss
  ];
--- a/pkgs/applications/misc/swaynotificationcenter/default.nix
+++ b/pkgs/applications/misc/swaynotificationcenter/default.nix
@ -18,6 +18,7 @@
 , meson
 , ninja
 , pkg-config
+, python3
 , scdoc
 , vala
 , xvfb-run
@ -25,13 +26,13 @@

 stdenv.mkDerivation (finalAttrs: rec {
  pname = "SwayNotificationCenter";
-  version = "0.6.3";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "ErikReider";
    repo = "SwayNotificationCenter";
    rev = "v${version}";
-    hash = "sha256-79Kda2Mi2r38f0J12bRm9wbHiZCy9+ojPDxwlFG8EYw=";
+    hash = "sha256-s4yacSK5ajuq+BeGcPX+/o9wuDOcTOdZu4p8nPS8wk4=";
  };

  nativeBuildInputs = [
@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: rec {
    meson
    ninja
    pkg-config
+    python3
    scdoc
    vala
    wrapGAppsHook
@ -61,15 +63,9 @@ stdenv.mkDerivation (finalAttrs: rec {
    # systemd # ends with broken permission
  ];

-  # Fix-Me: Broken in 0.6.3, but fixed on master. Enable on next release. Requires python3 in nativeBuildInputs.
-  # postPatch = ''
-  #   chmod +x build-aux/meson/postinstall.py
-  #   patchShebangs build-aux/meson/postinstall.py
-  # '';
-
-  # Remove past 0.6.3
-  postInstall = ''
-    glib-compile-schemas "$out"/share/glib-2.0/schemas
+  postPatch = ''
+    chmod +x build-aux/meson/postinstall.py
+    patchShebangs build-aux/meson/postinstall.py
  '';

  passthru.tests.version = testers.testVersion {
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -1,8 +1,8 @@
 {
  "stable": {
-    "version": "105.0.5195.102",
-    "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw",
-    "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa",
+    "version": "105.0.5195.125",
+    "sha256": "0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0",
+    "sha256bin64": "14knj758nzihs4yh6gb6w0l4i985cnrd0y5hdmz3yd49n9a7s5hv",
    "deps": {
      "gn": {
        "version": "2022-07-11",
@ -19,9 +19,9 @@
    }
  },
  "beta": {
-    "version": "106.0.5249.30",
-    "sha256": "11sn0syhxzjz4lcw09aifcnrj2nf72siqh8v60zx6cpqj8jpgk48",
-    "sha256bin64": "13yg8kb1k3n2vgh5l71vjyx6jf5zsibn41wvqnk0qds0kq6vnxxm",
+    "version": "106.0.5249.40",
+    "sha256": "14nidf49nqpirsd0qpq91pvsyhc7ngkhcyq3n3yl37mswvaalnm1",
+    "sha256bin64": "17x0mx4kzrrl2calibi9cjsq80kn30c396pv20qf5n6850dc0rx2",
    "deps": {
      "gn": {
        "version": "2022-08-11",
@ -32,22 +32,22 @@
    }
  },
  "dev": {
-    "version": "107.0.5286.2",
-    "sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz",
-    "sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk",
+    "version": "107.0.5300.0",
+    "sha256": "1h059sma9g6kzaip3rvnb569d3x11h669330a68sif2krpl91bnv",
+    "sha256bin64": "1kwmhjc15d35lxmdn7f5v8nm8yfs4ckaks9zvxm73wlnvwv0i1qj",
    "deps": {
      "gn": {
-        "version": "2022-08-31",
+        "version": "2022-09-08",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78",
-        "sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g"
+        "rev": "b4851eb2062f76a880c07f7fa0d12913beb6d79e",
+        "sha256": "1cz7155rzsydg02j1yprczm4qjk5g4lqbnh5qdky8p1ghg3miq3i"
      }
    }
  },
  "ungoogled-chromium": {
-    "version": "105.0.5195.102",
-    "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw",
-    "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa",
+    "version": "105.0.5195.127",
+    "sha256": "1q15i5vcb7q20awib7csh2v7mzjnppb4pqgqzgqiixs9wj710j3m",
+    "sha256bin64": null,
    "deps": {
      "gn": {
        "version": "2022-07-11",
@ -56,8 +56,8 @@
        "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
      },
      "ungoogled-patches": {
-        "rev": "105.0.5195.102-1",
-        "sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc"
+        "rev": "105.0.5195.127-1",
+        "sha256": "0iinags8lvfiw0l55fc3ldq92qw6p01a62zs8q2av0srzpx0xd0b"
      }
    }
  }
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -16,9 +16,8 @@ let
    let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ];
    in
    buildGoModule ({
-      name = "terraform-${version}";
-
-      inherit vendorSha256;
+      pname = "terraform";
+      inherit version vendorSha256;

      src = fetchFromGitHub {
        owner = "hashicorp";
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@ -4,30 +4,31 @@
 , fetchFromGitHub
 , installShellFiles
 , btrfs-progs
-, glibc
 , testers
 , werf
 }:

 buildGoModule rec {
  pname = "werf";
-  version = "1.2.168";
+  version = "1.2.173";

  src = fetchFromGitHub {
    owner = "werf";
    repo = "werf";
    rev = "v${version}";
-    hash = "sha256-/Shmnnpme1ffN7GMTryb4ddPlcAsruyWhFdjr1PJ3HM=";
+    hash = "sha256-jbV2pQSFq/E++eOyQwB0ssG2R9mm3sprlm5mFfHJsBA=";
  };

-  vendorHash = "sha256-E5yDk48O7zze8QTeLQ999QmB8XLkpKNZ8JQ2wVRMGCU=";
+  vendorHash = "sha256-NHRPl38/R7yS8Hht118mBc+OBPwfYiHOaGIwryNK8Mo=";

  proxyVendor = true;

  subPackages = [ "cmd/werf" ];

  nativeBuildInputs = [ installShellFiles ];
-  buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs glibc.static ];
+
+  buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs ]
+    ++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ];

  CGO_ENABLED = if stdenv.isLinux then 1 else 0;

@ -36,7 +37,7 @@ buildGoModule rec {
    "-w"
    "-X github.com/werf/werf/pkg/werf.Version=${src.rev}"
  ] ++ lib.optionals stdenv.isLinux [
-    "-extldflags=-static"
+    "-extldflags '-static'"
    "-linkmode external"
  ];

@ -61,6 +62,9 @@ buildGoModule rec {
      integration/suites \
      pkg/true_git/*test.go \
      test/e2e
+  '' + lib.optionalString (CGO_ENABLED == 0) ''
+    # A workaround for osusergo.
+    export USER=nixbld
  '';

  postInstall = ''
@ -72,7 +76,7 @@ buildGoModule rec {
  passthru.tests.version = testers.testVersion {
    package = werf;
    command = "werf version";
-    version = "v${version}";
+    version = src.rev;
  };

  meta = with lib; {
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "rclone";
-  version = "1.59.1";
+  version = "1.59.2";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-eblCMe9ywJztjsWmngUkB/IE2ePI9Yin2jkxBW0tTbQ=";
+    sha256 = "sha256-2/CwqjlVa5g4DAAc2v0KarqbsXCTSrzQKRzCHF72X+I=";
  };

  vendorSha256 = "sha256-MZ5RtB4UGHPlMxyQ0VbX5iPpZw98oUuEhuMBDZcYiw8=";
--- a/pkgs/applications/radio/tncattach/default.nix
+++ b/pkgs/applications/radio/tncattach/default.nix
@ -0,0 +1,32 @@
+{ lib, stdenv, fetchFromGitHub, installShellFiles }:
+
+stdenv.mkDerivation rec {
+  pname = "tncattach";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "markqvist";
+    repo = "tncattach";
+    rev = version;
+    sha256 = "0n7ad4gqvpgabw2i67s51lfz386wmv0cvnhxq9ygxpsqmx9aynxk";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  makeFlags = [ "compiler=$(CC)" ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 tncattach -t $out/bin
+    installManPage tncattach.8
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Attach KISS TNC devices as network interfaces";
+    homepage = "https://github.com/markqvist/tncattach";
+    license = licenses.mit;
+    maintainers = with maintainers; [ sarcasticadmin ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/applications/science/biology/messer-slim/default.nix
+++ b/pkgs/applications/science/biology/messer-slim/default.nix
@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }:

 stdenv.mkDerivation rec {
-  version = "4.0";
+  version = "4.0.1";
  pname = "messer-slim";

  src = fetchFromGitHub {
    owner = "MesserLab";
    repo = "SLiM";
    rev = "v${version}";
-    sha256 = "sha256-2iEflSDknlQtCLz2MvEZExOT+MQlEYOMY2JI0XE6mw0=";
+    sha256 = "sha256-KC9MbIJi//ZYreoRS+DED8eQW7e4IPvGT+rLI+f7Zrk=";
  };

  nativeBuildInputs = [ cmake gcc gcc-unwrapped ];
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@ -1,30 +1,49 @@
-{ stdenv, fetchurl, lib, xorg }:
+{ lib, stdenv, fetchurl, undmg, makeWrapper, xorg }:

 let
-  badArch = throw "scilab-bin requires i686-linux or x86_64-linux";
-
-  architecture =
-    if stdenv.hostPlatform.system == "i686-linux" then
-      "i686"
-    else if stdenv.hostPlatform.system == "x86_64-linux" then
-      "x86_64"
-    else
-      badArch;
-in
-stdenv.mkDerivation rec {
  pname = "scilab-bin";
  version = "6.1.1";

-  src = fetchurl {
-    url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-${architecture}.tar.gz";
-    sha256 =
-      if stdenv.hostPlatform.system == "i686-linux" then
-        "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib"
-      else if stdenv.hostPlatform.system == "x86_64-linux" then
-        "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk="
-      else
-        badArch;
+  srcs = {
+    aarch64-darwin = fetchurl {
+      url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-accelerate-arm64.dmg";
+      sha256 = "sha256-L4dxD8R8bY5nd+4oDs5Yk0LlNsFykLnAM+oN/O87SRI=";
+    };
+    x86_64-darwin = fetchurl {
+      url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-x86_64.dmg";
+      sha256 = "sha256-tBeqzllMuogrGcJxGqEl2DdNXaiwok3yhzWSdlWY5Fc=";
+    };
+    x86_64-linux = fetchurl {
+      url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-x86_64.tar.gz";
+      sha256 = "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk=";
+    };
  };
+  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  meta = {
+    homepage = "http://www.scilab.org/";
+    description = "Scientific software package for numerical computations (Matlab lookalike)";
+    platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.gpl2Only;
+  };
+
+  darwin = stdenv.mkDerivation rec {
+    inherit pname version src meta;
+
+    nativeBuildInputs = [ undmg makeWrapper ];
+
+    sourceRoot = "scilab-${version}.app";
+
+    installPhase = ''
+      mkdir -p $out/{Applications/scilab.app,bin}
+      cp -R . $out/Applications/scilab.app
+      makeWrapper $out/{Applications/scilab.app/Contents/MacOS,bin}/scilab
+    '';
+  };
+
+  linux = stdenv.mkDerivation rec {
+    inherit pname version src meta;

  libPath = lib.makeLibraryPath [
    stdenv.cc.cc
@ -89,12 +108,6 @@ stdenv.mkDerivation rec {
    # Moving other share/ folders
    mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share
  '';
-
-  meta = {
-    homepage = "http://www.scilab.org/";
-    description = "Scientific software package for numerical computations (Matlab lookalike)";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    # see http://www.scilab.org/legal_notice
-    license = "Scilab";
  };
-}
+in
+if stdenv.isDarwin then darwin else linux
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@ -18,13 +18,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "meld";
-  version = "3.21.2";
+  version = "3.22.0";

  format = "other";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4=";
+    sha256 = "sha256-P8EHyY7251NY/9Kw0UyF3bSP4UoR6TmpQyL6qo6QxA0=";
  };

  nativeBuildInputs = [
@ -56,6 +56,10 @@ python3.pkgs.buildPythonApplication rec {
  # https://github.com/NixOS/nixpkgs/issues/56943
  strictDeps = false;

+  postPatch = ''
+    patchShebangs meson_shebang_normalisation.py
+  '';
+
  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
@ -65,7 +69,7 @@ python3.pkgs.buildPythonApplication rec {

  meta = with lib; {
    description = "Visual diff and merge tool";
-    homepage = "http://meldmerge.org/";
+    homepage = "https://meld.app/";
    license = licenses.gpl2Plus;
    platforms = platforms.linux ++ platforms.darwin;
    maintainers = with maintainers; [ jtojnar mimame ];
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "nixpacks";
-  version = "0.3.12";
+  version = "0.5.6";

  src = fetchFromGitHub {
    owner = "railwayapp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-wzbyBofWYXkOx+kNAmo9lDQdfkYLndh+Pw09+bxNqbU=";
+    sha256 = "sha256-pYqaBLrGEZUhIqaoYhkXrf2OoaAfswQntSa8FnYMBLA=";
  };

-  cargoSha256 = "sha256-0KMs4YeWMj4Wz+iIVQ5XEwswVRs0q5Vibcy5fFNbH04=";
+  cargoSha256 = "sha256-ud6bhyWePINiddSuWcpUkMjp3q6/Xd9TK3CaoFZFB20=";

  # skip test due FHS dependency
  doCheck = false;
--- a/pkgs/applications/window-managers/picom/picom-next.nix
+++ b/pkgs/applications/window-managers/picom/picom-next.nix
@ -2,12 +2,12 @@

 picom.overrideAttrs (oldAttrs: rec {
  pname = "picom-next";
-  version = "unstable-2022-02-05";
+  version = "unstable-2022-08-23";
  src = fetchFromGitHub {
    owner = "yshui";
    repo = "picom";
-    rev = "928963721c8789fc5f27949e8b0730771aab940d";
-    sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y=";
+    rev = "e0758eb5e572d5d7cf28f28e5e409f20e0bd2ded";
+    sha256 = "sha256-L0cFkKPFw92dx3P9jlkwgw7/otjUVkVZbOE0UT6gF+I=";
  };
  meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
 })
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@ -180,12 +180,12 @@ in stdenvNoCC.mkDerivation (args // {
              ;;
      esac

-      deps_file="$(realpath "''${1:-$(mktemp -t "XXXXXX-${pname}-deps.nix")}")"
-      export HOME=$(mktemp -td "XXXXXX-${pname}-home")
+      deps_file="$(realpath "''${1:-$(mktemp -t "${pname}-deps-XXXXXX.nix")}")"
+      export HOME=$(mktemp -td "${pname}-home-XXXXXX")
      mkdir -p "$HOME/nuget_pkgs"

      store_src="${srcOnly args}"
-      src="$(mktemp -td "XXXXXX-${pname}-src")"
+      src="$(mktemp -td "${pname}-src-XXXXXX")"
      cp -rT "$store_src" "$src"
      chmod -R +w "$src"
      trap "rm -rf $src $HOME" EXIT
--- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
@ -4,7 +4,7 @@ linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps {
  fetchNuGet = { pname, version, sha256
    , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }:
    fetchurl {
-      name = "${pname}-${version}.nupkg";
+      name = "${pname}.${version}.nupkg";
      inherit url sha256;
    };
 })
--- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
@ -30,7 +30,9 @@ while read pkg_spec; do
  pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"

  pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")"
-  if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; then
+  if [[ -d $pkg_src ]]; then
+      continue
+  elif [[ $pkg_src != https://api.nuget.org/* ]]; then
    pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}"
    pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg"
    echo "  (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@ -2,20 +2,25 @@

 let
  sets = [
+    # The compact, sans-serif set:
    "comfy"
    "comfy-fixed"
    "comfy-duo"
+    # The compact, serif set:
+    "comfy-motion"
+    "comfy-motion-fixed"
+    "comfy-motion-duo"
+    # The wide, sans-serif set:
    "comfy-wide"
    "comfy-wide-fixed"
-    "comfy-motion"
-    "comfy-motion-duo"
+    "comfy-wide-duo"
  ];
-  version = "0.4.0";
+  version = "1.0.0";
  src = fetchFromSourcehut {
    owner = "~protesilaos";
    repo = "iosevka-comfy";
    rev = version;
-    sha256 = "sha256-d3C5HNiZCd0xva6zvMP9NmvmeU4uXuaO04pbgIepwfw=";
+    sha256 = "0psbz40hicv3v3x7yq26hy6nfbzml1kha24x6a88rfrncdp6bds7";
  };
  privateBuildPlan = src.outPath + "/private-build-plans.toml";
  overrideAttrs = (attrs: {
@ -24,8 +29,8 @@ let
    meta = with lib; {
      inherit (src.meta) homepage;
      description = ''
-        Custom build of Iosevka with a rounded style and open shapes,
-        adjusted metrics, and overrides for almost all individual glyphs
+        Customised build of the Iosevka typeface, with a consistent
+        rounded style and overrides for almost all individual glyphs
        in both roman (upright) and italic (slanted) variants.
      '';
      license = licenses.ofl;
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@ -18,6 +18,7 @@
 , mixNixDeps ? { }
 , elixir ? inputs.elixir
 , hex ? inputs.hex.override { inherit elixir; }
+, stripDebug ? true
 , ...
 }@attrs:
 let
@ -25,6 +26,8 @@ let
  overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ];
 in
 assert mixNixDeps != { } -> mixFodDeps == null;
+assert stripDebug -> !enableDebugInfo;
+
 stdenv.mkDerivation (overridable // {
  # rg is used as a better grep to search for erlang references in the final release
  nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ];
@ -116,6 +119,10 @@ stdenv.mkDerivation (overridable // {
        substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out"
      done
    fi
+  '' + lib.optionalString stripDebug ''
+    # strip debug symbols to avoid hardreferences to "foreign" closures actually
+    # not needed at runtime, while at the same time reduce size of BEAM files.
+    erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop
  '';

  # TODO investigate why the resulting closure still has
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@ -18,8 +18,11 @@ assert if type == "sdk" then packages != null else true;
 , openssl_1_1
 , libuuid
 , zlib
+, libkrb5
 , curl
 , lttng-ust_2_12
+, testers
+, runCommand
 }:

 let
@ -37,27 +40,24 @@ let
    sdk = ".NET SDK ${version}";
  };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: rec {
  inherit pname version;

  # Some of these dependencies are `dlopen()`ed.
-  rpath = lib.makeLibraryPath ([
-    stdenv.cc.cc
-    zlib
-    curl
-    icu
-    libunwind
-    libuuid
-    openssl_1_1
-  ] ++ lib.optional stdenv.isLinux lttng-ust_2_12);
-
  nativeBuildInputs = [
    makeWrapper
  ] ++ lib.optional stdenv.isLinux autoPatchelfHook;

  buildInputs = [
    stdenv.cc.cc
-  ];
+    zlib
+    icu
+    libkrb5
+    # this must be before curl for autoPatchElf to find it
+    # curl brings in its own openssl
+    openssl_1_1
+    curl
+  ] ++ lib.optional stdenv.isLinux lttng-ust_2_12;

  src = fetchurl (
    srcs."${stdenv.hostPlatform.system}" or (throw
@ -77,24 +77,30 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  postFixup = lib.optionalString stdenv.isLinux ''
-    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/dotnet
-    patchelf --set-rpath "${rpath}" $out/dotnet
-    find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
-    find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \;
-
-    wrapProgram $out/bin/dotnet \
-      --prefix LD_LIBRARY_PATH : ${icu}/lib
-  '';
-
  doInstallCheck = true;
  installCheckPhase = ''
-    # Fixes cross
-    export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-
    $out/bin/dotnet --info
  '';

+  # Tell autoPatchelf about runtime dependencies.
+  # (postFixup phase is run before autoPatchelfHook.)
+  postFixup = lib.optionalString stdenv.isLinux ''
+    patchelf \
+      --add-needed libicui18n.so \
+      --add-needed libicuuc.so \
+      $out/shared/Microsoft.NETCore.App/*/libcoreclr.so \
+      $out/shared/Microsoft.NETCore.App/*/*System.Globalization.Native.so \
+      $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost
+    patchelf \
+      --add-needed libgssapi_krb5.so \
+      $out/shared/Microsoft.NETCore.App/*/*System.Net.Security.Native.so \
+      $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost
+    patchelf \
+      --add-needed libssl.so \
+      $out/shared/Microsoft.NETCore.App/*/*System.Security.Cryptography.Native.OpenSsl.so \
+      $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost
+  '';
+
  setupHook = writeText "dotnet-setup-hook" ''
    if [ ! -w "$HOME" ]; then
      export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files
@ -117,6 +123,23 @@ stdenv.mkDerivation rec {

    # Convert a "stdenv.hostPlatform.system" to a dotnet RID
    systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}");
+
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+      };
+
+      smoke-test = runCommand "dotnet-sdk-smoke-test" {
+        nativeBuildInputs = [ finalAttrs.finalPackage ];
+      } ''
+        HOME=$(pwd)/fake-home
+        dotnet new console
+        dotnet build
+        output="$(dotnet run)"
+        # yes, older SDKs omit the comma
+        [[ "$output" =~ Hello,?\ World! ]] && touch "$out"
+      '';
+    };
  };

  meta = with lib; {
@ -125,6 +148,6 @@ stdenv.mkDerivation rec {
    license = licenses.mit;
    maintainers = with maintainers; [ kuznero mdarocha ];
    mainProgram = "dotnet";
-    platforms = builtins.attrNames srcs;
+    platforms = attrNames srcs;
  };
-}
+})
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.97/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.98/ -A '*.tar.xz' )
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@ -4,667 +4,667 @@

 {
  attica = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/attica-5.97.0.tar.xz";
-      sha256 = "0ciq7dbr027g8dgkfs4l3ys9fdhxlgkr0hd1mip3fngwcjn2my65";
-      name = "attica-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/attica-5.98.0.tar.xz";
+      sha256 = "0w1w6w2jia1q32jnn2dhyxmkq64ha1dcbsqj233v4f224rp3aknp";
+      name = "attica-5.98.0.tar.xz";
    };
  };
  baloo = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/baloo-5.97.0.tar.xz";
-      sha256 = "0s2rpaz5dk0zixm6x51h6h9g4997g3sjj6mmqjx2fnyaxh79r1hz";
-      name = "baloo-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/baloo-5.98.0.tar.xz";
+      sha256 = "0x515lnvrzlnsv5i924q17mzi88k00krj90myad17s0g7p5pi1rw";
+      name = "baloo-5.98.0.tar.xz";
    };
  };
  bluez-qt = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/bluez-qt-5.97.0.tar.xz";
-      sha256 = "16gawrq75008r70hjf38fk7w9y1ns2x9vrxs953gbg58ygaryfh3";
-      name = "bluez-qt-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/bluez-qt-5.98.0.tar.xz";
+      sha256 = "0h2k2qiskn921cpni5rs7x5ahric6dlllwsrk77akpi4xcsrip2g";
+      name = "bluez-qt-5.98.0.tar.xz";
    };
  };
  breeze-icons = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/breeze-icons-5.97.0.tar.xz";
-      sha256 = "18vij7ihdyd6mar971yci2925c2j5l9q0479931h563ph8i49bkf";
-      name = "breeze-icons-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/breeze-icons-5.98.0.tar.xz";
+      sha256 = "0a3zvmhcfsnxv0jpyjny3sl769p99psadl1872v0qlkax47pvsjp";
+      name = "breeze-icons-5.98.0.tar.xz";
    };
  };
  extra-cmake-modules = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/extra-cmake-modules-5.97.0.tar.xz";
-      sha256 = "02n5xywig2pksbkxfckd0dn97mdn6qjv3shyqryscayqvbrkblly";
-      name = "extra-cmake-modules-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/extra-cmake-modules-5.98.0.tar.xz";
+      sha256 = "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w";
+      name = "extra-cmake-modules-5.98.0.tar.xz";
    };
  };
  frameworkintegration = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/frameworkintegration-5.97.0.tar.xz";
-      sha256 = "1srj8gnvb3mhppiiy2p489vwj0rcq0j91h4q4halmbl3hd9j4s1v";
-      name = "frameworkintegration-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/frameworkintegration-5.98.0.tar.xz";
+      sha256 = "1mrangjj8lhm4njpkhqna2zwnidkd9crs23gj6kdlwzmiknypi6q";
+      name = "frameworkintegration-5.98.0.tar.xz";
    };
  };
  kactivities = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kactivities-5.97.0.tar.xz";
-      sha256 = "0dyg0rd8cwc3vyb7p3d1n5c670d4f87s09q017ml88pndxpbnbfi";
-      name = "kactivities-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kactivities-5.98.0.tar.xz";
+      sha256 = "0n7r88y1b8mph5al2xh8fbw5ckdzdmdzjipf205y20ib35bskd9i";
+      name = "kactivities-5.98.0.tar.xz";
    };
  };
  kactivities-stats = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kactivities-stats-5.97.0.tar.xz";
-      sha256 = "1nwbp36p8hk6wwyf4mq4ijy57ig6lass8kyla31dkhy95nqc79p8";
-      name = "kactivities-stats-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kactivities-stats-5.98.0.tar.xz";
+      sha256 = "0zvw3km1wf91wl9xbjvawjia0847kbs3js4nbf3d0z87l5h6rbx8";
+      name = "kactivities-stats-5.98.0.tar.xz";
    };
  };
  kapidox = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kapidox-5.97.0.tar.xz";
-      sha256 = "0rg91cv60r4my7cvj9kjrp06jghgk5kwslqi8b5s9hjh2c0w73wx";
-      name = "kapidox-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kapidox-5.98.0.tar.xz";
+      sha256 = "1k2qk8ibv5dqdhkn2992n8rlmslpmngz83hxb7zrh3pkphdg8v2n";
+      name = "kapidox-5.98.0.tar.xz";
    };
  };
  karchive = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/karchive-5.97.0.tar.xz";
-      sha256 = "14ldrbkzlm59sjysirvj8yhihgyy4x85w54ydj8khnmvvm4q5zqv";
-      name = "karchive-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/karchive-5.98.0.tar.xz";
+      sha256 = "1ipj7j1iw6g56z0qppji38h6qwbs05piiqqbsw8hdbf96l6cdiq2";
+      name = "karchive-5.98.0.tar.xz";
    };
  };
  kauth = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kauth-5.97.0.tar.xz";
-      sha256 = "1xa2r9qwi0h3740f07dj4qxzvr9qgaqjjwbf3lj5g1k2nd9wakfp";
-      name = "kauth-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kauth-5.98.0.tar.xz";
+      sha256 = "0nzdvx2mibpq1cgzpll9ffjr46vch1qvriaywyqih0iybx6mx5z6";
+      name = "kauth-5.98.0.tar.xz";
    };
  };
  kbookmarks = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kbookmarks-5.97.0.tar.xz";
-      sha256 = "0skbw5m3ihg8v4g46gfvbvgrhdfav6sx26l9jcjx0pfi85ksqvbp";
-      name = "kbookmarks-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kbookmarks-5.98.0.tar.xz";
+      sha256 = "1rpjqz2xnpb2wp2k3pjdclbkb0p96y48x6h8l056nr93alxyrqvi";
+      name = "kbookmarks-5.98.0.tar.xz";
    };
  };
  kcalendarcore = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcalendarcore-5.97.0.tar.xz";
-      sha256 = "1476yjbww2cwxnc84nmdgc3r7wi50hj2jjmh6qgfa8067w2sx9yq";
-      name = "kcalendarcore-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcalendarcore-5.98.0.tar.xz";
+      sha256 = "16kclspsjzld9n07z1i8li2pc91ihpqhbk46a4s92nsihs2dkayk";
+      name = "kcalendarcore-5.98.0.tar.xz";
    };
  };
  kcmutils = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcmutils-5.97.0.tar.xz";
-      sha256 = "0xasda9bi455fmmqdhmapdm6n7sg5m1kgvzh5zx7r43s6jshf6dd";
-      name = "kcmutils-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcmutils-5.98.0.tar.xz";
+      sha256 = "0jqkg4i16jnxricrhi1cbvv7gjjj7ry3z36mzh11h48ml7rl05qx";
+      name = "kcmutils-5.98.0.tar.xz";
    };
  };
  kcodecs = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcodecs-5.97.0.tar.xz";
-      sha256 = "0w16il3gqy76x4l7135jgi1sfxz4yl9zss2r53mgm583m0bybrk3";
-      name = "kcodecs-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcodecs-5.98.0.tar.xz";
+      sha256 = "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz";
+      name = "kcodecs-5.98.0.tar.xz";
    };
  };
  kcompletion = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcompletion-5.97.0.tar.xz";
-      sha256 = "19lygg1x12yx41rrh1fklzhrg86nbhg6cji2i25g50ycsd7f1cba";
-      name = "kcompletion-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcompletion-5.98.0.tar.xz";
+      sha256 = "191vid00zskvhl6dgj6yz9iyvwdcmg35l5gq68ggjr17cj59acsf";
+      name = "kcompletion-5.98.0.tar.xz";
    };
  };
  kconfig = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kconfig-5.97.0.tar.xz";
-      sha256 = "0bgnagh8kljakvx9rg461fvispf1f37pcd8z9qxr6flwgw67gzlh";
-      name = "kconfig-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kconfig-5.98.0.tar.xz";
+      sha256 = "15m2bggfr682q68dym7nzmvz7q7pwarzijad1wj0r5cs62l3bkjy";
+      name = "kconfig-5.98.0.tar.xz";
    };
  };
  kconfigwidgets = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kconfigwidgets-5.97.0.tar.xz";
-      sha256 = "0a44qp3c3isi7xgjcqhs0npiisgf379nxlswmyblmlm00rn03ii0";
-      name = "kconfigwidgets-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kconfigwidgets-5.98.0.tar.xz";
+      sha256 = "05bwldqc5k6dlzsxjby5565sch6i0mh7jg5cbyjz24xb1fpj0d7b";
+      name = "kconfigwidgets-5.98.0.tar.xz";
    };
  };
  kcontacts = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcontacts-5.97.0.tar.xz";
-      sha256 = "026rjgmi6lgvm30799klkbcmwfhzlixsbdqyjvzcpsszxh0nj6dq";
-      name = "kcontacts-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcontacts-5.98.0.tar.xz";
+      sha256 = "0g3lg1i9rg7hjw7xjx9228sy54dy35lgwghcjds5cawszl5yi106";
+      name = "kcontacts-5.98.0.tar.xz";
    };
  };
  kcoreaddons = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcoreaddons-5.97.0.tar.xz";
-      sha256 = "1ah28900l7j8nb3v3q7xsmmvrq6cv63b8gyisbcw6kryhw9kah09";
-      name = "kcoreaddons-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcoreaddons-5.98.0.tar.xz";
+      sha256 = "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52";
+      name = "kcoreaddons-5.98.0.tar.xz";
    };
  };
  kcrash = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kcrash-5.97.0.tar.xz";
-      sha256 = "1ipmm012v9zvxf7fxcl811xzxw9h6a6d6lzmnn589h9h3n6j8wgg";
-      name = "kcrash-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kcrash-5.98.0.tar.xz";
+      sha256 = "03ba3x9jgp15dxgwbjnv5s98f5di2z4ncp4hiv1qkyiibqqfx6kf";
+      name = "kcrash-5.98.0.tar.xz";
    };
  };
  kdav = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kdav-5.97.0.tar.xz";
-      sha256 = "1nx5zks5svxszhnm4732w9kh17p20bh66z90gl77zxgixqsq93fm";
-      name = "kdav-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kdav-5.98.0.tar.xz";
+      sha256 = "02474a3k7yqgnb1sbxbnm6l4cahn88y2631jvkq9xlmcx7xs2dzi";
+      name = "kdav-5.98.0.tar.xz";
    };
  };
  kdbusaddons = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kdbusaddons-5.97.0.tar.xz";
-      sha256 = "0b8j2bj4zn7a9yhba44almsvq1s6vg7s3s5gr97mj7mz2hlyiiqk";
-      name = "kdbusaddons-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kdbusaddons-5.98.0.tar.xz";
+      sha256 = "0fwdmlnci2xn5pi1ywgia3xka3zsh6gl6xpx1gvql7lczk1y490a";
+      name = "kdbusaddons-5.98.0.tar.xz";
    };
  };
  kdeclarative = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kdeclarative-5.97.0.tar.xz";
-      sha256 = "0w2s3139xz7001awzs9wpjd23qp5hxzw0k3sgljnwqa36scd4s5y";
-      name = "kdeclarative-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kdeclarative-5.98.0.tar.xz";
+      sha256 = "0y5scmcnzhwvyb7x6fdb59xgdhghw8v9i3r05gx1x7g1gfsw0wh6";
+      name = "kdeclarative-5.98.0.tar.xz";
    };
  };
  kded = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kded-5.97.0.tar.xz";
-      sha256 = "19znbzhifix0r2wzsr5f7fj839ymlpjwlpagpkwsx57pg21k9p2b";
-      name = "kded-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kded-5.98.0.tar.xz";
+      sha256 = "1k8yxdnihfvvdjmw7lmd62vi5k1hpvjdcwd7njqxz6178iq7dd75";
+      name = "kded-5.98.0.tar.xz";
    };
  };
  kdelibs4support = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kdelibs4support-5.97.0.tar.xz";
-      sha256 = "04a14i0g59wj54lzq34s8av9mxkfw8jcvlgv3pg87l8xwq4xvpqs";
-      name = "kdelibs4support-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kdelibs4support-5.98.0.tar.xz";
+      sha256 = "0hyyrxic1rkw2jrr92rnmbk6bqkfrcnpc917vs7xyansk9799b8f";
+      name = "kdelibs4support-5.98.0.tar.xz";
    };
  };
  kdesignerplugin = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kdesignerplugin-5.97.0.tar.xz";
-      sha256 = "087xycnizfw7psnha2f9v16nxphvdnly3ymqywcjwv213cd7y1r8";
-      name = "kdesignerplugin-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kdesignerplugin-5.98.0.tar.xz";
+      sha256 = "17b0javl6k5zcmx04aqzmh3qdgwvzhf62x603m4pg6xbl3zns67g";
+      name = "kdesignerplugin-5.98.0.tar.xz";
    };
  };
  kdesu = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kdesu-5.97.0.tar.xz";
-      sha256 = "1csgsrj1jld4p9rqpda4c9wckk224m6zyhhybfqh0mhz78pvcbk5";
-      name = "kdesu-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kdesu-5.98.0.tar.xz";
+      sha256 = "15fbb7zifk4lhnlwvqhs9svzb80qwms03zbrjfnsc1n1wyyfk7v2";
+      name = "kdesu-5.98.0.tar.xz";
    };
  };
  kdewebkit = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kdewebkit-5.97.0.tar.xz";
-      sha256 = "1dijacbg76mn9l13fk8cl0kgj98g8wkky3z1210x65gjgqgzl97f";
-      name = "kdewebkit-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kdewebkit-5.98.0.tar.xz";
+      sha256 = "03bwwgzh1xfj4w7q2cvr7712yrjgf9qhqkqgzypcdb49gpvaq164";
+      name = "kdewebkit-5.98.0.tar.xz";
    };
  };
  kdnssd = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kdnssd-5.97.0.tar.xz";
-      sha256 = "0lmlwb4b06fy8myvai76srx4i1w60vw58mn14sy7l88kr28xc12d";
-      name = "kdnssd-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kdnssd-5.98.0.tar.xz";
+      sha256 = "0wcjq0g1cdjz9npy31i4rqbx85a95f15w71aamhm8x82l8nysv4g";
+      name = "kdnssd-5.98.0.tar.xz";
    };
  };
  kdoctools = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kdoctools-5.97.0.tar.xz";
-      sha256 = "1xha2l0sqf4zyqbwglfc946pw483fcl9g43vlmnxrk9qsfr75b31";
-      name = "kdoctools-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kdoctools-5.98.0.tar.xz";
+      sha256 = "0ygpjasdynsmb3c8rdwnc5jminl5f34cmqnihsig831xsq8z6chs";
+      name = "kdoctools-5.98.0.tar.xz";
    };
  };
  kemoticons = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kemoticons-5.97.0.tar.xz";
-      sha256 = "02ii85h7l508xhf9f05pfw0c4vldr102v7lbygk5mlrcpgmgqnp2";
-      name = "kemoticons-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kemoticons-5.98.0.tar.xz";
+      sha256 = "0f3d0jmpnqkrjn95sbvjzda923rfdgrlxd4k58pmzd0bblxkcxh2";
+      name = "kemoticons-5.98.0.tar.xz";
    };
  };
  kfilemetadata = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kfilemetadata-5.97.0.tar.xz";
-      sha256 = "08bhs3nq5q362qfqhz3z4znm0svbjy8blcdgy3l0smfpfr8xhbrz";
-      name = "kfilemetadata-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kfilemetadata-5.98.0.tar.xz";
+      sha256 = "1nsvslhs2kiff3r5ji8z931lh6srvjzzvwnv9cs0j74sr46c6rkn";
+      name = "kfilemetadata-5.98.0.tar.xz";
    };
  };
  kglobalaccel = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kglobalaccel-5.97.0.tar.xz";
-      sha256 = "0cdbwyckad5a7rlv1kcmpp51q32clbi86cbggap9l9r8h99x7i75";
-      name = "kglobalaccel-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kglobalaccel-5.98.0.tar.xz";
+      sha256 = "1vr6k7lpxsxa6in60ld2wcdqfpaan5xgbmwm3xyr584x6pv737cl";
+      name = "kglobalaccel-5.98.0.tar.xz";
    };
  };
  kguiaddons = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kguiaddons-5.97.0.tar.xz";
-      sha256 = "10kmjq38ykbxhp5vr797vmgcv8jf28g2nrkx0j3myhwq1xgmjy7v";
-      name = "kguiaddons-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kguiaddons-5.98.0.tar.xz";
+      sha256 = "022qf858khdqklq117i223ihpw8mvdcbcfn8cwqmn2cv9qnfxnqj";
+      name = "kguiaddons-5.98.0.tar.xz";
    };
  };
  kholidays = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kholidays-5.97.0.tar.xz";
-      sha256 = "0b5qr7vmrshp5hghxbab0q26i01aafw2za4qmj779cj9givpm3vj";
-      name = "kholidays-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kholidays-5.98.0.tar.xz";
+      sha256 = "0ysw52wiyxrkprn0gis85nphpfl1wdb4439i66dfmg7s9nyqpzp0";
+      name = "kholidays-5.98.0.tar.xz";
    };
  };
  khtml = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/khtml-5.97.0.tar.xz";
-      sha256 = "14dv3734z0m53rc1clx4qdm020pwc251ac9dvmpvg2x294vlj5kc";
-      name = "khtml-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/khtml-5.98.0.tar.xz";
+      sha256 = "0bflwrp6i2w6a3fq2m2df655495rpnsmqcm7w1f1dzfndc6yd9i5";
+      name = "khtml-5.98.0.tar.xz";
    };
  };
  ki18n = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/ki18n-5.97.0.tar.xz";
-      sha256 = "07hyz3vaqwd12g92gwrmzd3p2wx3qksfnnd560kan5f8g1pnsbq3";
-      name = "ki18n-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/ki18n-5.98.0.tar.xz";
+      sha256 = "0b3r53v2ybhlyqpkjv98dv2w9q49yqqxk9qzbyc4mm7ypq4hvl47";
+      name = "ki18n-5.98.0.tar.xz";
    };
  };
  kiconthemes = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kiconthemes-5.97.0.tar.xz";
-      sha256 = "04csm9hb6inp1v0471xsqgxim5748s2k1fxl5lzmpzmbmslcdwcl";
-      name = "kiconthemes-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kiconthemes-5.98.0.tar.xz";
+      sha256 = "1qmld8xgabmwx2dh5395pll0a0jgirxhlbqv6aph76jg4lvynkqx";
+      name = "kiconthemes-5.98.0.tar.xz";
    };
  };
  kidletime = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kidletime-5.97.0.tar.xz";
-      sha256 = "0aq4qpplafzsipflfjf463xp5p68gpcfssdr8lpkx84lqqa0k89m";
-      name = "kidletime-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kidletime-5.98.0.tar.xz";
+      sha256 = "1jdbjkishqnlzz1qrzyg92xnlsl7w89dmrh0zhzaj9bnr5a3icck";
+      name = "kidletime-5.98.0.tar.xz";
    };
  };
  kimageformats = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kimageformats-5.97.0.tar.xz";
-      sha256 = "04ajq25xh4iyxfnm658h6fd9z8ipn5dgwd640ax9walbp4pkd0zb";
-      name = "kimageformats-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kimageformats-5.98.0.tar.xz";
+      sha256 = "0v4jr1lh2qjk453q8mpz94cd98k4kmjrykn8kxrd7zvrkaa4snfy";
+      name = "kimageformats-5.98.0.tar.xz";
    };
  };
  kinit = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kinit-5.97.0.tar.xz";
-      sha256 = "19ac8i0dvh6q2sqrgk3rjg231x5n4k6d4hd0vgjycyxjmi3aqmjq";
-      name = "kinit-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kinit-5.98.0.tar.xz";
+      sha256 = "04654hz3yipnlhy5gz3bkh988fcfl1lv7608k4xa5qnbsxaqh141";
+      name = "kinit-5.98.0.tar.xz";
    };
  };
  kio = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kio-5.97.0.tar.xz";
-      sha256 = "11sqcy0m3867ss9hgs5n7jmwck0rmdql2b1mp5q99d4fg98816yc";
-      name = "kio-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kio-5.98.0.tar.xz";
+      sha256 = "0z1ikpa3an3qmd26h2v48kxxw1jph21i12x4nawvc4x1dp4vkm1d";
+      name = "kio-5.98.0.tar.xz";
    };
  };
  kirigami2 = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kirigami2-5.97.0.tar.xz";
-      sha256 = "016ny2pf34cll4zwxxfj0r4fjkvbm0mmac5z7d22dq6cgqrdz7j4";
-      name = "kirigami2-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kirigami2-5.98.0.tar.xz";
+      sha256 = "1l0ggwrprmg5n5y3gxv7h4593fg87d7naxkf30603kkavq0hgks6";
+      name = "kirigami2-5.98.0.tar.xz";
    };
  };
  kitemmodels = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kitemmodels-5.97.0.tar.xz";
-      sha256 = "0vxlajl8lvddxrwnq3zdcm4sj36r6nyczplwk97xsr5q52minpbw";
-      name = "kitemmodels-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kitemmodels-5.98.0.tar.xz";
+      sha256 = "1z9swjmll833jxy2ym63zzgi9vl8ld79mgypndqszsrd4mfsbs16";
+      name = "kitemmodels-5.98.0.tar.xz";
    };
  };
  kitemviews = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kitemviews-5.97.0.tar.xz";
-      sha256 = "1ggv3lf1z5986g837kq0dw2pkwd032zzdx2c9zs5zal1y7aid6f5";
-      name = "kitemviews-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kitemviews-5.98.0.tar.xz";
+      sha256 = "176gqlinsvdgkbg7kr4qd97mnvcnbymrkcs9kg6hm75qzxcaj8dj";
+      name = "kitemviews-5.98.0.tar.xz";
    };
  };
  kjobwidgets = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kjobwidgets-5.97.0.tar.xz";
-      sha256 = "16s2rjbmxz6x1kmnx9mg8sa42p65ps5jk074s86vg9qnhk0jxkf9";
-      name = "kjobwidgets-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kjobwidgets-5.98.0.tar.xz";
+      sha256 = "0f87n5d3h2f9y1z2imfd0jj9108wbcxg7dg4k1c53zar2lrfx4wc";
+      name = "kjobwidgets-5.98.0.tar.xz";
    };
  };
  kjs = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kjs-5.97.0.tar.xz";
-      sha256 = "1y6wgfc85smlp3kqxyma0h0nnn5z5hzszy0xdvbl76c1azby2n8f";
-      name = "kjs-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kjs-5.98.0.tar.xz";
+      sha256 = "03is1a5b1sfh1nd011lchgir9nrywvax06ilg9y7z0vsn0ick7ik";
+      name = "kjs-5.98.0.tar.xz";
    };
  };
  kjsembed = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kjsembed-5.97.0.tar.xz";
-      sha256 = "07s0xpcvxslnyk6z6ilz2h57in5g4a1xa6yi896isqwihqc28kxx";
-      name = "kjsembed-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kjsembed-5.98.0.tar.xz";
+      sha256 = "0zb4vr0hp73lzc1gfnpq1grwmlpdvnp8awf3ydx4vqjh9n6jbaf2";
+      name = "kjsembed-5.98.0.tar.xz";
    };
  };
  kmediaplayer = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kmediaplayer-5.97.0.tar.xz";
-      sha256 = "14hc5kz98smihlnnf5lg5i6mw8xnblix7jaql2x1ym6vj7vbnjks";
-      name = "kmediaplayer-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kmediaplayer-5.98.0.tar.xz";
+      sha256 = "0wcv99xgg9pxijbjl4cmsgmpwb893ira6wd3ys5ihk2nakbvd09x";
+      name = "kmediaplayer-5.98.0.tar.xz";
    };
  };
  knewstuff = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/knewstuff-5.97.0.tar.xz";
-      sha256 = "0k49zbypxw0b79nbmhc59q2bz4h0whaq72if5nfa4jdxrvfvn9yp";
-      name = "knewstuff-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/knewstuff-5.98.0.tar.xz";
+      sha256 = "09mxzpv0l1i5ml963gdnji8rskmi8b2f0hp4rn6ibkcj00z48fgy";
+      name = "knewstuff-5.98.0.tar.xz";
    };
  };
  knotifications = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/knotifications-5.97.0.tar.xz";
-      sha256 = "07ylq0ynb66cp5v7p26j49w65kadza8zkww3wl32nnvi3qa68qz3";
-      name = "knotifications-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/knotifications-5.98.0.tar.xz";
+      sha256 = "10whr3wjldaxdvbj6i250rqgsy2m1n606ja1yka571f1fz7laqcd";
+      name = "knotifications-5.98.0.tar.xz";
    };
  };
  knotifyconfig = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/knotifyconfig-5.97.0.tar.xz";
-      sha256 = "1yldfc44k1z7s1f3yqzdm0dgg84xlzqddllkrxc60cf6aaq7pnhv";
-      name = "knotifyconfig-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/knotifyconfig-5.98.0.tar.xz";
+      sha256 = "1qlmgr5rifygp8zk8qfjwm6k72kfyj8x6hvqwy2a59lfi3wgbm07";
+      name = "knotifyconfig-5.98.0.tar.xz";
    };
  };
  kpackage = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kpackage-5.97.0.tar.xz";
-      sha256 = "03j184bnv7lnbx2srqxhv9q5klgr0dvrfdwhx1b56jpmxjrdf79c";
-      name = "kpackage-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kpackage-5.98.0.tar.xz";
+      sha256 = "1234jq9qqhq2z5afkkniz6w5s1ab9r4x9wamq3c9y08nzjq634py";
+      name = "kpackage-5.98.0.tar.xz";
    };
  };
  kparts = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kparts-5.97.0.tar.xz";
-      sha256 = "0l95af7c9m79z1pwyzzhdihd2wksjxy0vnl6h4a5qi35a553v0zg";
-      name = "kparts-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kparts-5.98.0.tar.xz";
+      sha256 = "01gcnywbzrgwlk4cws2rr139r95r201yfal1af3jkd7g2x499vgr";
+      name = "kparts-5.98.0.tar.xz";
    };
  };
  kpeople = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kpeople-5.97.0.tar.xz";
-      sha256 = "1fy2dpfbhcmi0v08ik6pbb31z29m1g91l14p98ny3g6sy6r1l83v";
-      name = "kpeople-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kpeople-5.98.0.tar.xz";
+      sha256 = "0wxy8pxkbfqbb4i9v3q912shzck56bk6xra3blhwva82qm9rps0f";
+      name = "kpeople-5.98.0.tar.xz";
    };
  };
  kplotting = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kplotting-5.97.0.tar.xz";
-      sha256 = "03pa2qbpm6qsc9v6i6wqr15jwjkgywzdwy7jl6cxrh9acdmy3ljy";
-      name = "kplotting-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kplotting-5.98.0.tar.xz";
+      sha256 = "0hnzyl1x6acv1psdgsa9prpvnm12j71x6w6wbs1b0fl9bv5zw222";
+      name = "kplotting-5.98.0.tar.xz";
    };
  };
  kpty = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kpty-5.97.0.tar.xz";
-      sha256 = "1i0a53l1ik44blxy7xg3lf2l2x2idxfrxn1rnjdgm119klysdic7";
-      name = "kpty-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kpty-5.98.0.tar.xz";
+      sha256 = "0arxbdxldwnrcg5x1vpvkwdd4hayrpqvn08jz6r7zb4s9h1582ww";
+      name = "kpty-5.98.0.tar.xz";
    };
  };
  kquickcharts = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kquickcharts-5.97.0.tar.xz";
-      sha256 = "1v2zky53hvwbqnbh0wj8n6rp0lp59qii4k5gm3j2pfcjzrdj8an1";
-      name = "kquickcharts-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kquickcharts-5.98.0.tar.xz";
+      sha256 = "1xll5yf8cjziraxgybmhclnsg1i5lgmvh5bqqnwnzncg8anzijhk";
+      name = "kquickcharts-5.98.0.tar.xz";
    };
  };
  kross = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kross-5.97.0.tar.xz";
-      sha256 = "0143l7nxq0j207cjvs0srcllvfyzpwrzxmcrdl22hrj951j1aq5s";
-      name = "kross-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kross-5.98.0.tar.xz";
+      sha256 = "0yjn66r44jxlrm4vz1nf8s64kcw7lmarjpqz1mcgb1n4jc28hs60";
+      name = "kross-5.98.0.tar.xz";
    };
  };
  krunner = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/krunner-5.97.0.tar.xz";
-      sha256 = "0addv0whngqzfvsi1gcsiissin3sa7gg8n5kd3nnp03w7kqbapr9";
-      name = "krunner-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/krunner-5.98.0.tar.xz";
+      sha256 = "0kch839xw09h1lddqgdcfwniq6rza5wdyyzcx99hcasn7l60nhsj";
+      name = "krunner-5.98.0.tar.xz";
    };
  };
  kservice = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kservice-5.97.0.tar.xz";
-      sha256 = "0bi07qdnl99g4kwxikh5nb4n6ihnn5hg8g1sl64jkggd06l1c03d";
-      name = "kservice-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kservice-5.98.0.tar.xz";
+      sha256 = "0lgwpcdkkbxwq84zp5aymrdwy0iacqxz5ckc89pymcm0bacyhl31";
+      name = "kservice-5.98.0.tar.xz";
    };
  };
  ktexteditor = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/ktexteditor-5.97.0.tar.xz";
-      sha256 = "02hwh736zlb98vkd83sz8a2ywqcv3wbik2pscdg746ff2pvqnwlb";
-      name = "ktexteditor-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/ktexteditor-5.98.0.tar.xz";
+      sha256 = "1pazi9rz4v95g31s7d26yla8rcb0cgd08mlmdcasywsaxc8nn7vw";
+      name = "ktexteditor-5.98.0.tar.xz";
    };
  };
  ktextwidgets = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/ktextwidgets-5.97.0.tar.xz";
-      sha256 = "1kwa52f1nyidxjkcipp5r3p1cp5m4xdm57cr77vv9krzhcaznhmx";
-      name = "ktextwidgets-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/ktextwidgets-5.98.0.tar.xz";
+      sha256 = "14ivmpng7x9rsk3x6kyd86jabzqxgjcdrma1im44wacnvisi4llk";
+      name = "ktextwidgets-5.98.0.tar.xz";
    };
  };
  kunitconversion = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kunitconversion-5.97.0.tar.xz";
-      sha256 = "1pspm7ka6yvy7pbdsfliyzr0xi20m8krd4qvy24jy4rn0wa5xy6v";
-      name = "kunitconversion-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kunitconversion-5.98.0.tar.xz";
+      sha256 = "0lhyg1d1k25kqk94lzy8mb06p4c17limmcrzirnsnxjvhjrc6r05";
+      name = "kunitconversion-5.98.0.tar.xz";
    };
  };
  kwallet = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kwallet-5.97.0.tar.xz";
-      sha256 = "08fqjxsnqiifp5knsb0w5ajx5713c1z4p5s7cbg6395bqsq7i6xb";
-      name = "kwallet-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kwallet-5.98.0.tar.xz";
+      sha256 = "0kwxkxlk0xlxkjgpjpb40xfl2l9hnhpymb4lxw4zwlxjn81r6sab";
+      name = "kwallet-5.98.0.tar.xz";
    };
  };
  kwayland = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kwayland-5.97.0.tar.xz";
-      sha256 = "0g6a618kdgsra0b7mkg3hyvxm3lzwnmz5j2mlkhmmkfci5n02wg5";
-      name = "kwayland-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kwayland-5.98.0.tar.xz";
+      sha256 = "0c0953gm63xhrqb7aspvf28wi7x31mrgaid23dw5gqphkbgis5qw";
+      name = "kwayland-5.98.0.tar.xz";
    };
  };
  kwidgetsaddons = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kwidgetsaddons-5.97.0.tar.xz";
-      sha256 = "05xcnrv27m7xfhgkfmgrbrfg6m6bb3p65iqb8gxjjs0357jcgh3s";
-      name = "kwidgetsaddons-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kwidgetsaddons-5.98.0.tar.xz";
+      sha256 = "117wki4w2bs1d2pjhi5qpb2b3qhhva6fq9gikba5fb6980kmdayr";
+      name = "kwidgetsaddons-5.98.0.tar.xz";
    };
  };
  kwindowsystem = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kwindowsystem-5.97.0.tar.xz";
-      sha256 = "1wgybsf3n16q66pkgcg3hjypmfl9cam69bcz98xf074s6ybaf8mq";
-      name = "kwindowsystem-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kwindowsystem-5.98.0.tar.xz";
+      sha256 = "02l7xmxcilmrxpkkid4m9srl0d8ymqgwpw5j80w3g57p0rahwjl1";
+      name = "kwindowsystem-5.98.0.tar.xz";
    };
  };
  kxmlgui = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/kxmlgui-5.97.0.tar.xz";
-      sha256 = "1xdd30r9a3f611h8kmk53mybyil870159b7qr7v13g5asqlpkwds";
-      name = "kxmlgui-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/kxmlgui-5.98.0.tar.xz";
+      sha256 = "08n5l3zgkh0fxaqwrfx5mk4j5wq9ylkpxd37751qcivpag7l0x45";
+      name = "kxmlgui-5.98.0.tar.xz";
    };
  };
  kxmlrpcclient = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/portingAids/kxmlrpcclient-5.97.0.tar.xz";
-      sha256 = "02fkzf9z983r2mfyjwyhpzf9b3qpk8bavh1pixbvwd6iddmqhnj9";
-      name = "kxmlrpcclient-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/portingAids/kxmlrpcclient-5.98.0.tar.xz";
+      sha256 = "09apfrkgvvzv8zwxyjbi5qb145a9awirk02nx474bshgypfqslpb";
+      name = "kxmlrpcclient-5.98.0.tar.xz";
    };
  };
  modemmanager-qt = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/modemmanager-qt-5.97.0.tar.xz";
-      sha256 = "0qg56r4j3mlyp27zjdrhwckw4a10zfp4bpzwr35m37ccsb80304k";
-      name = "modemmanager-qt-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/modemmanager-qt-5.98.0.tar.xz";
+      sha256 = "0gk4jy3r1451a2dajhnz6lin4lfawc4qdlxp7n7m43ca4d89h13k";
+      name = "modemmanager-qt-5.98.0.tar.xz";
    };
  };
  networkmanager-qt = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/networkmanager-qt-5.97.0.tar.xz";
-      sha256 = "10bczach9x3az29h32rn6h0gnz4ghj8dn8ynm93jkkjmw87asml5";
-      name = "networkmanager-qt-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/networkmanager-qt-5.98.0.tar.xz";
+      sha256 = "0s1h02v9k8nyl30mw7gayzvpb8bnzzp9crcfqpry7rf02rxv9idw";
+      name = "networkmanager-qt-5.98.0.tar.xz";
    };
  };
  oxygen-icons5 = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/oxygen-icons5-5.97.0.tar.xz";
-      sha256 = "1ypr4l1205jzc9cpdin64a2rk0bz4x0wjy7k87lswm2643w6sjsm";
-      name = "oxygen-icons5-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/oxygen-icons5-5.98.0.tar.xz";
+      sha256 = "03wk52hqrgj0r73nb4yiq7rnmdn4rrqzrj3cdzbg3flkw5r7wbbq";
+      name = "oxygen-icons5-5.98.0.tar.xz";
    };
  };
  plasma-framework = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/plasma-framework-5.97.0.tar.xz";
-      sha256 = "09xmjmv9l26dpyngwks66lb48clfwfagpndavf2djcfjid4pv63k";
-      name = "plasma-framework-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/plasma-framework-5.98.0.tar.xz";
+      sha256 = "1bmwvk0pj0bnb8qhcl0bz82r63nls6h7lzzmkfkdwcwmjifmiqg4";
+      name = "plasma-framework-5.98.0.tar.xz";
    };
  };
  prison = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/prison-5.97.0.tar.xz";
-      sha256 = "06skmwxb1hkg2h1q2fhgkbbsdnvhg6l930533n446g42p7qlzw56";
-      name = "prison-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/prison-5.98.0.tar.xz";
+      sha256 = "1ppqm1f06q8fc1ncvzn9a133npmvlh1qxgvvbpwn6m0a8cr7ac6w";
+      name = "prison-5.98.0.tar.xz";
    };
  };
  purpose = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/purpose-5.97.0.tar.xz";
-      sha256 = "17sih5a5v28qpwrvc1jq3b2hhi7qrbwaw14swg0iz89icbaxizl3";
-      name = "purpose-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/purpose-5.98.0.tar.xz";
+      sha256 = "0g9ykhsn9dl3y3qp4wm3r7bkdhpl9mcbg671wa26qx3ba8a2jynr";
+      name = "purpose-5.98.0.tar.xz";
    };
  };
  qqc2-desktop-style = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/qqc2-desktop-style-5.97.0.tar.xz";
-      sha256 = "19ily5hn1hmyqw9d2qwm7440zzr3kjdz1qf2n073w2miqgp6fsa6";
-      name = "qqc2-desktop-style-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/qqc2-desktop-style-5.98.0.tar.xz";
+      sha256 = "1af7izd4k220dzngf1nwgcw0bi7vl772lpjrqd9fp9rijh74dx7d";
+      name = "qqc2-desktop-style-5.98.0.tar.xz";
    };
  };
  solid = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/solid-5.97.0.tar.xz";
-      sha256 = "17aclbb8jwdj4hd6kz3svgla5i5rm03xj7cavdinbvy2g13avh44";
-      name = "solid-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/solid-5.98.0.tar.xz";
+      sha256 = "14bf2k40skhyhrmgyyscg7psm1a8klf4z696pimlwjjhnawjfr06";
+      name = "solid-5.98.0.tar.xz";
    };
  };
  sonnet = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/sonnet-5.97.0.tar.xz";
-      sha256 = "14qijjhm0ar14nw03dp192gnmlx13xgybw2iv71nrxg7cybp74m3";
-      name = "sonnet-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/sonnet-5.98.0.tar.xz";
+      sha256 = "0j4p91xx1scg3jmvq6km7bwfjz5ihafk76yf1byb6aqyw50h3bm3";
+      name = "sonnet-5.98.0.tar.xz";
    };
  };
  syndication = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/syndication-5.97.0.tar.xz";
-      sha256 = "0qcxmsirzqbycndw4grvpcmvyfz01crj7cdlazj92a5gckz640jn";
-      name = "syndication-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/syndication-5.98.0.tar.xz";
+      sha256 = "04py880hxkvidydsqcyjbkq0wv9cp42d7svkdgf74fmzfyfrmrax";
+      name = "syndication-5.98.0.tar.xz";
    };
  };
  syntax-highlighting = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/syntax-highlighting-5.97.0.tar.xz";
-      sha256 = "17d9a2mr0g3l62nqvrsmwkhraxjc26bw8hxf27xwpngazy8rd2z8";
-      name = "syntax-highlighting-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/syntax-highlighting-5.98.0.tar.xz";
+      sha256 = "092ilbhhs8xaqblc9w1xksapdzvqyazz8lj011wz4762p1nagiq2";
+      name = "syntax-highlighting-5.98.0.tar.xz";
    };
  };
  threadweaver = {
-    version = "5.97.0";
+    version = "5.98.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.97/threadweaver-5.97.0.tar.xz";
-      sha256 = "13s0zjmjwqpzxv14h7x8d12av4icgdnhgzb9qcdc82gazq1mv5s6";
-      name = "threadweaver-5.97.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.98/threadweaver-5.98.0.tar.xz";
+      sha256 = "1pwinpz5kscx64kc7dn4qf76m64kxzp92zjk8j2a2s1mx0s0vk2s";
+      name = "threadweaver-5.98.0.tar.xz";
    };
  };
 }
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:

 let
-  version = "4.4.1";
+  version = "4.5.0";
  libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];

 in stdenv.mkDerivation {
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
    owner = "oracle";
    repo = "odpi";
    rev = "v${version}";
-    sha256 = "sha256-tc6N19jSLkuOvTe5f/pBAd1FvpnOjsa4V9CgygUvpZo=";
+    sha256 = "sha256-EPTEZ8Sh8yWtgbKRhwa1nrXSgQelUJfZDaStGSfOKGw=";
  };

  nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
--- a/pkgs/development/python-modules/astropy-healpix/default.nix
+++ b/pkgs/development/python-modules/astropy-healpix/default.nix
@ -12,12 +12,12 @@

 buildPythonPackage rec {
  pname = "astropy-healpix";
-  version = "0.6";
+  version = "0.7";

  src = fetchPypi {
    inherit version;
    pname = lib.replaceStrings ["-"] ["_"] pname;
-    sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690";
+    sha256 = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/bitcoinlib/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace bitcoin/core/key.py --replace \
-      "ctypes.util.find_library('ssl') or 'libeay32'" \
+      "ctypes.util.find_library('ssl.35') or ctypes.util.find_library('ssl') or 'libeay32'" \
      "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'"
  '';

--- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix
+++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix
@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, into-dbus-python
+, dbus-python
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "dbus-python-client-gen";
+  version = "0.8";
+
+  src = fetchFromGitHub {
+    owner = "stratis-storage";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-nSzxT65WHBVct5pGHmIAHJXftd0tKZeK/argN+V9xcs=";
+  };
+
+  propagatedBuildInputs = [
+    into-dbus-python
+    dbus-python
+  ];
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "A Python library for generating dbus-python client code";
+    homepage = "https://github.com/stratis-storage/dbus-python-client-gen";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
+++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix
@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pyparsing
+, pytestCheckHook
+, hypothesis
+, hs-dbus-signature
+}:
+
+buildPythonPackage rec {
+  pname = "dbus-signature-pyparsing";
+  version = "0.04";
+
+  src = fetchFromGitHub {
+    owner = "stratis-storage";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-IXyepfq7pLTRkTolKWsKGrYDoxukVC9JTrxS9xV7s2I=";
+  };
+
+  propagatedBuildInputs = [ pyparsing ];
+  checkInputs = [
+    pytestCheckHook
+    hypothesis
+    hs-dbus-signature
+  ];
+
+  meta = with lib; {
+    description = "A Parser for a D-Bus Signature";
+    homepage = "https://github.com/stratis-storage/dbus-signature-pyparsing";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/development/python-modules/deep-chainmap/default.nix
+++ b/pkgs/development/python-modules/deep-chainmap/default.nix
@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "deep-chainmap";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    pname = "deep_chainmap";
+    inherit version;
+    sha256 = "sha256-6K7dyB5iQzzw3lXLcU10SVsiHZ+SAXhz9DSCkYnPQAA=";
+  };
+
+  # Tests are not published to pypi
+  doCheck = false;
+
+  pythonImportsCheck = [ "deep_chainmap" ];
+
+  # See the guide for more information: https://nixos.org/nixpkgs/manual/#chap-meta
+  meta = with lib; {
+    description = "A recursive subclass of ChainMap";
+    homepage = "https://github.com/neutrinoceros/deep-chainmap";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rehno-lindeque ];
+  };
+}
--- a/pkgs/development/python-modules/hs-dbus-signature/default.nix
+++ b/pkgs/development/python-modules/hs-dbus-signature/default.nix
@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, hypothesis
+}:
+
+buildPythonPackage rec {
+  pname = "hs-dbus-signature";
+  version = "0.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-NNnTcSX+K8zU+sj1QBd13h7aEXN9VqltJMNWCuhgZ6I=";
+  };
+
+  checkInputs = [
+    pytestCheckHook
+    hypothesis
+  ];
+
+  meta = with lib; {
+    description = "A Hypothesis Strategy for Generating Arbitrary DBus Signatures";
+    homepage = "https://github.com/stratis-storage/hs-dbus-signature";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/development/python-modules/into-dbus-python/default.nix
+++ b/pkgs/development/python-modules/into-dbus-python/default.nix
@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, dbus-signature-pyparsing
+, dbus-python
+, pytestCheckHook
+, hypothesis
+, hs-dbus-signature
+}:
+
+buildPythonPackage rec {
+  pname = "into-dbus-python";
+  version = "0.08";
+
+  src = fetchFromGitHub {
+    owner = "stratis-storage";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Z8e6oAvRMIisMjG4HcS5jSH1znGVc7pGpMITo5fXYVs=";
+  };
+
+  propagatedBuildInputs = [
+    dbus-signature-pyparsing
+    dbus-python
+  ];
+  checkInputs = [
+    pytestCheckHook
+    hypothesis
+    hs-dbus-signature
+  ];
+
+  meta = with lib; {
+    description = "A transformer to dbus-python types";
+    homepage = "https://github.com/stratis-storage/into-dbus-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , isPy27
 , fetchPypi
@ -37,11 +38,19 @@ buildPythonPackage rec {
    ./pyqt5-confirm-license.patch
  ];

+  postPatch =
  # be more verbose
-  postPatch = ''
+  ''
    cat >> pyproject.toml <<EOF
    [tool.sip.project]
    verbose = true
+  ''
+  # Due to bug in SIP .whl name generation we have to bump minimal macos sdk upto 11.0 for
+  # aarch64-darwin. This patch can be removed once SIP will fix it in upstream,
+  # see https://github.com/NixOS/nixpkgs/pull/186612#issuecomment-1214635456.
+  + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+    minimum-macos-version = "11.0"
+  '' + ''
    EOF
  '';

--- a/pkgs/development/python-modules/reportlab/darwin-m1-compat.patch
+++ b/pkgs/development/python-modules/reportlab/darwin-m1-compat.patch
@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 7625074..b3aa2fc 100644
+--- a/setup.py
+++ b/setup.py
+@@ -249,7 +249,7 @@ class inc_lib_dirs:
+             aDir(L, os.path.join("/usr/lib", "python%s" % sys.version[:3], "config"))
+         elif platform == "darwin":
+             machine = sysconfig_platform.split('-')[-1]
+-            if machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64':
+            if False and machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64':
+                 #print('!!!!! detected darwin arm64 build')
+                 #probably an M1
+                 target = pjoin(
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@ -19,6 +19,10 @@ in buildPythonPackage rec {
    sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko=";
  };

+  patches = [
+    ./darwin-m1-compat.patch
+  ];
+
  checkInputs = [ glibcLocales ];

  buildInputs = [ ft pillow ];
--- a/pkgs/development/python-modules/simple-rlp/default.nix
+++ b/pkgs/development/python-modules/simple-rlp/default.nix
@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "simple-rlp";
-  version = "0.1.2";
+  version = "0.1.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "5c4a9c58f1b742f7fa8af0fe4ea6ff9fb02294ae041912f771570dfaf339d2b9";
+    sha256 = "sha256-LfHSt2nwoBd9JiMauL4W5l41RrF7sKmkkO/TUXwIKHY=";
  };

  pythonImportsCheck = [ "rlp" ];
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  pname = "codeql";
-  version = "2.8.5";
+  version = "2.10.5";

  dontConfigure = true;
  dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

  src = fetchzip {
    url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "sha256-HZJBqm196RgWR/14mfrLYQlU+4W3t0b4TXme04XkfKw=";
+    sha256 = "sha256-7LtGRCB4BNulJ8fgq3IiDrcVMbbE4gjylzVKJ+3Q9Ac=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/appthreat-depscan/default.nix
+++ b/pkgs/development/tools/appthreat-depscan/default.nix
@ -5,13 +5,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "appthreat-depscan";
-  version = "2.1.7";
+  version = "2.1.9";

  src = fetchFromGitHub {
    owner = "AppThreat";
    repo = "dep-scan";
    rev = "refs/tags/v${version}";
-    hash = "sha256-hudPySVFewKrXI5FAYBCPTkjI4W7/kmnNwhnjxMhkrw=";
+    hash = "sha256-3K8dIKeb9bqopu8B8f1fHLIzXHTfmn4ZtDztRBSm10k=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/development/tools/build-managers/bob/default.nix
+++ b/pkgs/development/tools/build-managers/bob/default.nix
@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "bob";
+  version = "0.5.3";
+
+  src = fetchFromGitHub {
+    owner = "benchkram";
+    repo = pname;
+    rev = version;
+    hash = "sha256-JG1fysCqqd/MwpNhKJwLr4cTGq4/88f9OMMapb+r3bc=";
+  };
+
+  ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
+
+  vendorHash = "sha256-R+zXGR5isoo76oc4lsFf9uCM0Kyi8dQiKEg4BUxtv+k=";
+
+  excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ];
+
+  # tests require network access
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A build system for microservices";
+    homepage = "https://bob.build";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ zuzuleinen ];
+  };
+}
--- a/pkgs/development/tools/eltclsh/default.nix
+++ b/pkgs/development/tools/eltclsh/default.nix
@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchgit
+, automake
+, autoconf
+, libtool
+, libedit
+, tcl
+, tk
+}:
+
+tcl.mkTclDerivation rec {
+  pname = "eltclsh";
+  version = "1.18";
+
+  src = fetchgit {
+    url = "https://git.openrobots.org/robots/eltclsh.git";
+    rev = "eltclsh-${version}";
+    hash = "sha256-C996BJxEoCSpA0x/nSnz4nnmleTIWyzm0imZp/K+Q/o=";
+  };
+
+  nativeBuildInputs = [
+    automake
+    autoconf
+    libtool
+  ];
+  buildInputs = [
+    libedit
+    tk
+  ];
+
+  preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+
+  configureFlags = [
+    "--enable-tclshrl"
+    "--enable-wishrl"
+    "--with-tk=${tk}/lib"
+    "--with-includes=${libedit.dev}/include/readline"
+    "--with-libtool=${libtool}"
+  ];
+
+  meta = with lib; {
+    description = "Interactive shell for the TCL programming language based on editline";
+    homepage = "https://homepages.laas.fr/mallet/soft/shell/eltclsh";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ iwanb ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/development/tools/kube-linter/default.nix
+++ b/pkgs/development/tools/kube-linter/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kube-linter";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "stackrox";
    repo = pname;
    rev = version;
-    sha256 = "XAsPbl9fqYk2nhDxRg5wyPwciwSpfigoBZ4hzdWAVgw=";
+    sha256 = "sha256-YEcEXXtCuK4Yg9EsaDFOfM+ri6iGoU7d0O6SlYYKG+U=";
  };

-  vendorSha256 = "sha256-0bjAIHSjw0kHrh9CzJHv1UAaBJDn6381055eOHufvCw=";
+  vendorSha256 = "sha256-UVa+0mrQ2pW/4Zmegon/IOrH4SiWhrdCc3/fs3pxGq8=";

  ldflags = [
    "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"
--- a/pkgs/development/tools/lightningcss/default.nix
+++ b/pkgs/development/tools/lightningcss/default.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "lightningcss";
-  version = "1.14.0";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "parcel-bundler";
    repo = "lightningcss";
    rev = "v${version}";
-    sha256 = "sha256-6OitOUy5y00gOWzXxvPuVJQlvERayHG1RK7To9kx23s=";
+    sha256 = "sha256-r/j8ZQo3hbM65TNAaC2BFMfuD56/8/QRUjcD7MRQN9c=";
  };

-  cargoSha256 = "sha256-RFI/QrUixKy+sxIw1NUTjHT8oQJFEnWNbbuAA6Rh18Y=";
+  cargoSha256 = "sha256-J6Z7PARdXNDiHECjutjFcx+Yhwz7cBZfhusukSDgWa8=";

  buildFeatures = [ "cli" ];

--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@ -18,35 +18,35 @@ let
    "8.1" = "blackfire-20210902";
  }.${phpMajor} or (throw "Unsupported PHP version.");

-  version = "1.77.0";
+  version = "1.78.1";

  hashes = {
    "x86_64-linux" = {
      system = "amd64";
-      sha256 = "oC4pANYT2XtF3ju+pT2TCb6iJSlNm6t+Xkawb88xWUo=";
+      sha256 = "Q9VuZewJ/KX2ZL77d3YLsE80B0y3RYg/hE2H14s9An4=";
    };
    "i686-linux" = {
      system = "i386";
-      sha256 = "zdebak5RWuPqCJ3eReKjtDLnCXtjtVFnSqvqC4U0+RE=";
+      sha256 = "YBt6OAeUsQZUyf7P6jIvknq2K0fGWl0xmJkEXFBlTyE=";
    };
    "aarch64-linux" = {
      system = "arm64";
-      sha256 = "5J1JcD/ZFxV0FWaySv037x1xjmCdM/zHiBfmRuCidjs=";
+      sha256 = "NTM3xdu+60EBz7pbRyTvhrvvZWVn4tl+LgnkHG1IpYM=";
    };
    "aarch64-darwin" = {
      system = "arm64";
      sha256 = {
        "7.4" = {
-          normal = "vKOH+yPDyf8KxX0DoEnrp2HXYfDAxVD708MZrRGMEEk=";
-          zts = "cpeOtDRhPA35utai8G1Dosuqhf76hiqvwe+Em9cFhDo=";
+          normal = "4raEYMELZjWfC82348l94G9MTHX2jnF+ZvF4AAxN9JA=";
+          zts = "HWrcLRZeyFtfJId42iHDN2ci0kTfRoXC/pEv2tObNT8=";
        };
        "8.0" = {
-          normal = "v6PD1+Ghvtoq1wzAXwqi9elyC9/NwzX0EDdtQtCfeL4=";
-          zts = "Dqs0P8X7ScDJCPYKuqlumnLz4kB7cEOnVbDACQ02sko=";
+          normal = "kRTULbqlaK3bXRC8WQ1npeZHqWnuobN7eO20oYD5OIE=";
+          zts = "vWmSXueMIdi+hwmmhCQcltywphLjsNQoCW7eN2KDRvc=";
        };
        "8.1" = {
-          normal = "mCZ1avC8FsqYdGYNepeqWgSK2kqVo1E0VjhofxdaSyk=";
-          zts = "zliaM2VbaDEgNBr5ETe1GdYNyTZy5te92LedZiolx/8=";
+          normal = "JSM/HC2ZYaSBl+cSUtaKQBYPziKk013mwyW9S4DoXFA=";
+          zts = "9OMm9rEs0o+daxhZdSps4NWQJegLU09zd3SLclGDOns=";
        };
      };
    };
@ -54,16 +54,16 @@ let
      system = "amd64";
      sha256 = {
        "7.4" = {
-          normal = "nLsrpRnR9zo3d/a0+TFBlNcAebknpBQc101ysqPs+dU=";
-          zts = "o7R8zmhIOtiNDS8Se3Dog+cn9HyTHzS4jquXdzGQQOU=";
+          normal = "rWaf0Vjkrj78q+64Zy7gJ94Lfwd8waMaOWqoPqRJLRw=";
+          zts = "zU4cPAWc4k1OEho0fZKutcJ06LstSZhA4U18zx9nfi0=";
        };
        "8.0" = {
-          normal = "Pe2/GNDiS5DuSXCffO0jo5dRl0qkh1RgBVL3JzLwVkQ=";
-          zts = "zu7QgaKbBNQkby7bLv+NKLSIa79UXMONEf171EO+uNE=";
+          normal = "huGvDPaAmfy8YM6Bg3Y0Ys6JhfIdddOXl1DnnRQsvoE=";
+          zts = "V4QWMdMhbjQtb2M7g+oHvqy+Mv0Y9j9MwyqeuMZfYkg=";
        };
        "8.1" = {
-          normal = "3SOlLeLCM4crWY6U+/zmtWmNYg2j0HC/3FWCmCi7lOo=";
-          zts = "GG8s+Pd0K6SEUzRV96Ba2mYfLgQMuGNzRoUtmz9m0NY=";
+          normal = "pnxegrKPe8WoYAcrnBJanoYT1rg8nO8kQ7SJXQJfymg=";
+          zts = "m0grZ4Xl6Sm5ZPvmS6mcJGcQOA2ECPJKvzmccqPlyBE=";
        };
      };
    };
--- a/pkgs/development/tools/misc/seer/default.nix
+++ b/pkgs/development/tools/misc/seer/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "seer";
-  version = "1.9";
+  version = "1.10";

  src = fetchFromGitHub {
    owner = "epasveer";
    repo = "seer";
    rev = "v${version}";
-    sha256 = "sha256-YIxKjykhuxTAr0kEmlj2JFA2NRs1vknpoJAGEoshwtg=";
+    sha256 = "sha256-G8kiLZBRS8Ec8LYsbppmyYZcNk3By0bcfWQFyI5epZ4=";
  };

  preConfigure = ''
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "oh-my-posh";
-  version = "9.1.0";
+  version = "9.3.0";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-waqEXmKGxGgAjJ+USsK/sfLSJV3XPAhkdXCqb45Gs+M=";
+    sha256 = "sha256-5VI7L6aGJcaqcNK0bNGv5Hb0YQxTfLFDcMmiWKTyzWA=";
  };

-  vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";
+  vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";

  sourceRoot = "source/src";

--- a/pkgs/development/tools/rust/cargo-edit/default.nix
+++ b/pkgs/development/tools/rust/cargo-edit/default.nix
@ -5,27 +5,25 @@
 , openssl
 , zlib
 , stdenv
-, libiconv
 , Security
 }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-edit";
-  version = "0.10.4";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "killercup";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-U3B/Tb7q61R5jmBni1QKqqul2JJgjtmh3st04apu0xE=";
+    hash = "sha256-TqRz1Og5wsKsiIESmplnTsGLRboEQ20cViWgXfwEHGQ=";
  };

-  cargoSha256 = "sha256-e8ICBRI6kNfItu3CxxbIY+56/2ho0Rnn1B3w/WJX+KM=";
+  cargoSha256 = "sha256-4DVek/R7VABzSJ8vEb6f3Tgf1vVLIKAWj80Il5gWu2g=";

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [
-    libiconv
    Security
  ];

--- a/pkgs/development/tools/rust/cargo-espflash/default.nix
+++ b/pkgs/development/tools/rust/cargo-espflash/default.nix
@ -0,0 +1,30 @@
+{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-espflash";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "esp-rs";
+    repo = "espflash";
+    rev = "v${version}";
+    sha256 = "sha256-YQ621YbdEy2sS4uEYvgnQU1G9iW5SpWNObPH4BfyeF0=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    udev
+  ];
+
+  cargoSha256 = "sha256-mDSNjeaEtYpEGpiIg2F+e8x/XCssNQxUx+6Cj+8XX5Q=";
+
+  meta = with lib; {
+    description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py";
+    homepage = "https://github.com/esp-rs/cargo-espflash";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
--- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-zigbuild";
-  version = "0.12.0";
+  version = "0.12.3";

  src = fetchFromGitHub {
    owner = "messense";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-nBncU5rM3gS5e/Qs14U/ZwAkLFLdNuO2DhSQW+7xGQk=";
+    sha256 = "sha256-qwOlYy9pNAKEJDgt3ML4dxDwlkyPIVO+X/q/YijEHo0=";
  };

-  cargoSha256 = "sha256-Zq+RG36aeNd8G+LSdiyLK8SYC0MckGUIBTvia4H9OJY=";
+  cargoSha256 = "sha256-8x2B8WBN9u17HS58bAwMNPEoSabNX6KzyPBLEvaGOBk=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/development/tools/ytt/default.nix
+++ b/pkgs/development/tools/ytt/default.nix
@ -1,13 +1,13 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
  pname = "ytt";
-  version = "0.42.0";
+  version = "0.43.0";

  src = fetchFromGitHub {
    owner = "vmware-tanzu";
    repo = "carvel-ytt";
    rev = "v${version}";
-    sha256 = "sha256-D9ugW/b8k1SIUjlReLB8bk0VOSymBKYrm7tSlU2B9zg=";
+    sha256 = "sha256-oxN4IfJ6ATw92Yri2l1R0EF1CKsGrXikaaEPpnU9qqc=";
  };

  vendorSha256 = null;
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@ -0,0 +1,97 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, SDL2
+, SDL2_image
+, SDL2_mixer
+, SDL2_ttf
+, boost
+, cmake
+, ffmpeg
+, innoextract
+, luajit
+, minizip
+, ninja
+, pkg-config
+, python3
+, qtbase
+, tbb
+, wrapQtAppsHook
+, zlib
+, testers
+, vcmi
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vcmi";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "vcmi";
+    repo = "vcmi";
+    rev = version;
+    fetchSubmodules = true;
+    hash = "sha256-5PuFq6wDSj5Ye2fUjqcr/VRU0ocus6h2nn+myQTOrhU=";
+  };
+
+  postPatch = ''
+    substituteInPlace Version.cpp.in \
+      --subst-var-by GIT_SHA1 "0000000";
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    python3
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    SDL2
+    SDL2_image
+    SDL2_mixer
+    SDL2_ttf
+    boost
+    ffmpeg
+    luajit
+    minizip
+    qtbase
+    tbb
+    zlib
+  ];
+
+  cmakeFlags = [
+    "-DENABLE_TEST:BOOL=NO"
+    "-DENABLE_PCH:BOOL=NO"
+    # Make libvcmi.so discoverable in a non-standard location.
+    "-DCMAKE_INSTALL_RPATH:STRING=${placeholder "out"}/lib/vcmi"
+    # Upstream assumes relative value while Nixpkgs passes absolute.
+    # Both should be allowed: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
+    # Meanwhile work it around by passing a relative value.
+    "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/vcmibuilder \
+      --prefix PATH : "${lib.makeBinPath [ innoextract ]}"
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = vcmi;
+    command = ''
+      XDG_DATA_HOME=$PWD XDG_CACHE_HOME=$PWD XDG_CONFIG_HOME=$PWD \
+        vcmiclient --version
+    '';
+  };
+
+  meta = with lib; {
+    description = "Open-source engine for Heroes of Might and Magic III";
+    homepage = "https://vcmi.eu";
+    changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog";
+    license = with licenses; [ gpl2Only cc-by-sa-40 ];
+    maintainers = with maintainers; [ azahi ];
+    platforms = platforms.linux;
+    mainProgram = "vcmiclient";
+  };
+}
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@ -4,16 +4,16 @@ let
  # comments with variant added for update script
  # ./update-zen.py zen
  zenVariant = {
-    version = "5.19.8"; #zen
+    version = "5.19.9"; #zen
    suffix = "zen1"; #zen
-    sha256 = "1jqzny85gl2wc029wp96v5x48wpn6nyx6zx9xrxqw0bhrlczzgq7"; #zen
+    sha256 = "1zwy5d7wzjxpzf9v13550zvfpkxhq7gck08zv9s94hwaz9h5xna3"; #zen
    isLqx = false;
  };
  # ./update-zen.py lqx
  lqxVariant = {
-    version = "5.19.8"; #lqx
-    suffix = "lqx2"; #lqx
-    sha256 = "1k1i9fqc0d5p2kp9bwdsp0ccbdfimavx4wpxv48mcnb7b93bpln2"; #lqx
+    version = "5.19.9"; #lqx
+    suffix = "lqx1"; #lqx
+    sha256 = "0jgl5dnbdcg7p2ix4lliif7l8pqvhnbl4ndxq64yyx78r7jrbfs2"; #lqx
    isLqx = true;
  };
  zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
--- a/pkgs/servers/dex/default.nix
+++ b/pkgs/servers/dex/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "dex";
-  version = "2.33.0";
+  version = "2.34.0";

  src = fetchFromGitHub {
    owner = "dexidp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-sl/OdwSkN4uEtuIyYtR5xjxy1z7B6rmG2Cf7xWz0Kp0=";
+    sha256 = "sha256-OML1DMIuFzoIyXtWxZW+lE/yU0B+7gx61v9CTb6MNmM=";
  };

-  vendorSha256 = "sha256-9zjQBgAuphtvpbs9kzFmrgto6KvNh1N4GdRDk3wIBGY=";
+  vendorSha256 = "sha256-qMkU4OQtoOYFF9vexZ+SH0E/4xo+WARIqQrbsMPm/C8=";

  subPackages = [
    "cmd/dex"
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "icingaweb2";
-  version = "2.10.1";
+  version = "2.11.1";

  src = fetchFromGitHub {
    owner = "Icinga";
    repo = "icingaweb2";
    rev = "v${version}";
-    sha256 = "sha256-X4RaAJjhUnSALJyFYiwagN3cHyW+GyB5MPkW7l+Zv10=";
+    hash = "sha256-MRk+ZshdOUg311+FNuEM+jspYM4ZqqQLx5dRBM1KNpI=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "keycloak";
-  version = "19.0.1";
+  version = "19.0.2";

  src = fetchzip {
    url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    sha256 = "sha256-3hqnFH0zWvgOgpQHV4eMqTGzUWEoRwxvOcOUL2s8YQk=";
+    sha256 = "sha256-Ze9VE2gtLxoZpyqbeisvHdOu8yFPwAKnDMpfA3FXWy8=";
  };

  nativeBuildInputs = [ makeWrapper jre ];
--- a/pkgs/servers/komga/default.nix
+++ b/pkgs/servers/komga/default.nix
@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "komga";
-  version = "0.157.1";
+  version = "0.157.2";

  src = fetchurl {
    url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
-    sha256 = "sha256-EXwMvUVNi2FuN+/6HI+HOxBpbwELhTSyvRtyGNgzSAQ=";
+    sha256 = "sha256-RN8EoCy/adcb9gwtjSIbQEi27OZJw4KlNAu76kGJrM8=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@ -7,21 +7,21 @@

 buildGoModule rec {
  pname = "mattermost";
-  version = "7.2.0";
+  version = "7.3.0";

  src = fetchFromGitHub {
    owner = "mattermost";
    repo = "mattermost-server";
    rev = "v${version}";
-    sha256 = "sha256-gwp09E47B0Y9wURH75DbWcS8qQ+TK/SVDcFRKLtuoq0=";
+    sha256 = "sha256-WDFay0XeaeNR/yX5if9Ab9XwzFF4cIGwBOrhc2rlX/c=";
  };

  webapp = fetchurl {
    url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-    sha256 = "sha256-FATtO6xFa/bKwywyhKEFZgrle0QPKZI8BQbrA3IlPRg=";
+    sha256 = "sha256-fIjasaaAEMPLaxo86MfASqTp/0WzzTDKJACKWuWby/A=";
  };

-  vendorSha256 = "sha256-98riYN6MaBsKyaueogjXI7x3Lcionk0xcGt4DH684QU=";
+  vendorSha256 = "sha256-qZQXNVbJZDddVE+xk6F8XJCEg5dhhuXz68wcn2Uvmxk=";

  subPackages = [ "cmd/mattermost" ];

--- a/pkgs/servers/monitoring/mackerel-agent/default.nix
+++ b/pkgs/servers/monitoring/mackerel-agent/default.nix
@ -2,20 +2,20 @@

 buildGoModule rec {
  pname = "mackerel-agent";
-  version = "0.73.0";
+  version = "0.73.1";

  src = fetchFromGitHub {
    owner = "mackerelio";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Ev7GhJjGNgMlkvfGV2oi2uvtvlDTTIo3YQAM87KC4r0=";
+    sha256 = "sha256-zbzTKMvadp9+KbHm2utJM84MPb80+zjR8hUHHTtzSdc=";
  };

  nativeBuildInputs = [ makeWrapper ];
  checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
  buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];

-  vendorSha256 = "sha256-K/HnlrXFgLsm+9161RkeTBbToY8SoHVinY2aY2+S6p4=";
+  vendorSha256 = "sha256-GuaBdqiqKUhYySYlJlJIR1NhUx7LuCqcUSXfLTkIvQI=";

  subPackages = [ "." ];

--- a/pkgs/servers/pocketbase/default.nix
+++ b/pkgs/servers/pocketbase/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "pocketbase";
-  version = "0.6.0";
+  version = "0.7.2";

  src = fetchFromGitHub {
    owner = "pocketbase";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-sDq8i79Ndwi5hLidukqnuuShCRCE7kxaiOQy29bJQCw=";
+    sha256 = "sha256-T7gK3UycEUVKKNklLzcH1ST0x4KzqOUGz8zJCimNcjY=";
  };

  vendorSha256 = "sha256-Ty06TegTT4BILgH0MpnxINxBQMW0zi0ItptHmDqKW1k=";
--- a/pkgs/servers/sql/proxysql/default.nix
+++ b/pkgs/servers/sql/proxysql/default.nix
@ -30,13 +30,13 @@

 stdenv.mkDerivation rec {
  pname = "proxysql";
-  version = "2.4.3";
+  version = "2.4.4";

  src = fetchFromGitHub {
    owner = "sysown";
    repo = pname;
    rev = version;
-    hash = "sha256-gh0x8wi1v/+iUlE4JymOyD/NI7rL+2/JJQYGAcsL7/g=";
+    hash = "sha256-S0Oy0uQPbAn52KM0r7yxLvVl1DKQwRW3QYVHtJ20CnM=";
  };

  patches = [
--- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
@ -4,6 +4,7 @@ let
 in
 {
  discourse-assign = callPackage ./discourse-assign {};
+  discourse-bbcode-color = callPackage ./discourse-bbcode-color {};
  discourse-calendar = callPackage ./discourse-calendar {};
  discourse-canned-replies = callPackage ./discourse-canned-replies {};
  discourse-chat-integration = callPackage ./discourse-chat-integration {};
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
@ -0,0 +1,17 @@
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
+
+mkDiscoursePlugin {
+  name = "discourse-bbcode-color";
+  src = fetchFromGitHub {
+    owner = "discourse";
+    repo = "discourse-bbcode-color";
+    rev = "e58c38930122772aef15738676683f7d7ff68411";
+    sha256 = "sha256-/uHJ9HMXx7YMYsAc3t/s//ucI8I9Wh3wtC/dQCbtbGU=";
+  };
+  meta = with lib; {
+    homepage = "https://github.com/discourse/discourse-bbcode-color";
+    maintainers = with maintainers; [ ryantm ];
+    license = licenses.mit;
+    description = "Support BBCode color tags.";
+  };
+}
--- a/pkgs/servers/web-apps/discourse/update.py
+++ b/pkgs/servers/web-apps/discourse/update.py
@ -283,6 +283,7 @@ def update_plugins():
    """Update plugins to their latest revision."""
    plugins = [
        {'name': 'discourse-assign'},
+        {'name': 'discourse-bbcode-color'},
        {'name': 'discourse-calendar'},
        {'name': 'discourse-canned-replies'},
        {'name': 'discourse-chat-integration'},
--- a/pkgs/shells/zsh/pure-prompt/default.nix
+++ b/pkgs/shells/zsh/pure-prompt/default.nix
@ -4,13 +4,13 @@ with lib;

 stdenv.mkDerivation rec {
  pname = "pure-prompt";
-  version = "1.20.3";
+  version = "1.20.4";

  src = fetchFromGitHub {
    owner = "sindresorhus";
    repo = "pure";
    rev = "v${version}";
-    sha256 = "sha256-vFms0MaSiLEzlYdgmUPGXaApTHVSVhwbw11N4GucgLg=";
+    sha256 = "sha256-e1D+9EejlVZxOyErg6eRgawth5gAhv6KpgjhK06ErZc=";
  };

  strictDeps = true;
--- a/pkgs/tools/admin/kics/default.nix
+++ b/pkgs/tools/admin/kics/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kics";
-  version = "1.5.15";
+  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "Checkmarx";
    repo = "kics";
    rev = "v${version}";
-    sha256 = "sha256-e6esrGb1p96yV9Ce7z0UCapXqOpRPjFb4EdStolAiMk=";
+    sha256 = "sha256-BiwSIjMczo24TDaQBQGf0sEmiOizVwu+6nbi9StMQ8s=";
  };

-  vendorSha256 = "sha256-eieulT+Vt6p2+gmQ/Ic8kgd3Cg6uHX0LSUSr/QrK/yw=";
+  vendorSha256 = "sha256-UfUu3yYl/o2lNHQYG8Z7rGvvtvJmZw2b+aTAoURZfm4=";

  subPackages = [ "cmd/console" ];

--- a/pkgs/tools/admin/swapspace/default.nix
+++ b/pkgs/tools/admin/swapspace/default.nix
@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles }:
+
+stdenv.mkDerivation rec {
+  pname = "swapspace";
+  version = "1.17";
+
+  src = fetchFromGitHub {
+    owner = "Tookmund";
+    repo = "Swapspace";
+    rev = "v${version}";
+    sha256 = "sha256-v1kSkepZm6+S4wf86ETgQzEAZBLJ2jQBgCRdF7yvuxs=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    installShellFiles
+  ];
+
+  postInstall = ''
+    installManPage doc/swapspace.8
+  '';
+
+  meta = with lib; {
+    description = "Dynamic swap manager for Linux";
+    homepage = "https://github.com/Tookmund/Swapspace";
+    license = licenses.gpl2Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ misuzu ];
+  };
+}
--- a/pkgs/tools/admin/zbctl/default.nix
+++ b/pkgs/tools/admin/zbctl/default.nix
@ -0,0 +1,49 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "zbctl";
+  version = "8.0.6";
+
+  src = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then fetchurl {
+    url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl.darwin";
+    sha256 = "17hfjrcr6lmw91jq24nbw5yz61x6larmx39lyfj6pwlz0710y13p";
+  } else if stdenvNoCC.hostPlatform.system == "x86_64-linux" then fetchurl {
+    url = "https://github.com/camunda/zeebe/releases/download/${version}/zbctl";
+    sha256 = "1xng11x7wcjvc0vipdrqyn97aa4jlgcp7g9aw4d36fw0xp9p47kp";
+  } else throw "Unsupported platform ${stdenvNoCC.hostPlatform.system}";
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp $src $out/bin/zbctl
+    chmod +x $out/bin/zbctl
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "The command line interface to interact with Camunda 8 and Zeebe";
+    homepage = "https://docs.camunda.io/docs/apis-clients/cli-client/";
+    downloadPage = "https://github.com/camunda/zeebe/releases";
+    changelog = "https://github.com/camunda/zeebe/releases/tag/${version}";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.asl20;
+    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+    maintainers = with maintainers; [ thetallestjj ];
+    longDescription = ''
+      A command line interface for Camunda Platform 8 designed to create and read resources inside a Zeebe broker.
+      It can be used for regular development and maintenance tasks such as:
+      * Deploying processes
+      * Creating process instances and job workers
+      * Activating, completing, or failing jobs
+      * Updating variables and retries
+      * Viewing cluster status
+    '';
+  };
+}
--- a/pkgs/tools/backup/autorestic/default.nix
+++ b/pkgs/tools/backup/autorestic/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "autorestic";
-  version = "1.7.1";
+  version = "1.7.3";

  src = fetchFromGitHub {
    owner = "cupcakearmy";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-UUK5C26wM8LKQ7TE6DWEfzq+uPXH09B2Nybkfuqk+1o=";
+    sha256 = "sha256-/TTnviFfL56l5WJwNLTcVXccUss8uhvR9ZSkHZcisc8=";
  };

  vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE=";
--- a/pkgs/tools/filesystems/simg2img/default.nix
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {

  buildInputs = [ zlib ];

-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" "DEP_CXX:=$(CXX)" ];

  meta = with lib; {
    description = "Tool to convert Android sparse images to raw images";
    homepage = "https://github.com/anestisb/android-simg2img";
    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ dezgeg arkivm ];
  };
 }
--- a/pkgs/tools/filesystems/stratis-cli/default.nix
+++ b/pkgs/tools/filesystems/stratis-cli/default.nix
@ -0,0 +1,36 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+, nixosTests
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "stratis-cli";
+  version = "3.2.0";
+
+  src = fetchFromGitHub {
+    owner = "stratis-storage";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-JQXTzvm4l/pl2T4djZ3HEdDQJdFE+I9doe8Iv5q34kw=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    psutil
+    python-dateutil
+    wcwidth
+    justbytes
+    dbus-client-gen
+    dbus-python-client-gen
+    packaging
+  ];
+
+  passthru.tests = nixosTests.stratis;
+
+  meta = with lib; {
+    description = "CLI for the Stratis project";
+    homepage = "https://stratis-storage.github.io";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nickcao ];
+  };
+}
--- a/pkgs/tools/filesystems/stratisd/default.nix
+++ b/pkgs/tools/filesystems/stratisd/default.nix
@ -18,6 +18,7 @@
 , tpm2-tools
 , coreutils
 , clevisSupport ? false
+, nixosTests
 }:

 stdenv.mkDerivation rec {
@ -95,6 +96,8 @@ stdenv.mkDerivation rec {
    rm -r "$out/lib/systemd/system-generators"
  '';

+  passthru.tests = nixosTests.stratis;
+
  meta = with lib; {
    description = "Easy to use local storage management for Linux";
    homepage = "https://stratis-storage.github.io";
--- a/pkgs/tools/graphics/agi/default.nix
+++ b/pkgs/tools/graphics/agi/default.nix
@ -1,5 +1,5 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchzip
 , autoPatchelfHook
 , makeWrapper
@ -9,63 +9,69 @@
 , gobject-introspection
 , gdk-pixbuf
 , jre
-, androidenv
+, android-tools
 }:

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
  pname = "agi";
-  version = "3.2.0-dev-20220831";
+  version = "3.0.1";

  src = fetchzip {
-    url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
-    sha256 = "sha256-pAPYIhNqr7TpVDnHhRVGkd6HCqu945OCXa5dpGi2UhU=";
+    url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip";
+    sha256 = "sha256-793lOJL1/wqETkWfiksnLY3Lmxx500fw4PIzT9ZQqQs=";
  };

  nativeBuildInputs = [
-    autoPatchelfHook
-    makeWrapper
    wrapGAppsHook
    gdk-pixbuf
    gobject-introspection
+    autoPatchelfHook
    copyDesktopItems
-  ];
-
-  buildInputs = [
-    stdenv.cc.cc.lib
+    makeWrapper
  ];

  installPhase = ''
    runHook preInstall
-    mkdir -p $out/{bin,lib}
+
+    mkdir -p $out/bin
    cp ./{agi,gapis,gapir,gapit,device-info} $out/bin
-    cp lib/gapic.jar $out/lib
-    wrapProgram $out/bin/agi \
-      --add-flags "--vm ${jre}/bin/java" \
-      --add-flags "--jar $out/lib/gapic.jar" \
-      --add-flags "--adb ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"
+    cp -r lib $out
+
    for i in 16 32 48 64 96 128 256 512 1024; do
      install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png
    done
+
    runHook postInstall
  '';

-  desktopItems = [(makeDesktopItem {
+  dontWrapGApps = true;
+
+  preFixup = ''
+    wrapProgram $out/bin/agi \
+      --add-flags "--vm ${jre}/bin/java" \
+      --add-flags "--adb ${android-tools}/bin/adb" \
+      --add-flags "--jar $out/lib/gapic.jar" \
+      "''${gappsWrapperArgs[@]-}"
+  '';
+
+  desktopItems = lib.toList (makeDesktopItem {
    name = "agi";
    desktopName = "Android GPU Inspector";
    exec = "agi";
    icon = "agi";
    categories = [ "Development" "Debugger" "Graphics" "3DGraphics" ];
-  })];
+  });

  meta = with lib; {
-    homepage = "https://github.com/google/agi/";
    description = "Android GPU Inspector";
+    homepage = "https://gpuinspector.dev";
+    changelog = "https://github.com/google/agi/releases/tag/v${version}";
+    platforms = [ "x86_64-linux" ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.ivar ];
    sourceProvenance = with sourceTypes; [
      binaryBytecode
      binaryNativeCode
    ];
-    license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ maintainers.ivar ];
  };
 }
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "goreleaser";
-  version = "1.11.2";
+  version = "1.11.3";

  src = fetchFromGitHub {
    owner = "goreleaser";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Qe2Q7cFu9G0Zj/mHTnxSq57OpeNMX3yZQp8VApVtZDc=";
+    sha256 = "sha256-aWaNJVNd3CUTU6ap4sUMo2EqDDkA4iMe9xdxqaA+wl0=";
  };

-  vendorSha256 = "sha256-7xySEPmc24yOwUerGoARsKaGIYnIvaJFjcwNvbHG4Ls=";
+  vendorSha256 = "sha256-iUXbvwh04W8cZ4pa+OS4bRi3bCyFQ2shPzHNh6/e3Vs=";

  ldflags = [
    "-s"
--- a/pkgs/tools/misc/mapcidr/default.nix
+++ b/pkgs/tools/misc/mapcidr/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "mapcidr";
-  version = "1.0.1";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-lSAA1lWHGQr1tguBdBePdkN+CNKkxmLweI6oqzzOG6A=";
+    sha256 = "sha256-qfEm+DFnTmGwHV7Sb488qFmjT+7QSCmbT4n5JhtDo5g=";
  };

-  vendorSha256 = "sha256-1QG+IV2unyqfD1qL8AnLjHLL/Fv3fe7rwhySM4/tJok=";
+  vendorSha256 = "sha256-5XkBw/RBNcQyoKuWQuBGGRKawuKJtMOKG06lpIPBf+8=";

  modRoot = ".";
  subPackages = [
--- a/pkgs/tools/misc/mmctl/default.nix
+++ b/pkgs/tools/misc/mmctl/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "mmctl";
-  version = "7.2.0";
+  version = "7.3.0";

  src = fetchFromGitHub {
    owner = "mattermost";
    repo = "mmctl";
    rev = "v${version}";
-    sha256 = "sha256-LPhFWZrQdusJKv0pDHWOv1gQ0EyVpT3nzkPYshh6pRw=";
+    sha256 = "sha256-4v88+3P9knVYBwbdDT6y9TrHPRwCzXHSclKKiy6dWs8=";
  };

  vendorSha256 = null;
--- a/pkgs/tools/misc/pcp/default.nix
+++ b/pkgs/tools/misc/pcp/default.nix
@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "pcp";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "dennis-tra";
+    repo = "pcp";
+    rev = "v${version}";
+    sha256 = "sha256-aZO8VuOiYhOPctFKZ6a2psJB0lKHlPc+NLy2RWDU4JI=";
+  };
+
+  vendorSha256 = "sha256-3bkzBQ950Phg4A9p+IjeUx7Xw7eVmUbeYnQViNjghFk=";
+
+  meta = with lib; {
+    description = "Command line peer-to-peer data transfer tool based on libp2p";
+    homepage = "https://github.com/dennis-tra/pcp";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ matthewcroughan ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/tools/misc/ripdrag/default.nix
+++ b/pkgs/tools/misc/ripdrag/default.nix
@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchCrate, pkg-config, gtk4 }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ripdrag";
+  version = "0.1.5";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-Pa/QYxdPt95deEjSXEVhm2jR3r8rTaKQj2DltT7EVAw=";
+  };
+
+  cargoSha256 = "sha256-jI7nF8Q8sA4AxkXvQ43r5GqcbTWffuf453DLGUs7I98=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ gtk4 ];
+
+  meta = with lib; {
+    description = "An application that lets you drag and drop files from and to the terminal";
+    homepage = "https://github.com/nik012003/ripdrag";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/tools/misc/sharedown/default.nix
+++ b/pkgs/tools/misc/sharedown/default.nix
@ -17,13 +17,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "Sharedown";
-  version = "4.0.2";
+  version = "5.0.2";

  src = fetchFromGitHub {
    owner = "kylon";
    repo = pname;
    rev = version;
-    sha256 = "sha256-hHYk7B0+wqmpOmU5wf44MBTuocLM//Oif5SOtNzO++c=";
+    sha256 = "sha256-N5jnjiD3R+uTRgHHocVVxYQ7GzUTz0fZAQGIXzcVTtA=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/misc/sharedown/yarn.lock
+++ b/pkgs/tools/misc/sharedown/yarn.lock
--- a/pkgs/tools/misc/sharedown/yarndeps.nix
+++ b/pkgs/tools/misc/sharedown/yarndeps.nix
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@ -1,14 +1,16 @@
-{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg }:
+{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg
+, testers, yle-dl
+}:

 python3Packages.buildPythonApplication rec {
  pname = "yle-dl";
-  version = "20220425";
+  version = "20220830";

  src = fetchFromGitHub {
    owner = "aajanki";
    repo = "yle-dl";
    rev = version;
-    sha256 = "sha256-PIoJ+enbRwXiszh7BTkfeoA6IfDXoFOi9WitzQp3EQE=";
+    hash = "sha256-pQIe5kYsiK1tHx3hx4bgpS5UwuBrEyX3SBMLwSjxXc4=";
  };

  propagatedBuildInputs = with python3Packages; [
@ -19,6 +21,11 @@ python3Packages.buildPythonApplication rec {
  doCheck = false; # tests require network access
  checkInputs = with python3Packages; [ pytestCheckHook ];

+  passthru.tests.version = testers.testVersion {
+    package = yle-dl;
+    command = "yle-dl -h";
+  };
+
  meta = with lib; {
    description = "Downloads videos from Yle (Finnish Broadcasting Company) servers";
    homepage = "https://aajanki.github.io/yle-dl/";
--- a/pkgs/tools/networking/hostname-debian/default.nix
+++ b/pkgs/tools/networking/hostname-debian/default.nix
@ -0,0 +1,28 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "hostname-debian";
+  version = "3.23";
+
+  src = fetchurl {
+    url = "https://deb.debian.org/debian/pool/main/h/hostname/hostname_${version}.tar.gz";
+    sha256 = "sha256-vG0ZVLIoSYaf+LKmAuOfCLFwL2htS1jdeSfN61tIdu8=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile --replace 'install -o root -g root' 'install'
+  '';
+  makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
+
+  meta = with lib; {
+    description = "Utility to set/show the host name or domain name";
+    longDescription = ''
+      This package provides commands which can be used to display the system's
+      DNS name, and to display or set its hostname or NIS domain name.
+    '';
+    homepage = "https://tracker.debian.org/pkg/hostname";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ posch ];
+    platforms = platforms.gnu;
+  };
+}
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation rec {
  pname = "mu";
-  version = "1.8.9";
+  version = "1.8.10";

  src = fetchFromGitHub {
    owner = "djcb";
    repo = "mu";
    rev = "v${version}";
-    hash = "sha256-AqbTYcPwV9iNar34pESbz9Vp/88hhB+/VxcLIhLZ16o=";
+    hash = "sha256-hwroSuxn9zVjQBz8r2y93o42zzVkHWAZaEKKEVgSb5s=";
  };

  postPatch = ''
@ -40,8 +40,6 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkg-config meson ninja ];

-  enableParallelBuilding = true;
-
  doCheck = true;

  meta = with lib; {
--- a/pkgs/tools/networking/tracebox/default.nix
+++ b/pkgs/tools/networking/tracebox/default.nix
@ -1,34 +1,45 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcrafter, libpcap, lua }:
-
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libpcap
+, lua5_1
+, json_c
+}:
 stdenv.mkDerivation rec {
  pname = "tracebox";
-  version = "0.2";
+  version = "0.4.4";

  src = fetchFromGitHub {
    owner = "tracebox";
    repo = "tracebox";
    rev = "v${version}";
-    hash = "sha256-2r503xEF3/F9QQCEaSnd4Hw/RbbAhVj9C0SVZepVrT8=";
+    hash = "sha256-1KBJ4uXa1XpzEw23IjndZg+aGJXk3PVw8LYKAvxbxCA=";
+    fetchSubmodules = true;
  };

  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libcrafter lua ];
+  buildInputs = [
+    libpcap
+    lua5_1
+    json_c
+  ];

-  configureFlags = [ "--with-lua=yes" ];
+  configureFlags = [
+    "--with-lua=yes"
+    "--with-libpcap=yes"
+  ];

-  NIX_LDFLAGS = "${libpcap}/lib/libpcap.so ${libcrafter}/lib/libcrafter.so";
+  PCAPLIB="-lpcap";
+  LUA_LIB="-llua";

-  preAutoreconf = ''
-    substituteInPlace Makefile.am --replace "noinst" ""
-    sed '/noinst/d' -i configure.ac
-    sed '/libcrafter/d' -i src/tracebox/Makefile.am
-  '';
+  enableParallelBuilding = true;

  meta = with lib; {
    homepage = "http://www.tracebox.org/";
    description = "A middlebox detection tool";
-    license = lib.licenses.gpl2;
-    maintainers = [ ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ck3d ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/package-management/comma/default.nix
+++ b/pkgs/tools/package-management/comma/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "comma";
-  version = "1.2.3";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "comma";
    rev = "v${version}";
-    sha256 = "sha256-emhvBaicLAnu/Kn4oxHngGa5BSxOEwbkhTLO5XvauMw=";
+    sha256 = "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=";
  };

-  cargoSha256 = "sha256-mQxNo4VjW2Q0MYfU+RCb4Ayl9ClpxrSV8X4EKZ7PewA=";
+  cargoSha256 = "sha256-9PVbiWmaTDx4iob5g9tXC+FV5Jmy6Id9tQxm05fJLkM=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "cosign";
-  version = "1.11.1";
+  version = "1.12.0";

  src = fetchFromGitHub {
    owner = "sigstore";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-LKnv/+6R/RaVdRYYdp+EqVQZtUn8SnYLCr5rqgGrq68=";
+    sha256 = "sha256-TfPxLSUVs/b9krexTa1wzBkaUAL8xggfpJOlxdHLzjA=";
  };

  buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@ -16,7 +16,7 @@ buildGoModule rec {

  nativeBuildInputs = [ pkg-config installShellFiles ];

-  vendorSha256 = "sha256-ao1WI8M3T/oSxYM0OrW1L3/JQf9S2C7AzE4HA6VIx5w=";
+  vendorSha256 = "sha256-gL5VCFcKz+hrwJ+KZifgBtgrgpKcBbvE4mFAg0LnOgc=";

  subPackages = [
    "cmd/cosign"
--- a/pkgs/tools/video/tsduck/default.nix
+++ b/pkgs/tools/video/tsduck/default.nix
@ -0,0 +1,83 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, curl
+, jdk
+, libedit
+, srt
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tsduck";
+  version = "3.31-2761";
+
+  src = fetchFromGitHub {
+    owner = "tsduck";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-268TKCh3naebbw+sOQ6d4N/zl7UEVtc3l3flFAYHDU4=";
+  };
+
+  buildInputs = [
+    curl
+    libedit
+    srt
+    jdk
+  ];
+
+  # remove tests which call out to https://tsduck.io/download/test/...
+  postPatch = ''
+    sed -i"" \
+      -e '/TSUNIT_TEST(testMasterPlaylist);/ d' \
+      -e '/TSUNIT_TEST(testMasterPlaylistWithAlternate);/ d' \
+      -e '/TSUNIT_TEST(testMediaPlaylist);/ d' \
+      src/utest/utestHLS.cpp
+
+    sed -i"" \
+      -e '/TSUNIT_TEST(testBetterSystemRandomGenerator);/ d' \
+      src/utest/utestSystemRandomGenerator.cpp
+
+    sed -i"" \
+      -e '/TSUNIT_ASSERT(request.downloadBinaryContent/ d' \
+      -e '/TSUNIT_ASSERT(!request.downloadBinaryContent/ d' \
+      -e '/TSUNIT_TEST(testGitHub);/ d' \
+      -e '/TSUNIT_TEST(testGoogle);/ d' \
+      -e '/TSUNIT_TEST(testNoRedirection);/ d' \
+      -e '/TSUNIT_TEST(testReadMeFile);/ d' \
+      src/utest/utestWebRequest.cpp
+
+    sed -i"" \
+      -e '/TSUNIT_TEST(testHomeDirectory);/ d' \
+      src/utest/utestSysUtils.cpp
+  '';
+
+  enableParallelBuilding = true;
+  makeFlags = [
+    "NODEKTEC=1"
+    "NOHIDES=1"
+    "NOPCSC=1"
+    "NORIST=1"
+    "NOVATEK=1"
+  ] ++ installFlags;
+
+  checkTarget = "test";
+  doCheck = true;
+
+  installFlags = [
+    "SYSROOT=${placeholder "out"}"
+    "SYSPREFIX=/"
+    "USRLIBDIR=/lib"
+  ];
+  installTargets = [
+    "install-tools"
+    "install-devel"
+  ];
+
+  meta = with lib; {
+    description = "The MPEG Transport Stream Toolkit";
+    homepage    = "https://github.com/tsduck/tsduck";
+    license     = licenses.bsd2;
+    maintainers = with maintainers; [ siriobalmelli ];
+    platforms   = platforms.all;
+  };
+}
--- a/Show more
+++ b/Show more