Merge staging-next into staging

2024-09-20 12:29:02 +02:00 · 2023-03-15 18:01:44 +00:00 · 2023-03-15 18:01:44 +00:00 · 795332a826
parent 71f95c65f3 432ead9434
commit 795332a826
75 changed files with 2217 additions and 1673 deletions
--- a/.github/workflows/check-maintainers-sorted.yaml
+++ b/.github/workflows/check-maintainers-sorted.yaml
@ -0,0 +1,21 @@
+name: "Check that maintainer list is sorted"
+
+on:
+  pull_request:
+    paths:
+      - 'maintainers/maintainer-list.nix'
+permissions:
+  contents: read
+
+jobs:
+  nixos:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'NixOS'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v19
+        with:
+          # explicitly enable sandbox
+          extra_nix_config: sandbox = true
+      - name: Check that maintainer-list.nix is sorted
+        run: nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
--- a/maintainers/scripts/check-maintainers-sorted.nix
+++ b/maintainers/scripts/check-maintainers-sorted.nix
@ -0,0 +1,57 @@
+let
+  lib = import ../../lib;
+  inherit (lib)
+    add attrNames elemAt foldl' genList length replaceStrings sort toLower trace;
+
+  maintainers = import ../maintainer-list.nix;
+  simplify = replaceStrings [ "-" "_" ] [ "" "" ];
+  compare = a: b: simplify (toLower a) < simplify (toLower b);
+  namesSorted =
+    sort
+      (a: b: a.key < b.key)
+      (map
+        (n: let pos = builtins.unsafeGetAttrPos n maintainers;
+            in assert pos == null -> throw "maintainers entry ${n} is malformed";
+              { name = n; line = pos.line; key = toLower (simplify n); })
+        (attrNames maintainers));
+  before = { name, line, key }:
+    foldl'
+      (acc: n: if n.key < key && (acc == null || n.key > acc.key) then n else acc)
+      null
+      namesSorted;
+  errors = foldl' add 0
+    (map
+      (i: let a = elemAt namesSorted i;
+              b = elemAt namesSorted (i + 1);
+              lim = let t = before a; in if t == null then "the initial {" else t.name;
+          in if a.line >= b.line
+             then trace
+               ("maintainer ${a.name} (line ${toString a.line}) should be listed "
+                + "after ${lim}, not after ${b.name} (line ${toString b.line})")
+               1
+             else 0)
+      (genList (i: i) (length namesSorted - 1)));
+in
+assert errors == 0; "all good!"
+
+# generate edit commands to sort the list.
+# may everything following the last current entry (closing } ff) in the wrong place
+# with lib;
+# concatStringsSep
+#   "\n"
+#   (let first = foldl' (acc: n: if n.line < acc then n.line else acc) 999999999 namesSorted;
+#        commands = map
+#          (i: let e = elemAt namesSorted i;
+#                  begin = foldl'
+#                    (acc: n: if n.line < e.line && n.line > acc then n.line else acc)
+#                    1
+#                    namesSorted;
+#                  end =
+#                    foldl' (acc: n: if n.line > e.line && n.line < acc then n.line else acc)
+#                      999999999
+#                      namesSorted;
+#              in "${toString e.line},${toString (end - 1)} p")
+#          (genList (i: i) (length namesSorted));
+#    in map
+#      (c: "sed -ne '${c}' maintainers/maintainer-list.nix")
+#      ([ "1,${toString (first - 1)} p" ] ++ commands))
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -99,6 +99,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.

+- `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch).
+
 - `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative.

 - The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.
--- a/nixos/modules/services/cluster/hadoop/hbase.nix
+++ b/nixos/modules/services/cluster/hadoop/hbase.nix
@ -5,11 +5,95 @@ let
  cfg = config.services.hadoop;
  hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";
  mkIfNotNull = x: mkIf (x != null) x;
+  # generic hbase role options
+  hbaseRoleOption = name: extraOpts: {
+    enable = mkEnableOption (mdDoc "HBase ${name}");
+
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = mdDoc "Open firewall ports for HBase ${name}.";
+    };
+
+    restartIfChanged = mkOption {
+      type = types.bool;
+      default = false;
+      description = mdDoc "Restart ${name} con config change.";
+    };
+
+    extraFlags = mkOption {
+      type = with types; listOf str;
+      default = [];
+      example = literalExpression ''[ "--backup" ]'';
+      description = mdDoc "Extra flags for the ${name} service.";
+    };
+
+    environment = mkOption {
+      type = with types; attrsOf str;
+      default = {};
+      example = literalExpression ''
+        {
+          HBASE_MASTER_OPTS = "-Dcom.sun.management.jmxremote.ssl=true";
+        }
+      '';
+      description = mdDoc "Environment variables passed to ${name}.";
+    };
+  } // extraOpts;
+  # generic hbase role configs
+  hbaseRoleConfig = name: ports: (mkIf cfg.hbase."${name}".enable {
+    services.hadoop.gatewayRole = {
+      enable = true;
+      enableHbaseCli = mkDefault true;
+    };
+
+    systemd.services."hbase-${toLower name}" = {
+      description = "HBase ${name}";
+      wantedBy = [ "multi-user.target" ];
+      path = with cfg; [ hbase.package ] ++ optional
+        (with cfg.hbase.master; enable && initHDFS) package;
+      preStart = mkIf (with cfg.hbase.master; enable && initHDFS)
+        (concatStringsSep "\n" (
+          map (x: "HADOOP_USER_NAME=hdfs hdfs --config /etc/hadoop-conf ${x}")[
+            "dfsadmin -safemode wait"
+            "dfs -mkdir -p ${cfg.hbase.rootdir}"
+            "dfs -chown hbase ${cfg.hbase.rootdir}"
+          ]
+        ));
+
+      inherit (cfg.hbase."${name}") environment;
+      script = concatStringsSep " " (
+        [
+          "hbase --config /etc/hadoop-conf/"
+          "${toLower name} start"
+        ]
+        ++ cfg.hbase."${name}".extraFlags
+        ++ map (x: "--${toLower x} ${toString cfg.hbase.${name}.${x}}")
+          (filter (x: hasAttr x cfg.hbase.${name}) ["port" "infoPort"])
+      );
+
+      serviceConfig = {
+        User = "hbase";
+        SyslogIdentifier = "hbase-${toLower name}";
+        Restart = "always";
+      };
+    };
+
+    services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
+
+    networking = {
+      firewall.allowedTCPPorts = mkIf cfg.hbase."${name}".openFirewall ports;
+      hosts = mkIf (with cfg.hbase.regionServer; enable && overrideHosts) {
+        "127.0.0.2" = mkForce [ ];
+        "::1" = mkForce [ ];
+      };
+    };
+
+  });
 in
 {
  options.services.hadoop = {

-    gatewayRole.enableHbaseCli = mkEnableOption (lib.mdDoc "HBase CLI tools");
+    gatewayRole.enableHbaseCli = mkEnableOption (mdDoc "HBase CLI tools");

    hbaseSiteDefault = mkOption {
      default = {
@ -21,7 +105,7 @@ in
        "hbase.cluster.distributed" = "true";
      };
      type = types.attrsOf types.anything;
-      description = lib.mdDoc ''
+      description = mdDoc ''
        Default options for hbase-site.xml
      '';
    };
@ -29,8 +113,12 @@ in
      default = {};
      type = with types; attrsOf anything;
      example = literalExpression ''
+        {
+          "hbase.hregion.max.filesize" = 20*1024*1024*1024;
+          "hbase.table.normalization.enabled" = "true";
+        }
      '';
-      description = lib.mdDoc ''
+      description = mdDoc ''
        Additional options and overrides for hbase-site.xml
        <https://github.com/apache/hbase/blob/rel/2.4.11/hbase-common/src/main/resources/hbase-default.xml>
      '';
@ -39,7 +127,7 @@ in
      default = {};
      type = with types; attrsOf anything;
      internal = true;
-      description = lib.mdDoc ''
+      description = mdDoc ''
        Internal option to add configs to hbase-site.xml based on module options
      '';
    };
@ -50,11 +138,11 @@ in
        type = types.package;
        default = pkgs.hbase;
        defaultText = literalExpression "pkgs.hbase";
-        description = lib.mdDoc "HBase package";
+        description = mdDoc "HBase package";
      };

      rootdir = mkOption {
-        description = lib.mdDoc ''
+        description = mdDoc ''
          This option will set "hbase.rootdir" in hbase-site.xml and determine
          the directory shared by region servers and into which HBase persists.
          The URL should be 'fully-qualified' to include the filesystem scheme.
@ -68,7 +156,7 @@ in
        default = "/hbase";
      };
      zookeeperQuorum = mkOption {
-        description = lib.mdDoc ''
+        description = mdDoc ''
          This option will set "hbase.zookeeper.quorum" in hbase-site.xml.
          Comma separated list of servers in the ZooKeeper ensemble.
        '';
@ -76,107 +164,36 @@ in
        example = "zk1.internal,zk2.internal,zk3.internal";
        default = null;
      };
-      master = {
-        enable = mkEnableOption (lib.mdDoc "HBase Master");
-        initHDFS = mkEnableOption (lib.mdDoc "initialization of the hbase directory on HDFS");
-
-        openFirewall = mkOption {
-          type = types.bool;
-          default = false;
-          description = lib.mdDoc ''
-            Open firewall ports for HBase master.
-          '';
+    } // (let
+      ports = port: infoPort: {
+        port = mkOption {
+          type = types.int;
+          default = port;
+          description = mdDoc "RPC port";
+        };
+        infoPort = mkOption {
+          type = types.int;
+          default = infoPort;
+          description = mdDoc "web UI port";
        };
      };
-      regionServer = {
-        enable = mkEnableOption (lib.mdDoc "HBase RegionServer");
-
-        overrideHosts = mkOption {
-          type = types.bool;
-          default = true;
-          description = lib.mdDoc ''
-            Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix
-            Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records
-            or /etc/hosts entries.
-
-          '';
-        };
-
-        openFirewall = mkOption {
-          type = types.bool;
-          default = false;
-          description = lib.mdDoc ''
-            Open firewall ports for HBase master.
-          '';
-        };
+    in mapAttrs hbaseRoleOption {
+      master.initHDFS = mkEnableOption (mdDoc "initialization of the hbase directory on HDFS");
+      regionServer.overrideHosts = mkOption {
+        type = types.bool;
+        default = true;
+        description = mdDoc ''
+          Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix
+          Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records
+          or /etc/hosts entries.
+        '';
      };
-    };
+      thrift = ports 9090 9095;
+      rest = ports 8080 8085;
+    });
  };

