Merge master into staging-next

2023-08-07 12:00:52 +00:00 · 2023-08-07 12:00:52 +00:00 · dd48ee46cf
commit dd48ee46cf
parent d23097a818 e462b98597
56 changed files with 909 additions and 577 deletions
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@ -216,6 +216,7 @@ in {
        PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules";
      } // lib.optionalAttrs (!cfg.enableAnalyticsReporting) {
        DO_NOT_TRACK = "1";
+        NETDATA_PIPENAME = "/run/netdata/ipc";
      };
      restartTriggers = [
        config.environment.etc."netdata/netdata.conf".source
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
    netdata =
      { pkgs, ... }:
        {
-          environment.systemPackages = with pkgs; [ curl jq ];
+          environment.systemPackages = with pkgs; [ curl jq netdata ];
          services.netdata.enable = true;
        };
    };
@ -34,5 +34,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
    filter = '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0'
    cmd = f"curl -s {url} | jq -e '{filter}'"
    netdata.wait_until_succeeds(cmd)
+
+    # check if the control socket is available
+    netdata.succeed("sudo netdatacli ping")
  '';
 })
--- a/pkgs/applications/audio/easyabc/default.nix
+++ b/pkgs/applications/audio/easyabc/default.nix
@ -15,7 +15,7 @@ python39.pkgs.buildPythonApplication {
  nativeBuildInputs = [ wrapGAppsHook ];

  propagatedBuildInputs = with python39.pkgs; [
-    cx_Freeze
+    cx-freeze
    wxPython_4_2
    pygame
  ];
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "ergo";
-  version = "5.0.12";
+  version = "5.0.13";

  src = fetchurl {
    url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "sha256-kh0maR7Bl7YbA49vcJOYeglYfvOi7wk4cHQfwOT9qpQ=";
+    sha256 = "sha256-ZnWiP6Mk6EnrqPT+apSQ0igIEVHy+B8QVbsXRna7up0=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -49,12 +49,12 @@
  };
  awk = buildGrammar {
    language = "awk";
-    version = "0.0.0+rev=7fef050";
+    version = "0.0.0+rev=2444262";
    src = fetchFromGitHub {
      owner = "Beaglefoot";
      repo = "tree-sitter-awk";
-      rev = "7fef05082d7aeb4e9dc0d9dca2695056b28ce6a8";
-      hash = "sha256-2GCcYUFFJT6hjKuAnPC99aSrbziJOVRE5d1TM8VfVrQ=";
+      rev = "244426241376b08d9531616290d657106ec8f7ff";
+      hash = "sha256-rNQxGMgK9O1wpi1Rdhz/3I210w92AIPAJzEf0v/ICz8=";
    };
    meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";
  };
@ -170,12 +170,12 @@
  };
  chatito = buildGrammar {
    language = "chatito";
-    version = "0.0.0+rev=3baf22e";
+    version = "0.0.0+rev=a945b8e";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-chatito";
-      rev = "3baf22e7e507cedf15d1dbc03df8afa50a625586";
-      hash = "sha256-NsdkvMkrHfVakeYxPJfr4HOg5BlLB6OPFQeMseQQL/k=";
+      rev = "a945b8e799dac06c47309f7c2f3b7c385bbee029";
+      hash = "sha256-U3RY6puadyG4foZVP+1JTI8d1nXUlJ24Q/iiczsxTvc=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
  };
@ -280,12 +280,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "0.0.0+rev=ccb8368";
+    version = "0.0.0+rev=0c3dd8d";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "ccb8368181f1684d3c9815bc1271eb25aa7ddb16";
-      hash = "sha256-Fwy05mSFnvV7h0TEiO024uzHI7I3k2IYu4i5fRbdDrs=";
+      rev = "0c3dd8d5310076875e64bd224fdac93b6a16838e";
+      hash = "sha256-ZERn1FdQpiiY+Ljt9zlKkkDUkxxGKfSe98a/2MhOr+I=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@ -347,12 +347,12 @@
  };
  diff = buildGrammar {
    language = "diff";
-    version = "0.0.0+rev=f69bde8";
+    version = "0.0.0+rev=c165725";
    src = fetchFromGitHub {
      owner = "the-mikedavis";
      repo = "tree-sitter-diff";
-      rev = "f69bde8e56f431863eba2fe4bab23e7d9692855f";
-      hash = "sha256-MFVXhnNxmGtqu8Y8ciigu/AIi15maPQjnJduBm7iCQI=";
+      rev = "c165725c28e69b36c5799ff0e458713a844f1aaf";
+      hash = "sha256-qou5ow/Am/qyO0I1j74ojgnBonwmJriLCCeSNpTk7t8=";
    };
    meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
  };
@ -414,12 +414,12 @@
  };
  elm = buildGrammar {
    language = "elm";
-    version = "0.0.0+rev=8fce414";
+    version = "0.0.0+rev=b075803";
    src = fetchFromGitHub {
      owner = "elm-tooling";
      repo = "tree-sitter-elm";
-      rev = "8fce414fb951d6d2374593a3adf732621ef4bccf";
-      hash = "sha256-TuWEqei//UZm2RHWJTooJVOM9EiAST8TtehGw6JnuN4=";
+      rev = "b075803c445191af3cf7dbfdc84efef5f5bbc0f5";
+      hash = "sha256-KtijU8ZODsqcNZc4Roh0AILaBWFs+D1cnSUfwQlEx84=";
    };
    meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
  };
@ -502,12 +502,12 @@
  };
  foam = buildGrammar {
    language = "foam";
-    version = "0.0.0+rev=7ef88a8";
+    version = "0.0.0+rev=09e0344";
    src = fetchFromGitHub {
      owner = "FoamScience";
      repo = "tree-sitter-foam";
-      rev = "7ef88a8c652073785bffd7ce9c3effc68035aa11";
-      hash = "sha256-k/m1kz2/9Q15Lt6/hrKolvb29Gl0b/z2oelgkyS1wTM=";
+      rev = "09e03445f49290450589c5d293610ab39434e3e4";
+      hash = "sha256-+ZNLgv0LbXET0WoalAaxo2WjVy0ranPtdOw1CCseqcM=";
    };
    meta.homepage = "https://github.com/FoamScience/tree-sitter-foam";
  };
@ -623,12 +623,12 @@
  };
  gleam = buildGrammar {
    language = "gleam";
-    version = "0.0.0+rev=2d5d6b0";
+    version = "0.0.0+rev=8302c98";
    src = fetchFromGitHub {
      owner = "gleam-lang";
      repo = "tree-sitter-gleam";
-      rev = "2d5d6b001ba12bf1c7ac94679d69ac2bed3151dc";
-      hash = "sha256-9NHjBGvWLxenbD4dDBdWOOT7fVDIvyigilyd/SDtQtE=";
+      rev = "8302c98ed78128b22f946fadefaf4af5ba5d5850";
+      hash = "sha256-rWNReuod+P7/Wq+zJoJNo9tWLLpo9Xu7B5MYxjWdp0I=";
    };
    meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
  };
@ -678,12 +678,12 @@
  };
  gomod = buildGrammar {
    language = "gomod";
-    version = "0.0.0+rev=4a65743";
+    version = "0.0.0+rev=f41a273";
    src = fetchFromGitHub {
      owner = "camdencheek";
      repo = "tree-sitter-go-mod";
-      rev = "4a65743dbc2bb3094114dd2b43da03c820aa5234";
-      hash = "sha256-znvUD/xqwSUeHCDxwXIgPXiB94bY1wEOjRQSvURcdME=";
+      rev = "f41a27386f1cfa1271122db5f0ff59b910520007";
+      hash = "sha256-U/kpBEgUqJzJ3qQ40TMBuM1UKI9+HxnFEmmN8FfvS5w=";
    };
    meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
  };
@ -810,12 +810,12 @@
  };
  hlsl = buildGrammar {
    language = "hlsl";
-    version = "0.0.0+rev=20c40a3";
+    version = "0.0.0+rev=d3dc3e3";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-hlsl";
-      rev = "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd";
-      hash = "sha256-mLcl73XNDjkKUvFixPjW4EAO9y++gpitu7e+oym/Mpc=";
+      rev = "d3dc3e3cd010d200573eee26421dbdecfd6a6b59";
+      hash = "sha256-mdESPOOxwJ1WEuO5No26wfvxsaiIFtQcLsE4m5OkzIQ=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
  };
@ -887,12 +887,12 @@
  };
  ini = buildGrammar {
    language = "ini";
-    version = "0.0.0+rev=1a0ce07";
+    version = "0.0.0+rev=7f11a02";
    src = fetchFromGitHub {
      owner = "justinmk";
      repo = "tree-sitter-ini";
-      rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44";
-      hash = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU=";
+      rev = "7f11a02fb8891482068e0fe419965d7bade81a68";
+      hash = "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M=";
    };
    meta.homepage = "https://github.com/justinmk/tree-sitter-ini";
  };
@ -920,12 +920,12 @@
  };
  java = buildGrammar {
    language = "java";
-    version = "0.0.0+rev=6c8329e";
+    version = "0.0.0+rev=e8d1bc4";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-java";
-      rev = "6c8329e2da78fae78e87c3c6f5788a2b005a4afc";
-      hash = "sha256-pAo9hYhlLWjWB/n8nq/MzdMXbzOxcFzfrBCrj8xR/5g=";
+      rev = "e8d1bc4043c1d2326f7ce3aa7b8833c7b18d0560";
+      hash = "sha256-UXTEUb5OyGYRDae52fuSBOiu/6LXIk3s8mt0vl7z2Bw=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
  };
@ -997,23 +997,23 @@
  };
  jsonnet = buildGrammar {
    language = "jsonnet";
-    version = "0.0.0+rev=fdc7757";
+    version = "0.0.0+rev=af22de3";
    src = fetchFromGitHub {
      owner = "sourcegraph";
      repo = "tree-sitter-jsonnet";
-      rev = "fdc775714afa27fdef823adbaba6ab98f5ae66f2";
-      hash = "sha256-KVpSB3LiC1qpF05Y1ScIglaXWIrAL+m7G4Q4/EVn0U8=";
+      rev = "af22de3337abcc01130fc7968014205ed8001b6c";
+      hash = "sha256-DUwWET5HiGAcdzFDfghgHFEj0Octo/gz1Jnpgka1v9Q=";
    };
    meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet";
  };
  julia = buildGrammar {
    language = "julia";
-    version = "0.0.0+rev=d68ded9";
+    version = "0.0.0+rev=ab0f70c";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-julia";
-      rev = "d68ded9d5131878a2a06211ef0b47b72e70c6c08";
-      hash = "sha256-vPmZ9oA4t2LtQng88UNWkngwmpf2JLRlPOx/PM5mi80=";
+      rev = "ab0f70c0a919d38b41822305a8ca80e527c94e4f";
+      hash = "sha256-+rD3kL3nSzdsj/P6pWf5i+XQugZsxUc0vz6JZIk/lr8=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
  };