-  config = mkMerge [
-    (mkIf cfg.hbase.master.enable {
-      services.hadoop.gatewayRole = {
-        enable = true;
-        enableHbaseCli = mkDefault true;
-      };
-
-      systemd.services.hbase-master = {
-        description = "HBase master";
-        wantedBy = [ "multi-user.target" ];
-
-        preStart = mkIf cfg.hbase.master.initHDFS ''
-          HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfsadmin -safemode wait
-          HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -mkdir -p ${cfg.hbase.rootdir}
-          HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -chown hbase ${cfg.hbase.rootdir}
-        '';
-
-        serviceConfig = {
-          User = "hbase";
-          SyslogIdentifier = "hbase-master";
-          ExecStart = "${cfg.hbase.package}/bin/hbase --config ${hadoopConf} " +
-                      "master start";
-          Restart = "always";
-        };
-      };
-
-      services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
-
-      networking.firewall.allowedTCPPorts = mkIf cfg.hbase.master.openFirewall [
-        16000 16010
-      ];
-
-    })
-
-    (mkIf cfg.hbase.regionServer.enable {
-      services.hadoop.gatewayRole = {
-        enable = true;
-        enableHbaseCli = mkDefault true;
-      };
-
-      systemd.services.hbase-regionserver = {
-        description = "HBase RegionServer";
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          User = "hbase";
-          SyslogIdentifier = "hbase-regionserver";
-          ExecStart = "${cfg.hbase.package}/bin/hbase --config /etc/hadoop-conf/ " +
-                      "regionserver start";
-          Restart = "always";
-        };
-      };
-
-      services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir;
-
-      networking = {
-        firewall.allowedTCPPorts = mkIf cfg.hbase.regionServer.openFirewall [
-          16020 16030
-        ];
-        hosts = mkIf cfg.hbase.regionServer.overrideHosts {
-          "127.0.0.2" = mkForce [ ];
-          "::1" = mkForce [ ];
-        };
-      };
-    })
+  config = mkMerge ([

    (mkIf cfg.gatewayRole.enable {

@ -192,5 +209,10 @@ in
        isSystemUser = true;
      };
    })
-  ];
+  ] ++ (mapAttrsToList hbaseRoleConfig {
+    master = [ 16000 16010 ];
+    regionServer = [ 16020 16030 ];
+    thrift = with cfg.hbase.thrift; [ port infoPort ];
+    rest = with cfg.hbase.rest; [ port infoPort ];
+  }));
 }
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@ -592,7 +592,8 @@ in
                    || dmConf.sddm.enable
                    || dmConf.xpra.enable
                    || dmConf.sx.enable
-                    || dmConf.startx.enable);
+                    || dmConf.startx.enable
+                    || config.services.greetd.enable);
      in mkIf (default) (mkDefault true);

    # so that the service won't be enabled when only startx is used
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@ -130,6 +130,13 @@ let
      pkgs.replaceDependency { inherit oldDependency newDependency drv; }
    ) baseSystemAssertWarn config.system.replaceRuntimeDependencies;

+  systemWithBuildDeps = system.overrideAttrs (o: {
+    systemBuildClosure = pkgs.closureInfo { rootPaths = [ system.drvPath ]; };
+    buildCommand = o.buildCommand + ''
+      ln -sn $systemBuildClosure $out/build-closure
+    '';
+  });
+
 in

 {
@ -306,6 +313,27 @@ in
      '';
    };

+    system.includeBuildDependencies = mkOption {
+      type = types.bool;
+      default = false;
+      description = lib.mdDoc ''
+        Whether to include the build closure of the whole system in
+        its runtime closure.  This can be useful for making changes
+        fully offline, as it includes all sources, patches, and
+        intermediate outputs required to build all the derivations
+        that the system depends on.
+
+        Note that this includes _all_ the derivations, down from the
+        included applications to their sources, the compilers used to
+        build them, and even the bootstrap compiler used to compile
+        the compilers. This increases the size of the system and the
+        time needed to download its dependencies drastically: a
+        minimal configuration with no extra services enabled grows
+        from ~670MiB in size to 13.5GiB, and takes proportionally
+        longer to download.
+      '';
+    };
+
  };


@ -336,7 +364,7 @@ in
      ]; };
    };

-    system.build.toplevel = system;
+    system.build.toplevel = if config.system.includeBuildDependencies then systemWithBuildDeps else system;

  };

--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@ -134,11 +134,11 @@ let
      mask = ''\xff\xff\xff\xff'';
    };
    x86_64-windows = {
-      magicOrExtension = ".exe";
+      magicOrExtension = "exe";
      recognitionType = "extension";
    };
    i686-windows = {
-      magicOrExtension = ".exe";
+      magicOrExtension = "exe";
      recognitionType = "extension";
    };
  };
--- a/nixos/modules/virtualisation/ec2-metadata-fetcher.sh
+++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.sh
@ -55,10 +55,9 @@ done
 echo "getting EC2 instance metadata..."

 get_imds() {
-  # Intentionally no --fail here, so that we proceed even if e.g. a
-  # 404 was returned (but we still fail if we can't reach the IMDS
-  # server).
-  curl --silent --show-error --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@"
+  # --fail to avoid populating missing files with 404 HTML response body
+  # || true to allow the script to continue even when encountering a 404
+  curl --silent --show-error --fail --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@" || true
 }

 get_imds -o "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
--- a/nixos/tests/hadoop/hbase.nix
+++ b/nixos/tests/hadoop/hbase.nix
@ -53,6 +53,24 @@ with pkgs.lib;
        };
      };
    };
+    thrift = { ... }:{
+      services.hadoop = {
+        inherit coreSite;
+        hbase = {
+          inherit zookeeperQuorum;
+          thrift = defOpts;
+        };
+      };
+    };
+    rest = { ... }:{
+      services.hadoop = {
+        inherit coreSite;
+        hbase = {
+          inherit zookeeperQuorum;
+          rest = defOpts;
+        };
+      };
+    };
  };

  testScript = ''
@ -80,5 +98,12 @@ with pkgs.lib;
    assert "1 active master, 0 backup masters, 1 servers" in master.succeed("echo status | HADOOP_USER_NAME=hbase hbase shell -n")
    regionserver.wait_until_succeeds("echo \"create 't1','f1'\" | HADOOP_USER_NAME=hbase hbase shell -n")
    assert "NAME => 'f1'" in regionserver.succeed("echo \"describe 't1'\" | HADOOP_USER_NAME=hbase hbase shell -n")
+
+    rest.wait_for_open_port(8080)
+    assert "${hbase.version}" in regionserver.succeed("curl http://rest:8080/version/cluster")
+
+    thrift.wait_for_open_port(9090)
  '';
+
+  meta.maintainers = with maintainers; [ illustris ];
 })
--- a/nixos/tests/nixops/default.nix
+++ b/nixos/tests/nixops/default.nix
@ -30,12 +30,10 @@ let
        virtualisation.additionalPaths = [
          pkgs.hello
          pkgs.figlet
-
-          # This includes build dependencies all the way down. Not efficient,
-          # but we do need build deps to an *arbitrary* depth, which is hard to
-          # determine.
-          (allDrvOutputs nodes.server.config.system.build.toplevel)
        ];
+
+        # TODO: make this efficient, https://github.com/NixOS/nixpkgs/issues/180529
+        system.includeBuildDependencies = true;
      };
      server = { lib, ... }: {
        imports = [ ./legacy/base-configuration.nix ];
--- a/pkgs/applications/audio/touchosc/default.nix
+++ b/pkgs/applications/audio/touchosc/default.nix
@ -45,7 +45,7 @@ in

 stdenv.mkDerivation rec {
  pname = "touchosc";
-  version = "1.1.6.150";
+  version = "1.1.9.163";

  suffix = {
    aarch64-linux = "linux-arm64";
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
    hash = {
-      aarch64-linux = "sha256-sYkAFyXnmzgSzo68OF0oiv8tUvY+g1WCcY783OZO+RM=";
-      armv7l-linux  = "sha256-GWpYW1262plxIzPVzBEh4Z3fQIhSmy0N9xAgwnjXrQE=";
-      x86_64-linux  = "sha256-LUWlLEsTUqVoWAkjXC/zOziPqO85H8iIlwJU7eqLRcY=";
+      aarch64-linux = "sha256-LhF0pgMRbEXeLt5g56VBNuCssaTjsczx/+C76ckmGZo=";
+      armv7l-linux  = "sha256-T4AzXIbhO6fNN8xDFwz6M2lSH6hLgNjVyDsSt8m+Mr4=";
+      x86_64-linux  = "sha256-LJ36kHx8PPzfLpJMx1ANSmifS84saCQ8pF0quhgzdt0=";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };

--- a/pkgs/applications/audio/touchosc/update.sh
+++ b/pkgs/applications/audio/touchosc/update.sh
@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nix curl libxml2 jq common-updater-scripts
+#!nix-shell -i bash -p nix curl libxml2 jq

 set -euo pipefail

@ -8,6 +8,20 @@ nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixp
 attr="${UPDATE_NIX_ATTR_PATH:-touchosc}"
 version="$(curl -sSL https://hexler.net/touchosc/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)"

+narhash() {
+    nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash
+}
+
+nixeval() {
+    if [ "$#" -ge 2 ]; then
+        systemargs=(--argstr system "$2")
+    else
+        systemargs=()
+    fi
+
+    nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r .
+}
+
 findpath() {
    path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
    outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
@ -19,15 +33,22 @@ findpath() {
    echo "$path"
 }

+oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}"
+
 pkgpath="$(findpath "$attr")"

-sed -i -e "/version\s*=/ s|\"$UPDATE_NIX_OLD_VERSION\"|\"$version\"|" "$pkgpath"
+if [ "$version" = "$oldversion" ]; then
+    echo 'update.sh: New version same as old version, nothing to do.'
+    exit 0
+fi
+
+sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath"

 for system in aarch64-linux armv7l-linux x86_64-linux; do
-    url="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.url | jq -r .)"
+    url="$(nixeval "$attr".src.url "$system")"

-    curhash="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.outputHash | jq -r .)"
-    newhash="$(nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash)"
+    curhash="$(nixeval "$attr".src.outputHash "$system")"
+    newhash="$(narhash "$url")"

    sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
 done
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3
 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook
 }:

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ];
-  buildInputs = [ wxGTK31 gtk3 ]
+  buildInputs = [ wxGTK32 gtk3 ]
    ++ lib.optionals contribPlugins [ hunspell gamin boost ];
  enableParallelBuilding = true;
  patches = [
@ -47,11 +47,74 @@ stdenv.mkDerivation rec {
      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch";
      sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU=";
    })
+    (fetchpatch {
+      name = "fix-taskbar-icons.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch";
+      hash = "sha256-Gj5gtxX5QNYAeF+QrPS/bBHLLEmflSxUHSLUK3GSs0I=";
+    })
+    (fetchpatch {
+      name = "fix-warnings.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch";
+      excludes = [ "src/src/environmentsettingsdlg.h" ];
+      hash = "sha256-tl4rF9iAf1TzCIbKhVFqcxvr1IiPdwqLYZg0SY5BJ7I=";
+    })
    (fetchpatch {
      name = "fix-getstring.patch";
      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch";
      sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ=";
    })
+    # Fix build with wxGTK 3.1.6
+    (fetchpatch {
+      name = "remove-code-for-old-wx-1.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch";
+      hash = "sha256-Z8Ap03W/XH5VwKFVudJr7rugb0BgI2dKJgQS4yIWbEM=";
+    })
+    (fetchpatch {
+      name = "remove-code-for-old-wx-2.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch";
+      hash = "sha256-SwYixvbRuXQ+jA1ijmClWkzqzzr0viVuFOAsihGc5dM=";
+    })
+    (fetchpatch {
+      name = "remove-code-for-old-wx-3.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch";
+      hash = "sha256-1lcIiCnY2nBuUsffXC2rdglOE3ccIbogcgTx4M2Ee2I=";
+    })
+    (fetchpatch {
+      name = "fix-notebookstyles.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch";
+      hash = "sha256-Uc1V0eEbNljnN+1Dqb/35MLSSoLjyuRZMTofgcXRyb8=";
+    })
+    (fetchpatch {
+      name = "fix-regex.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch";
+      hash = "sha256-Aix58T0JJcX/7VZukU/9i/nXh9GJywXC3yXEyUZK0js=";
+    })
+    (fetchpatch {
+      name = "fix-build-with-clang.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch";
+      hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI=";
+    })
+    (fetchpatch {
+      name = "fix-normalize.patch";
+      url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch";
+      hash = "sha256-7wEwDLwuNUWHUwHjFyq74sHiuEha1VexRLEX42rPZSs=";
+    })
+    # Fix HiDPI
+    (fetchpatch {
+      name = "update-about-dialog.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch";
+      hash = "sha256-2S4sVn+Dq5y9xcxCkzQ+WeR+qWxAOLbQUZEnk060RI0=";
+    })
+    (fetchpatch {
+      name = "add-display-info.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch";
+      hash = "sha256-C0dVfC0NIHMXfWNlOwjzoGz5tmG2dlnU/EE92Jjebbs=";
+    })
+    (fetchpatch {
+      name = "fix-hidpi.patch";
+      url = "https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch";
+      hash = "sha256-/Xp6ww9C3V6I67tTA4MrGpSGo3J0MXzFjzQU7RxY84U=";
+    })
  ];
  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
  postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@ -49,7 +49,7 @@ let
  mkLibretroCore =
    { core
    , src ? (getCoreSrc core)
-    , version ? "unstable-2022-12-20"
+    , version ? "unstable-2023-03-13"
    , ...
    }@args:
    import ./mkLibretroCore.nix ({
@ -400,8 +400,6 @@ in
    core = "flycast";
    extraBuildInputs = [ libGL libGLU ];
    makefile = "Makefile";
-    makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ];
-    patches = [ ./fix-flycast-makefile.patch ];
    meta = {
      description = "Flycast libretro port";
      license = lib.licenses.gpl2Only;
@ -734,9 +732,7 @@ in

  picodrive = mkLibretroCore {
    core = "picodrive";
-    version = "unstable-2023-02-15";
    dontConfigure = true;
-    makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
    meta = {
      description = "Fast MegaDrive/MegaCD/32X emulator";
      license = "MAME";
@ -822,8 +818,19 @@ in
    };
  };

-  scummvm = mkLibretroCore {
+  scummvm = mkLibretroCore rec {
    core = "scummvm";
+    version = "unstable-2022-04-06";
+    # Commit below introduces libretro platform, that uses libretro-{deps,common} as
+    # submodules. We will probably need to introduce this as separate derivations,
+    # but for now let's just use the last known version that does not use it.
+    # https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada
+    src = fetchFromGitHub {
+      owner = "libretro";
+      repo = core;
+      rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3";
+      hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=";
+    };
    extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ];
    makefile = "Makefile";
    preConfigure = "cd backends/platform/libretro/build";
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@ -52,26 +52,17 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "retroarch-bare";
-  version = "1.14.0";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "RetroArch";
-    hash = "sha256-oEENGehbzjJq1kTiz6gkXHMMe/rXjWPxxMoe4RqdqK4=";
+    hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc=";
    rev = "v${version}";
  };

  patches = [
    ./use-default-values-for-libretro_info_path-assets_directory.patch
-    # TODO: remove those two patches in the next RetroArch release
-    (fetchpatch {
-      url = "https://github.com/libretro/RetroArch/commit/894c44c5ea7f1eada9207be3c29e8d5c0a7a9e1f.patch";
-      hash = "sha256-ThB6jd9pmsipT8zjehz7znK/s0ofHHCJeEYBKur6sO8=";
-    })
-    (fetchpatch {
-      url = "https://github.com/libretro/RetroArch/commit/c5bfd52159cf97312bb28fc42203c39418d1bbbd.patch";
-      hash = "sha256-rb1maAvCSUgq2VtJ67iqUY+Fz00Fchl8YGG0EPm0+F0=";
-    })
  ];

  nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++
--- a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch
+++ b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch
@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 01d99c30..8c2dd248 100644
--- a/Makefile
-+++ b/Makefile
-@@ -440,7 +440,6 @@ else ifeq ($(platform), arm64)
- 	CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers
- 	CFLAGS += $(CPUFLAGS)
- 	CXXFLAGS += $(CPUFLAGS)
-	ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize
- 	PLATFORM_EXT := unix
- 	WITH_DYNAREC=arm64
- 	HAVE_GENERIC_JIT = 0
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@ -14,38 +14,38 @@
    "beetle-lynx": {
        "owner": "libretro",
        "repo": "beetle-lynx-libretro",
-        "rev": "9c48124dc15604b3eb6892e3616dfb77992a6fd6",
-        "sha256": "ZXFU4QmjVQVU5bE5TVmGm4gepZpuoS8+p60l+Ha4I9s="
+        "rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae",
+        "sha256": "f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA="
    },
    "beetle-ngp": {
        "owner": "libretro",
        "repo": "beetle-ngp-libretro",
-        "rev": "00c7cb8ea97ad9a372307405d8abf34e401fec8a",
-        "sha256": "MtZMPjgT4dQy+E+4jSDE08PRi0pwa+q48kmTHhfIQMY="
+        "rev": "65460e3a9ad529f6901caf669abbda11f437ab55",
+        "sha256": "+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w="
    },
    "beetle-pce-fast": {
        "owner": "libretro",
        "repo": "beetle-pce-fast-libretro",
-        "rev": "d4fa4480f17f067c3aba25380717a5aee059f026",
-        "sha256": "t7OJuqEWec3GvNq9dsmrRhgz+GybBzt1ZO6FwZ9L5yE="
+        "rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e",
+        "sha256": "uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA="
    },
    "beetle-pcfx": {
        "owner": "libretro",
        "repo": "beetle-pcfx-libretro",
-        "rev": "af16dfd8353ed6cf76ef381b98a6a9abf59051ec",
-        "sha256": "snAA5PCU2NRsCiQtBRYEzczPSGG9OT2jDTrGaPZqhic="
+        "rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758",
+        "sha256": "xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY="
    },
    "beetle-psx": {
        "owner": "libretro",
        "repo": "beetle-psx-libretro",
-        "rev": "3827fb4bd0d36f0db7b59e0c220524c7daaf0430",
-        "sha256": "CGNzb6XDPsp+EitkgyvDha9DoZSy+e9JWye0nmCiOns="
+        "rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0",
+        "sha256": "yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI="
    },
    "beetle-saturn": {
        "owner": "libretro",
        "repo": "beetle-saturn-libretro",
-        "rev": "19ce186783174b93b90845c3f0e1fa1694904912",
-        "sha256": "mEuv9lrDi/q2ASV9hxYptievupcv4PfUWPYlDcNzXQg="
+        "rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414",
+        "sha256": "RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM="
    },
    "beetle-snes": {
        "owner": "libretro",
@ -62,20 +62,20 @@
    "beetle-supergrafx": {
        "owner": "libretro",
        "repo": "beetle-supergrafx-libretro",
-        "rev": "787772dff157c8fe54b2e16bb770f2c344c8932b",
-        "sha256": "i4SnjIqA0U88FnaT7fz5fqMyp8FyfNvxxhflOaAv1mA="
+        "rev": "1ff2daa9377114d5394142f75f1c388b706567ed",
+        "sha256": "0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE="
    },
    "beetle-vb": {
        "owner": "libretro",
        "repo": "beetle-vb-libretro",
-        "rev": "3e845666d7ce235a071eb306e94074f1a72633bf",
-        "sha256": "ukKzG+O2o6EAF0l7cmMQOkemJ1oweIpRH5rle1gqaFk="
+        "rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313",
+        "sha256": "C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674="
    },
    "beetle-wswan": {
        "owner": "libretro",
        "repo": "beetle-wswan-libretro",
-        "rev": "cccee4217e53e164fd70196e56dfb24b967e5fd8",
-        "sha256": "RpGYQwDWkfYY0qnrTuAMzVuOSfTX5AZph7FD8ijUggc="
+        "rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701",
+        "sha256": "xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8="
    },
    "blastem": {
        "owner": "libretro",
@ -92,8 +92,8 @@
    "bsnes": {
        "owner": "libretro",
        "repo": "bsnes-libretro",
-        "rev": "dabf6679024124b2f819c79f279dbb85a5263255",
-        "sha256": "iv8gxC48i8JMzby3vR4eYDViqCwSf8JGlPekQE6AF4c="
+        "rev": "4da970a334ba4644cef72e560985ea3f31fa40f7",
+        "sha256": "Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI="
    },
    "bsnes-hd": {
        "owner": "DerKoun",
@ -110,8 +110,8 @@
    "citra": {
        "owner": "libretro",
        "repo": "citra",
-        "rev": "f0b09a5c0cb3767d43f5f8ca12a783012298fd44",
-        "sha256": "v86R5TLmNNMhuTMCwU3mAAtLK5H0sP//soh4x+cFgTQ=",
+        "rev": "d7e1612c17b1acb5d5eb68bb046820db49aeea5e",
+        "sha256": "u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=",
        "fetchSubmodules": true
    },
    "desmume": {
@ -153,14 +153,14 @@
    "fbneo": {
        "owner": "libretro",
        "repo": "fbneo",
-        "rev": "ef17049274a21239e5f21198b026dacbb38d7b90",
-        "sha256": "2N7c5L9grp+Rkhj25SoB9K9rVHq4H9IzU2KSeb1O7/E="
+        "rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5",
+        "sha256": "a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI="
    },
    "fceumm": {
        "owner": "libretro",
        "repo": "libretro-fceumm",
-        "rev": "8c3f690e61a1d65dfb25510426ae88eeae93e1ae",
-        "sha256": "vzPrAEII8SWj3Ki2OaZb0/9gbQDz04rp2dXf2LE1sXg="
+        "rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2",
+        "sha256": "B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE="
    },
    "flycast": {
        "owner": "libretro",
@ -183,20 +183,20 @@
    "gambatte": {
        "owner": "libretro",
        "repo": "gambatte-libretro",
-        "rev": "7e02df60048db0898131ea365f387a026e4e648d",
-        "sha256": "RnFuD8PL+/uPhWe+sSXMPm5+XH8FzCwY+MSquR/AB+o="
+        "rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d",
+        "sha256": "2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk="
    },
    "genesis-plus-gx": {
        "owner": "libretro",
        "repo": "Genesis-Plus-GX",
-        "rev": "74a2f6521aea975a51f99497b57c5db500d61ed9",
-        "sha256": "qTNbFXg5QFKSzMOWhDdDfc0FinF/D7n2OruG5zv+ANY="
+        "rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027",
+        "sha256": "4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI="
    },
    "gpsp": {
        "owner": "libretro",
        "repo": "gpsp",
-        "rev": "81649a2c8075201bb823cce8fdf16a31c92a3b6c",
-        "sha256": "De9Tke+fp6CtXzm0w6Qzts3jj1j/1uB0kYZfaWyNqA0="
+        "rev": "541adc9e1c6c9328c07058659594d6300ae0fa19",
+        "sha256": "2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA="
    },
    "gw": {
        "owner": "libretro",
@ -207,8 +207,8 @@
    "handy": {
        "owner": "libretro",
        "repo": "libretro-handy",
-        "rev": "517bb2d02909271836604c01c8f09a79ad605297",
-        "sha256": "Igf/OvmnCzoWjCZBoep7T0pXsoBKq3NJpXlYhE7nr3s="
+        "rev": "63db085af671bad2929078c55434623b7d4632a1",
+        "sha256": "N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE="
    },
    "hatari": {
        "owner": "libretro",
@ -219,8 +219,8 @@
    "mame": {
        "owner": "libretro",
        "repo": "mame",
-        "rev": "85581d60bb24fea14542b154aef2c7b624f5b60f",
-        "sha256": "AUqJAXJCvddv9vPqXt5EZncKNdeLaXoc6xhYWqOMebY="
+        "rev": "f7761a9902d59030882c58d4482446196e748c50",
+        "sha256": "g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g="
    },
    "mame2000": {
        "owner": "libretro",
@ -237,8 +237,8 @@
    "mame2003-plus": {
        "owner": "libretro",
        "repo": "mame2003-plus-libretro",
-        "rev": "3249de7ceaaa92ee18e93cbd8c2ace9f1ee34c08",
-        "sha256": "mBF1j4em4e/fKEmPA8MmAZrXXYQiqFfAloOHdMbVq+k="
+        "rev": "0b9309d9d86aea2457df74709e997bea37899475",
+        "sha256": "US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0="
    },
    "mame2010": {
        "owner": "libretro",
@ -267,7 +267,7 @@
    "mesen": {
        "owner": "libretro",
        "repo": "mesen",
-        "rev": "c89474c9d87df967d21b7b7d5971dc9475fec028",
+        "rev": "caa4e6f14373c40bd2805c600d1b476e7616444a",
        "sha256": "cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU="
    },
    "mesen-s": {
@ -285,45 +285,45 @@
    "mgba": {
        "owner": "libretro",
        "repo": "mgba",
-        "rev": "ec5ecb26deba8d7ac830fc66ade9fac0eeaeb4ae",
-        "sha256": "kDDs+M7TPu6UhFnj9+XGI9whQFQ5/+7fSb0YUN7oMsg="
+        "rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad",
+        "sha256": "rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg="
    },
    "mupen64plus": {
        "owner": "libretro",
        "repo": "mupen64plus-libretro-nx",
-        "rev": "bc241538b9ef85d8b22c392d7699dc73f460e283",
-        "sha256": "eCosI2yL1HJpHWvZLYZQe6+1rmmyHLFYCY7bX+3hPec="
+        "rev": "5a63aadedc29655254d8fc7b4da3a325472e198b",
+        "sha256": "QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE="
    },
    "neocd": {
        "owner": "libretro",
        "repo": "neocd_libretro",
-        "rev": "53f5453311a1ac43700fedb2317c810586f9ccf5",
-        "sha256": "BZBpojShHk+j5wz/d7FnykpX562TgH6PAqTUigE+zUU="
+        "rev": "2070f5258c9d3feee15962f9db8c8ef20072ece8",
+        "sha256": "X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg="
    },
    "nestopia": {
        "owner": "libretro",
        "repo": "nestopia",
-        "rev": "d30c55052292826836f6dbaa2adc46fdf1a2d93c",
-        "sha256": "R2Kbtr2EqNUyx5eGBYyyw/ugSxVRM70TP/IsIsU0EZM="
+        "rev": "16b14865caf1effca030630e2fc73d2d4271fc53",
+        "sha256": "dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM="
    },
    "np2kai": {
        "owner": "AZO234",
        "repo": "NP2kai",
-        "rev": "606fafa7081b62df5f4727c34560da23927c21cd",
-        "sha256": "qS7OrY8bFkAmRgbzLCw9PqgxtKuVNKI+tsDVU7PqWIw=",
+        "rev": "6089943a80a45b6c18d765765f7f31d7a5c0d9c6",
+        "sha256": "tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=",
        "fetchSubmodules": true
    },
    "nxengine": {
        "owner": "libretro",
        "repo": "nxengine-libretro",
-        "rev": "e271c6262d73f07e5d92d285503f1c049801c51a",
-        "sha256": "PfzHV6/nGUdbnfZ8+aHuoIQhvKcxdbuKnjIMWIIFt7Q="
+        "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a",
+        "sha256": "4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0="
    },
    "o2em": {
        "owner": "libretro",
        "repo": "libretro-o2em",
-        "rev": "3303cc15e4323280084471f694f6d34c78199725",
-        "sha256": "xH8Dlsg84q8awxjObMPXKZcJSwmix1YdRXIpee7rw6o="
+        "rev": "a2a12472fde910b6089ac3ca6de805bd58a9c999",
+        "sha256": "0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg="
    },
    "opera": {
        "owner": "libretro",
@ -340,59 +340,59 @@
    "pcsx2": {
        "owner": "libretro",
        "repo": "pcsx2",
-        "rev": "d2e37b80cfe6f6eecfe0356c7537d8e98bee7a8d",
-        "sha256": "rHXJG2wGoyNGvxxeZVF/I1CpaSBPUwZNERJtkG/z7MU="
+        "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9",
+        "sha256": "0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4="
    },
    "pcsx_rearmed": {
        "owner": "libretro",
        "repo": "pcsx_rearmed",
-        "rev": "aced3eb3fcaa0fe13c44c4dd196cdab42555fd98",
-        "sha256": "RzcrSADagi3AIPINQxc36BfMjWjatP/JL6HY744XnZk="
+        "rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3",
+        "sha256": "727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U="
    },
    "picodrive": {
        "owner": "libretro",
        "repo": "picodrive",
-        "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043",
-        "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=",
+        "rev": "7ab066aab84f15388a53433ea273420bcf917e00",
+        "sha256": "NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=",
        "fetchSubmodules": true
    },
    "play": {
        "owner": "jpd002",
        "repo": "Play-",
-        "rev": "0483fc43da01b5b29883acb2cf1d02d33bba1e30",
-        "sha256": "OxBQFTQP0L8k0lH88Ey6KWybW912Ehsv7XjWrvFivxo=",
+        "rev": "b33834af08a4954f06be215eee80a72e7a378e91",
+        "sha256": "IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=",
        "fetchSubmodules": true
    },
    "ppsspp": {
        "owner": "hrydgard",
        "repo": "ppsspp",
-        "rev": "1fa2f7a97191d2a73f243bfc464edef69b26f652",
-        "sha256": "BDX2eHtFbsloC9XYORHwpix8tbRSQUbcoP7DKFIohW4=",
+        "rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4",
+        "sha256": "GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=",
        "fetchSubmodules": true
    },
    "prboom": {
        "owner": "libretro",
        "repo": "libretro-prboom",
-        "rev": "4e671fa0a4b7b892e17ac4e1803c9d627653a4c1",
-        "sha256": "d2/cpfhNczZkHzMGQIxO9jw65AMs9Jmh4ItiLLdDYsk="
+        "rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582",
+        "sha256": "klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA="
    },
    "prosystem": {
        "owner": "libretro",
        "repo": "prosystem-libretro",
-        "rev": "cf544d3c8e40ff197ea5bb177a1269db31077803",
-        "sha256": "A7yQwzM8ewI+UCPQVyO7DNyiQCTw2yG1soi6l7T3pDE="
+        "rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b",
+        "sha256": "rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E="
    },
    "puae": {
        "owner": "libretro",
        "repo": "libretro-uae",
-        "rev": "af9e35383c00980aabb38c929e679704b624dee0",
-        "sha256": "hp4XOQUKktmUfLtRfVv1Oe1vqHUYu+vagxSSef55APs="
+        "rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76",
+        "sha256": "6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU="
    },
    "quicknes": {
        "owner": "libretro",
        "repo": "QuickNES_Core",
-        "rev": "1b88a09f1c386ff9ee46bb371583ae04c5cb5dd0",
-        "sha256": "Q7DDufGTdP+R05ND56PxMNR96ZacJFxPi0ETieV2B58="
+        "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29",
+        "sha256": "yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw="
    },
    "sameboy": {
        "owner": "libretro",
@ -403,8 +403,8 @@
    "scummvm": {
        "owner": "libretro",
        "repo": "scummvm",
-        "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3",
-        "sha256": "wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="
+        "rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b",
+        "sha256": "9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM="
    },
    "smsplus-gx": {
        "owner": "libretro",
@ -415,8 +415,8 @@
    "snes9x": {
        "owner": "snes9xgit",
        "repo": "snes9x",
-        "rev": "3c4982edddfdba482204ed48cf0b1d41ccae5493",
-        "sha256": "d4luyBSU/4PdsDd2jLwWSyckBPAqXMJ3C1sNmLO+E6U="
+        "rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684",
+        "sha256": "1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo="
    },
    "snes9x2002": {
        "owner": "libretro",
@ -433,26 +433,26 @@
    "snes9x2010": {
        "owner": "libretro",
        "repo": "snes9x2010",
-        "rev": "e86e54624a7910a64a9a744e3734d4067c48d240",
-        "sha256": "U1eeXuhYssAOgiNOZ7fr/8rkPScts3GmWgK6ki39PVA="
+        "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf",
+        "sha256": "7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU="
    },
    "stella": {
        "owner": "stella-emu",
        "repo": "stella",
-        "rev": "82da36dd685c68b09047d7c835175879edb68653",
-        "sha256": "y7AOSY2VUe4Jv+wteplvA1ul5iXHoeYQhgycD+nfIuc="
+        "rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15",
+        "sha256": "9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4="
    },
    "stella2014": {
        "owner": "libretro",
        "repo": "stella2014-libretro",
-        "rev": "1351a4fe2ca6b1f3a66c7db0df2ec268ab002d41",
-        "sha256": "/sVDOfP5CE8k808lhmH3tT47oZ1ka3pgDG5LglfPmHc="
+        "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f",
+        "sha256": "wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0="
    },
    "swanstation": {
        "owner": "libretro",
        "repo": "swanstation",
-        "rev": "f2e335bfd4751410dfb24d933f762b9a4fd7fdeb",
-        "sha256": "l3A1Xb6YD+OOTZEF6whst1Kr8fSRnXuIVIUN1BCa2Bw="
+        "rev": "e24f21196cdcd50321475c4366b51af245a6bbe6",
+        "sha256": "DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978="
    },
    "tgbdual": {
        "owner": "libretro",
@ -463,8 +463,8 @@
    "thepowdertoy": {
        "owner": "libretro",
        "repo": "ThePowderToy",
-        "rev": "ac620c0a89a18774c3ad176a8a1bc596df23ff57",
-        "sha256": "C/X1DbmnucRddemEYml2zN3qr5yoXY3b+nvqfpboS0M="
+        "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243",
+        "sha256": "aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo="
    },
    "tic80": {
        "owner": "libretro",
@ -476,20 +476,20 @@
    "vba-m": {
        "owner": "libretro",
        "repo": "vbam-libretro",
-        "rev": "7e30b038893de63e674944f75581d57c7685ea3a",
-        "sha256": "CmmiKiy0mFqAiagUHFV5wRSZ0MkzADrHRAG+h82dWAQ="
+        "rev": "640ce45325694d1dc574e90c95c55bc464368d7e",
+        "sha256": "aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM="
    },
    "vba-next": {
        "owner": "libretro",
        "repo": "vba-next",
-        "rev": "4191e09e2b0fcf175a15348c1fa8a12bbc6320dd",
-        "sha256": "IG2oH4F17tlSv1cXYZobggb37tFNE53JOHzan/X0+ws="
+        "rev": "0c310082a6345790124e9348861b300bcccbeced",
+        "sha256": "RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78="
    },
    "vecx": {
        "owner": "libretro",
        "repo": "libretro-vecx",
-        "rev": "b5c17bb7fd4a704f58160bc699322a16d0643396",
-        "sha256": "nICXrVyoMWs2yDcewHd7z6rBt+haY/Dqf5lvF6RLnyg="
+        "rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7",
+        "sha256": "2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM="
    },
    "virtualjaguar": {
        "owner": "libretro",
@ -500,7 +500,7 @@
    "yabause": {
        "owner": "libretro",
        "repo": "yabause",
-        "rev": "c7e02721eddb3de0ec7ae0d61e9e3afa5f586a62",
-        "sha256": "Y2YsPpgBA021pRDOFqH29zsRSbFIpRo5fq+tkknJbSA="
+        "rev": "4c96b96f7fbe07223627c469ff33376b2a634748",
+        "sha256": "7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8="
    }
 }
--- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix
+++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix
@ -5,12 +5,12 @@

 stdenvNoCC.mkDerivation rec {
  pname = "libretro-core-info";
-  version = "1.14.0";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "libretro-core-info";
-    hash = "sha256-3nw8jUxBQJxiKlWS6OjTjwUYWKx3r2E7eHmbj4naWrk=";
+    hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA=";
    rev = "v${version}";
  };

--- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix
+++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix
@ -53,6 +53,7 @@ stdenv.mkDerivation ({
    "ARCH=${{
      armv7l = "arm";
      armv6l = "arm";
+      aarch64 = "arm64";
      i686 = "x86";
    }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}"
  ] ++ (args.makeFlags or [ ]);
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/pkgs/applications/graphics/kodelife/default.nix
@ -45,7 +45,7 @@ in

 stdenv.mkDerivation rec {
  pname = "kodelife";
-  version = "1.0.6.163";
+  version = "1.0.8.170";

  suffix = {
    aarch64-linux = "linux-arm64";
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
  src = fetchurl {
    url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
    hash = {
-      aarch64-linux = "sha256-BbNk/YfTx/J8ApgdiY/thnD2MFUUCSQt/CMjkewLcL0=";
-      armv7l-linux  = "sha256-fp4YM2BgyTr4vvxw5FaqKyGm608q8fOpB3gAgPA9UQ4=";
-      x86_64-linux  = "sha256-sLRdU/UW2JORAUOPzmr+VUkcLoesrshjdLvDCizX0iM=";
+      aarch64-linux = "sha256-FHE87B34QSc7rcKHE3wkZq1VzcZeKWh68rlIIMDRmm8=";
+      armv7l-linux  = "sha256-OqomlL7IFHyQQULbdbf5I0dRXdy3lDHY4ej2P1OZgzo=";
+      x86_64-linux  = "sha256-QNcWMVZ4bTXPLFEtD35hP2LbuNntvF2e9Wk2knt4TBY=";
    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };

--- a/pkgs/applications/networking/browsers/offpunk/default.nix
+++ b/pkgs/applications/networking/browsers/offpunk/default.nix
@ -3,10 +3,8 @@
  installShellFiles,
  less,
  lib,
-  makeWrapper,
  offpunk,
-  python3,
-  stdenv,
+  python3Packages,
  testers,
  timg,
  xdg-utils,
@ -14,7 +12,7 @@
 }:

 let
-  pythonDependencies = with python3.pkgs; [
+  pythonDependencies = with python3Packages; [
    beautifulsoup4
    cryptography
    feedparser
@ -30,40 +28,34 @@ let
    xsel
  ];
 in
-stdenv.mkDerivation (finalAttrs: {
+python3Packages.buildPythonPackage rec {
  pname = "offpunk";
-  version = "1.9";
+  version = "1.9.2";
+  format = "flit";
+
+  disabled = python3Packages.pythonOlder "3.7";

  src = fetchFromSourcehut {
    owner = "~lioploum";
    repo = "offpunk";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-sxX4/7jbNbLwHVfE1lDtjr/luby5zAf6Hy1RcwXZLBA=";
+    rev = "v${version}";
+    sha256 = "sha256-CYsuoj5/BaaboDRtcOrGzJoZDCfOLs7ROVWLVjOAnRU=";
  };

-  nativeBuildInputs = [ makeWrapper installShellFiles ];
-  buildInputs = otherDependencies ++ pythonDependencies;
+  nativeBuildInputs = [ installShellFiles ];
+  propagatedBuildInputs = otherDependencies ++ pythonDependencies;

-  installPhase = ''
-    runHook preInstall
-
-    install -D ./offpunk.py $out/bin/offpunk
-
-    wrapProgram $out/bin/offpunk \
-        --set PYTHONPATH "$PYTHONPATH" \
-        --set PATH ${lib.makeBinPath otherDependencies}
-
-   installManPage man/*.1
-   runHook postInstall
+  postInstall = ''
+    installManPage man/*.1
  '';

  passthru.tests.version = testers.testVersion { package = offpunk; };

  meta = with lib; {
    description = "An Offline-First browser for the smolnet ";
-    homepage = finalAttrs.src.meta.homepage;
+    homepage = src.meta.homepage;
    maintainers = with maintainers; [ DamienCassou ];
    platforms = platforms.linux;
    license = licenses.bsd2;
  };
-})
+}
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@ -12,7 +12,7 @@
 , sqlite
 , tinyxml
 , wrapGAppsHook
-, wxGTK30
+, wxGTK32
 , gtk3
 , xdg-utils
 }:
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
    pugixml
    sqlite
    tinyxml
-    wxGTK30
+    wxGTK32
    gtk3
    xdg-utils
  ];
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@ -89,12 +89,16 @@ in runCommand "${unwrapped.name}-wrapped" {
 } (''
  mkdir -p "$out/bin"
  mkdir -p "$out/share"
+  for dir in ${unwrapped}/share/*; do
+    dirname="''${dir##*/}"
+    if [[ $dirname == "applications" ]]; then
+      cp -r $dir/ $out/share/
+    else
+      ln -s $dir $out/share/
+    fi
+  done

-  ln -s ${unwrapped}/share/icons $out/share/icons
-  ln -s ${unwrapped}/share/templates $out/share/templates
  ln -s ${unwrapped}/lib $out/lib
-
-  cp -r ${unwrapped}/share/applications/ $out/share/
  for f in $out/share/applications/*.desktop; do
    substituteInPlace "$f" \
      --replace "Exec=libreoffice${major}.${minor}" "Exec=soffice"
--- a/pkgs/applications/version-management/lefthook/default.nix
+++ b/pkgs/applications/version-management/lefthook/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "lefthook";
-  version = "1.3.3";
+  version = "1.3.5";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "evilmartians";
    repo = "lefthook";
-    sha256 = "sha256-9XmLQPkc8we5wRZe5+bhL1b9lxWX6JAQeF4DmRXBgew=";
+    sha256 = "sha256-v4ES3TbuDRUBK8xH/viP5QOZmp3eWjsy0YRaSxfTZV4=";
  };

  vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg=";
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "i3status-rust";
-  version = "0.30.4";
+  version = "0.30.5";

  src = fetchFromGitHub {
    owner = "greshake";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-yJFM7+fpG/vnYvHRT+34rqToCfj8pjKpPRKQ49p2mh0=";
+    hash = "sha256-7Fjz6Q/f6jocMPAcgeodzdImILKuRmF6V0zo00ZPfjI=";
  };

-  cargoHash = "sha256-G2Yveyplq/SdHgc+sipQqQ67YAU/dPteESVJ8My5Hqs=";
+  cargoHash = "sha256-cHG3wUlk0AotfrQ8pYZNQDualhKSp6aNpY2mbjgnqzU=";

  nativeBuildInputs = [ pkg-config makeWrapper ];

--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@ -22,36 +21,15 @@

 stdenv.mkDerivation rec {
  pname = "elementary-mail";
-  version = "7.0.0";
+  version = "7.0.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "mail";
    rev = version;
-    sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4=";
+    sha256 = "sha256-IY+ml/ftLSk0A3Emi0ZL2wxIDIngNU6QKbHErRAaaMA=";
  };

-  patches = [
-    # build: fix documentation build
-    # https://github.com/elementary/mail/pull/795
-    (fetchpatch {
-      url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch";
-      sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY=";
-    })
-    # build: support webkit2gtk-4.1
-    # https://github.com/elementary/mail/pull/794
-    (fetchpatch {
-      url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch";
-      sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs=";
-    })
-    # Fix crash on setting message flag
-    # https://github.com/elementary/mail/pull/825
-    (fetchpatch {
-      url = "https://github.com/elementary/mail/commit/c630f926196e44e086ddda6086cb8b9bdd3efc83.patch";
-      sha256 = "sha256-4vEETSHA1Gd8GpBZuko4X+9AjG7SFwUlK2MxrWq+iOE=";
-    })
-  ];
-
  nativeBuildInputs = [
    libxml2
    meson
--- a/pkgs/development/libraries/keystone/default.nix
+++ b/pkgs/development/libraries/keystone/default.nix
@ -3,6 +3,7 @@
 , pkg-config
 , cmake
 , python3
+, fixDarwinDylibNames
 }:

 stdenv.mkDerivation rec {
@ -25,6 +26,9 @@ stdenv.mkDerivation rec {
    pkg-config
    cmake
    python3
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # TODO: could be replaced by setting CMAKE_INSTALL_NAME_DIR?
+    fixDarwinDylibNames
  ];

  meta = with lib; {
--- a/pkgs/development/libraries/level-zero/default.nix
+++ b/pkgs/development/libraries/level-zero/default.nix
@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, addOpenGLRunpath
+, cmake
+}:

 stdenv.mkDerivation rec {
  pname = "level-zero";
-  version = "1.9.4";
+  version = "1.9.9";

  src = fetchFromGitHub {
    owner = "oneapi-src";
    repo = "level-zero";
-    rev = "v${version}";
-    sha256 = "sha256-4AQnMMKo4BvajfhhKmhTZA0snKPnO4WjOuZAeiWU5PY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-zzlecBk7Mi3Nhj4eIAp81pq7+lIiKpvEaNeXuJKDPII=";
  };

  nativeBuildInputs = [ cmake addOpenGLRunpath ];
@ -20,6 +25,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "oneAPI Level Zero Specification Headers and Loader";
    homepage = "https://github.com/oneapi-src/level-zero";
+    changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = [ maintainers.ziguana ];
  };
--- a/pkgs/development/nim-packages/cbor/default.nix
+++ b/pkgs/development/nim-packages/cbor/default.nix
@ -2,12 +2,12 @@

 buildNimPackage rec {
  pname = "cbor";
-  version = "20221007";
+  version = "20230310";
  src = fetchFromSourcehut {
    owner = "~ehmry";
    repo = "nim_${pname}";
    rev = version;
-    hash = "sha256-zFkYsXFRAiBrfz3VNML3l+rYrdJmczl0bfZcJSbHHbM=";
+    hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ=";
  };
  doCheck = true;
  meta = with lib;
--- a/pkgs/development/nim-packages/coap/default.nix
+++ b/pkgs/development/nim-packages/coap/default.nix
@ -0,0 +1,20 @@
+{ lib, buildNimPackage, fetchFromGitea, taps }:
+
+buildNimPackage rec {
+  pname = "coap";
+  version = "20230125";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "eris";
+    repo = "${pname}-nim";
+    rev = version;
+    hash = "sha256-wlDyqRxXTrX+zXDIe2o9FTU2o26LO/6m7H/FGok1JDw=";
+  };
+  propagatedBuildInputs = [ taps ];
+  meta = src.meta // {
+    description =
+      "Nim implementation of the Constrained Application Protocol (CoAP) over TCP";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+}
--- a/pkgs/development/nim-packages/eris/default.nix
+++ b/pkgs/development/nim-packages/eris/default.nix
@ -0,0 +1,37 @@
+{ lib, buildNimPackage, fetchFromGitea, pkg-config
+, base32, coap, cbor, freedesktop_org, syndicate, tkrzw }:
+
+buildNimPackage rec {
+  pname = "eris";
+  version = "20230201";
+  outputs = [ "bin" "out" ];
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "eris";
+    repo = "nim-${pname}";
+    rev = version;
+    hash = "sha256-6vlD/woqTkbSRWhRtQD/ynk0DG+GrGwh6x+qUmo6YSQ=";
+  };
+  propagatedNativeBuildInputs = [ pkg-config ];
+  propagatedBuildInputs = [
+    base32
+    coap
+    cbor
+    freedesktop_org
+    syndicate
+    tkrzw
+  ];
+  postInstall = ''
+    mkdir -p "$bin/share/applications"
+    substitute "eris-open.desktop" "$bin/share/applications/eris-open.desktop"\
+      --replace "Exec=eriscmd " "Exec=$bin/bin/eriscmd "
+
+    install -D "eris-link.xml" -t "$bin/share/mime/packages"
+    install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png"
+  '';
+  meta = src.meta // {
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ ehmry ];
+    mainProgram = "eriscmd";
+  };
+}
--- a/pkgs/development/nim-packages/freedesktop_org/default.nix
+++ b/pkgs/development/nim-packages/freedesktop_org/default.nix
@ -0,0 +1,32 @@
+{ lib, buildNimPackage, fetchFromSourcehut, fetchFromGitHub }:
+
+let
+  # freedesktop_org requires a fork of configparser
+  configparser = buildNimPackage rec {
+    pname = "configparser";
+    version = "20230120";
+    src = fetchFromGitHub {
+      repo = "nim-" + pname;
+      owner = "ehmry";
+      rev = "695f1285d63f1954c25eb1f42798d90fa7bcbe14";
+      hash = "sha256-Z2Qr14pv2RHzQNfEYIKuXKHfHvvIfaEiGCHHCWJZFyw=";
+    };
+    doCheck = true;
+  };
+in buildNimPackage rec {
+  pname = "freedesktop_org";
+  version = "20230201";
+  src = fetchFromSourcehut {
+    owner = "~ehmry";
+    repo = pname;
+    rev = version;
+    hash = "sha256-gEN8kiWYCfC9H7o4UE8Xza5s7OwU3TFno6XnIlEm9Dg=";
+  };
+  propagatedBuildInputs = [ configparser ];
+  doCheck = true;
+  meta = src.meta // {
+    description = "Some Nim procedures for looking up freedesktop.org data";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+}
--- a/pkgs/development/nim-packages/preserves/default.nix
+++ b/pkgs/development/nim-packages/preserves/default.nix
@ -0,0 +1,20 @@
+{ lib, stdenv, buildNimPackage, fetchFromGitea, npeg }:
+
+buildNimPackage rec {
+  pname = "preserves";
+  version = "20221102";
+  src = fetchFromGitea {
+    domain = "git.syndicate-lang.org";
+    owner = "ehmry";
+    repo = "${pname}-nim";
+    rev = version;
+    hash = "sha256-oRsq1ugtrOvTn23596BXRy71TQZ4h/Vv6JGqBTZdoKY=";
+  };
+  propagatedBuildInputs = [ npeg ];
+  doCheck = !stdenv.isDarwin;
+  meta = src.meta // {
+    description = "Nim implementation of the Preserves data language";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+}
--- a/pkgs/development/nim-packages/syndicate/default.nix
+++ b/pkgs/development/nim-packages/syndicate/default.nix
@ -0,0 +1,20 @@
+{ lib, buildNimPackage, fetchFromGitea, nimSHA2, preserves }:
+
+buildNimPackage rec {
+  pname = "syndicate";
+  version = "20221102";
+  src = fetchFromGitea {
+    domain = "git.syndicate-lang.org";
+    owner = "ehmry";
+    repo = "${pname}-nim";
+    rev = version;
+    hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ=";
+  };
+  propagatedBuildInputs = [ nimSHA2 preserves ];
+  doCheck = true;
+  meta = src.meta // {
+    description = "Nim implementation of the Syndicated Actor model";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+}
--- a/pkgs/development/ocaml-modules/routes/default.nix
+++ b/pkgs/development/ocaml-modules/routes/default.nix
@ -2,14 +2,14 @@

 buildDunePackage rec {
  pname = "routes";
-  version = "1.0.0";
+  version = "2.0.0";

-  useDune2 = true;
+  duneVersion = "3";
  minimalOCamlVersion = "4.05";

  src = fetchurl {
    url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz";
-    sha256 = "sha256-WSlASDTA1UX+NhW38/XuLkOkdwjIxz0OUkX6Nd2iROg=";
+    hash = "sha256-O2KdaYwrAOUEwTtM14NUgGNxnc8BWAycP1EEuB6w1og=";
  };

  meta = with lib; {
--- a/pkgs/development/python-modules/aioshutil/default.nix
+++ b/pkgs/development/python-modules/aioshutil/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "aioshutil";
-  version = "1.2";
+  version = "1.3";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "kumaraditya303";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-HDN170lKxMj5vK94dn0sNXNDKoksg1tJ8G+vZEU7g/4=";
+    hash = "sha256-XIGjiLjoyS/7vUDIyBPvHNMyHOBa0gsg/c/vGgrhZAg=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "bottleneck";
-  version = "1.3.6";
+  version = "1.3.7";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "Bottleneck";
    inherit version;
-    hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k=";
+    hash = "sha256-4UZ+NzrUado0DtD/KDIU1lMcwIv9yiCDNho6pkcGgfg=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "glean-parser";
-  version = "7.0.0";
+  version = "7.1.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "glean_parser";
    inherit version;
-    hash = "sha256-xIlg3W/A3FBvVOEin/ku0QdmzGXlmOm5yLeYvoGkzNU=";
+    hash = "sha256-IgBaLVTVF4pGkC5EKZvLaa7U6Lwy2r/xit3E26kWEas=";
  };

  postPatch = ''
@ -68,6 +68,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK";
    homepage = "https://github.com/mozilla/glean_parser";
+    changelog = "https://github.com/mozilla/glean_parser/blob/v${version}/CHANGELOG.md";
    license = licenses.mpl20;
    maintainers = with maintainers; [];
  };
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "jira";
-  version = "3.4.1";
+  version = "3.5.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "pycontribs";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-EZCvYpcQ1dSsXDhipUalrHEG5SYOochktYrBdIoNDRo=";
+    hash = "sha256-6Nx12xEEPSWZE6XORU3I5HYM7vIjbAWPu7vNrzR4W24=";
  };

  nativeBuildInputs = [
@ -62,6 +62,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Library to interact with the JIRA REST API";
    homepage = "https://github.com/pycontribs/jira";
+    changelog = "https://github.com/pycontribs/jira/releases/tag/${version}";
    license = licenses.bsd2;
    maintainers = with maintainers; [ globin ];
  };
--- a/pkgs/development/python-modules/nianet/default.nix
+++ b/pkgs/development/python-modules/nianet/default.nix
@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, matplotlib
+, niapy
+, numpy
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, scikit-learn
+, toml-adapt
+, torch
+}:
+
+buildPythonPackage rec {
+  pname = "nianet";
+  version = "1.1.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "SasoPavlic";
+    repo = pname;
+    rev = "version_${version}";
+    sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY=";
+  };
+
+  nativeBuildInputs = [
+    toml-adapt
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    niapy
+    numpy
+    scikit-learn
+    torch
+  ];
+
+  # create niapy and torch dep version consistent
+  preBuild = ''
+    toml-adapt -path pyproject.toml -a change -dep niapy -ver X
+    toml-adapt -path pyproject.toml -a change -dep torch -ver X
+  '';
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "nianet"
+  ];
+
+  meta = with lib; {
+    description = "Designing and constructing neural network topologies using nature-inspired algorithms";
+    homepage = "https://github.com/SasoPavlic/NiaNet";
+    changelog = "https://github.com/SasoPavlic/NiaNet/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ firefly-cpp ];
+  };
+}
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@ -1,29 +1,29 @@
 { lib
+, argcomplete
 , buildPythonPackage
 , fetchFromGitHub
-, pythonOlder
 , hatchling
-, userpath
-, argcomplete
-, packaging
 , importlib-metadata
+, packaging
 , pip
+, platformdirs
 , pytestCheckHook
+, pythonOlder
+, userpath
 }:

 buildPythonPackage rec {
  pname = "pipx";
-  version = "1.1.0";
+  version = "1.2.0";
  format = "pyproject";

  disabled = pythonOlder "3.6";

-  # no tests in the pypi tarball, so we directly fetch from github
  src = fetchFromGitHub {
    owner = "pipxproject";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-6cKKVOgHIoKNfGqvDWK5cwBGBDkgfyRuBRDV6fruBoA=";
+    hash = "sha256-lm/Q+8nNubhaUR1pUbSIoD4DEUEkK+pQvvUdWNquW4Q=";
  };

  nativeBuildInputs = [
@ -31,9 +31,10 @@ buildPythonPackage rec {
  ];

  propagatedBuildInputs = [
-    userpath
    argcomplete
    packaging
+    platformdirs
+    userpath
  ] ++ lib.optionals (pythonOlder "3.8") [
    importlib-metadata
  ];
@ -51,6 +52,7 @@ buildPythonPackage rec {
    # start local pypi server and use in tests
    "--net-pypiserver"
  ];
+
  disabledTests = [
    # disable tests which are difficult to emulate due to shell manipulations
    "path_warning"
@ -74,9 +76,9 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
-    description =
-      "Install and Run Python Applications in Isolated Environments";
+    description = "Install and run Python applications in isolated environments";
    homepage = "https://github.com/pipxproject/pipx";
+    changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ yshym ];
  };
--- a/pkgs/development/python-modules/pyquil/default.nix
+++ b/pkgs/development/python-modules/pyquil/default.nix
@ -26,7 +26,7 @@

 buildPythonPackage rec {
  pname = "pyquil";
-  version = "3.3.3";
+  version = "3.3.4";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -35,7 +35,7 @@ buildPythonPackage rec {
    owner = "rigetti";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-jA6nYQSfdxd9FCTMQlYTe/EbV39vV0h9F9Fgf1M0+SY=";
+    hash = "sha256-iHyYX9e3O611OzBMafqn4V+yR1y8y4twiJehYDYlvdg=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/pytest-pytestrail/default.nix
+++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix
@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools-scm
+, pytest
+, testrail-api
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-pytestrail";
+  version = "0.10.5";
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  src = fetchFromGitHub {
+    owner = "tolstislon";
+    repo = "pytest-pytestrail";
+    rev = version;
+    sha256 = "sha256-y34aRxQ8mu6b6GBRMFVzn1shMVc7TumdjRS3daMEZJM=";
+  };
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  propagatedBuildInputs = [
+    testrail-api
+  ];
+
+  # all tests require network accesss
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pytest_pytestrail"
+  ];
+
+  meta = with lib; {
+    description = "Pytest plugin for interaction with TestRail";
+    homepage = "https://github.com/tolstislon/pytest-pytestrail";
+    changelog = "https://github.com/tolstislon/pytest-pytestrail/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ aanderse ];
+  };
+}
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@ -16,11 +16,11 @@

 buildPythonPackage rec {
  pname = "python-openstackclient";
-  version = "6.1.0";
+  version = "6.2.0";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-7ZF5GFG/eQmvQYnVmaV8iWYPhWldJPPumlZloeJkNLg=";
+    hash = "sha256-fFOr4bc7RT9Z2ntzZ5w7dZtI5RuLBUhktf3qLqgnJ9Y=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "slackclient";
-  version = "3.20.0";
+  version = "3.20.1";
  format =  "setuptools";

  disabled = pythonOlder "3.6";
@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "slackapi";
    repo = "python-slack-sdk";
    rev = "refs/tags/v${version}";
-    hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws=";
+    hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@ -36,14 +36,14 @@

 buildPythonPackage rec {
  pname = "spacy";
-  version = "3.5.0";
+  version = "3.5.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU=";
+    hash = "sha256-gRrhRoxYuX/JqjEYfWtVMXeEJY8KR+v2nYHKtjnj+hU=";
  };

  propagatedBuildInputs = [
@ -107,6 +107,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Industrial-strength Natural Language Processing (NLP)";
    homepage = "https://github.com/explosion/spaCy";
+    changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ ];
  };
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "stanza";
-  version = "1.4.2";
+  version = "1.5.0";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "stanfordnlp";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-v4/wYfXqOwSXxx864LNxviRtsqu5DXqs9diswA1oZXc=";
+    hash = "sha256-sFGAVavY16UQNJmW467+Ekojws59UMcAoCc1t9wWHM4=";
  };

  propagatedBuildInputs = [
@ -47,6 +47,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Official Stanford NLP Python Library for Many Human Languages";
    homepage = "https://github.com/stanfordnlp/stanza/";
+    changelog = "https://github.com/stanfordnlp/stanza/releases/tag/v${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ riotbib ];
  };
--- a/pkgs/development/python-modules/testrail-api/default.nix
+++ b/pkgs/development/python-modules/testrail-api/default.nix
@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, requests
+, pytestCheckHook
+, responses
+}:
+
+buildPythonPackage rec {
+  pname = "testrail-api";
+  version = "1.12.0";
+
+  src = fetchFromGitHub {
+    owner = "tolstislon";
+    repo = "testrail-api";
+    rev = version;
+    sha256 = "sha256-VuAW5Dl3pkA6mtn/mbzxTFoavO5jPoqFSFVlrxc7KRk=";
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    responses
+  ];
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  meta = with lib; {
+    description = "A Python wrapper of the TestRail API";
+    homepage = "https://github.com/tolstislon/testrail-api";
+    changelog = "https://github.com/tolstislon/ytestrail-api/releases/tag/${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ aanderse ];
+  };
+}
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "radare2";
-  version = "5.8.2";
+  version = "5.8.4";

  src = fetchFromGitHub {
    owner = "radare";
    repo = "radare2";
-    rev = version;
-    hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Fbluq3Q/BgPwTVNKW28FJL+Ok46hDiBjwFt6KwN4anc=";
  };

  preBuild = ''
@ -110,6 +110,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "UNIX-like reverse engineering framework and command-line tools";
    homepage = "https://radare.org";
+    changelog = "https://github.com/radareorg/radare2/releases/tag/${version}";
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ azahi raskin makefu mic92 arkivm ];
    platforms = platforms.unix;
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@ -5,14 +5,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "sqlfluff";
-  version = "1.4.5";
+  version = "2.0.0";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-Kc0doBR2iOy54arxOYXH5eHlcM7pXFVUqedopsZH8rE=";
+    hash = "sha256-2WKRB4mMiML7POCAd9G0IROTKujcsJT591h1bmSX63E=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "oh-my-posh";
-  version = "14.12.0";
+  version = "14.14.1";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-brwfM/IPgwLdVwMNur4EBCsubbv/DCVhTMJbAn6mbFg=";
+    hash = "sha256-EdW9LnSYSa8ulXKSJz3LBktVlDev7CLVOZL9qAytjcQ=";
  };

  vendorHash = "sha256-JZ5UiL2vGsXy/xmz+NcAKYDmp5hq7bx54/OdUyQHUp0=";
--- a/pkgs/development/tools/rust/cargo-binstall/default.nix
+++ b/pkgs/development/tools/rust/cargo-binstall/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-binstall";
-  version = "0.21.2";
+  version = "0.21.3";

  src = fetchFromGitHub {
    owner = "cargo-bins";
    repo = "cargo-binstall";
    rev = "v${version}";
-    hash = "sha256-8iJOjaOnbvRZWkygkXK0e/BiImpyQ92E0XQDklb4JJQ=";
+    hash = "sha256-K4NerJSW3ckXMFFnFCMXIqMeevE3Xzr/Wsz9nloolBI=";
  };

-  cargoHash = "sha256-+u1v3XJ+DCXMbMpLcjxUZMKcF0E9LrNv6+9XVo/DduQ=";
+  cargoHash = "sha256-YSKnfhSZ885evtEK40QTt90RwtH03aO/aJ6A/DddoVU=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@ -238,11 +238,11 @@ in {
    #   zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2
    #   for future releases, please delete this condition.
    kernelCompatible =
-      if kernel.stdenv.isx86_64
+      if stdenv'.isx86_64
      then kernel.kernelOlder "6.3"
      else kernel.kernelOlder "6.2";
    latestCompatibleLinuxPackages =
-      if kernel.stdenv.isx86_64
+      if stdenv'.isx86_64
      then linuxPackages_6_2
      else linuxPackages_6_1;

--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@ -39,13 +39,13 @@ let common = { version, hash, jdk ? jdk11_headless, tests }:
 in
 {
  hbase_2_4 = common {
-    version = "2.4.15";
-    hash = "sha256-KJXpfQ91POVd7ZnKQyIX5qzX4JIZqh3Zn2Pz0chW48g=";
+    version = "2.4.16";
+    hash = "sha256-vMuTqS2bXFRcCsZ7bOaNLVGyOG38HhL8WlCq2MFmAaE=";
    tests.standalone = nixosTests.hbase_2_4;
  };
  hbase_2_5 = common {
-    version = "2.5.1";
-    hash = "sha256-ddSa4q43PSJv1W4lzzaXfv4LIThs4n8g8wYufHgsZVE=";
+    version = "2.5.3";
+    hash = "sha256-h08jnDQaakpkYFHHn9qeg4JCSBtwRjv42qKLpyOVdsI=";
    tests.standalone = nixosTests.hbase2;
  };
  hbase_3_0 = common {
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@ -12,20 +12,20 @@ in
 with python3.pkgs;
 buildPythonApplication rec {
  pname = "matrix-synapse";
-  version = "1.78.0";
+  version = "1.79.0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "matrix-org";
    repo = "synapse";
    rev = "v${version}";
-    hash = "sha256-UMP/JQ77qGfAQ+adLBLB8NFI2OiuwjILEbEecEDcK1A=";
+    hash = "sha256-2MHP4Gu+C5yyXObbd7NLYWCy1E0L7fUwpzYsoD7ULDo=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-UTuMvTWfOlFlL+4qsCEfVljnkeylBKq0wd5FlAOYAFQ=";
+    hash = "sha256-yDKs6KRStjJMC/48dZcyQ4OmBXY1TombjH/ZDfBJbSc=";
  };

  postPatch = ''
--- a/pkgs/servers/rtsp-simple-server/default.nix
+++ b/pkgs/servers/rtsp-simple-server/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "rtsp-simple-server";
-  version = "0.21.5";
+  version = "0.21.6";

  src = fetchFromGitHub {
    owner = "aler9";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-BwifUZxTM5/7UdSCN7glPU1MWLu7yBxfVAHInGLf4yA=";
+    hash = "sha256-b9sb5XU+wE14N4N7NELE26gSntu7wJgpneIF+T2w6WY=";
  };

-  vendorHash = "sha256-OO4Ak+dmf6yOCZmV/lVhrHnseWoi2MysUh+NKpwrZxI=";
+  vendorHash = "sha256-rKmaxsDQ6+cLp6eaw8TRjpPsNcQlPauqmX6hcslc2Wo=";

  # Tests need docker
  doCheck = false;
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@ -26,7 +26,7 @@

 rustPlatform.buildRustPackage (
  let
-    version =  "0.76.0";
+    version =  "0.77.0";
    pname = "nushell";
  in {
  inherit version pname;
@ -35,10 +35,10 @@ rustPlatform.buildRustPackage (
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "sha256-dGsnbKsg0nQFFXZDRDei2uGhGWEQSeSHGpXJp+8QUC8=";
+    sha256 = "sha256-cffAxuM12wdd7IeLbKSpL6dpvpZVscA8nMOh3jFqY3E=";
  };

-  cargoSha256 = "sha256-9oXMojQA4tSoIxY1lwMPGhQz3WHcxEKtwl+4LsAYbDo=";
+  cargoSha256 = "sha256-OcYE9d3hO3JtxF3REWev0Rz97Kr9l7P7nUxhIb5fhi0=";

  nativeBuildInputs = [ pkg-config ]
    ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
--- a/pkgs/tools/misc/halp/default.nix
+++ b/pkgs/tools/misc/halp/default.nix
@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "halp";
-  version = "0.1.1";
+  version = "0.1.2";

  src = fetchFromGitHub {
    owner = "orhun";
    repo = "halp";
    rev = "v${version}";
-    hash = "sha256-A48r7bDXyYVYrsyhqaQMk7c9fuCzilj2Ch9dYHFh8xY=";
+    hash = "sha256-gcWE2PRDBnZ+ijbuu85S4xCuNvNrYVWtfXQyiajJVKQ=";
  };

-  cargoHash = "sha256-CTLCpGkUobMgKsGLCZ1Z+zfLbvn37TXPmIWynGs1ybA=";
+  cargoHash = "sha256-Y21w+UlsQA/lDbnQTiD5EsbIKuh0REZrsWm+JHIeoKg=";

  patches = [
    # patch tests to point to the correct target directory
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@ -8,14 +8,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "hyperfine";
-  version = "1.15.0";
+  version = "1.16.0";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-JJ4sEwe2fXOGlofJ9SkXEllMCMhn7MSJ+H3aAF0F0zk=";
+    sha256 = "sha256-cbox7TAgeb0ZPt0i3SphWClAz/mUUgRlFKCOS/E0MT4=";
  };

-  cargoSha256 = "sha256-3xOh51rUnQcUfQ+asurbfNYTb5dWQO5YY/AbGRV+26w=";
+  cargoSha256 = "sha256-Bc3twE42iB7NNkI5cPcniEb+JcR1wjc9nx80p6HCDVc=";

  nativeBuildInputs = [ installShellFiles ];
  buildInputs = lib.optional stdenv.isDarwin Security;
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "vivid";
-  version = "0.8.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "sharkdp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA=";
+    hash = "sha256-zNsNEXj/SaJaYsYvoOGPopLhJDfLIXSs7eeZDdJrHiQ=";
  };

-  cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY=";
+  cargoHash = "sha256-gtqdQuf3Ybt0PDCQw3gGAzIROq39NJKPIat0lyIPGgg=";

  meta = with lib; {
    description = "A generator for LS_COLORS with support for multiple color themes";
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/pkgs/tools/networking/netboot/default.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Mini PXE server";
    maintainers = [ maintainers.raskin ];
-    platforms = ["x86_64-linux"];
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
    license = lib.licenses.free;
  };
 }
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@ -3,11 +3,12 @@
 , httpServer ? false # build web interface for the daemon
 , client ? false # build amule remote gui
 , fetchFromGitHub
+, fetchpatch
 , stdenv
 , lib
 , cmake
 , zlib
-, wxGTK30 # WxGTK 3.0 must be used because aMule does not yet work well with 3.1
+, wxGTK32
 , perl
 , cryptopp
 , libupnp
@ -37,11 +38,18 @@ stdenv.mkDerivation rec {
    sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi";
  };

+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/a/amule/1%3A2.3.3-3/debian/patches/wx3.2.patch";
+      hash = "sha256-OX5Ef80bL+dQqHo2OBLZvzMUrU6aOHfsF7AtoE1r7rs=";
+    })
+  ];
+
  nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ];

  buildInputs = [
    zlib
-    wxGTK30
+    wxGTK32
    perl
    cryptopp.dev
    libupnp
@ -90,6 +98,7 @@ stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ ];
    platforms = platforms.unix;
+    # Undefined symbols for architecture arm64: "_FSFindFolder"
    broken = stdenv.isDarwin;
  };
 }
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2023-03-10";
+  version = "2023-03-15";

  src = fetchFromGitLab {
    owner = "exploit-database";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-H7zPCPOQZgsujdic8o7/+OjLm7iP9PRFlpO0lH6YhwM=";
+    hash = "sha256-qP14hkYO8gXD9C3B6uhBnYDx3YZMbbvtzHOSKFtFSmA=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "gitleaks";
-  version = "8.16.0";
+  version = "8.16.1";

  src = fetchFromGitHub {
    owner = "zricethezav";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-EazTDPJMMUGmGSfQ5d7J1opv/KlapQLZZYxjbzBRaUY=";
+    hash = "sha256-zidRNnvbjqLxYE0fBRygYWWBf5pS9xLLYFpSB0dtNks=";
  };

  vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE=";
--- a/pkgs/tools/security/rsign2/default.nix
+++ b/pkgs/tools/security/rsign2/default.nix
@ -0,0 +1,24 @@
+{ lib
+, rustPlatform
+, fetchCrate
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rsign2";
+  version = "0.6.2";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-Ono7cKXccYMmkrlsJ+Z85w8z0fEduuEQhRlHQQk0vzU=";
+  };
+
+  cargoHash = "sha256-Yuf4iTWGQp/1ZUVqaR0tKfFxKJ9JEmMLq1LL7gwf6w0=";
+
+  meta = with lib; {
+    description = "A command-line tool to sign files and verify signatures";
+    homepage = "https://github.com/jedisct1/rsign2";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "rsign";
+  };
+}
--- a/pkgs/tools/security/semgrep/common.nix
+++ b/pkgs/tools/security/semgrep/common.nix
@ -1,13 +1,13 @@
 { lib, fetchFromGitHub, fetchzip, stdenv }:

 rec {
-  version = "1.0.0";
+  version = "1.14.0";

  src = fetchFromGitHub {
    owner = "returntocorp";
    repo = "semgrep";
    rev = "v${version}";
-    sha256 = "sha256-4fNBpokHKCtMB3P0ot1TzcuzOs5hlyH8nIw+bCGqThA=";
+    sha256 = "sha256-qtiOZRqN+EqJs7kDmNReW4uweEynJd0TrU7vpR/fbqI=";
  };

  # submodule dependencies
@ -18,14 +18,14 @@ rec {
    "cli/src/semgrep/lang" = fetchFromGitHub {
      owner = "returntocorp";
      repo = "semgrep-langs";
-      rev = "65cb2ed80e31e01b122f893fef8428d14432da75";
-      sha256 = "sha256-HdPJdOlMM1l7vNSATkEu5KrCkpt2feEAH8LFDU84KUM=";
+      rev = "08656cdefc9e6818c64e168cf51ee1e76ea8829e";
+      sha256 = "sha256-vYf33JhfvEDmt/VW0hBOmqailIERS0GdUgrPuCxWt9I=";
    };
    "cli/src/semgrep/semgrep_interfaces" = fetchFromGitHub {
      owner = "returntocorp";
      repo = "semgrep-interfaces";
-      rev = "c69e30a4cf39f11cab5378700f5e193e8282079e";
-      sha256 = "sha256-Wr3/TWx/LHiTFCoGY4sqdsn3dHvMsEIVYA3RGiv88xQ=";
+      rev = "deffcb8e0e5166e29ce17b8af72716f45cbb2aa6";
+      sha256 = "sha256-yrVn1fJcAkQd3TMIvrWa5NDb/fN3ngybOycu7DG4pbE=";
    };
  };

@ -35,11 +35,11 @@ rec {
    data = {
      x86_64-linux = {
        suffix = "-ubuntu-16.04.tgz";
-        sha256 = "sha256-SsaAuhcDyO3nr6H2xOtdxzOoEQd6aIe0mlpehvDWzU0=";
+        sha256 = "sha256-cnF92jrVeRxDAbDQxicZ4+CfdOD7BJUz2fHjIHEim24=";
      };
      x86_64-darwin = {
        suffix = "-osx.zip";
-        sha256 = "sha256-DAcAB/q6XeljCp4mVljIJB4AUjUuzMSRMFzIuyjWMew=";
+        sha256 = "sha256-eg6oHTz3vRd4GubvOYiJIjv/NZgXRWHPBmFvSu60S+E=";
      };
    };
    src = let
--- a/pkgs/tools/security/semgrep/default.nix
+++ b/pkgs/tools/security/semgrep/default.nix
@ -17,15 +17,17 @@ buildPythonApplication rec {
  pname = "semgrep";
  inherit (common) src version;

-  postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList (
-    path: submodule: ''
-      # substitute ${path}
-      # remove git submodule placeholder
-      rm -r ${path}
-      # link submodule
-      ln -s ${submodule}/ ${path}
-    ''
-  ) common.submodules)) + ''
+  postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList
+    (
+      path: submodule: ''
+        # substitute ${path}
+        # remove git submodule placeholder
+        rm -r ${path}
+        # link submodule
+        ln -s ${submodule}/ ${path}
+      ''
+    )
+    common.submodules)) + ''
    cd cli
  '';

@ -50,6 +52,7 @@ buildPythonApplication rec {
    click-option-group
    glom
    requests
+    rich
    ruamel-yaml
    tqdm
    packaging
--- a/pkgs/tools/security/semgrep/update.sh
+++ b/pkgs/tools/security/semgrep/update.sh
@ -25,7 +25,7 @@ instantiateClean() {

 # get latest version
 NEW_VERSION=$(
-  curl -s -H
+  curl -s -H \
    "Accept: application/vnd.github.v3+json" \
    ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \
    https://api.github.com/repos/returntocorp/semgrep/releases/latest \
@ -75,8 +75,8 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.com
 | jq '.[]' -r \
 | while read -r PLATFORM; do
    echo "Updating core for $PLATFORM"
-    SUFFIX=$(instantiateClean semgrep.common.core.data."$1".suffix "$PLATFORM")
-    OLD_HASH=$(instantiateClean semgrep.common.core.data."$1".sha256 "$PLATFORM")
+    SUFFIX=$(instantiateClean semgrep.common.core.data."$PLATFORM".suffix)
+    OLD_HASH=$(instantiateClean semgrep.common.core.data."$PLATFORM".sha256)
    echo "Old hash $OLD_HASH"

    NEW_URL="https://github.com/returntocorp/semgrep/releases/download/v$NEW_VERSION/semgrep-v$NEW_VERSION$SUFFIX"
@ -123,7 +123,7 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas
    NEW_URL=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g")
    NEW_HASH=$(nix --experimental-features nix-command hash to-sri "sha256:$(nix-prefetch-url "$NEW_URL")")

-    TMP_HASH="sha256-ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+    TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
    replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE"
    replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE"
    NEW_HASH="$(fetchgithub semgrep.passthru.common.submodules."$SUBMODULE")"
--- a/pkgs/tools/security/tlsx/default.nix
+++ b/pkgs/tools/security/tlsx/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "tlsx";
-  version = "1.0.5";
+  version = "1.0.6";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-9Cs5lkt7lAgCl/q2Xc8W5A8/frKER/d3mS1KH9jAy68=";
+    hash = "sha256-rKnnBvutJqWUOsYt47+VwreJVRtJYYhRVxZdSqymRiw=";
  };

-  vendorHash = "sha256-eQnrSE45UGRbJ7zO6TdBh6UKooUEnhVxg4cdgoFu5eM=";
+  vendorHash = "sha256-kLZCtmKJKNjmEk7vPoHfzqEnuBrycDYGNMh/zUDZ76g=";

  # Tests require network access
  doCheck = false;
--- a/pkgs/tools/text/d2/default.nix
+++ b/pkgs/tools/text/d2/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "d2";
-  version = "0.2.3";
+  version = "0.2.4";

  src = fetchFromGitHub {
    owner = "terrastruct";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-HFopiZamQ0A40u/+/pTxwYb598vyvWlNV4510Ode5RM=";
+    hash = "sha256-aReYFw6mlPhf11bhLII5CrMG1G9d0hhPsFVrZxmt72o=";
  };

-  vendorHash = "sha256-xmB1i7IKTELvqZBxVL23Zpr7CfihW6LPBKwPUUXnHmQ=";
+  vendorHash = "sha256-+Z8nzna5KedWzmhBKGSpsbE8ooaC9sPk6Bh5zkrzwrQ=";

  ldflags = [
    "-s"
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "cri-tools";
-  version = "1.26.0";
+  version = "1.26.1";

  src = fetchFromGitHub {
    owner = "kubernetes-sigs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-ALeK51fsGEys9iEHv0C8vCZVD4vx+VYUooj7pH7p7tg=";
+    sha256 = "sha256-jJhHlqnc7wDsc6nn5CTZMnaZpUJrEDkGzyvQ2EoX4GE=";
  };

  vendorSha256 = null;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -5689,6 +5689,8 @@ with pkgs;

  rsbkb = callPackage ../tools/text/rsbkb { };

+  rsign2 = callPackage ../tools/security/rsign2 { };
+
  rsyslog = callPackage ../tools/system/rsyslog {
    withHadoop = false; # Currently Broken
    withKsi = false; # Currently Broken
--- a/pkgs/top-level/nim-packages.nix
+++ b/pkgs/top-level/nim-packages.nix
@ -30,10 +30,16 @@ lib.makeScope newScope (self:

    chroma = callPackage ../development/nim-packages/chroma { };

+    coap = callPackage  ../development/nim-packages/coap { };
+
    docopt = callPackage ../development/nim-packages/docopt { };

+    eris = callPackage ../development/nim-packages/eris { };
+
    flatty = callPackage ../development/nim-packages/flatty { };

+    freedesktop_org = callPackage ../development/nim-packages/freedesktop_org { };
+
    frosty = callPackage ../development/nim-packages/frosty { };

    getdns = callPackage ../development/nim-packages/getdns {
@ -73,6 +79,8 @@ lib.makeScope newScope (self:

    pixie = callPackage ../development/nim-packages/pixie { };

+    preserves = callPackage ../development/nim-packages/preserves { };
+
    redis = callPackage ../development/nim-packages/redis { };

    redpool = callPackage ../development/nim-packages/redpool { };
@ -102,6 +110,8 @@ lib.makeScope newScope (self:

    supersnappy = callPackage ../development/nim-packages/supersnappy { };

+    syndicate = callPackage ../development/nim-packages/syndicate { };
+
    taps = callPackage ../development/nim-packages/taps { };

    tempfile = callPackage ../development/nim-packages/tempfile { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -6454,6 +6454,8 @@ self: super: with self; {

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

+  nianet = callPackage ../development/python-modules/nianet { };
+
  niaarm = callPackage ../development/python-modules/niaarm { };

  niapy = callPackage ../development/python-modules/niapy { };
@ -9252,6 +9254,8 @@ self: super: with self; {

  pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };

+  pytest-pytestrail = callPackage ../development/python-modules/pytest-pytestrail { };
+
  pytest-qt = callPackage ../development/python-modules/pytest-qt { };

  pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
@ -11569,6 +11573,8 @@ self: super: with self; {

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

+  testrail-api = callPackage ../development/python-modules/testrail-api { };
+
  testrepository = callPackage ../development/python-modules/testrepository { };

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