@ -1366,23 +1366,23 @@
  };
  pem = buildGrammar {
    language = "pem";
-    version = "0.0.0+rev=3662443";
+    version = "0.0.0+rev=8032882";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-pem";
-      rev = "3662443335bc95bac0168a338b0f29f87162c244";
-      hash = "sha256-J6ktfMcH7umeDaK+r2YRljb+5dwKiXJ7dJazuDoBgno=";
+      rev = "8032882300fb7976af769b578b8c798c146bd1a2";
+      hash = "sha256-SH5qUUE/eA9lZ4ZNlvTDvDNjhs2UW8STSbZ2A6YQXU0=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem";
  };
  perl = buildGrammar {
    language = "perl";
-    version = "0.0.0+rev=6141ee2";
+    version = "0.0.0+rev=79e88f6";
    src = fetchFromGitHub {
      owner = "ganezdragon";
      repo = "tree-sitter-perl";
-      rev = "6141ee2cb4c954d5fab9c4ed20ad2b159341533c";
-      hash = "sha256-eRgnMVCh2/DD8Ka1unyBt9KoLNR4fo3lJiJlZXYBOJo=";
+      rev = "79e88f64681660f3961939bf764d8f3b4bbb0d27";
+      hash = "sha256-cadmD6kXhA3TENHhM03+iX2J0+Z0UhHizFiZLnknXLk=";
    };
    meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl";
  };
@ -1476,14 +1476,14 @@
  };
  proto = buildGrammar {
    language = "proto";
-    version = "0.0.0+rev=42d82fa";
+    version = "0.0.0+rev=e9f6b43";
    src = fetchFromGitHub {
-      owner = "mitchellh";
+      owner = "treywood";
      repo = "tree-sitter-proto";
-      rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f";
-      hash = "sha256-cX+0YARIa9i8UymPPviyoj+Wh37AFYl9fsoNZMQXPgA=";
+      rev = "e9f6b43f6844bd2189b50a422d4e2094313f6aa3";
+      hash = "sha256-Ue6w6HWy+NTJt+AKTFfJIUf3HXHTwkUkDk4UdDMSD+U=";
    };
-    meta.homepage = "https://github.com/mitchellh/tree-sitter-proto";
+    meta.homepage = "https://github.com/treywood/tree-sitter-proto";
  };
  prql = buildGrammar {
    language = "prql";
@ -1586,12 +1586,12 @@
  };
  racket = buildGrammar {
    language = "racket";
-    version = "0.0.0+rev=d181a97";
+    version = "0.0.0+rev=7dc4fb6";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-racket";
-      rev = "d181a9738177a3b21b9f0e7bbb33b1a562f73ba6";
-      hash = "sha256-USdHc4c5s1ZGB1nHf0nw8IZEi1xbLWJTnj6KBzcmacY=";
+      rev = "7dc4fb60390218b09bc351062eeede7dcdbb4d9f";
+      hash = "sha256-80BJ12gstc2+SuPqwziOClOzeH9BJflQ39JSqUmutkQ=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
  };
@ -1663,12 +1663,12 @@
  };
  rst = buildGrammar {
    language = "rst";
-    version = "0.0.0+rev=a41a933";
+    version = "0.0.0+rev=2ca8c12";
    src = fetchFromGitHub {
      owner = "stsewd";
      repo = "tree-sitter-rst";
-      rev = "a41a933524a54de1ba3ac4f5336b6eeb46deac15";
-      hash = "sha256-sORX9vzxF6nhmbG5yPgOPvLuhJiKkT5LoA2HgBlKrt0=";
+      rev = "2ca8c123c82ca41f41b66b5d13d403cff0204b78";
+      hash = "sha256-aCeKxuBRLPYM8CjVLP5cBUhtuAezzZpGfCE2UaJj1E4=";
    };
    meta.homepage = "https://github.com/stsewd/tree-sitter-rst";
  };
@ -1719,12 +1719,12 @@
  };
  scheme = buildGrammar {
    language = "scheme";
-    version = "0.0.0+rev=ca8af22";
+    version = "0.0.0+rev=af3af6c";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-scheme";
-      rev = "ca8af220aaf2a80aaf609bfb0df193817e4f064b";
-      hash = "sha256-m+ZFC82hWMfP0cRo64mFglS3jdya8DAQfVACNZfRfuM=";
+      rev = "af3af6c9356b936f8a515a1e449c32e804c2b1a8";
+      hash = "sha256-s9AoMNYnKvzr969aujgwUaVn4WoRaZ5snfFEF73KUGA=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
  };
@ -1796,12 +1796,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "0.0.0+rev=61ab791";
+    version = "0.0.0+rev=012fe71";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "61ab7913e110082b7f1fab5421ae3f971b3578ce";
-      hash = "sha256-0M0iMJ3qCh6OLAxHaZatK/DTaLwAzDGC5Anxsjjg8kY=";
+      rev = "012fe71ce44399e870f75615b54bd40d91b87a63";
+      hash = "sha256-K977zxbsxRkSlA+pYW5oVV3kECDHgUhDrnY3kHdBMP0=";
    };
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
  };
@ -1896,14 +1896,14 @@
  };
  t32 = buildGrammar {
    language = "t32";
-    version = "0.0.0+rev=e4cb4a6";
+    version = "0.0.0+rev=6da5e3c";
    src = fetchFromGitLab {
      owner = "xasc";
      repo = "tree-sitter-t32";
-      rev = "e4cb4a6adb26650e0a2bf4ae57d829ccb8066dcc";
-      hash = "sha256-WNkO6EkvEmS/Yrpj5Kj34xFcScoCCbbrXiW0CORJYvw=";
+      rev = "6da5e3cbabd376b566d04282005e52ffe67ef74a";
+      hash = "sha256-BRDlNZolMurXpUqnFbS+7ADTcuBthGDYVr6wBn9PIr4=";
    };
-    meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";
+    meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
  };
  tablegen = buildGrammar {
    language = "tablegen";
@ -2176,12 +2176,12 @@
  };
  wing = buildGrammar {
    language = "wing";
-    version = "0.0.0+rev=996e87a";
+    version = "0.0.0+rev=fea885a";
    src = fetchFromGitHub {
      owner = "winglang";
      repo = "wing";
-      rev = "996e87a0fa23ebd41d6c50fdff61d2ec6e2e1c1e";
-      hash = "sha256-OKR/zt+53s3BO9Gu0VKEEsslR2Is2LaUnurXqrgNlSo=";
+      rev = "fea885a0358e5d6146dbd12feaa3f270ddfd78a3";
+      hash = "sha256-4sLupliDl7j281sMcVeF4EROI9TvAqhh077ZhJI6Ctw=";
    };
    location = "libs/tree-sitter-wing";
    generate = true;
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -947,7 +947,7 @@ self: super: {
        pname = "sg-nvim-rust";
        inherit (old) version src;

-        cargoHash = "sha256-DgNA/RqnpKmixJKKEDOzflaw8qfnTaBG/Dus1cqgHTU=";
+        cargoHash = "sha256-MJUEGzV756zWCHGAcdm9uU8DpoX6b1G8C2bRWy4QCfE=";

        nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/emulators/xemu/default.nix
+++ b/pkgs/applications/emulators/xemu/default.nix
@ -28,13 +28,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xemu";
-  version = "0.7.110";
+  version = "0.7.111";

  src = fetchFromGitHub {
    owner = "xemu-project";
    repo = "xemu";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ztYjvQunjskPZUIntzX4GEh0nv0K6knVubYW+QlCCII=";
+    hash = "sha256-j7VNNKGm8mFEz+8779ylw1Yjd+jDuoL19Sw52kJll4s=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/keepmenu/default.nix
+++ b/pkgs/applications/misc/keepmenu/default.nix
@ -2,11 +2,11 @@

 python3Packages.buildPythonApplication rec {
  pname = "keepmenu";
-  version = "1.2.2";
+  version = "1.3.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "SeVNtONH1bn2hb2pBOVM3Oafrb+jARgfvRe7vUu6Gto=";
+    hash = "sha256-AGuJY7IirzIjcu/nY9CzeOqU1liwcRijYLi8hGN/pRg=";
  };

  preConfigure = ''
--- a/pkgs/applications/misc/krabby/default.nix
+++ b/pkgs/applications/misc/krabby/default.nix
@ -4,14 +4,14 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "krabby";
-  version = "0.1.6";
+  version = "0.1.7";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-BUX3D/UXJt9OxajUYaUDxI0u4t4ntSxqI1PMtk5IZNQ=";
+    sha256 = "sha256-YI8OkNIDZWxAV+9n8AbKdZuWdA3A2cD94DuPgFvkokE=";
  };

-  cargoHash = "sha256-XynD19mlCmhHUCfbr+pmWkpb+D4+vt3bsgV+bpbUoaY=";
+  cargoHash = "sha256-j4zCuPmn/+ZSLFkAivNs3lH7YWVLvLA9k9RKbh43tUU=";

  meta = with lib; {
    description = "Print pokemon sprites in your terminal";
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "pachyderm";
-  version = "2.6.6";
+  version = "2.6.8";

  src = fetchFromGitHub {
    owner = "pachyderm";
    repo = "pachyderm";
    rev = "v${version}";
-    hash = "sha256-EvoxA8Mavr3pQ3GZg6+/cPQJqh+Xe+Rj906aO2frdgU=";
+    hash = "sha256-2AD/JGdcJV8qYH/k3gR9YgLsMcyKtWJmqQN29NUsE4Y=";
  };

  vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "netmaker";
-  version = "0.20.4";
+  version = "0.20.5";

  src = fetchFromGitHub {
    owner = "gravitl";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-4njC4hQoiAWlkwyvP14wWK+PxQ6bGR5QzteurHcuo4o=";
+    hash = "sha256-bnYIyYnJhrdI8zfeOBdab8yZuK2rxTO5YO6EKlaRlHo=";
  };

-  vendorHash = "sha256-f6foYD/2b9iLzQbPTXeiKCdrm7gz5E8ulWHZaj+KB/M=";
+  vendorHash = "sha256-Nz1vE3SelUdgJoGQLOBXtFwAtM1VTDL9oKDQqxVi8Vg=";

  inherit subPackages;

--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "samtools";
-  version = "1.17";
+  version = "1.18";

  src = fetchurl {
    url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-Ot85C2KCGf1kCPFGAqTEqpDmPhizldrXIqtRlDiipyk";
+    sha256 = "sha256-1ob/piECO6YYIqKlC3DoXQsY55Nx3lrbB4KFGdP8BuE=";
  };

  # tests require `bgzip` from the htslib package
--- a/pkgs/applications/science/logic/poly/default.nix
+++ b/pkgs/applications/science/logic/poly/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "libpoly";
-  version = "0.1.11";
+  version = "0.1.13";

  src = fetchFromGitHub {
    owner = "SRI-CSL";
    repo = "libpoly";
    # they've pushed to the release branch, use explicit tag
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-vrYB6RQYShipZ0c0j1KcSTJR1h0rQKAAeJvODMar1GM=";
+    sha256 = "sha256-7aFz+6XJOVEA/Fmi0ywd6rZdTW8sHq8MoHqXR0Hc2o4=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/version-management/git-credential-oauth/default.nix
+++ b/pkgs/applications/version-management/git-credential-oauth/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "git-credential-oauth";
-  version = "0.8.0";
+  version = "0.9.1";

  src = fetchFromGitHub {
    owner = "hickford";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-t1P20BDNQ0aJRgQhOgYP2Md44+I8xs6884ktBO4nGjY=";
+    hash = "sha256-FNOGzv0oAPpAPS8V8I+wowKY5uZhfWm6m8obiAay3AE=";
  };

  ldflags = [
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@ -12,14 +12,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "pijul";
-  version = "1.0.0-beta.5";
+  version = "1.0.0-beta.6";

  src = fetchCrate {
    inherit version pname;
-    hash = "sha256-hFNNi5xzH1wQnmy4XkXg07ZbZMlyWR4/GLe/PyJpb20=";
+    hash = "sha256-1cIb4QsDYlOCGrQrLgEwIjjHZ3WwD2o0o0bF+OOqEtI=";
  };

-  cargoHash = "sha256-gOREd5Z1j+UUJ2NNryoDDsFtP6XYlWQlR/llgqKgy+g=";
+  cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0=";

  doCheck = false;
  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "lima";
-  version = "0.16.0";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "lima-vm";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-6BNUuYAy3rUpPeUsbLRpz0+LdgVeHjlVjmQRcuFSXEg=";
+    sha256 = "sha256-EVPIb8+0pMDq7sRiG5ERHRW8Lq2NRdHiBj0zPouzwpc=";
  };

-  vendorHash = "sha256-KuMEAlXvW5FhTC7HQa3CoqRlhtwSBzjk+dgAnzScfno=";
+  vendorHash = "sha256-BrfrCsVJ6ca16dyBHOUXFZHU8JZz2iUxcc2gGf3MF/U=";

  nativeBuildInputs = [ makeWrapper installShellFiles ]
    ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@ -11,7 +11,7 @@ let
    (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "26.0.1";
+  version = "26.0.2";

  src = fetchurl {
    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "0rr2a78svxi67hbwzxj4izz27lag0x3kdaxndp8w8vp4q5wdl7ny";
-  iosevka-aile = "0057ncsrq5jdc1szg8wcwp3fcjn2iaspmgscapbfqdkvbfwpxr1w";
-  iosevka-curly = "10byxhv3zh5akp0phclfb1vssa2abm3bc2z5a1s1p1giz6npzr7y";
-  iosevka-curly-slab = "0h1n4w6s22jcxli2yhmpfankaqfqhw9yv48qpyyqsyclcyhnp41r";
-  iosevka-etoile = "1wrfmkynfj3vrnyg2c7qx8j2icr5a2ixpjmh4dfxw4jh5k0bgh91";
-  iosevka-slab = "0qfbi7sl1byipkgz83p30yndzx3x7ss8id7pia508ggdhv899xqg";
-  iosevka-ss01 = "1jamw3zjdq1by309zic1mcliz42837xp1qill8s2mx54dv1l9c88";
-  iosevka-ss02 = "1xzdi58ls44cjhwd5z82w1bhw9lliysa98728ld58jkryq8f0wc7";
-  iosevka-ss03 = "13wi8phrarflp701xssyfvx3a9bhahs52pcwx5440c278892kpw1";
-  iosevka-ss04 = "1l9zzy65wjz4mgf5wwam1hc72wn24glnvahmn32a9r1hjnwmmj7p";
-  iosevka-ss05 = "14glack97mar9z65qp919hv3yzaw0hb618y9fjpxyl8aw7zh9jvn";
-  iosevka-ss06 = "0bv6vymg58lj0ndi7982spn5qh461dg14p9k13hyyj42yi880x4w";
-  iosevka-ss07 = "10qan63yhwgp6hxdj45wwdnncj8917a8m4amd197kzky6h2q5xf9";
-  iosevka-ss08 = "0k7qx4pg64v8wh4xcxn73xhjwqcspssi769fc72wfnqm2hb7pn23";
-  iosevka-ss09 = "04lsdxqgk42vzqlgvx0d74f7vbchiinr7wz658j4bph5dfcdzchq";
-  iosevka-ss10 = "05bzz0psvfv9m1lf5zyjl04wk1h5xzncg5md7gaxr1dviw8shp1f";
-  iosevka-ss11 = "11i7wrb1dnmgng8hcx0ng4xphd7gikfv4kv4wr792rz1f5dkmd3s";
-  iosevka-ss12 = "1jhjbyv6z6s3ay1y011h7hf7capg7b5pkjfjb6yb7wca85bn3b67";
-  iosevka-ss13 = "1xr8rrrvdb74qx8ajxx7adywvmsvzvg7q1zzy5hl219w8f5rxji1";
-  iosevka-ss14 = "19ngfzlrzff8zbnm48nwd5n2l2h7v36pcp5rprjl9hbngjcl0acq";
-  iosevka-ss15 = "0kxkm81mki2p95r61ipczggzxar45jxf1xhvlgs0k6s8ysr0h24a";
-  iosevka-ss16 = "01arpv2pxgs1m5vqg8mzcnfkmaml4cl643ab4i284xxl9d8za712";
-  iosevka-ss17 = "0ypc59wrpyh7p5jyigai89wj7ji81r80za25nk8mngaskk90pk28";
-  iosevka-ss18 = "1n48psav41fk2kiic8hgdw7hyr8p34ahvys9v6zpi16djapq1sff";
-  sgr-iosevka = "0w0jrva0rhxs0l9rqww0c3w69q2k2b1xfcn25n89gh0m0zz5iq75";
-  sgr-iosevka-aile = "17hhs8jkvqwvlw7hxsdwng6sgh6j6myrzp89ljhqfq8f9i847q72";
-  sgr-iosevka-curly = "13kvw8ln4ys6rv1ajjgd4iqsp5rlzr4lsp59yhwqzf40fjnw7l05";
-  sgr-iosevka-curly-slab = "097mfshjmapiclbxjzwli031wd4mf7w4jbcy3kn1pmb8ndjl4mnb";
-  sgr-iosevka-etoile = "0if0868s94jyn7yj7z3adjrm3kkngm804jdi7sabi8pa3mrrnbj0";
-  sgr-iosevka-fixed = "0q7r9lnh3icasqzhscxy0fd1v9gvc7nw38y059iybpv9n41hwjgf";
-  sgr-iosevka-fixed-curly = "00k2i270zmpmdliivrjvvr1bghqaj04b102kvggcjrhgljj02r9s";
-  sgr-iosevka-fixed-curly-slab = "1xq3dw3lgjpwcj54lb3vz8n8pjgvygap3rk6sq5q39w5ga3njhc1";
-  sgr-iosevka-fixed-slab = "00wxahzfrhwf9nfwpv3hl7n0r3wshi06bqqlffd1rps8vm52g8bj";
-  sgr-iosevka-fixed-ss01 = "0bqyb43q9ip8x761c9h6fj2n6saq9k9krj5glynpk9qn7rj086fv";
-  sgr-iosevka-fixed-ss02 = "1icz41wpr061jy4r6p7lgcgjrgb3gmf80yqrlkwaiidgahr25h0f";
-  sgr-iosevka-fixed-ss03 = "0050q4i05xw3a9h8yzw2c3yzip0xg75xv433z26g6p22h44rbasd";
-  sgr-iosevka-fixed-ss04 = "1qq6l1cpsqsbx5v5n49gqq5pvvy9g3vws4877dd77q31309n9q29";
-  sgr-iosevka-fixed-ss05 = "07bs5fgva3nzdmc785m0i3b8mvaqp16rw1aan11gy1i14064ayr7";
-  sgr-iosevka-fixed-ss06 = "1lpsr82r40r9wandcxcn1gcs44cmd4x7p295gkd4b8zyvkbxhmx0";
-  sgr-iosevka-fixed-ss07 = "0xhnxh2hhnyp7difb0rxwid45kc2ykwr7n7rbdn2ay6wzq5f7j2d";
-  sgr-iosevka-fixed-ss08 = "1hmbfyiclny4jcf3rshra5zhs4s0hfmz2cyw0zpvg0mp7j2xkvw7";
-  sgr-iosevka-fixed-ss09 = "0jwzgyrr57kbkdpys47f1dpl74q37iv5k4bl01hpxpl6hl5npnz9";
-  sgr-iosevka-fixed-ss10 = "1qv9pq947d82ms1cysc48msxa9hqaqr62r7czwjh5nb5a7s9kym0";
-  sgr-iosevka-fixed-ss11 = "0lay5dj4q1vd8s5llr9kcmhrjz5pvjbcdxh8vqlykjymn038pcc7";
-  sgr-iosevka-fixed-ss12 = "0iwd5rrf11da8w7vym90ikw7piai7pw1mw7q57i7pdsp588dq76i";
-  sgr-iosevka-fixed-ss13 = "1ymslbh1kpyj5zva4m7rg6ac74j215y614zxmvrndlgjp7xnpq2d";
-  sgr-iosevka-fixed-ss14 = "123hq7pxjfn1239kw8fisdf895wryqrmqi79x8dcqhncbvcy57dz";
-  sgr-iosevka-fixed-ss15 = "03yd228gf4vj11cwr5nmq6i34v1xa79b3j0mf173psxgm40kfxjy";
-  sgr-iosevka-fixed-ss16 = "0rxr9cj59ici41idgd40la3jn882zhshsr35inmylyxlxhsiyqf1";
-  sgr-iosevka-fixed-ss17 = "0qqnl7r0kvdwxfxspvji3a4kgh0naqhpmza9c46z2f36khfp4js7";
-  sgr-iosevka-fixed-ss18 = "0qkjdn8zq1xv4llayhsp5h7rphf4j16zwk3sdvqwclpdhflpwncg";
-  sgr-iosevka-slab = "0k8ma569dpsdfllw5mrjfcqn157195v4m1viykhqs8y2p5gmwzyk";
-  sgr-iosevka-ss01 = "0s58pbsqy7nwm3370hj002idgxjhikq9w01axysasbax7maw46di";
-  sgr-iosevka-ss02 = "1d7lbf8ifki037x2sn479131rda1slgmyl9bkn9dpi660s33nlmj";
-  sgr-iosevka-ss03 = "10d1hgjdpd93hksbhshlsj7hz7m2b4ivdxxadyvzs295r05w6sr7";
-  sgr-iosevka-ss04 = "0rpddjxmipm45i420mjnrcspik0ifnilcs25hnjpp76svipgmrrf";
-  sgr-iosevka-ss05 = "00h4whmf3qzsyymz7fh988iwwhhmyya0gql0q4zzv4i6w8pr62sh";
-  sgr-iosevka-ss06 = "1qca1z6vr77iis6wcbidbqc4qkhhfpnjb6iyifzx2hfzk858lq7f";
-  sgr-iosevka-ss07 = "0vi1rgg7db3h7yj6fnqsbxpjpysvis89sv5f2bny0yxhzj6wzqwb";
-  sgr-iosevka-ss08 = "19sxsnzc3rkvvlx9w3ys6agnjvzr08j77ccm451j3k9asybfk1hw";
-  sgr-iosevka-ss09 = "16ip24nz9wz517ji0zrf0l41m4avg2pc0y57pdr6mzqjq1qc0428";
-  sgr-iosevka-ss10 = "0zqbd9ng0f83k5sj4ndhi9c9gl1im686i4nijp71vzps767scclz";
-  sgr-iosevka-ss11 = "14psy4w63007ysw21jlslgbryqlb9yk0pwh3zf1b5dqspg3qf9z1";
-  sgr-iosevka-ss12 = "1k4f7a7j1589ch263988a09mgrlmgbxwsz7iqalcb8cpzbljvirc";
-  sgr-iosevka-ss13 = "0rhkdrgzqqy70dggm0plz1y14rhabs4f3m6kdrgrbh0v97hhi160";
-  sgr-iosevka-ss14 = "0r00nrdilxcqnwfrcs6w1zklw09pa2sjjkiszm3fkcmcrzchqbnq";
-  sgr-iosevka-ss15 = "0f8r55ad90ssbdaczgv3skqgamjp9v2mdnzqbvmbrw7diy6r1ggg";
-  sgr-iosevka-ss16 = "11kz020068isdvfzdp3g33kvfdxmmcsrl2b3misizypvq1pwc4dv";
-  sgr-iosevka-ss17 = "1gm45xp3sqw6szaxkqz9z5ff01l3mc5dr6mlaqvq4yrpj8v40ql0";
-  sgr-iosevka-ss18 = "09cl87c8fin4wiy2ngw0cv1xxzjpl138yxicq28vhwvxrgkb3syn";
-  sgr-iosevka-term = "1884wmmp7kyxiapw9jp5d2w4dq2bpqw6rdyaz9zwp73n9mql3bwx";
-  sgr-iosevka-term-curly = "0d085vv4xikl1nsckpf81h0p6p0ilgr2blzx3711k9kvs6fsg2cw";
-  sgr-iosevka-term-curly-slab = "0lqjnv9vhrfgcsds9rll7jhyhnqk2sq3wa694gc6xnzg1grc8p5d";
-  sgr-iosevka-term-slab = "1j01vm9djbb9lw6nd0n7mvzfrd5aj3gl7azg1mf91ls0pxz81w4b";
-  sgr-iosevka-term-ss01 = "1pb5kwm02dblrlw16lrf70bk9k7v9dpgz7wg9fj2iy1fkmx5d0il";
-  sgr-iosevka-term-ss02 = "0biczq6b6fg9lyz33j8ffbc8l49yqlxigy7sjxmc4bwmpibz20yc";
-  sgr-iosevka-term-ss03 = "0nvqdsx96jfjhgg5fq0wc53gh3qvk0jvfz6nh7alw6b4c27pjqwa";
-  sgr-iosevka-term-ss04 = "11qg3s5gxcc5z1009mlb2iz6hycpll2a2azisx8mkjfihzryx88n";
-  sgr-iosevka-term-ss05 = "1k2cwnn09pn4j07aj6mkmm03d8nl74jdc69gshi90fbm12688b0g";
-  sgr-iosevka-term-ss06 = "06lgk8kcfk8vc2dh1nd7ab7z6mfpxqh4h1jnhyj6ca6fq2k12khf";
-  sgr-iosevka-term-ss07 = "0ksj9nhir6bg35583lylqy50nz3ap9ba13vlxx1bfv99ah6y3z88";
-  sgr-iosevka-term-ss08 = "0x3f4i4mzx1b0n844hfi78by4657lz7lwpr6dlqkwkw58pzg6x5f";
-  sgr-iosevka-term-ss09 = "07favifpnx26hgnnah2jpfgk8cvzj6xzshvvbfmnhjyfq0b37fyw";
-  sgr-iosevka-term-ss10 = "021hkqzaijjkk8s90mkqsqmc8n62h6zdlzbgpah24snwdapqyv5f";
-  sgr-iosevka-term-ss11 = "0smipv7hk7c6ar836k3sc7czzcg7f3ppfx1vyl81rzvpb136bvxf";
-  sgr-iosevka-term-ss12 = "1qm35k70dpc3xgxl1vaslmhbchk38mqx7brz8a3qb6kx75mjviq0";
-  sgr-iosevka-term-ss13 = "015ibdhmbyl57b1687qvhg1xx6mnqgvxgdc3aly2kj6a0xk5jf0g";
-  sgr-iosevka-term-ss14 = "0i91xy0dvbx1hawqz5sy8dhrv2i5cs9frix963rprsjwhzzj91ny";
-  sgr-iosevka-term-ss15 = "0nnpzqplmafvdm0ibnvvdh3w0j7cj5kni352kqq7rvkxjyx3pwd4";
-  sgr-iosevka-term-ss16 = "1hag4vkj974g320k5cdckd334vlk9sq7rdpg9zwsil79dhnlrajk";
-  sgr-iosevka-term-ss17 = "0xhv40h4m2b6zv5pprjz51i996hgyfxchysv70wdask3x20wg18c";
-  sgr-iosevka-term-ss18 = "0k5hy0pb8ksnqx7r4ln588qw1s04qd87p41viwrw5krdhdvfyhmi";
+  iosevka = "1mlicv98ih9kjd0rnr7kzxzyy96d2vgajlgk4gh3hyn390wkcz78";
+  iosevka-aile = "0qy84wiqkazja6bs9r763zk3xp12183ijz9gqf0v0xj74qymrwax";
+  iosevka-curly = "1lrh0666vr10n7n924w36qa5bh0w7rqrf3irx0fmwzgsk24zn8d1";
+  iosevka-curly-slab = "15zz7czs5rf5y6c5mr7i5ds69f9kqdwyzsivy5i3qi4iz1jakf29";
+  iosevka-etoile = "16kpki6xvdhjlz7v2gdfyjvv4apby68b66913igd5d8zjd85k47n";
+  iosevka-slab = "0gcv3198802h1kzy2m90hb3kj3p4y50bld7j1gprif3d8mp6an9r";
+  iosevka-ss01 = "09if5d5g4kwlfn5s9hyyrpd1g9fjm2wxj6kbq1s9x28wq7n6xgz8";
+  iosevka-ss02 = "1a4978p6j1fp68qfh0baykg47gssz68bcjkhwn1sb2i99fr37qng";
+  iosevka-ss03 = "0gfg97jf1s2zkc0grlg15bzzxn1z9l8g0x7pg58igr1i2d4x2gvb";
+  iosevka-ss04 = "0clhiydpqs146zv8flqa185b0rgfrj2ifls5fzlvpnba2q223wz3";
+  iosevka-ss05 = "0gxvb19awcj6f41196r1q3ghgm87y0y9j9sfi533f5ny7088mliz";
+  iosevka-ss06 = "14v4962qqbxy5r5kyzq372ckqhzx6l0kmc3xpqxf9fpvfjk89a2y";
+  iosevka-ss07 = "0n2ykrjrfixyildpmi4i1hpj9bsckskgkk3zd3acm2fmpxljvc9n";
+  iosevka-ss08 = "0p9wm3ydvqi0hvayg3mh7841k8rjl2j59qf5m3q4vz8bpbyn80g4";
+  iosevka-ss09 = "1z43l6dlxhh0qrnwd1l93dm5xdvw2jfdsp7fi754r9jc1c3pyamz";
+  iosevka-ss10 = "19nrvx6j9kxxvql6c88rnq6vnnacd0k6lgxg70306zdd7j6g2g1f";
+  iosevka-ss11 = "0jp65j6wqinwmkb412bzjxpb4py6z0kvmm68psgdcl0962w1j806";
+  iosevka-ss12 = "01azishdfz1k202ss1vdz1vl88qn0vsfh9kx53mzin83nqfnqym0";
+  iosevka-ss13 = "1w7syx42y6i6xkxhylc4ybr95ffs9dqhllziyv7dv8p9k1sq9b5v";
+  iosevka-ss14 = "1mplavdlqqclsyjbsh91c8bmbhm0cli6y10f3p6rxjjy16536y24";
+  iosevka-ss15 = "1j6f566l0ppynqvfiq68rb5facmapwj1wbp37xpnswhbh5jilc2h";
+  iosevka-ss16 = "1xxg98mx7m9slm4a1zyrl8lp6n12gbgz79vwd21lanq6bw3l0ki3";
+  iosevka-ss17 = "05bvcw7zpisfpagy54fy2985kscp4466q1fvxn28wb1sw0m6gnvy";
+  iosevka-ss18 = "19lg2xlz3pjcprmni8mc57z9kh28qxap4d94102qzpqb4krfhj07";
+  sgr-iosevka = "0gj6cq0adj0ph85ml205n8wqjimkaqm4yqxgfg02ddk2h3ss97g3";
+  sgr-iosevka-aile = "1vsxdqrxy5qgqry3zskbqpimb3l9950j9yws9zb0jga3v77blwy1";
+  sgr-iosevka-curly = "0dwl6s0pnr4xhl3pgphh3jddz80b9gwcais8fn56hc7x0dkni585";
+  sgr-iosevka-curly-slab = "1fxr7d7rhpm07db5r3qc5bmks05dr9pa2yzk4h3i4zvkpw7gzwd7";
+  sgr-iosevka-etoile = "0dwjywirg5b4ia93kg6cdbyjhk5n171yjb0x2sq6npfq0ywzn8fk";
+  sgr-iosevka-fixed = "0fa9s91p64w3z2pkypy7p5a7srha75c0vi4n4cy8qm2lbx7pgvkh";
+  sgr-iosevka-fixed-curly = "0sdxnsbhsr7kl6f8sb701hcadg1dlq2adkmd9ljg9x8kf8qyjbk4";
+  sgr-iosevka-fixed-curly-slab = "0xc7qxbcxdwnr0nl48mxxmjm7i66rksp7pka522i764yagv2gaf7";
+  sgr-iosevka-fixed-slab = "1fxv28gi3bdihckznsqna5r5d3yzkfqgnidcngb4v9wmvvzxdbjv";
+  sgr-iosevka-fixed-ss01 = "0gynmpnrsj757r9kcznx41lsfpji30xc0c8y3gd8i2zbjps0akrz";
+  sgr-iosevka-fixed-ss02 = "10kplc1xwg5r11j526ax2vjkyqfabxhfa2azzj1hy4cmqqzjxqzg";
+  sgr-iosevka-fixed-ss03 = "0hg1wcnaxcf6xd21xsf6bhm6w0ksj7fl3k6q7nj3j348pfzxw4xj";
+  sgr-iosevka-fixed-ss04 = "0j7lcrda9n865r1vyrx9qc89wnxc6lf3xly28bk856cjf6z84q5d";
+  sgr-iosevka-fixed-ss05 = "0w0cfl8bqcbgw8q6rf0vwngcx7x6z2shk4cysk70nkkmhc584r4r";
+  sgr-iosevka-fixed-ss06 = "0kkhc8w52dgp0skb4sbr5z3i9s0rdhmmx88qs27j3wdlwryk8m08";
+  sgr-iosevka-fixed-ss07 = "1pf70s6cg4ppah985sn0rl7ri5y0xs9y1svcf5a57bp84wc0h8dl";
+  sgr-iosevka-fixed-ss08 = "13iannimij20igm71725l22wqfaq5w6c1m2vjz5hmcxrh7nmfsn5";
+  sgr-iosevka-fixed-ss09 = "1nb8xgn95x07jxxxfy39rwlkpb8w20qxnaz15l4kzxfjlwwwgcwl";
+  sgr-iosevka-fixed-ss10 = "0dbbchg8lmkpjqw8yn052qpmk00vb1bwcar7nwlhr93vy4z8y72h";
+  sgr-iosevka-fixed-ss11 = "1ljkr3ld4zv7f33xy5xx5wzrypzxzkpwv01cmc5w349dwbza9fpc";
+  sgr-iosevka-fixed-ss12 = "11wvz3g45l589nnljawp9avz80jbv64df6i0mhgb3ln8n7mx7y7g";
+  sgr-iosevka-fixed-ss13 = "1qb9xspdcadsmvb5ghi555bkj1x8iv0dw00yvxs4mzw7rgq47rrb";
+  sgr-iosevka-fixed-ss14 = "17xig4lm02xg8r19pfn5lc45qbc7j4h1q79lcp5w4ym83wmfcsq6";
+  sgr-iosevka-fixed-ss15 = "0ivy6d8xmm3yl0n2zy58z9jbkbwv5wagdnk70vszp1ln9vsgbnfn";
+  sgr-iosevka-fixed-ss16 = "1jbr1cf0wmqg164z0i16rgn0qjpll9qyw5ch5p225a25pfkk4sbv";
+  sgr-iosevka-fixed-ss17 = "1zz3drhw9k3ckn2x460v4m033j7shjy082d3hhwkadfwgpy7cbny";
+  sgr-iosevka-fixed-ss18 = "0qvm24y2c248rwhcyy7fv1930dnsbs1sa23q5w94g7xw94pigq4z";
+  sgr-iosevka-slab = "1ln6kx0cn2f9lz0jiz2qq3bb3vkxzpcw2jn52wxpq3pa55fmh9xw";
+  sgr-iosevka-ss01 = "1vimfq19c0hf3vysi6agyplnshzbkg3hprslrlrcqv6pafhc0j4m";
+  sgr-iosevka-ss02 = "1l4wfi2s47pxsdhlif7h9rgdqmj8dxswbpmrwghad1vpi09s9q33";
+  sgr-iosevka-ss03 = "078vckd5hsmvnpyh54yzab7pbxlsqrr0h4phyhnpzsmqgg483kwm";
+  sgr-iosevka-ss04 = "01z2f6qddl6d5k8k9v6xpry6wihr9w8b7chy1n8zvli52p5mbww7";
+  sgr-iosevka-ss05 = "0bvjr0nh1j8wb2xs91z32vxxzwhkjwbpkpz8l8mwf1a0hlaqpbar";
+  sgr-iosevka-ss06 = "1lpnvjdw6qzs5l473fwx4vk2xxwxkbfw4rfkvml3i60rs655nmy6";
+  sgr-iosevka-ss07 = "01jbma445cyr6acic4qafjkxfl9q7bbn0ngvx7s5bxmc6xv3hnaf";
+  sgr-iosevka-ss08 = "1vxlc5m4pwydy9zcam47494vx52c7h0nfp6f7z4iqpfshv0nnyp6";
+  sgr-iosevka-ss09 = "0w5qfwpxagls74s0b98grd9in4m947fmrw6nn215zhp0zj2mfwi6";
+  sgr-iosevka-ss10 = "1fwbyis93kdjc62vp701rr6vpfw2an1xznpnm0aifafnz6rl5zfg";
+  sgr-iosevka-ss11 = "081gj3b1b669vc38l6gpwagk7afd7338d04jqprx5savz9a9nfs7";
+  sgr-iosevka-ss12 = "09hc5vnvkymlrirjy3rszxb64n55c7a359vs5lfgcsmrf08z35xw";
+  sgr-iosevka-ss13 = "0qzzs4rgny8habxxrjqqnfigh6pcx15hcgi9z29crs5sskmcsp2s";
+  sgr-iosevka-ss14 = "004rcv0g0916c7vrkb796zck9sywhsdrd5z1kx1v8v9gyxlgv46z";
+  sgr-iosevka-ss15 = "1yn6alx6ppgrgfzhmgsiwmw7rrvj7ad7yss5yqwbas6k9n70j5ki";
+  sgr-iosevka-ss16 = "06h59vvl0vcrb5r24y22cwhdmcpi0wn92daz3ak739x52qnc9dll";
+  sgr-iosevka-ss17 = "0c8s66lb7mp0zya12mcxdfy05jhwwi78fwm35lnk1xkarbzrdwq8";
+  sgr-iosevka-ss18 = "00k036viav27far3jbmh7zpawccnmg9qh93v5d6wz6b7l2h7mwam";
+  sgr-iosevka-term = "16bwjvamhaq7bcl2dkvv79asn68bdzqkii7q1h5sc3jvzhd0v6sz";
+  sgr-iosevka-term-curly = "0scrz4yfs7v26vyjcd35p2jgbqj4phasr6yswc0xlc7l19x9z91v";
+  sgr-iosevka-term-curly-slab = "0551npqdascnn4crd9drkfx8mw4gfjqrvn2112diqn5q4rlpgyrn";
+  sgr-iosevka-term-slab = "0gjr5lw1aj4vskv5kkbgahfhn7aqh4qdlnv9560c2laaxfs62zdh";
+  sgr-iosevka-term-ss01 = "08gh7rsyj1pl444g5crfm2rjnxk9kqqd6svvzqalaq5j3pgdk7mb";
+  sgr-iosevka-term-ss02 = "1x4swlfrjazkxbryb1rswjg9wiqjypdyzwvab1875g0ian6zl293";
+  sgr-iosevka-term-ss03 = "1cp2z0spb0q9n7xi370hvz2lw7rrwly6cicww0k8x6mzd67n7jyr";
+  sgr-iosevka-term-ss04 = "1z7njiz4j98liqg9d4mp6f9zlw7r1kqwl41lhh1r9vb8nx8b64xi";
+  sgr-iosevka-term-ss05 = "0nwfhrm22wl402j3nzff7zb9v7w9fgg5njivhm3r23lllh368ga9";
+  sgr-iosevka-term-ss06 = "1j56gpp7680f2kq0d28nz9nfcz6hq08vq613f0d3c8vln6pmk082";
+  sgr-iosevka-term-ss07 = "1wsi14f6lkkvvvf4cwzdc6six821r2izdgwa7yd96fdk4l3jc357";
+  sgr-iosevka-term-ss08 = "0w4hb53dyr9mwrxghr62gc36s8sqbrfhw4088zar9jz5w8clsrr6";
+  sgr-iosevka-term-ss09 = "0ym37rrfi23rbshnv8hi9acx7gf4zs70m6pr2gy556w8bb95dw66";
+  sgr-iosevka-term-ss10 = "093ca1i94dk16zvbxnw41g80krfmi946gwvzbfw8a9nmx5krcvx6";
+  sgr-iosevka-term-ss11 = "03s2wiwlx6k676jqidgc78rpxm1c4dc194k2lk5704jxvysv5i3x";
+  sgr-iosevka-term-ss12 = "1wq4i66zxwgc7n2zqwc2x05fmxpg6yqm9f0ll9balih1al0qvwb6";
+  sgr-iosevka-term-ss13 = "169fwn82lippqs9rnil0mibn25mzkmxm6rgnhs61lp4z7srqd5h9";
+  sgr-iosevka-term-ss14 = "05mw5hav1xin4xycbfdjpw4j62ixckkd6bw0nl5dnq3ji33v0skg";
+  sgr-iosevka-term-ss15 = "1mpmkvsk8y1a8i4c2dwqglxm46rgkqmd2y68wyik0asa8vrfflv6";
+  sgr-iosevka-term-ss16 = "051hxw063d29m59971zbcsfj26ch0sk1cxv503xm86ilblmj54dj";
+  sgr-iosevka-term-ss17 = "0mlp1kbn298w0mwfyfbmzkfwbf7cibchb3f0l8mk833lvxjxxiaz";
+  sgr-iosevka-term-ss18 = "0v5j17y5hpg56h2kdz1469k56358k7g0wqxl4nd1ib3j0y7jndsc";
 }
--- a/pkgs/data/fonts/lxgw-neoxihei/default.nix
+++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix
@ -5,11 +5,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "lxgw-neoxihei";
-  version = "1.102.1";
+  version = "1.103.1";

  src = fetchurl {
    url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-prEyymKABhu7/jdiyUyZ4xb6rrYmo91Jt462qQKV9/0=";
+    hash = "sha256-z9SzSt+GXV+9GLtzjY6EQQa6bKrixYo03kEfzGfug90=";
  };

  dontUnpack = true;
--- a/pkgs/development/beam-modules/elvis-erlang/default.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/default.nix
@ -8,10 +8,10 @@ in rebar3Relx rec {
  releaseType = "escript";
  # The package name "elvis" is already taken
  pname = "elvis-erlang";
-  version = "1.1.0";
+  version = "3.0.1";
  src = fetchFromGitHub {
    inherit owner repo;
-    sha256 = "6vNxr3AYpFuXaIVH9bWw7K5KiF1swfI+CSI43RoMQEA=";
+    sha256 = "vXCsGLTpqoKBAN2K35Zl9W82uKbZAFFFzpXh+HTEAwA=";
    rev = version;
  };
  beamDeps = builtins.attrValues (import ./rebar-deps.nix {
--- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
+++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
@ -16,11 +16,11 @@ let
    };
    ssl_verify_fun = builder {
      name = "ssl_verify_fun";
-      version = "1.1.6";
+      version = "1.1.7";
      src = fetchHex {
        pkg = "ssl_verify_fun";
-        version = "1.1.6";
-        sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA=";
+        version = "1.1.7";
+        sha256 = "sha256-/kwZDo83QB0wFnyMQF7aGUafNFd5h8dt3mE+g4u8Z/g=";
      };
      beamDeps = [ ];
    };
@ -66,11 +66,11 @@ let
    };
    certifi = builder {
      name = "certifi";
-      version = "2.8.0";
+      version = "2.11.0";
      src = fetchHex {
        pkg = "certifi";
-        version = "2.8.0";
-        sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o=";
+        version = "2.11.0";
+        sha256 = "sha256-njfgVC7D+rqhmgc0s5ANwJV5f6xIxAoql0HYrV48m7c=";
      };
      beamDeps = [ ];
    };
@ -96,11 +96,11 @@ let
    };
    katana_code = builder {
      name = "katana_code";
-      version = "1.1.2";
+      version = "2.0.2";
      src = fetchHex {
        pkg = "katana_code";
-        version = "1.1.2";
-        sha256 = "sha256-5+YWKkToJqA/aLUDt9kpgbiUv4NMHvDmR3g/fWaIAhw=";
+        version = "2.0.2";
+        sha256 = "sha256-Plf+1jXgsWpfvazNyHLsU96yHtn8bn65tkFf8Zm3sTg=";
      };
      beamDeps = [ ];
    };
@ -146,11 +146,11 @@ let
    };
    elvis_core = builder {
      name = "elvis_core";
-      version = "1.3.1";
+      version = "3.0.1";
      src = fetchHex {
        pkg = "elvis_core";
-        version = "1.3.1";
-        sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk=";
+        version = "3.0.1";
+        sha256 = "sha256-TPc1QB50ZcEIUcYkXB4+jnZJhNjAtZSdVpexS1+urUk=";
      };
      beamDeps = [ katana_code zipper ];
    };
--- a/pkgs/development/compilers/zig/hook.nix
+++ b/pkgs/development/compilers/zig/hook.nix
@ -8,6 +8,14 @@ makeSetupHook {

  propagatedBuildInputs = [ zig ];

+  substitutions = {
+    zig_default_flags =
+      if lib.versionAtLeast zig.version "0.11" then
+        "-Doptimize=ReleaseSafe -Dcpu=baseline"
+      else
+        "-Drelease-safe=true -Dcpu=baseline";
+  };
+
  passthru = { inherit zig; };

  meta = {
--- a/pkgs/development/compilers/zig/setup-hook.sh
+++ b/pkgs/development/compilers/zig/setup-hook.sh
@ -20,7 +20,7 @@
 # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
 # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653

-readonly zigDefaultFlagsArray=("-Drelease-safe=true" "-Dcpu=baseline")
+readonly zigDefaultFlagsArray=(@zig_default_flags@)

 function zigSetGlobalCacheDir {
    ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
--- a/pkgs/development/libraries/agda/1lab/default.nix
+++ b/pkgs/development/libraries/agda/1lab/default.nix
@ -0,0 +1,32 @@
+{ lib, mkDerivation, fetchFromGitHub }:
+
+mkDerivation rec {
+  pname = "1lab";
+  version = "unstable-2023-03-07";
+
+  src = fetchFromGitHub {
+    owner = "plt-amy";
+    repo = pname;
+    # Last commit that compiles with Agda 2.6.3
+    rev = "c6ee57a2da327def241324b4775ec2c67cdab2af";
+    hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg=";
+  };
+
+  # We don't need anything in support; avoid installing LICENSE.agda
+  postPatch = ''
+    rm -rf support
+  '';
+
+  libraryName = "cubical-1lab";
+  libraryFile = "1lab.agda-lib";
+  everythingFile = "src/index.lagda.md";
+
+  meta = with lib; {
+    description =
+      "A formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory ";
+    homepage = src.meta.homepage;
+    license = licenses.agpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ncfavier ];
+  };
+}
--- a/pkgs/development/libraries/httplib/default.nix
+++ b/pkgs/development/libraries/httplib/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "httplib";
-  version = "0.13.1";
+  version = "0.13.3";

  src = fetchFromGitHub {
    owner = "yhirose";
    repo = "cpp-httplib";
    rev = "v${version}";
-    hash = "sha256-2vS8gdJrf7Iz6F5kyyWlr7zB1eBDjxdLesJcnkhg5eE=";
+    hash = "sha256-ESaH0+n7ycpOKM+Mnv/UgT16UEx86eFMQDHB3RVmgBw=";
  };

  nativeBuildInputs = [ cmake ];
@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
    changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}";
    maintainers = with maintainers; [ aidalgol ];
    license = licenses.mit;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/openimageio/default.nix
+++ b/pkgs/development/libraries/openimageio/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "openimageio";
-  version = "2.4.13.0";
+  version = "2.4.14.0";

  src = fetchFromGitHub {
    owner = "OpenImageIO";
    repo = "oiio";
    rev = "v${version}";
-    hash = "sha256-VVLJJB32oTujB384rmqm4MHxWplYov7CqoLqhdWjTi4=";
+    hash = "sha256-iHXU3Zr32XNn2Q2Pn/sgF6E1q/FXbdmVrOKC4lhGx3k=";
  };

  outputs = [ "bin" "out" "dev" "doc" ];
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "indilib";
-  version = "2.0.2";
+  version = "2.0.3";

  src = fetchFromGitHub {
    owner = "indilib";
    repo = "indi";
    rev = "v${version}";
-    hash = "sha256-GoEvWzGT3Ckv9Syif6Z2kAlnvg/Kt5I8SpGFG9kFTJo=";
+    hash = "sha256-YhUwRbpmEybezvopbqFj7M1EE3pufkNrN8yi/zbnJ3U=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "trompeloeil";
-  version = "44";
+  version = "45";

  src = fetchFromGitHub {
    owner = "rollbear";
    repo = "trompeloeil";
    rev = "v${version}";
-    sha256 = "sha256-dZl1yJwJp7OZL3xoBbz43NWVEhrSgkDYkZB4OEydRXY=";
+    sha256 = "sha256-oCDsvpH9P5onME/t+o7VGttk1cHUpneODz21/0RkVkk=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/misc/brev-cli/default.nix
+++ b/pkgs/development/misc/brev-cli/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "brev-cli";
-  version = "0.6.249";
+  version = "0.6.252";

  src = fetchFromGitHub {
    owner = "brevdev";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Og6NrjSm27OM671icJavK44UQwyA59cA3IZ9ff+Wu2c=";
+    sha256 = "sha256-CwoSLAY6KNGaEKt+/ojlO/v1fRZSRsRpd67vXellLSQ=";
  };

  vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@ -5,12 +5,16 @@
 , ncurses
 , importlib-metadata
 , setuptools
+, wheel
 , patchelf
 }:

 buildPythonPackage rec {
  pname = "cx-freeze";
  version = "6.14.4";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.5";

  src = fetchPypi {
    pname = "cx_Freeze";
@ -18,7 +22,10 @@ buildPythonPackage rec {
    hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg=";
  };

-  disabled = pythonOlder "3.5";
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];

  propagatedBuildInputs = [
    importlib-metadata # upstream has this for 3.8 as well
--- a/pkgs/development/python-modules/nlpcloud/default.nix
+++ b/pkgs/development/python-modules/nlpcloud/default.nix
@ -6,12 +6,12 @@

 buildPythonPackage rec {
  pname = "nlpcloud";
-  version = "1.0.43";
+  version = "1.1.43";
  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-WLbmPFBiZ7utFo0cqiBKsetlhtgun/YMGTEIvMUhRnc=";
+    hash = "sha256-y3OZ5Tgd9FJmuon+9UyFmJgoASd1UyZVsWxmlPaxqEI=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/oldest-supported-numpy/default.nix
+++ b/pkgs/development/python-modules/oldest-supported-numpy/default.nix
@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "oldest-supported-numpy";
+  version = "2023.8.3";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-yJp+wzsihagnI3crGPDBo+CqbVO4Xhxulj/o/NitxU0=";
+  };
+
+  # The purpose of oldest-supported-numpy is to build a project against the
+  # oldest version of numpy for a given Python distribution in order to build
+  # a binary that is compatible with the largest possible versons of numpy.
+  # We only build against one version of numpy in nixpkgs, so instead we only
+  # want to make sure that we have a version above the minimum.
+  #
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace 'numpy==' 'numpy>='
+  '';
+
+  nativeBuildInputs = [
+    numpy
+  ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Meta-package providing the oldest supported Numpy for a given Python version and platform";
+    homepage = "https://github.com/scipy/oldest-supported-numpy";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ tjni ];
+  };
+}
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "esbuild";
-  version = "0.18.18";
+  version = "0.18.19";

  src = fetchFromGitHub {
    owner = "evanw";
    repo = "esbuild";
    rev = "v${version}";
-    hash = "sha256-RWWBYiTlcDNEhhyaWsf0CuYr7CpShLjkxDYK/wFE2zI=";
+    hash = "sha256-/W+vEtK84o16AqEU3akuA2uujXjBR3E5SDujdlsty4w=";
  };

  vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
--- a/pkgs/development/tools/java/jextract/default.nix
+++ b/pkgs/development/tools/java/jextract/default.nix
@ -77,17 +77,14 @@ stdenv.mkDerivation {
  installPhase = ''
    runHook preInstall

-    install -D --mode=0444 --target-directory="$out/share/java" \
-      ./build/libs/org.openjdk.jextract-unspecified.jar
+    mkdir -p $out/opt/
+    cp -r ./build/jextract $out/opt/jextract

    runHook postInstall
  '';

  postFixup = ''
-    makeWrapper "${jdk20}/bin/java" "$out/bin/jextract" \
-      --add-flags "--enable-preview" \
-      --add-flags "--class-path $out/share/java/org.openjdk.jextract-unspecified.jar" \
-      --add-flags "org.openjdk.jextract.JextractTool"
+    makeWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract"
  '';

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

 buildGoModule rec {
  pname = "oras";
-  version = "1.0.0";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "oras-project";
    repo = "oras";
    rev = "v${version}";
-    hash = "sha256-NGkpmObFY3Z8sKBbgIwFAnIyVEFE0sRxgrX+3oXEVo0=";
+    hash = "sha256-Q+KTT7wIsakE79WJpP8uUhOEh+sJfcxC4Od8z92gX6Q=";
  };

-  vendorHash = "sha256-l2UuYrkFdZYaqQUW57y0OZyu1gPO22C+AwNdIYymV9k=";
+  vendorHash = "sha256-NhgppD2sYgdM3cAmtij/1Sd5Wq/my8nguHjUfv7wOaY=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/development/tools/toml2json/default.nix
+++ b/pkgs/development/tools/toml2json/default.nix
@ -2,14 +2,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "toml2json";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-TxTxKHf5g+mBXDq147T5tuwCqyfyoz6Mj55g1tlgRDY=";
+    sha256 = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY=";
  };

-  cargoHash = "sha256-EYp30TMIpzSCkPIqqdc7sGpfaWs9OLi9ey7DoPE4jzI=";
+  cargoHash = "sha256-laOM7LpmsCpLcm4kPRsJiXHoKR58RCuQxVO5Z78beWI=";

  meta = with lib; {
    description = "A very small CLI for converting TOML to JSON";
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "flyctl";
-  version = "0.1.62";
+  version = "0.1.71";

  src = fetchFromGitHub {
    owner = "superfly";
    repo = "flyctl";
    rev = "v${version}";
-    hash = "sha256-/IIHe3OG/r/cZ4PaYZazv/aPBzyxNBCWbgkzFbJMpvc=";
+    hash = "sha256-0VgXcWWJxm3VBG+GJitL22tHUfXf2pI9MAepqqTVSYo=";
  };

-  vendorHash = "sha256-bjlNwhhhvwrw5GtWO8+1HV2IauqexKSb+O9WGX06qGA=";
+  vendorHash = "sha256-h06iAJN3ZkcV1TN2iEY8DEZyu4DEgF+7nF4IXq6fD/4=";

  subPackages = [ "." ];

--- a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
@ -37,13 +37,13 @@ let
  ];

  configureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--build=${buildPlatform.config}"
+    "--host=${hostPlatform.config}"
    "--disable-nls"
    "--disable-shared"
    "--disable-werror"
-    "--prefix=${placeholder "out"}"
-
-    "--build=${buildPlatform.config}"
-    "--host=${hostPlatform.config}"
+    "--with-sysroot=/"

    # Turn on --enable-new-dtags by default to make the linker set
    # RUNPATH instead of RPATH on binaries.  This is important because
@ -93,8 +93,6 @@ bash.runCommand "${pname}-${version}" {

  # Patch
  ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches}
-  # Clear the default library search path.
-  echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt

  # Configure
  ${if mesBootstrap then ''
--- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
@ -73,6 +73,11 @@ lib.makeScope
      mesBootstrap = true;
    };

+    gcc46 = callPackage ./gcc/4.6.nix {
+      gcc = gcc2;
+      glibc = glibc22;
+    };
+
    inherit (callPackage ./glibc {
      bash = bash_2_05;
      gnused = gnused-mes;
@ -151,6 +156,7 @@ lib.makeScope
      echo ${gawk.tests.get-version}
      echo ${gcc2.tests.get-version}
      echo ${gcc2-mes.tests.get-version}
+      echo ${gcc46.tests.get-version}
      echo ${gnugrep.tests.get-version}
      echo ${gnused.tests.get-version}
      echo ${gnused-mes.tests.get-version}
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
@ -0,0 +1,161 @@
+{ lib
+, buildPlatform
+, hostPlatform
+, fetchurl
+, bash
+, gcc
+, glibc
+, linux-headers
+, binutils
+, gnumake
+, gnupatch
+, gnused
+, gnugrep
+, gawk
+, diffutils
+, findutils
+, gnutar
+, gzip
+}:
+let
+  pname = "gcc";
+  version = "4.6.4";
+
+  src = fetchurl {
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.gz";
+    sha256 = "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75";
+  };
+
+  ccSrc = fetchurl {
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.gz";
+    sha256 = "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9";
+  };
+
+  patches = [
+    # This patch enables building gcc-4.6.4 using gcc-2.95.3 and glibc-2.2.5
+    # * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using #:makeflags
+    # * Add missing limits.h include.
+    # * Add SSIZE_MAX define.  The SSIZE_MAX define has been added to Mes
+    #   upstream and can be removed with the next Mes release.
+    # * Remove -fbuilding-libgcc flag, it assumes features being present from a
+    #   newer gcc or glibc.
+    # * [MES_BOOTSTRAP_GCC]: Disable threads harder.
+    (fetchurl {
+      url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/gcc-boot-4.6.4.patch?id=50249cab3a98839ade2433456fe618acc6f804a5";
+      sha256 = "1zzd8gnihw6znrgb6c6pfsmm0vix89xw3giv1nnsykm57j0v3z0d";
+    })
+    ./libstdc++-target.patch
+  ];
+
+  # To reduce the set of pre-built bootstrap inputs, build
+  # GMP & co. from GCC.
+  gmpVersion = "4.3.2";
+  gmp = fetchurl {
+    url = "mirror://gnu/gmp/gmp-${gmpVersion}.tar.gz";
+    sha256 = "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv";
+  };
+
+  mpfrVersion = "2.4.2";
+  mpfr = fetchurl {
+    url = "mirror://gnu/mpfr/mpfr-${mpfrVersion}.tar.gz";
+    sha256 = "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94";
+  };
+
+  mpcVersion = "1.0.3";
+  mpc = fetchurl {
+    url = "mirror://gnu/mpc/mpc-${mpcVersion}.tar.gz";
+    sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";
+  };
+in
+bash.runCommand "${pname}-${version}" {
+  inherit pname version;
+
+  nativeBuildInputs = [
+    gcc
+    binutils
+    gnumake
+    gnupatch
+    gnused
+    gnugrep
+    gawk
+    diffutils
+    findutils
+    gnutar
+    gzip
+  ];
+
+  # condition in ./libcpp/configure requires `env` which is not available in this coreutils
+  am_cv_CXX_dependencies_compiler_type = "gcc";
+  am_cv_CC_dependencies_compiler_type = "gcc";
+
+  passthru.tests.get-version = result:
+    bash.runCommand "${pname}-get-version-${version}" {} ''
+      ${result}/bin/gcc --version
+      mkdir $out
+    '';
+
+  meta = with lib; {
+    description = "GNU Compiler Collection, version ${version}";
+    homepage = "https://gcc.gnu.org";
+    license = licenses.gpl3Plus;
+    maintainers = teams.minimal-bootstrap.members;
+    platforms = platforms.unix;
+  };
+} ''
+  # Unpack
+  tar xzf ${src}
+  tar xzf ${ccSrc}
+  tar xzf ${gmp}
+  tar xzf ${mpfr}
+  tar xzf ${mpc}
+  cd gcc-${version}
+
+  ln -s ../gmp-${gmpVersion} gmp
+  ln -s ../mpfr-${mpfrVersion} mpfr
+  ln -s ../mpc-${mpcVersion} mpc
+
+  # Patch
+  ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches}
+
+  # Configure
+  export C_INCLUDE_PATH="${gcc}/lib/gcc-lib/${hostPlatform.config}/${gcc.version}/include:${linux-headers}/include:${glibc}/include:$(pwd)/mpfr/src"
+  export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
+  export LDFLAGS="-B${glibc}/lib -Wl,-dynamic-linker -Wl,${glibc}"
+  export LDFLAGS_FOR_TARGET=$LDFLAGS
+  export LIBRARY_PATH="${glibc}/lib:${gcc}/lib"
+  export LIBS="-lc -lnss_files -lnss_dns -lresolv"
+  bash ./configure \
+    --prefix=$out \
+    --build=${buildPlatform.config} \
+    --host=${hostPlatform.config} \
+    --with-native-system-header-dir=${glibc}/include \
+    --with-build-sysroot=${glibc}/include \
+    --disable-bootstrap \
+    --disable-decimal-float \
+    --disable-libatomic \
+    --disable-libcilkrts \
+    --disable-libgomp \
+    --disable-libitm \
+    --disable-libmudflap \
+    --disable-libquadmath \
+    --disable-libsanitizer \
+    --disable-libssp \
+    --disable-libvtv \
+    --disable-lto \
+    --disable-lto-plugin \
+    --disable-multilib \
+    --disable-plugin \
+    --disable-threads \
+    --enable-languages=c,c++ \
+    --enable-static \
+    --disable-shared \
+    --enable-threads=single \
+    --disable-libstdcxx-pch \
+    --disable-build-with-cxx
+
+  # Build
+  make
+
+  # Install
+  make install
+''
--- a/pkgs/os-specific/linux/minimal-bootstrap/gcc/libstdc++-target.patch
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/libstdc++-target.patch
@ -0,0 +1,32 @@
+Patch to make the target libraries 'configure' scripts find the proper CPP.
+I noticed that building the mingw32 cross compiler.
+Looking at the build script for mingw in archlinux, I think that only nixos
+needs this patch. I don't know why.
+diff --git a/Makefile.in b/Makefile.in
+index 93f66b6..d691917 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
+ RAW_CXX_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+-	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
+	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
+	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ NORMAL_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+-	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
+	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
+	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ # Where to find GMP
+ HOST_GMPLIBS = @gmplibs@
--- a/pkgs/servers/geospatial/tegola/default.nix
+++ b/pkgs/servers/geospatial/tegola/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "tegola";
-  version = "0.16.0";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "go-spatial";
    repo = "tegola";
    rev = "v${version}";
-    sha256 = "sha256-W1UTh8OZpWaCLwMPQopGjSqXNgO9FoIEIJIG9yOwTtY=";
+    sha256 = "sha256-FYKsAkOVqhgTaps0eTI/SLCEI1BRTKKpRtwKo2m7srQ=";
  };

-  vendorSha256 = null;
+  vendorHash = null;

  subPackages = [ "cmd/tegola" ];

--- a/pkgs/servers/nosql/apache-jena/fuseki-test.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-test.nix
@ -1,5 +1,5 @@
-{ lib, runCommandNoCC, apache-jena-fuseki, curl }:
-runCommandNoCC "fuseki-test-${apache-jena-fuseki.name}"
+{ lib, runCommand, apache-jena-fuseki, curl }:
+runCommand "fuseki-test-${apache-jena-fuseki.name}"
 { nativeBuildInputs = [ curl apache-jena-fuseki ]; } ''
  export FUSEKI_BASE="$PWD/fuseki-base"
  mkdir -p "$FUSEKI_BASE/db"
--- a/pkgs/servers/soft-serve/default.nix
+++ b/pkgs/servers/soft-serve/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "soft-serve";
-  version = "0.5.4";
+  version = "0.5.5";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = "soft-serve";
    rev = "v${version}";
-    sha256 = "sha256-pVUkmia6W5CVYLjrE6Ie2OVme3y2pmhMMxCYS5qyhgs=";
+    sha256 = "sha256-+jtB6OuoMSF3w5TfW2Q+LaP+8VKC1EpWU4mWZbBDNDM=";
  };

  vendorHash = "sha256-wf2Dfo4uWHg/h2+EfEW5oGUgqf1kAgiTq7ivczI1w+c=";
--- a/pkgs/tools/misc/poop/default.nix
+++ b/pkgs/tools/misc/poop/default.nix
@ -0,0 +1,47 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, zigHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "poop";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "poop";
+    rev = version;
+    hash = "sha256-ekZpulQ1NpEOCG9KU2I4O0NL8mD+CC7bKF0tZbl7vHo=";
+  };
+
+  # fix compilation with zig 0.11
+  patches = [
+    # https://github.com/andrewrk/poop/pull/41
+    (fetchpatch {
+      name = "update-to-zig-0-11-0.patch";
+      url = "https://github.com/andrewrk/poop/commit/15c794d9dea91570485104cda26346f2ae5c9365.patch";
+      hash = "sha256-iv3IuYIDPzs98wiTXcO0igngaRRdQnASvzA4bYET54c=";
+    })
+    # https://github.com/andrewrk/poop/pull/36
+    (fetchpatch {
+      name = "update-zig-to-latest-0-11-0-dev-3883-7166407d8.patch";
+      url = "https://github.com/andrewrk/poop/commit/b1ca37c0cf637e9bbbf24cd243bafaedf02fa8c7.patch";
+      hash = "sha256-/j2zqi0Q2Pl7ZL+4GflwD/MnqcKScT/1SdYJAQ3o4bU=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    zigHook
+  ];
+
+  meta = with lib; {
+    description = "Compare the performance of multiple commands with a colorful terminal user interface";
+    homepage = "https://github.com/andrewrk/poop";
+    changelog = "https://github.com/andrewrk/poop/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/tools/misc/rauc/default.nix
+++ b/pkgs/tools/misc/rauc/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "rauc";
-  version = "1.10";
+  version = "1.10.1";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-WiN2lTS6LCVCeVyX0/2rSDLL2tKsAhWSMa95fK05UOg=";
+    sha256 = "sha256-KxU8/ExRsyqhV3np1EqAzpFm0Uy4fY/oi9lS2GBYHZE=";
  };

  passthru = {
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@ -30,16 +30,16 @@ let
 in
 buildGoModule rec {
  pname = "netbird";
-  version = "0.21.11";
+  version = "0.22.2";

  src = fetchFromGitHub {
    owner = "netbirdio";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-WC2KZ9geskQtwtWitQTR1GPBHXs/7KWSuZNw7u+gkZA=";
+    sha256 = "sha256-NLi6FJoSYwe1tr3z2F9m3INTfQiltvyq/VfoMwAhxZQ=";
  };

-  vendorHash = "sha256-RgvFbhhvfo4GyimAbUGjdU5DsuqS0pslD/oCmvFrtdg=";
+  vendorHash = "sha256-Fj80sYoNXt/rHUC8IEevbNbSIvWHPaKd90UQQTkd/7w=";

  nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;

--- a/pkgs/tools/networking/sing-box/default.nix
+++ b/pkgs/tools/networking/sing-box/default.nix
@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "sing-box";
-  version = "1.3.5";
+  version = "1.3.6";

  src = fetchFromGitHub {
    owner = "SagerNet";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-fSQuVvV2dL+cdPIAqyXbDB8OSW77gxaYaOHKElEbq6o=";
+    hash = "sha256-iVoouUEZ3dMv3sD7eljltsWrdhAn9L+YtG1bbB5YuPM=";
  };

-  vendorHash = "sha256-AMtDAAKNbKRFcu9OEW9E+S73gGgXK7HaroEdidrXS4Y=";
+  vendorHash = "sha256-4Rr/ILnDLJ4x0uSDOzTX2cjT3kaIApLOCo2NEOzGoyA=";

  tags = [
    "with_quic"
--- a/pkgs/tools/package-management/harmonia/default.nix
+++ b/pkgs/tools/package-management/harmonia/default.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "harmonia";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = pname;
    rev = "refs/tags/${pname}-v${version}";
-    hash = "sha256-g4ebmMmH+1DZwqGFNGe2cepHRoJfWtdjDEbQxtnORJI=";
+    hash = "sha256-ZnhidXSBSkgKgVF5ayJF+b8Sq8Ahl010GfvVgYHJcis=";
  };

-  cargoHash = "sha256-Zg5nvx/bBqj1OrG1X+/2pdLK7ITgiEEEa/hYQUqw3NU=";
+  cargoHash = "sha256-2kqXTvI1uwfcwblPLV2o2v77HzRJbqO5jKbMILvvxA8=";

  nativeBuildInputs = [
    pkg-config nix
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
  postFixup = ''
    wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]}
    wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]}
+    wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc
  '';

  enableParallelBuild = true;
--- a/pkgs/tools/system/netdata/ipc-socket-in-run.patch
+++ b/pkgs/tools/system/netdata/ipc-socket-in-run.patch
@ -1,13 +0,0 @@
-diff --git a/daemon/commands.h b/daemon/commands.h
-index bd4aabfe1cbe4..ce7eb3c730228 100644
--- a/daemon/commands.h
-+++ b/daemon/commands.h
-@@ -6,7 +6,7 @@
- #ifdef _WIN32
- # define PIPENAME "\\\\?\\pipe\\netdata-cli"
- #else
-# define PIPENAME "/tmp/netdata-ipc"
-+# define PIPENAME "/run/netdata/ipc"
- #endif
- 
- #define MAX_COMMAND_LENGTH 4096
--- a/pkgs/top-level/agda-packages.nix
+++ b/pkgs/top-level/agda-packages.nix
@ -33,5 +33,7 @@ let
    generic = callPackage ../development/libraries/agda/generic { };

    agdarsec = callPackage ../development/libraries/agda/agdarsec { };
+
+    _1lab = callPackage ../development/libraries/agda/1lab { };
  };
 in mkAgdaPackages Agda
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3012,6 +3012,12 @@ with pkgs;

  pikchr = callPackage ../tools/graphics/pikchr { };

+  poop = callPackage ../tools/misc/poop {
+    zigHook = zigHook.override {
+      zig = buildPackages.zig_0_11;
+    };
+  };
+
  popl = callPackage ../development/libraries/popl { };

  popsicle = callPackage ../tools/misc/popsicle { };
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -77,6 +77,7 @@ mapAliases ({
  coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04
  cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
  cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
+  cx_Freeze = cx-freeze; # added 2023-08-02
  dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
  dateutil = python-dateutil; # added 2021-07-03
  demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -2330,7 +2330,7 @@ self: super: with self; {

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

-  cx_Freeze = callPackage ../development/python-modules/cx_freeze { };
+  cx-freeze = callPackage ../development/python-modules/cx-freeze { };

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

@ -7287,6 +7287,8 @@ self: super: with self; {

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

+  oldest-supported-numpy = callPackage ../development/python-modules/oldest-supported-numpy { };
+
  olefile = callPackage ../development/python-modules/olefile { };

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