Merge master into staging-next

maintainers/maintainer-list.nix

@@ -3484,6 +3484,12 @@
     githubId = 1298344;
     name = "Daniel Fullmer";
   };
+  daniyalsuri6 = {
+    email = "daniyal.suri@gmail.com";
+    github = "daniyalsuri6";
+    githubId = 107034852;
+    name = "Daniyal Suri";
+  };
   dansbandit = {
     github = "dansbandit";
     githubId = 4530687;

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

@@ -176,6 +176,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes`
 
+- Many `services.syncthing` options have been moved to `services.syncthing.settings`, as part of [RFC 42](https://github.com/NixOS/rfcs/pull/42)'s implementation, see [#226088](https://github.com/NixOS/nixpkgs/pull/226088).
+
 - The `ssh` module does not read `/etc/ssh/ssh_known_hosts2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2).
 
 - The openssh module does not read `~/.ssh/authorized_keys2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2).

nixos/maintainers/scripts/cloudstack/cloudstack-image.nix

@@ -2,8 +2,6 @@
 
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
   imports =
     [ ../../../modules/virtualisation/cloudstack-config.nix ];

nixos/maintainers/scripts/lxd/lxd-image-inner.nix

@@ -4,8 +4,6 @@
 
 { config, pkgs, lib, ... }:
 
-with lib;
-
 {
   imports =
     [ # Include the default lxd configuration.

nixos/maintainers/scripts/lxd/lxd-image.nix

@@ -1,7 +1,5 @@
 { lib, config, pkgs, ... }:
 
-with lib;
-
 {
   imports = [
     ../../../modules/virtualisation/lxc-container.nix

nixos/maintainers/scripts/lxd/nix.tpl

@@ -1,7 +1,5 @@
 { lib, config, pkgs, ... }:
 
-with lib;
-
 # WARNING: THIS CONFIGURATION IS AUTOGENERATED AND WILL BE OVERWRITTEN AUTOMATICALLY
 
 {

nixos/modules/rename.nix

@@ -1,7 +1,10 @@
 { lib, pkgs, ... }:
 
-with lib;
+let
-
+  inherit (lib)
+    mkAliasOptionModuleMD
+    mkRemovedOptionModule;
+in
 {
   imports = [
     /*

nixos/tests/3proxy.nix

@@ -1,8 +1,6 @@
 { lib, pkgs, ... }: {
   name = "3proxy";
-  meta = with lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ misuzu ];
-    maintainers = [ misuzu ];
-  };
 
   nodes = {
     peer0 = { lib, ... }: {

nixos/tests/apparmor.nix

@@ -1,14 +1,11 @@
 import ./make-test-python.nix ({ pkgs, ... } : {
   name = "apparmor";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ julm ];
-    maintainers = [ julm ];
-  };
 
   nodes.machine =
     { lib, pkgs, config, ... }:
-    with lib;
     {
-      security.apparmor.enable = mkDefault true;
+      security.apparmor.enable = lib.mkDefault true;
     };
 
   testScript =

nixos/tests/atuin.nix

@@ -6,10 +6,9 @@ let
   testPass = "password";
   testEmail = "test.testerman@test.com";
 in
-with lib;
 {
   name = "atuin";
-  meta.maintainers = with pkgs.lib.maintainers; [ devusb ];
+  meta.maintainers = with lib.maintainers; [ devusb ];
 
   nodes = {
     server =

nixos/tests/bazarr.nix

@@ -1,13 +1,11 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 let
   port = 42069;
 in
 {
   name = "bazarr";
-  meta.maintainers = with maintainers; [ d-xo ];
+  meta.maintainers = with lib.maintainers; [ d-xo ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/boot-stage1.nix

@@ -107,8 +107,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         '';
       };
 
-      copyCanaries = with lib; concatMapStrings (canary: ''
+      copyCanaries = lib.concatMapStrings (canary: ''
-        ${optionalString (canary ? child) ''
+        ${lib.optionalString (canary ? child) ''
           copy_bin_and_libs "${canary.child}/bin/${canary.child.name}"
         ''}
         copy_bin_and_libs "${canary}/bin/${canary.name}"

nixos/tests/budgie.nix

@@ -1,9 +1,7 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "budgie";
 
-  meta = with lib; {
+  meta.maintainers = [ lib.maintainers.federicoschonborn ];
-    maintainers = [ maintainers.federicoschonborn ];
-  };
 
   nodes.machine = { ... }: {
     imports = [

nixos/tests/cadvisor.nix

@@ -1,15 +1,13 @@
-import ./make-test-python.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ lib, pkgs, ... } : {
   name = "cadvisor";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ offline ];
-    maintainers = [ offline ];
-  };
 
   nodes = {
     machine = { ... }: {
       services.cadvisor.enable = true;
     };
 
-    influxdb = { lib, ... }: with lib; {
+    influxdb = { lib, ... }: {
       services.cadvisor.enable = true;
       services.cadvisor.storageDriver = "influxdb";
       services.influxdb.enable = true;

nixos/tests/calibre-web.nix

@@ -5,10 +5,9 @@ import ./make-test-python.nix (
       port = 3142;
       defaultPort = 8083;
     in
-      with lib;
       {
         name = "calibre-web";
-        meta.maintainers = with pkgs.lib.maintainers; [ pborzenkov ];
+        meta.maintainers = with lib.maintainers; [ pborzenkov ];
 
         nodes = {
           customized = { pkgs, ... }: {

nixos/tests/cinnamon.nix

@@ -1,9 +1,7 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "cinnamon";
 
-  meta = with lib; {
+  meta.maintainers = lib.teams.cinnamon.members;
-    maintainers = teams.cinnamon.members;
-  };
 
   nodes.machine = { nodes, ... }: {
     imports = [ ./common/user-account.nix ];

nixos/tests/common/acme/server/default.nix

@@ -76,9 +76,9 @@ let
 in {
   imports = [ ../../resolver.nix ];
 
-  options.test-support.acme = with lib; {
+  options.test-support.acme = {
-    caDomain = mkOption {
+    caDomain = lib.mkOption {
-      type = types.str;
+      type = lib.types.str;
       readOnly = true;
       default = domain;
       description = lib.mdDoc ''
@@ -86,8 +86,8 @@ in {
         identify the CA server.
       '';
     };
-    caCert = mkOption {
+    caCert = lib.mkOption {
-      type = types.path;
+      type = lib.types.path;
       readOnly = true;
       default = testCerts.ca.cert;
       description = lib.mdDoc ''

nixos/tests/common/auto.nix

@@ -1,23 +1,16 @@
 { config, lib, ... }:
 
-with lib;
-
 let
-
   dmcfg = config.services.xserver.displayManager;
   cfg = config.test-support.displayManager.auto;
-
 in
-
 {
 
   ###### interface
 
   options = {
-
     test-support.displayManager.auto = {
-
+      enable = lib.mkOption {
-      enable = mkOption {
         default = false;
         description = lib.mdDoc ''
           Whether to enable the fake "auto" display manager, which
@@ -27,20 +20,16 @@ in
         '';
       };
 
-      user = mkOption {
+      user = lib.mkOption {
         default = "root";
         description = lib.mdDoc "The user account to login automatically.";
       };
-
     };
-
   };
 
-
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
-
     services.xserver.displayManager = {
       lightdm.enable = true;
       autoLogin = {
@@ -62,7 +51,5 @@ in
 
         session  include   lightdm
     '';
-
   };
-
 }

nixos/tests/convos.nix

@@ -1,14 +1,12 @@
 import ./make-test-python.nix ({ lib, pkgs, ... }:
 
-with lib;
+
 let
   port = 3333;
 in
 {
   name = "convos";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ sgo ];
-    maintainers = [ sgo ];
-  };
 
   nodes = {
     machine =

nixos/tests/couchdb.nix

@@ -1,9 +1,8 @@
 let
-
   makeNode = couchpkg: user: passwd:
     { pkgs, ... } :
 
-      { environment.systemPackages = with pkgs; [ jq ];
+      { environment.systemPackages = [ pkgs.jq ];
         services.couchdb.enable = true;
         services.couchdb.package = couchpkg;
         services.couchdb.adminUser = user;
@@ -12,16 +11,11 @@ let
   testuser = "testadmin";
   testpass = "cowabunga";
   testlogin = "${testuser}:${testpass}@";
-
+in
-in import ./make-test-python.nix ({ pkgs, lib, ...}:
+import ./make-test-python.nix ({ pkgs, lib, ...}:
-
-with lib;
-
 {
   name = "couchdb";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = [ ];
-    maintainers = [ ];
-  };
 
   nodes = {
     couchdb3 = makeNode pkgs.couchdb3 testuser testpass;

nixos/tests/doas.nix

@@ -2,9 +2,7 @@
 import ./make-test-python.nix (
   { lib, ... }: {
     name = "doas";
-    meta = with lib.maintainers; {
+    meta.maintainers = with lib.maintainers; [ cole-h ];
-      maintainers = [ cole-h ];
-    };
 
     nodes.machine =
       { ... }:

nixos/tests/doh-proxy-rust.nix

@@ -1,8 +1,6 @@
 import ./make-test-python.nix ({ lib, pkgs, ... }: {
   name = "doh-proxy-rust";
-  meta = with lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ stephank ];
-    maintainers = [ stephank ];
-  };
 
   nodes = {
     machine = { pkgs, lib, ... }: {

nixos/tests/esphome.nix

@@ -4,10 +4,9 @@ let
   testPort = 6052;
   unixSocket = "/run/esphome/esphome.sock";
 in
-with lib;
 {
   name = "esphome";
-  meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];
+  meta.maintainers = with lib.maintainers; [ oddlama ];
 
   nodes = {
     esphomeTcp = { ... }:

nixos/tests/fluidd.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "fluidd";
-  meta.maintainers = with maintainers; [ vtuan10 ];
+  meta.maintainers = with lib.maintainers; [ vtuan10 ];
 
   nodes.machine = { pkgs, ... }: {
     services.fluidd = {

nixos/tests/gitlab.nix

@@ -11,8 +11,6 @@
 
 { pkgs, lib, ... }:
 
-with lib;
-
 let
   inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
   initialRootPassword = "notproduction";
@@ -30,9 +28,7 @@ let
   bobProjectId = "3";
 in {
   name = "gitlab";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ globin yayayayaka ];
-    maintainers = [ globin yayayayaka ];
-  };
 
   nodes = {
     gitlab = { ... }: {
@@ -43,10 +39,10 @@ in {
       virtualisation.useNixStoreImage = true;
       virtualisation.writableStore = false;
 
-      systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitlab.serviceConfig.Restart = lib.mkForce "no";
-      systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitlab-workhorse.serviceConfig.Restart = lib.mkForce "no";
-      systemd.services.gitaly.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitaly.serviceConfig.Restart = lib.mkForce "no";
-      systemd.services.gitlab-sidekiq.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitlab-sidekiq.serviceConfig.Restart = lib.mkForce "no";
 
       services.nginx = {
         enable = true;
@@ -195,7 +191,7 @@ in {
         gitlab.succeed(
             "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"
         )
-      '' + optionalString doSetup ''
+      '' + lib.optionalString doSetup ''
         with subtest("Create user Alice"):
             gitlab.succeed(
                 """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserAlice} http://gitlab/api/v4/users)" = "201" ]"""

nixos/tests/gnome-flashback.nix

@@ -1,12 +1,11 @@
 import ./make-test-python.nix ({ pkgs, lib, ...} : {
   name = "gnome-flashback";
-  meta = with lib; {
+  meta.maintainers = lib.teams.gnome.members ++ [ lib.maintainers.chpatrick ];
-    maintainers = teams.gnome.members ++ [ maintainers.chpatrick ];
-  };
 
-  nodes.machine = { nodes, ... }: let
+  nodes.machine = { nodes, ... }:
-    user = nodes.machine.config.users.users.alice;
+    let
-  in
+      user = nodes.machine.config.users.users.alice;
+    in
 
     { imports = [ ./common/user-account.nix ];
 

nixos/tests/gnome-xorg.nix

@@ -1,7 +1,7 @@
 import ./make-test-python.nix ({ pkgs, lib, ...} : {
   name = "gnome-xorg";
-  meta = with lib; {
+  meta = {
-    maintainers = teams.gnome.members;
+    maintainers = lib.teams.gnome.members;
   };
 
   nodes.machine = { nodes, ... }: let

nixos/tests/gnome.nix

@@ -1,8 +1,6 @@
 import ./make-test-python.nix ({ pkgs, lib, ...} : {
   name = "gnome";
-  meta = with lib; {
+  meta.maintainers = lib.teams.gnome.members;
-    maintainers = teams.gnome.members;
-  };
 
   nodes.machine =
     { ... }:

nixos/tests/hadoop/hdfs.nix

@@ -1,6 +1,5 @@
 # Test a minimal HDFS cluster with no HA
 import ../make-test-python.nix ({ package, lib, ... }:
-with lib;
 {
   name = "hadoop-hdfs";
 
@@ -22,7 +21,7 @@ with lib;
           };
           httpfs = {
             # The NixOS hadoop module only support webHDFS on 3.3 and newer
-            enable = mkIf (versionAtLeast package.version "3.3") true;
+            enable = lib.mkIf (lib.versionAtLeast package.version "3.3") true;
             openFirewall = true;
           };
         };
@@ -57,7 +56,7 @@ with lib;
 
     datanode.wait_for_unit("hdfs-datanode")
     datanode.wait_for_unit("network.target")
-  '' + ( if versionAtLeast package.version "3" then ''
+  '' + (if lib.versionAtLeast package.version "3" then ''
     datanode.wait_for_open_port(9864)
     datanode.wait_for_open_port(9866)
     datanode.wait_for_open_port(9867)
@@ -76,7 +75,7 @@ with lib;
     datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")
     assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile")
 
-  '' + optionalString ( versionAtLeast package.version "3.3" ) ''
+  '' + lib.optionalString (lib.versionAtLeast package.version "3.3" ) ''
     namenode.wait_for_unit("hdfs-httpfs")
     namenode.wait_for_open_port(14000)
     assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1")

nixos/tests/hardened.nix

@@ -6,7 +6,6 @@ import ./make-test-python.nix ({ pkgs, ... } : {
 
   nodes.machine =
     { lib, pkgs, config, ... }:
-    with lib;
     { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
       users.users.sybil = { isNormalUser = true; group = "wheel"; };
       imports = [ ../modules/profiles/hardened.nix ];

nixos/tests/hibernate.nix

@@ -46,14 +46,14 @@ in makeTest {
 
   nodes = {
     # System configuration used for installing the installedConfig from above.
-    machine = { config, lib, pkgs, ... }: with lib; {
+    machine = { config, lib, pkgs, ... }: {
       imports = [
         ../modules/profiles/installation-device.nix
         ../modules/profiles/base.nix
       ];
 
       nix.settings = {
-        substituters = mkForce [];
+        substituters = lib.mkForce [];
         hashed-mirrors = null;
         connect-timeout = 1;
       };

nixos/tests/iftop.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }:
 
-with lib;
-
 {
   name = "iftop";
-  meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
+  meta.maintainers = with lib.maintainers; [ ma27 ];
 
   nodes = {
     withIftop = {

nixos/tests/jackett.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "jackett";
-  meta.maintainers = with maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ etu ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/jirafeau.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "jirafeau";
-  meta.maintainers = with maintainers; [ davidtwco ];
+  meta.maintainers = with lib.maintainers; [ davidtwco ];
 
   nodes.machine = { pkgs, ... }: {
     services.jirafeau = {

nixos/tests/komga.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "komga";
-  meta.maintainers = with maintainers; [ govanify ];
+  meta.maintainers = with lib.maintainers; [ govanify ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/libreddit.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "libreddit";
-  meta.maintainers = with maintainers; [ fab ];
+  meta.maintainers = with lib.maintainers; [ fab ];
 
   nodes.machine = {
     services.libreddit.enable = true;

nixos/tests/lidarr.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "lidarr";
-  meta.maintainers = with maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ etu ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/miniflux.nix

@@ -17,10 +17,9 @@ let
           '';
 
 in
-with lib;
 {
   name = "miniflux";
-  meta.maintainers = with pkgs.lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   nodes = {
     default =

nixos/tests/misc.nix

@@ -1,20 +1,17 @@
 # Miscellaneous small tests that don't warrant their own VM run.
 
-import ./make-test-python.nix ({ pkgs, ...} : let
+import ./make-test-python.nix ({ lib, pkgs, ...} : let
   foo = pkgs.writeText "foo" "Hello World";
 in {
   name = "misc";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ eelco ];
-    maintainers = [ eelco ];
-  };
 
   nodes.machine =
     { lib, ... }:
-    with lib;
+    { swapDevices = lib.mkOverride 0
-    { swapDevices = mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
-      environment.variables.EDITOR = mkOverride 0 "emacs";
+      environment.variables.EDITOR = lib.mkOverride 0 "emacs";
-      documentation.nixos.enable = mkOverride 0 true;
+      documentation.nixos.enable = lib.mkOverride 0 true;
       systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
       virtualisation.fileSystems = { "/tmp2" =
         { fsType = "tmpfs";
@@ -32,7 +29,7 @@ in {
           options = [ "bind" "rw" "noauto" ];
         };
       };
-      systemd.automounts = singleton
+      systemd.automounts = lib.singleton
         { wantedBy = [ "multi-user.target" ];
           where = "/tmp2";
         };

nixos/tests/mpv.nix

@@ -1,13 +1,11 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 let
   port = toString 4321;
 in
 {
   name = "mpv";
-  meta.maintainers = with maintainers; [ zopieux ];
+  meta.maintainers = with lib.maintainers; [ zopieux ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/n8n.nix

@@ -1,13 +1,10 @@
 import ./make-test-python.nix ({ lib, ... }:
-
-with lib;
-
 let
   port = 5678;
 in
 {
   name = "n8n";
-  meta.maintainers = with maintainers; [ freezeboy k900 ];
+  meta.maintainers = with lib.maintainers; [ freezeboy k900 ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/nfs/kerberos.nix

@@ -1,7 +1,5 @@
 import ../make-test-python.nix ({ pkgs, lib, ... }:
 
-with lib;
-
 let
   krb5 =
     { enable = true;

nixos/tests/noto-fonts.nix

@@ -1,8 +1,6 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "noto-fonts";
-  meta = {
+  meta.maintainers = with lib.maintainers; [ nickcao midchildan ];
-    maintainers = with lib.maintainers; [ nickcao midchildan ];
-  };
 
   nodes.machine = {
     imports = [ ./common/x11.nix ];

nixos/tests/nzbhydra2.nix

@@ -1,10 +1,7 @@
 import ./make-test-python.nix ({ lib, ... }:
-
-  with lib;
-
   {
     name = "nzbhydra2";
-    meta.maintainers = with maintainers; [ jamiemagee ];
+    meta.maintainers = with lib.maintainers; [ jamiemagee ];
 
     nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; };
 

nixos/tests/oci-containers.nix

@@ -11,9 +11,8 @@ let
   mkOCITest = backend: makeTest {
     name = "oci-containers-${backend}";
 
-    meta = {
+    meta.maintainers = lib.teams.serokell.members
-      maintainers = with lib.maintainers; [ adisbladis benley mkaito ] ++ lib.teams.serokell.members;
+                       ++ (with lib.maintainers; [ adisbladis benley mkaito ]);
-    };
 
     nodes = {
       ${backend} = { pkgs, ... }: {

nixos/tests/odoo.nix

@@ -1,8 +1,6 @@
-import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
   name = "odoo";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ mkg20001 ];
-    maintainers = [ mkg20001 ];
-  };
 
   nodes = {
     server = { ... }: {

nixos/tests/ombi.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "ombi";
-  meta.maintainers = with maintainers; [ woky ];
+  meta.maintainers = with lib.maintainers; [ woky ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/pantheon.nix

@@ -3,9 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
 {
   name = "pantheon";
 
-  meta = with lib; {
+  meta.maintainers = lib.teams.pantheon.members;
-    maintainers = teams.pantheon.members;
-  };
 
   nodes.machine = { ... }:
 

nixos/tests/please.nix

@@ -6,10 +6,10 @@ import ./make-test-python.nix ({ lib, ... }:
   nodes.machine =
     { ... }:
     {
-      users.users = with lib; mkMerge [
+      users.users = lib.mkMerge [
-        (listToAttrs (map
+        (lib.listToAttrs (map
-          (n: nameValuePair n { isNormalUser = true; })
+          (n: lib.nameValuePair n { isNormalUser = true; })
-          (genList (x: "user${toString x}") 6)))
+          (lib.genList (x: "user${toString x}") 6)))
         {
           user0.extraGroups = [ "wheel" ];
         }

nixos/tests/polaris.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "polaris";
-  meta.maintainers = with maintainers; [ pbsds ];
+  meta.maintainers = with lib.maintainers; [ pbsds ];
 
   nodes.machine =
     { pkgs, ... }: {

nixos/tests/prowlarr.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "prowlarr";
-  meta.maintainers = with maintainers; [ jdreaver ];
+  meta.maintainers = with lib.maintainers; [ jdreaver ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/quake3.nix

@@ -11,11 +11,11 @@ let
     };
 
   # Only allow the demo data to be used (only if it's unfreeRedistributable).
-  unfreePredicate = pkg: with lib; let
+  unfreePredicate = pkg: let
     allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ];
     allowLicenses = [ lib.licenses.unfreeRedistributable ];
-  in elem pkg.pname allowPackageNames &&
+  in lib.elem pkg.pname allowPackageNames &&
-     elem (pkg.meta.license or null) allowLicenses;
+     lib.elem (pkg.meta.license or null) allowLicenses;
 
   client =
     { pkgs, ... }:

nixos/tests/radarr.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "radarr";
-  meta.maintainers = with maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ etu ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/readarr.nix

@@ -1,10 +1,6 @@
-import ./make-test-python.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }: {
-
-with lib;
-
-{
   name = "readarr";
-  meta.maintainers = with maintainers; [ jocelynthode ];
+  meta.maintainers = with lib.maintainers; [ jocelynthode ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/redis.nix

@@ -1,19 +1,17 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
 {
   name = "redis";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ flokli ];
-    maintainers = [ flokli ];
-  };
 
   nodes = {
     machine =
-      { pkgs, lib, ... }: with lib;
+      { pkgs, lib, ... }:
 
       {
         services.redis.servers."".enable = true;
         services.redis.servers."test".enable = true;
 
-        users.users = listToAttrs (map (suffix: nameValuePair "member${suffix}" {
+        users.users = lib.listToAttrs (map (suffix: lib.nameValuePair "member${suffix}" {
           createHome = false;
           description = "A member of the redis${suffix} group";
           isNormalUser = true;

nixos/tests/sonarr.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "sonarr";
-  meta.maintainers = with maintainers; [ etu ];
+  meta.maintainers = with lib.maintainers; [ etu ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/sudo.nix

@@ -2,17 +2,13 @@
 
 let
   password = "helloworld";
-
 in
-  import ./make-test-python.nix ({ pkgs, ...} : {
+  import ./make-test-python.nix ({ lib, pkgs, ...} : {
     name = "sudo";
-    meta = with pkgs.lib.maintainers; {
+    meta.maintainers = with lib.maintainers; [ lschuermann ];
-      maintainers = [ lschuermann ];
-    };
 
     nodes.machine =
       { lib, ... }:
-      with lib;
       {
         users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
         users.users = {

nixos/tests/systemd-timesyncd.nix

@@ -11,11 +11,11 @@ in {
   name = "systemd-timesyncd";
   nodes = {
     current = mkVM {};
-    pre1909 = mkVM ({lib, ... }: with lib; {
+    pre1909 = mkVM ({lib, ... }: {
       # create the path that should be migrated by our activation script when
       # upgrading to a newer nixos version
       system.stateVersion = "19.03";
-      system.activationScripts.simulate-old-timesync-state-dir = mkBefore ''
+      system.activationScripts.simulate-old-timesync-state-dir = lib.mkBefore ''
         rm -f /var/lib/systemd/timesync
         mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync
         ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync

nixos/tests/tor.nix

@@ -1,15 +1,13 @@
-import ./make-test-python.nix ({ lib, ... }: with lib;
+import ./make-test-python.nix ({ lib, ... }: {
-
-{
   name = "tor";
-  meta.maintainers = with maintainers; [ joachifm ];
+  meta.maintainers = with lib.maintainers; [ joachifm ];
 
   nodes.client = { pkgs, ... }: {
     boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];
     networking.firewall.enable = false;
     networking.useDHCP = false;
 
-    environment.systemPackages = with pkgs; [ netcat ];
+    environment.systemPackages = [ pkgs.netcat ];
     services.tor.enable = true;
     services.tor.client.enable = true;
     services.tor.settings.ControlPort = 9051;

nixos/tests/ulogd.nix

@@ -1,9 +1,7 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "ulogd";
 
-  meta = with lib; {
+  meta.maintainers = with lib.maintainers; [ p-h ];
-    maintainers = with maintainers; [ p-h ];
-  };
 
   nodes.machine = { ... }: {
     networking.firewall.enable = false;

nixos/tests/uptime-kuma.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ lib, ... }:
 
-with lib;
-
 {
   name = "uptime-kuma";
-  meta.maintainers = with maintainers; [ julienmalka ];
+  meta.maintainers = with lib.maintainers; [ julienmalka ];
 
   nodes.machine =
     { pkgs, ... }:

nixos/tests/xautolock.nix

@@ -1,10 +1,8 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }:
 
-with lib;
-
 {
   name = "xautolock";
-  meta.maintainers = with pkgs.lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   nodes.machine = {
     imports = [ ./common/x11.nix ./common/user-account.nix ];

nixos/tests/xss-lock.nix

@@ -1,10 +1,6 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
-
-with lib;
-
-{
   name = "xss-lock";
-  meta.maintainers = with pkgs.lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   nodes = {
     simple = {

nixos/tests/yabar.nix

@@ -1,12 +1,6 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
-
-with lib;
-
-{
   name = "yabar";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = [ ];
-    maintainers = [ ];
-  };
 
   nodes.machine = {
     imports = [ ./common/x11.nix ./common/user-account.nix ];

pkgs/applications/graphics/ImageMagick/default.nix

@@ -47,13 +47,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-8";
+  version = "7.1.1-9";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-2wAm2y8YQwhgsPNqxGGJ65emL/kMYoVvF2phZMXTpZc=";
+    hash = "sha256-xTrkQpd4UYHEmHosb7ZLoqnDFSutrikjXPmuU5R9jQo=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

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

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tektoncd-cli";
-  version = "0.30.1";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-tn7nK5YTdEYJf9UBajOZEc8fQ0cx3qM0X/7UYnDklj8=";
+    sha256 = "sha256-LJEdeYVwcmxd7DU/HI0TpWtZ1xUJz4WEnjEfvx5HsZQ=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ];
 

pkgs/applications/science/biology/bwa/default.nix

@@ -1,24 +1,16 @@
-{ lib, stdenv, fetchurl, fetchpatch, zlib }:
+{ lib, stdenv, fetchFromGitHub, zlib }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bwa";
-  version = "0.7.17";
+  version = "unstable-2022-09-23";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "mirror://sourceforge/bio-bwa/${pname}-${version}.tar.bz2";
+    owner = "lh3";
-    sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy";
+    repo = "bwa";
+    rev = "139f68fc4c3747813783a488aef2adc86626b01b";
+    hash = "sha256-8u35lTK6gBKeapYoIkG9MuJ/pyy/HFA2OiPn+Ml2C6c=";
   };
 
-  patches = [
-    # Pull upstream patch for -fno-common toolchain support like upstream
-    # gcc-10: https://github.com/lh3/bwa/pull/267
-    (fetchpatch {
-      name  = "fno-common.patch";
-      url = "https://github.com/lh3/bwa/commit/2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch";
-      sha256 = "1lihfxai6vcshv5vr3m7yhk833bdivkja3gld6ilwrc4z28f6wqy";
-    })
-  ];
-
   buildInputs = [ zlib ];
 
   # Avoid hardcoding gcc to allow environments with a different
@@ -32,19 +24,23 @@ stdenv.mkDerivation rec {
   # it's unclear which headers are intended to be part of the public interface
   # so we may find ourselves having to add more here over time
   installPhase = ''
+    runHook preInstall
+
     install -vD -t $out/bin bwa
     install -vD -t $out/lib libbwa.a
     install -vD -t $out/include bntseq.h
     install -vD -t $out/include bwa.h
     install -vD -t $out/include bwamem.h
     install -vD -t $out/include bwt.h
+
+    runHook postInstall
   '';
 
   meta = with lib; {
     description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome";
-    license     = licenses.gpl3;
+    license     = licenses.gpl3Plus;
     homepage    = "https://bio-bwa.sourceforge.net/";
     maintainers = with maintainers; [ luispedro ];
-    platforms = platforms.x86_64;
+    platforms = platforms.unix;
   };
 }

pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "isabelle-linter";
-  version = "unstable-2022-09-05";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "isabelle-prover";
     repo = "isabelle-linter";
-    rev = "0424fc05426d5f7a23adf19ad08c690c17184e86";
+    rev = "Isabelle2022-v${version}";
-    sha256 = "02afbgmi195ibichjkpni2wjgjkszv7i6qkmmprwrmb4jd2wdvd5";
+    sha256 = "sha256-qlojNCsm3/49TtAVq6J31BbQipdIoDcn71pBotZyquY=";
   };
 
   nativeBuildInputs = [ isabelle ];
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/isabelle-prover/isabelle-linter";
     maintainers = with maintainers; [ jvanbruegge ];
     license = licenses.mit;
+    platforms = platforms.all;
   };
 }

pkgs/applications/version-management/git-mit/default.nix

@@ -1,12 +1,12 @@
 { lib
-, stdenv
-, fetchFromGitHub
 , rustPlatform
-, openssl
+, fetchFromGitHub
-, libgit2
-, libssh2
-, zlib
 , pkg-config
+, libgit2_1_5
+, openssl
+, zlib
+, stdenv
+, darwin
 }:
 
 let
@@ -25,15 +25,21 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-YtUuRLjmehG+5kUiCo4LK0PkKAckr28UahlrAjm9MYw=";
 
-  doCheck = true;
-
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl libgit2 libssh2 zlib ];
+  buildInputs = [
+    libgit2_1_5
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.AppKit
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Minimalist set of hooks to aid pairing and link commits to issues";
     homepage = "https://github.com/PurpleBooth/git-mit";
-    license = lib.licenses.cc0;
+    changelog = "https://github.com/PurpleBooth/git-mit/releases/tag/v${version}";
+    license = licenses.cc0;
+    maintainers = with maintainers; [ figsoda ];
   };
 }

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 = "22.1.1";
+  version = "22.1.2";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

pkgs/data/fonts/iosevka/variants.nix

@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "1j9yn7kb7g2yyw1dm9bmgblarfaf8fb4vdm7i7iif0kplxr7dgqj";
+  iosevka = "081fh4526mp6xpjr7jf4s238wz7qfwm6ycdvajwd2nxii0ax4ybq";
-  iosevka-aile = "0babmr9gjsgcmlag0pay7dg954h3x9d7g43c8kzgzwsl6xvsgwhn";
+  iosevka-aile = "0c43dyy1j0yh43sxxy0z8gz0v959vmpkvcfg78dy6qnj0f4mx6q4";
-  iosevka-curly = "0xjwk30df2dczypnqzs0jdvdn0wm9x5jb9akqcgm45dpbjmsy2cm";
+  iosevka-curly = "0nlh89adp4ikq6kkcw5bswlphdyfjadxz84wdq4snaf8b16a3pla";
-  iosevka-curly-slab = "12m6avk1wpajjqfs0wabgjkgmyp72nsx1wb4pa87hi6xrs0z55gs";
+  iosevka-curly-slab = "0zdzbc0v91xnbxp419vh060asfic3prdwx50ynx44551kscjf23l";
-  iosevka-etoile = "1a7ag0xk0vc1rsiys7j9pmrfg8ayrg9wqglmqq3gzdnl9z71hhzn";
+  iosevka-etoile = "1chz7j5dp6fjz73pa9xv1miaf4q4knm1rs0jxlxb6wspbs6x2b9f";
-  iosevka-slab = "142k5acg3c67jgprdxj7nhhg6blwj781w655452l3h9i6pvzvqd2";
+  iosevka-slab = "1hmljgbxlclp0hn7z5m4zq8m0zixwrxf551z4xxgc5s7756phfhm";
-  iosevka-ss01 = "01l1a2hqn2rnhyg5dv1nvqpx638dbvqsc1fm969ki03zfxq6q1qq";
+  iosevka-ss01 = "1i6p0vrqq3371j9xp7j336fn0hg0g5gwnkbjixhkyv69dphci56f";
-  iosevka-ss02 = "02cfy693p283k6w80fkmsldmnqa34rb1pf5mvnx7712gqksc2wd7";
+  iosevka-ss02 = "0ad8829ndx1gmszknw86ym0kksn2jasa1qnbinavnx9jb4wgacma";
-  iosevka-ss03 = "102aaypkayj87x7qfswqm6298dvqnjj5rcwmfwb8vnjaisk7rdaw";
+  iosevka-ss03 = "04rmrsb5x7if084x61ggvf173zvvldwa1qqvgcrm5jv901ga9ihw";
-  iosevka-ss04 = "0fc7hd1xjlbm8yknbdmxjhz29bmmpyj8c36ziz2wbbn5f2zf26j3";
+  iosevka-ss04 = "000r785jnkzd9fh41pcfh5frx540lcmarjmc04g9q2mzvdf3j6pf";
-  iosevka-ss05 = "0imsnl012ga9vsri3ghi060h2xpmcv846ap2w2j26rwgknii10gk";
+  iosevka-ss05 = "08frna6l600bb60rhyjl97n6ld9c7idbf88yq0nbr95bsa5vsvlm";
-  iosevka-ss06 = "02yf2vgxgqzx9hjwyvkvwvmyjna12d3sd9h7gfmph9sk0p0m7mss";
+  iosevka-ss06 = "0vfbw0bx3q2q5vr18d1f20wlw5sbiprfcvmy4yvm005kg8vm5dbf";
-  iosevka-ss07 = "1w1ssy096h9jfhxmwa7gnhrgnvlqvacfb1nip2995v82h44q2fi6";
+  iosevka-ss07 = "1yfvkhbdyfl4hb59xrcnk7z3pw2a3s0840ghpmb08dx31zrqw22i";
-  iosevka-ss08 = "1ijy9lm1wm3ckyh17kvcycgpxqnjdyqz52w0q9pw7lqdfgpdq1ai";
+  iosevka-ss08 = "0b5f54c6xr4ls33cjdxbyk8f5mlp4xl2rgbgfdyrg090sjqv1k91";
-  iosevka-ss09 = "0wymk5gahkr0dv1b0zxkifx4lah0468lrz2k7j919pg93j2ab1an";
+  iosevka-ss09 = "03npw4iwyyv13vfsjr8hh9587b5mhq55wnj9k38f6wjdbzp6lqb3";
-  iosevka-ss10 = "064sqi7y3ypbs7j4cay37hk14qflmmgvpnwrpm637bgnxdh9pd6i";
+  iosevka-ss10 = "1f2zzcz0adwlvfr846a9wiqac1zhq1fm0dccw9z5j3v9x5mv6370";
-  iosevka-ss11 = "15wlc86mnnkfhj66l1j3fvd74ks0ag74zss4893bghiaj3wcfnzx";
+  iosevka-ss11 = "00if9x4i2p2kxi083jxy92h7m2vp87vaac8vbaqmgvcvs689bywk";
-  iosevka-ss12 = "1al9rskiqcsh978x9fgpzrd4zayr6a8bias520gch3vid16mq776";
+  iosevka-ss12 = "0jnsqysmqav1q3gfcbaz529p3ksrld7kp99wi38nfggzjzs06kqr";
-  iosevka-ss13 = "0vbjvx0rkzs6wdpb8y35z7a4v6gj06zn5jcbpma6r849kkj1iy0a";
+  iosevka-ss13 = "0fwpq69k154kk1ycmckw56yggz425imk01bnbmwnciv31aqpaa4r";
-  iosevka-ss14 = "1qchkd15l532i7y1mwqvsapa7yfh4i393ix5yp4w7hwhf81jd4j5";
+  iosevka-ss14 = "03h0ddqxra2mygabm07w4cs3i8yyrjcvj5cnlbhnjkyipinxg8fz";
-  iosevka-ss15 = "11x4cfqs4ra9xz284s293bzm8x3mwf0sm0bbv4jgz72ab34qbbix";
+  iosevka-ss15 = "1a71y64g5hf8pwknsgibvi404673cgfd8y3nrl6k54j0vh6iv1j9";
-  iosevka-ss16 = "1gp7zhlf3mrmrp9vr1yzkwwn86iyvi7fhgb494lyzvivvlrd88hy";
+  iosevka-ss16 = "0ykir676rf94m2h0dvc6s8bwi4zic7rjyrj0lvbfjbb7fd48k50q";
-  iosevka-ss17 = "0i2fnn7afxmngfma0baarp9116sk36h7nx9g8ij1lkp4z2p16bnm";
+  iosevka-ss17 = "1n4qxqql2mr9g5391y17x9lbiy3wxfa48skq8ql11rpad2n75bbl";
-  iosevka-ss18 = "1lwj3qz9127z7qqbgls9bswbknzk931yb2akacz64x3qgbm93d5w";
+  iosevka-ss18 = "0rhbj2cyjahaaba0fh4rz79b03r5zz8l98v3na2im3fzmpzrvvjd";
-  sgr-iosevka = "02mzydyy7waihfgwsm2pycn3k75qvdb5q376rn4qb7ibzyv7kvi0";
+  sgr-iosevka = "1wfr3n4xc8wc1hflww5fvy3a1595bbyd5lw6dphki8kfr6zhx7gv";
-  sgr-iosevka-aile = "0l0vipmx0bvqs05wp61ar2nkq3lx2ihkrvskgkdh68v6rxg2na4g";
+  sgr-iosevka-aile = "1h6pmz589f60hxhb8inpjkf099l1cpx5j4c6avgj2kssy8gyfmrq";
-  sgr-iosevka-curly = "0bgzaja7nx4p44cs681k1jkffq0pwpc738gh3vjqqcccwhdicg79";
+  sgr-iosevka-curly = "1zqggj0q3dynf8x9lgw2hmzncgpi4vdj3ipyl4cbc8fvlfnvvjp3";
-  sgr-iosevka-curly-slab = "04adkwr6gb1ca9f8a64ai7wlfiy8j198zwfxka64rm19mdv1gva7";
+  sgr-iosevka-curly-slab = "1avr1760ilbwjkpvh8jm2kgh3lxd79m6zxynwjxiinaksnnj7rz4";
-  sgr-iosevka-etoile = "14svwdrczyphmp97ka0w6496dwym6dkasmqvqqyd51f2crzb76mb";
+  sgr-iosevka-etoile = "0cw86y669qhz9fla3syi77x0kgdpnk8gnch897nrnj5qhl07236l";
-  sgr-iosevka-fixed = "1h6w0p8hv8ipkxmyky7frfykakwhkbqkylzbfgiikaad41q230sh";
+  sgr-iosevka-fixed = "07ns51g4fyyxcmwpra6m1k808n5c8ydywfdq10y8nvbyawkvi5gy";
-  sgr-iosevka-fixed-curly = "1xhgllg93z4x7s623hyl4537v2cqd1z1p8bskxrfg2fhms2848la";
+  sgr-iosevka-fixed-curly = "00nz8cnli4f6h4bw0i6fs9yhl2hpq51q044zxrz9ahc5fab0nxpy";
-  sgr-iosevka-fixed-curly-slab = "09zzgia019r5szlcyqv79kka0p76d1gxdnqmpg8nzkw9m3xwps7g";
+  sgr-iosevka-fixed-curly-slab = "19lv662gj66zr1r4si0l2i7m4isgfsd2g1q9p15ivp3lnmk8d7sm";
-  sgr-iosevka-fixed-slab = "0ikzn6vmsdkd737g337kga81pa079bx467rq4ql81ydd66v0dxd9";
+  sgr-iosevka-fixed-slab = "0gw7j7jrjivpnibajmg6mhfvf4i7sqpw2prixsmxqd6azjypyjll";
-  sgr-iosevka-fixed-ss01 = "1srb1ncmk9zffkwap0qa2n7dyam73qymlxm12kq1x3f26c4j48rd";
+  sgr-iosevka-fixed-ss01 = "0ji9iyfqmhhl1pp0kf9pvskqsda57fdr73lhviikls3wdlfk84kp";
-  sgr-iosevka-fixed-ss02 = "0668b6r722qbgnm1mb3grx4psczs1lfvjca2lvqw32rc1fjksr1n";
+  sgr-iosevka-fixed-ss02 = "08z3anr3109f5msf25dpq7ln548i86q2ng332hxpv1h6z1v43lv1";
-  sgr-iosevka-fixed-ss03 = "09irdlxjg0c85vbcmr8jpb1n51ml6kkbq3hmv6rzh2y737if13bm";
+  sgr-iosevka-fixed-ss03 = "1j6qgak2jmihjmybqwm540kd6jnjv5snnprl2q8lj0cgwrbr9g78";
-  sgr-iosevka-fixed-ss04 = "07r37m809z45hqv97zpdrhrfdbc1rn5jx1375wf3nrdl14y08d5b";
+  sgr-iosevka-fixed-ss04 = "1vj9s195jdzyf3n7lzwdfgl6k6v1v4iry5bf7bwa5q8mfnyqjkb2";
-  sgr-iosevka-fixed-ss05 = "0in2f0999jh3zks8ymppqsxmk8fhlyixpf6lyjlxrli5g4ls63jm";
+  sgr-iosevka-fixed-ss05 = "0xknsf9gzk1qxrzq7ppsgm4skbhmrb9mfjqqjbyyqz3qqmz1db29";
-  sgr-iosevka-fixed-ss06 = "1rcjp005wa1qhz1lbp95gjxynqbsaa5y3lcxjrlyp5117xrbckwl";
+  sgr-iosevka-fixed-ss06 = "0inxlcylli0kns3kplg6ylwy3pai2hamz806x39f49w1ymngvm9q";
-  sgr-iosevka-fixed-ss07 = "1whn6mhlz5y6p0pz5a24r2avdxgknkd09iiksq5z55l3jifq6w5a";
+  sgr-iosevka-fixed-ss07 = "0vy5v7czx7sb0d9fkbfqg6ipnn6fadxlgkk1r4cz98ash6iffvl2";
-  sgr-iosevka-fixed-ss08 = "18k50bf3ki5kwrlm7i81ycyhgibps1abfddv6431sidb953dw5h4";
+  sgr-iosevka-fixed-ss08 = "01vk0kn32i41dmjcc2smqp08732rcahyp9rwk7i71q18s43z81hd";
-  sgr-iosevka-fixed-ss09 = "1gxiipbqnvq4l9i5z9jvrkha6d15pdnnyzv8dpgr2wb90d9kkc6y";
+  sgr-iosevka-fixed-ss09 = "0fqcnwfd619fjshfgdc6rwr84mjkq1spfcrri8fgb985gn8han4p";
-  sgr-iosevka-fixed-ss10 = "1d81qgylgq1jgasi5spahazjw0pkid1w0hanxbj0yrmmd2w7r8h7";
+  sgr-iosevka-fixed-ss10 = "0wy3qj8q429z4qp9344blw86q2s8djcpx68fk2528dfkdgc0qdcj";
-  sgr-iosevka-fixed-ss11 = "19qjs9gars612792mg163smmggbyrmbrnz94ixiy40k321zr29sa";
+  sgr-iosevka-fixed-ss11 = "0w10p1i8d6xb5ab1rjljxrad33cvadv11hmn4xhd4rid5w4c4000";
-  sgr-iosevka-fixed-ss12 = "0ys5piwqsvmln1h4wp1dminhparcba7z08p91vvdwnzdkgywqnlh";
+  sgr-iosevka-fixed-ss12 = "1h9yifc07yrg0bbzy93az1qrbjsgl4hak336dvgr1y106r998n84";
-  sgr-iosevka-fixed-ss13 = "19br5vfwngnwg7y00iidw3ga9brabd5xppbwiqs5zysdlybb4pwp";
+  sgr-iosevka-fixed-ss13 = "11lj7f7njax2l7vcj30wphdpl15s4ldbgr89050can8gkix8nynp";
-  sgr-iosevka-fixed-ss14 = "1nshbbap612f2x4b6m3bj1d99rwym5nxi0a2rajpg8mxf4ha5w57";
+  sgr-iosevka-fixed-ss14 = "0bsybrkw145ba30k3g28js6v1jnn49virj2j27kjvdgrvqcwsczl";
-  sgr-iosevka-fixed-ss15 = "1zyv1prndjm6bixqr0pzhw0j86jg75ldxppyxf9r0ybw3pm132nv";
+  sgr-iosevka-fixed-ss15 = "1r8klnfy1d31kzv51vgwlalg7q72izmcg0875055g17i58sh18rp";
-  sgr-iosevka-fixed-ss16 = "0b7f29hg4jzzi63xbb78m8rrf2kavvlp4nfgl2rnm7gckk5yfl70";
+  sgr-iosevka-fixed-ss16 = "0lkss8vwzndg9pppx384jc0l5y8njzh66gjf8v8i08635wa2k7gc";
-  sgr-iosevka-fixed-ss17 = "1vhfa79bjvpig6vbnmr52lmpsn5kkqcib4gqz875sgj4q557plxk";
+  sgr-iosevka-fixed-ss17 = "0v79km9gnmaszsny60hl5psczqc6ccnis86l5k30j2rir1n7iyic";
-  sgr-iosevka-fixed-ss18 = "1s3k12xz2506bi545nb9b9g6wd6jhlp1jf5sf40my2b8j721dr6s";
+  sgr-iosevka-fixed-ss18 = "0jj8028xlabidll3fznx9c1n3czapz0p8bwf7d5ydslz5byyd2sc";
-  sgr-iosevka-slab = "18f14g3yhs9rzj3njxn99m6zilp5xh3xdmycqza3cpcm9bxy61qp";
+  sgr-iosevka-slab = "0rn52fkgqcxa7661mzjk2m82qy61aacf3yll39kssgyd76h084vv";
-  sgr-iosevka-ss01 = "1rnnaxla2q0wd2wgn4ixg6z0n3yhaw0fwxxii1pip8bnvmfhg1hv";
+  sgr-iosevka-ss01 = "0pc0zgmq0l8283xwzsck8mm3qyd9hqn4h0dvr1nm1pp5sx7i393b";
-  sgr-iosevka-ss02 = "0mkrvc2kjindvjnvp009b3b8z0ci0v5x5rjk94ynwnxw0yi0d209";
+  sgr-iosevka-ss02 = "1y7jxs73jx82gss0jbqfdqxbs3rzgaa5w1pcbf33jyj635shqkzm";
-  sgr-iosevka-ss03 = "1h2ygx71ajx56p14xr8y0rw13dm6aml2r7whi0nicx67q3yqmmxg";
+  sgr-iosevka-ss03 = "1764hcmzy6k89fyqfqgz1jp5wy4xdm8xnvz5pwmbv299kvnp7dqi";
-  sgr-iosevka-ss04 = "1h0ji0lpadfhx8sir9m19zjykqqlvgvq7cg37a4l6xxf716bh2l2";
+  sgr-iosevka-ss04 = "1xhs5b5njlidg9b4m08c6n7s1lrhc099k57497zpy343ghspiwf3";
-  sgr-iosevka-ss05 = "1f8j8zjr5ja9x444pcrwimzv46sp5kls1k6ca9q8lax2jj4dpx32";
+  sgr-iosevka-ss05 = "1alss532acynp1rzdkqi66f2b7635n56qlwj9lnl707q52s1y7z0";
-  sgr-iosevka-ss06 = "05l5i76lv8w5qdwwbn05r4zykaczgq940jcrw49f7kjc47rvd8mi";
+  sgr-iosevka-ss06 = "1mif5gqf7ixgjj2r0lgsh6sz4wa81xfq5zyn5vd31sd11ary2r0f";
-  sgr-iosevka-ss07 = "03833pxrczwy8c38sqgbpszq5s5s9kpfmamjb9qjgnfcpzy99w60";
+  sgr-iosevka-ss07 = "04x7knvganhjlc3qdr1w2vx6ba0yr2lip19jy1fymz5mlhq25rzz";
-  sgr-iosevka-ss08 = "02iihwlkm4jasmwa33waxa8pj032w2xviw84ffgh4qvl3qhric22";
+  sgr-iosevka-ss08 = "104k95d3fw0yfkyicasda6ml7kz2pg875xnpkaq3s75hyap37h77";
-  sgr-iosevka-ss09 = "04cf7hgghd32wv21x9f8rrb9kfn9d3542rjfsqj5ydh68rq2jz66";
+  sgr-iosevka-ss09 = "0qmw3dwx7rqp244yr0mwx9s8dqq8aq4iflw3c2zfbrbfn063ibh5";
-  sgr-iosevka-ss10 = "1g4i2h024jw93n7q6qacsnhhbrin7m8amqvp6535d51j74rblbxy";
+  sgr-iosevka-ss10 = "14cj8fap1rifa3wc1d4bwncvdf064fg23vpn0h1y3ckwc29zcx70";
-  sgr-iosevka-ss11 = "0az3drdy6b812zkjp6if78v3952sxjyk2ncpsi7riij84ckb35p4";
+  sgr-iosevka-ss11 = "03jj5gc7687r0gijsdg5d76890pvn6jhbla2742mi5nvdalyq6cn";
-  sgr-iosevka-ss12 = "1f5zhsxa68jhvv07s4g2clk7bs5gfhfwg4cpand1w6pk263bvzhx";
+  sgr-iosevka-ss12 = "06i5xaqwlni42alyalibfm9g1158xflzm5v3fdsd9niwrjdisq40";
-  sgr-iosevka-ss13 = "0sdrxyf7kr6ys3zpb4vrfkhr0dx2na9ip9dj43sh55ld6ppbh0r0";
+  sgr-iosevka-ss13 = "12p1lb12cdk4mackmygrvkffpa7dyapys5dcmnxszk8z4pm4flfl";
-  sgr-iosevka-ss14 = "09pwhq09mml5la4dhd0xyl0nm63rdl30chcyzj2d7j6i0qfih3z6";
+  sgr-iosevka-ss14 = "1dvh7jz4qz2zkizks2cdmmgh5jgbij5alkqhjcc39crdbwzccsx4";
-  sgr-iosevka-ss15 = "08mjhs9g2yxy7drl8jn2f7qw66vmh4i61x5c6n22bml8y67cfzfc";
+  sgr-iosevka-ss15 = "15ap02918nbbmbsrfm5gvf89aj1679wlh4nhbpjyfhd9swn0dys3";
-  sgr-iosevka-ss16 = "0wq6d7fsy7rdhdms83401srm0ij11yk2458fgxmgr9cj8nfykzpm";
+  sgr-iosevka-ss16 = "1abff39i5gpx8xi6l6kfwmb0p4sysg11zcbr94rik6s02fyq8y6v";
-  sgr-iosevka-ss17 = "0v04afwg8qryh2s3096amh7mj9cnn112j4wgx3jgqqhwmsb0h6s0";
+  sgr-iosevka-ss17 = "1kmrsvd6xbzn0i5mvr84kxcl882yzyr8jbwbkxghshds8q7yxkwd";
-  sgr-iosevka-ss18 = "0mczg8glhvvfin2q62vcpxci0pgmh5f9mswn8ys3fh7mkk4hag7x";
+  sgr-iosevka-ss18 = "1xil3gsdq4p1r72d1qdykkdyacvx9l75k02idjid6sqj6lv982mr";
-  sgr-iosevka-term = "15yb718fb6f3ywc32875zd7pglnlrnmh9hzrhynl1lba71pq59c4";
+  sgr-iosevka-term = "1rlnv7yjjy03pifbbbxlxkkswsgyfai1bgxq4iz1z9fhb10k6iqw";
-  sgr-iosevka-term-curly = "1fs4infd0ps4v3fcij9c8jw1nz48rblq2hq2v5f8qsj1xn2k69x4";
+  sgr-iosevka-term-curly = "1qy7q4savijcrqicf5llpl8p87w3ai872zwbd2dwv54ia2r7ixsj";
-  sgr-iosevka-term-curly-slab = "0na07g2bcd173j6gzwlqziw4blbf92j0kx4m1y2x1k4ss606fzd5";
+  sgr-iosevka-term-curly-slab = "02722sdizc4pvam0kc2sf23ywzwwp6nwbskbgmr3syridxkcpdri";
-  sgr-iosevka-term-slab = "125wvyrf8mly7a51p705df4nryzh17rm7pc9zhydngxfmmaxrmcw";
+  sgr-iosevka-term-slab = "1xcnwr59s8a32zcg4gd0dh8a1fj1jqvw7900d9phj39ym1hd3wyr";
-  sgr-iosevka-term-ss01 = "1lmb0b2wzwq298kww3d3656xr67dmn8gz43582y3armggdxsgp8x";
+  sgr-iosevka-term-ss01 = "0fv8217chh5qfp4m1s0ar9jmkg9mqhc6rwfk15g9z79m0jrphq44";
-  sgr-iosevka-term-ss02 = "06mfxiazkab55ddqxd3k3mklwcjavn9567b4bk5n6n38krilmfd4";
+  sgr-iosevka-term-ss02 = "1y8zxv0pch1xn2izsbkzy3489rib2cy3j49fdk7mh4q525j07v84";
-  sgr-iosevka-term-ss03 = "1if3kxas3j287x0pl5q18j255c30rv24fbv8500s4a0min8n5315";
+  sgr-iosevka-term-ss03 = "1404ng2g8fc7bhs02qlca642va0y427p9vcbl7y9h40migpl595w";
-  sgr-iosevka-term-ss04 = "1q5zxhgzsgg2fzyjmp4mp63957jhf6xp66qlkp59iwzixc46lk8a";
+  sgr-iosevka-term-ss04 = "0d0fffp5zj9vhhxpxf58s5fklcwb5kmwsm885idiq0rqx20d0igw";
-  sgr-iosevka-term-ss05 = "1vln43l0sps02badcvfpxkr9vy80fzy7bcknza4axihf5dsfl233";
+  sgr-iosevka-term-ss05 = "0jf5p431ml05ppbbppi7mpwx05ms90yfhgyqy4i49nlvb73rzm5n";
-  sgr-iosevka-term-ss06 = "1z2i26qh5krp4y0nh3hvlf60wnwzkkvh2b9q69f1pqlxmhnc3c2f";
+  sgr-iosevka-term-ss06 = "189bvzgvqk3dms2xjrp4mcn8r8k57r56d9vb4r8y6kxnvhr6sn2g";
-  sgr-iosevka-term-ss07 = "1zx71hyygg2f7pma65zdymvdz4lbqzh9iiflpl4a2knhl50s3wk2";
+  sgr-iosevka-term-ss07 = "0smm363cmf5r5m5bw05v8lfahfy2qb8yf3j9cs99qzdn0p5jj1mz";
-  sgr-iosevka-term-ss08 = "08wqn6pqrmr5523nshvmlwmlkv4x4chbp2inr5n6v1wpsr7m3zfz";
+  sgr-iosevka-term-ss08 = "17f3zbag6g5y0akw4fw7y245k6p5iam4k3iwh6d6c0qdaxww0rjr";
-  sgr-iosevka-term-ss09 = "1iqicymw6dwxanrv9xb2jcnxw84bj5v4bk9gzc33l3mf5kqfywi7";
+  sgr-iosevka-term-ss09 = "0cvnqmcmf398rkjjm8qaigz9bsza3mfwjlaw5jknshwfiwn69lcc";
-  sgr-iosevka-term-ss10 = "1hl06vryvfy69b5q2rdhxv8acz8haj076xlicg8wpvmiwnbli6p8";
+  sgr-iosevka-term-ss10 = "0w1skzys1jlvidlbcs5q47iwvndsf4ag28f35zdgcp3mwaksvb38";
-  sgr-iosevka-term-ss11 = "1nzd49866v43zm1hv1bb5pn9gf0mhk1ay2c90jl32s1yk0lj3drr";
+  sgr-iosevka-term-ss11 = "1ga2saw9340dbgk3da12d2ncafyidp3cfxprainpdj47k6zxvk6s";
-  sgr-iosevka-term-ss12 = "0y356mvs29yz8kxh32w39hv8vm9c6m6i4hmkic4hnxdm13qbq32i";
+  sgr-iosevka-term-ss12 = "0s1fgmgwgdwnbxr0xs1hgrxkiv3zbm2hk4whh96wxfc14z7ksn1i";
-  sgr-iosevka-term-ss13 = "094scl6hhdm7kpkmlv9r7ss1f0w4dn621iz179lg4kx7h7a1x018";
+  sgr-iosevka-term-ss13 = "0xyajzh2zw37nk2v2d64fm5ck1blw6ry4221aylgrfd2i2qk35dc";
-  sgr-iosevka-term-ss14 = "06dr1sbb5awzncgk84bi2l1649ssnb8h8zzydgg040v5jc2y63v4";
+  sgr-iosevka-term-ss14 = "1an2abigqs6fs1rdyyhhnpmkymx1aic6isjb53qdk04yr0zg2zq9";
-  sgr-iosevka-term-ss15 = "0bksrj3xkhy5w0d4nv86lbc2pjx3fm8sjpkc86ybda958s8kw4ks";
+  sgr-iosevka-term-ss15 = "1wmwlfhbvfkaxwrgfprck8iivqxw9plsbxd6ylihfznpx05a1pl4";
-  sgr-iosevka-term-ss16 = "0bqr23cpa3a6vid1hr9dxn0fg69900hdlyr84lcyv49qmppls9ix";
+  sgr-iosevka-term-ss16 = "1xzixkinrj61p98ajrmknzxl9xwgcfd45w6jkczqccpszjl48843";
-  sgr-iosevka-term-ss17 = "0mawzcb1474k4x67y4rs6q1mf3dch3mm7is5zj7shmm5gchf4v70";
+  sgr-iosevka-term-ss17 = "1wvfms17dl8hgyaiqwnhvikkj36b1491lzw4m5c5hicryhqgmnyb";
-  sgr-iosevka-term-ss18 = "1afzrxw9clmi77rczd4rx6i1c3548wci13m66r69j6a5rcxyzk2b";
+  sgr-iosevka-term-ss18 = "19as67n70dh0j15b3war0va8fpqva7qj6dys101jxij70cjgdvwc";
 }

pkgs/development/compilers/purescript/purescript/default.nix

@@ -24,10 +24,17 @@ in stdenv.mkDerivation rec {
   src =
     if stdenv.isDarwin
     then
-    fetchurl {
+      (if stdenv.isAarch64
-      url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
+      then
-      sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f";
+      fetchurl {
-    }
+        url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz";
+        sha256 = "16ci26pgrw0zmnyn1zj129y9624cqwzrhqglc8mgfg4k7rxvqy2a";
+      }
+      else
+      fetchurl {
+        url = "https://123.github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
+        sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f";
+      })
     else
     fetchurl {
       url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
@@ -63,7 +70,7 @@ in stdenv.mkDerivation rec {
     license = licenses.bsd3;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
     mainProgram = "purs";
     changelog = "https://github.com/purescript/purescript/releases/tag/v${version}";
   };

pkgs/development/compilers/purescript/purescript/update.sh

@@ -29,11 +29,16 @@ old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/pures
 echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash"
 new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")"
 echo "v${new_version} darwin tarball hash: $new_darwin_version_hash"
+old_darwin_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos-arm64.tar.gz")"
+echo "v${old_version} darwin arm tarball hash (current version): $old_darwin_arm_version_hash"
+new_darwin_arm_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos-arm64.tar.gz")"
+echo "v${new_version} darwin arm tarball hash: $new_darwin_arm_version_hash"
 echo
 
 echo "Replacing version and hashes in ${purescript_derivation_file}."
 sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file"
 sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file"
+sed -i -e "s/${old_darwin_arm_version_hash}/${new_darwin_arm_version_hash}/" "$purescript_derivation_file"
 sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file"
 echo
 

pkgs/development/libraries/libressl/default.nix

@@ -62,7 +62,7 @@ let
       ''}
     '';
 
-    doCheck = true;
+    doCheck = !stdenv.hostPlatform.isPower64;
     preCheck = ''
       export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName}
       export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)"

pkgs/development/libraries/vtk/vtk.egg-info

@@ -1,4 +1,5 @@
 Metadata-Version: 2.1
+Name: vtk
 Version: @VTK_VER@
 Summary: VTK is an open-source toolkit for 3D computer graphics, image processing, and visualization
 Platform: UNKNOWN

pkgs/development/node-packages/overrides.nix

@@ -229,7 +229,11 @@ final: prev: {
   });
 
   joplin = prev.joplin.override {
-    nativeBuildInputs = [ pkgs.pkg-config ];
+    nativeBuildInputs = [
+      pkgs.pkg-config
+    ] ++ lib.optionals stdenv.isDarwin [
+      pkgs.xcbuild
+    ];
     buildInputs = with pkgs; [
       # required by sharp
       # https://sharp.pixelplumbing.com/install

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

@@ -23,6 +23,10 @@ buildPythonPackage rec {
       url = "https://github.com/bayespy/bayespy/commit/9be53bada763e19c2b6086731a6aa542ad33aad0.patch";
       hash = "sha256-KYt/0GcaNWR9K9/uS2OXgK7g1Z+Bayx9+IQGU75Mpuo=";
     })
+
+    # Fix deprecated numpy types
+    # https://sources.debian.org/src/python-bayespy/0.5.22-5/debian/patches/pr127-Fix-deprecated-numpy-types.patch/
+    ./pr127-Fix-deprecated-numpy-types.patch
   ];
 
   nativeCheckInputs = [ pytestCheckHook nose glibcLocales ];

pkgs/development/python-modules/bayespy/pr127-Fix-deprecated-numpy-types.patch

@@ -0,0 +1,129 @@
+Description: Fix deprecated numpy types
+From: Antti Mäkinen <antti.makinen@danfoss.com>
+Bug: https://github.com/bayespy/bayespy/pull/127
+Bug-Debian: https://bugs.debian.org/1027220
+
+--- a/bayespy/inference/vmp/nodes/categorical_markov_chain.py
++++ b/bayespy/inference/vmp/nodes/categorical_markov_chain.py
+@@ -171,7 +171,7 @@ class CategoricalMarkovChainDistribution
+         # Explicit broadcasting
+         P = P * np.ones(plates)[...,None,None,None]
+         # Allocate memory
+-        Z = np.zeros(plates + (self.N,), dtype=np.int)
++        Z = np.zeros(plates + (self.N,), dtype=np.int64)
+         # Draw initial state
+         Z[...,0] = random.categorical(p0, size=plates)
+         # Create [0,1,2,...,len(plate_axis)] indices for each plate axis and
+--- a/bayespy/inference/vmp/nodes/concatenate.py
++++ b/bayespy/inference/vmp/nodes/concatenate.py
+@@ -70,7 +70,7 @@ class Concatenate(Deterministic):
+         )
+ 
+         # Compute start indices for each parent on the concatenated plate axis
+-        self._indices = np.zeros(len(nodes)+1, dtype=np.int)
++        self._indices = np.zeros(len(nodes)+1, dtype=np.int64)
+         self._indices[1:] = np.cumsum([int(parent.plates[axis])
+                                        for parent in self.parents])
+         self._lengths = [parent.plates[axis] for parent in self.parents]
+--- a/bayespy/inference/vmp/nodes/tests/test_binomial.py
++++ b/bayespy/inference/vmp/nodes/tests/test_binomial.py
+@@ -43,7 +43,7 @@ class TestBinomial(TestCase):
+         X = Binomial(10, 0.7*np.ones((4,3)))
+         self.assertEqual(X.plates,
+                          (4,3))
+-        n = np.ones((4,3), dtype=np.int)
++        n = np.ones((4,3), dtype=np.int64)
+         X = Binomial(n, 0.7)
+         self.assertEqual(X.plates,
+                          (4,3))
+--- a/bayespy/inference/vmp/nodes/tests/test_multinomial.py
++++ b/bayespy/inference/vmp/nodes/tests/test_multinomial.py
+@@ -43,7 +43,7 @@ class TestMultinomial(TestCase):
+         X = Multinomial(10, 0.25*np.ones((2,3,4)))
+         self.assertEqual(X.plates,
+                          (2,3))
+-        n = 10 * np.ones((3,4), dtype=np.int)
++        n = 10 * np.ones((3,4), dtype=np.int64)
+         X = Multinomial(n, [0.1, 0.3, 0.6])
+         self.assertEqual(X.plates,
+                          (3,4))
+--- a/bayespy/inference/vmp/nodes/tests/test_take.py
++++ b/bayespy/inference/vmp/nodes/tests/test_take.py
+@@ -89,7 +89,7 @@ class TestTake(TestCase):
+ 
+         # Test matrix indices, no shape
+         X = GaussianARD(1, 1, plates=(3,), shape=(2,))
+-        Y = Take(X, np.ones((4, 5), dtype=np.int))
++        Y = Take(X, np.ones((4, 5), dtype=np.int64))
+         self.assertEqual(
+             Y.plates,
+             (4, 5),
+@@ -113,7 +113,7 @@ class TestTake(TestCase):
+ 
+         # Test vector indices with more plate axes
+         X = GaussianARD(1, 1, plates=(4, 2), shape=())
+-        Y = Take(X, np.ones(3, dtype=np.int))
++        Y = Take(X, np.ones(3, dtype=np.int64))
+         self.assertEqual(
+             Y.plates,
+             (4, 3),
+@@ -125,7 +125,7 @@ class TestTake(TestCase):
+ 
+         # Test take on other plate axis
+         X = GaussianARD(1, 1, plates=(4, 2), shape=())
+-        Y = Take(X, np.ones(3, dtype=np.int), plate_axis=-2)
++        Y = Take(X, np.ones(3, dtype=np.int64), plate_axis=-2)
+         self.assertEqual(
+             Y.plates,
+             (3, 2),
+@@ -141,7 +141,7 @@ class TestTake(TestCase):
+             ValueError,
+             Take,
+             X,
+-            np.ones(3, dtype=np.int),
++            np.ones(3, dtype=np.int64),
+             plate_axis=0,
+         )
+ 
+--- a/bayespy/utils/tests/test_linalg.py
++++ b/bayespy/utils/tests/test_linalg.py
+@@ -126,7 +126,7 @@ class TestBandedSolve(misc.TestCase):
+         # Random sizes of the blocks
+         #D = np.random.randint(5, 10, size=N)
+         # Fixed sizes of the blocks
+-        D = 5*np.ones(N, dtype=np.int)
++        D = 5*np.ones(N, dtype=np.int64)
+ 
+         # Some helpful variables to create the covariances
+         W = [np.random.randn(D[i], 2*D[i])
+--- a/bayespy/utils/misc.py
++++ b/bayespy/utils/misc.py
+@@ -355,7 +355,7 @@ class TestCase(unittest.TestCase):
+                     ]
+                 )
+             ]
+-        ).astype(np.int)
++        ).astype(int)
+ 
+         def pack(x):
+             return [
+--- a/bayespy/utils/random.py
++++ b/bayespy/utils/random.py
+@@ -284,7 +284,7 @@ def categorical(p, size=None):
+         for ind in inds:
+             z[ind] = np.searchsorted(P[ind], x[ind])
+ 
+-    return z.astype(np.int)
++    return z.astype(int)
+ 
+ 
+ def multinomial(n, p, size=None):
+@@ -313,7 +313,7 @@ def multinomial(n, p, size=None):
+     for i in misc.nested_iterator(size):
+         x[i] = np.random.multinomial(n[i], p[i])
+ 
+-    return x.astype(np.int)
++    return x.astype(int)
+ 
+ 
+ def gamma(a, b, size=None):

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

@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-x1EcS7PFCsjPYsq3Lt87SJRW4J5DE/OfdFs3NuyHiLw=";
   };
 
+  patches = [
+    # Fix deprecated numpy types
+    # https://sources.debian.org/data/main/b/brian/2.5.1-3/debian/patches/numpy1.24.patch
+    ./numpy1.24.patch
+  ];
+
   propagatedBuildInputs = [
     cython
     jinja2

pkgs/development/python-modules/brian2/numpy1.24.patch

@@ -0,0 +1,18 @@
+Description: Remove deprecated use of np.float
+Author: Marcel Stimberg <marcel.stimberg@inserm.fr>
+Bug-Debian: https://bugs.debian.org/1027193
+Applied-Upstream: 61ef84b316a3d0a892298adf51abd8ac50900758
+Last-Update: 2023-01-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- brian.orig/brian2/units/fundamentalunits.py
++++ brian/brian2/units/fundamentalunits.py
+@@ -1597,7 +1597,7 @@
+         unitless = np.array(self / best_unit, copy=False)
+         threshold = np.get_printoptions()['threshold'] // 100
+         if unitless.ndim == 0:
+-            sympy_quantity = np.float(unitless)
++            sympy_quantity = float(unitless)
+         elif unitless.ndim == 1:
+             array_str = np.array2string(unitless, separator=" & ", threshold=threshold,
+                                         max_line_width=sys.maxsize)

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

@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, pythonAtLeast
 , fetchPypi
 , pycosat
 , requests
@@ -15,6 +16,9 @@ buildPythonPackage rec {
   pname = "conda";
   version = "4.3.16";
 
+  # this is a very outdated version of conda that isn't compatible with python 3.10+
+  disabled = pythonAtLeast "3.10";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953";
@@ -30,5 +34,4 @@ buildPythonPackage rec {
     homepage = "https://github.com/conda/conda";
     license = lib.licenses.bsd3;
   };
-
 }

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

@@ -1,4 +1,12 @@
-{ stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, ncurses
+, importlib-metadata
+, setuptools
+, patchelf
+}:
 
 buildPythonPackage rec {
   pname = "cx-freeze";
@@ -15,23 +23,33 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     importlib-metadata # upstream has this for 3.8 as well
     ncurses
+    setuptools
   ];
 
-  # timestamp need to come after 1980 for zipfiles and nix store is set to epoch
   postPatch = ''
-    substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()"
+    # timestamp need to come after 1980 for zipfiles and nix store is set to epoch
+    substituteInPlace cx_Freeze/freezer.py --replace "st.st_mtime" "time.time()"
 
-    substituteInPlace setup.cfg \
+    sed -i /patchelf/d pyproject.toml
-      --replace "setuptools>=59.0.1,<=60.10.0" "setuptools>=59.0.1"
+    substituteInPlace pyproject.toml \
+      --replace 'setuptools>=61.2,<67' setuptools
   '';
 
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ patchelf ])
+  ];
+
   # fails to find Console even though it exists on python 3.x
   doCheck = false;
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
     description = "A set of scripts and modules for freezing Python scripts into executables";
     homepage = "https://marcelotduarte.github.io/cx_Freeze/";
     license = licenses.psfl;
+    maintainers = with maintainers; [ ];
+    mainProgram = "cxfreeze";
   };
 }

pkgs/development/python-modules/django-context-decorator/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "django-context-decorator";
-  version = "1.5.0";
+  version = "1.6.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "rixx";
     repo = "django-context-decorator";
     rev = "v${version}";
-    hash = "sha256-wgVZadI+4gK9snLfy/9FgFJJHqMyxndcxXwqIkMH29k=";
+    hash = "sha256-/FDGWGC1Pdu+RLyazDNZv+CMf5vscXprLdN8ELjUFNo=";
   };
 
   pythonImportsCheck = [

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

@@ -36,6 +36,10 @@ buildPythonPackage rec {
 
   postPatch = ''
     patchShebangs tests/integration
+
+    # `np.float` was a deprecated alias of the builtin `float`
+    substituteInPlace tests/test_storage.py \
+      --replace 'dtype=np.float)' 'dtype=float)'
   '';
 
   checkPhase = ''

pkgs/development/python-modules/google-cloud-pubsub/default.nix

@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.16.1";
+  version = "2.17.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MeJxvnVe1xQ64M3+0FBvr0DXUEtG+lyLW6tLki9sPTs=";
+    hash = "sha256-gojQMjgA8mszGxVP0fsxzpL+mibz+Eg3NyCce/5Qrek=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,12 +1,11 @@
-{ stdenv
+{ lib
-, lib
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
 , substituteAll
-, krb5
 , findutils
-, which
+, krb5
-, pythonOlder
+, stdenv
 }:
 
 buildPythonPackage rec {
@@ -26,7 +25,6 @@ buildPythonPackage rec {
       inherit findutils krb5;
       # krb5-config is in dev output
       krb5Dev = krb5.dev;
-      which = "${which}/bin/which";
     })
   ];
 

pkgs/development/python-modules/k5test/fix-paths.patch

@@ -1,23 +1,21 @@
-diff --git a/k5test/_utils.py b/k5test/_utils.py
-index e289fac..e2f486a 100644
 --- a/k5test/_utils.py
 +++ b/k5test/_utils.py
-@@ -65,12 +65,12 @@ def find_plugin_dir():
+@@ -63,12 +63,12 @@ def find_plugin_dir():
  
      # if there was no LD_LIBRARY_PATH, or the above failed
      if _PLUGIN_DIR is None:
--        lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64')
+-        lib_dir = os.path.join(get_output("krb5-config --prefix"), "lib64")
-+        lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib64')
++        lib_dir = os.path.join(get_output("@krb5Dev@/bin/krb5-config --prefix"), "lib64")
          _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))
  
      # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family
      if _PLUGIN_DIR is None:
--        lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib')
+-        lib_dir = os.path.join(get_output("krb5-config --prefix"), "lib")
-+        lib_dir = os.path.join(get_output('@krb5Dev@/bin/krb5-config --prefix'), 'lib')
++        lib_dir = os.path.join(get_output("@krb5Dev@/bin/krb5-config --prefix"), "lib")
          _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))
  
      if _PLUGIN_DIR is not None:
-@@ -89,7 +89,7 @@ def _decide_plugin_dir(dirs):
+@@ -87,7 +87,7 @@ def _decide_plugin_dir(dirs):
  
      for path in shortest_first:
          # check to see if it actually contains .so files
@@ -26,97 +24,93 @@ index e289fac..e2f486a 100644
              return path
  
      return None
-@@ -97,7 +97,7 @@ def _decide_plugin_dir(dirs):
+@@ -96,7 +96,7 @@ def _decide_plugin_dir(dirs):
- 
  def _find_plugin_dirs_installed(search_path):
      try:
--        options_raw = get_output('find %s/ -type d \( ! -executable -o ! -readable \) '
+         options_raw = get_output(
-+        options_raw = get_output('@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) '
+-            "find %s/ -type d \( ! -executable -o ! -readable \) "
-                                  '-prune -o '
++            "@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) "
-                                  '-type d -path "*/krb5/plugins" -print' % search_path,
+             "-prune -o "
-                                  stderr=subprocess.STDOUT)
+             '-type d -path "*/krb5/plugins" -print' % search_path,
+             stderr=subprocess.STDOUT,
 @@ -111,7 +111,7 @@ def _find_plugin_dirs_installed(search_path):
  
  
  def _find_plugin_dirs_src(search_path):
--    options_raw = get_output('find %s/../ -type d -name plugins' % search_path)
+-    options_raw = get_output("find %s/../ -type d -name plugins" % search_path)
-+    options_raw = get_output('@findutils@/bin/find %s/../ -type d -name plugins' % search_path)
++    options_raw = get_output("@findutils@/bin/find %s/../ -type d -name plugins" % search_path)
  
      if options_raw:
-         return options_raw.split('\n')
+         return options_raw.split("\n")
-diff --git a/k5test/realm.py b/k5test/realm.py
-index 161e5ad..9f50049 100644
 --- a/k5test/realm.py
 +++ b/k5test/realm.py
-@@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta):
+@@ -84,7 +84,7 @@ class K5Realm(metaclass=abc.ABCMeta):
+         provider_cls = cls
  
          if provider_cls == K5Realm:
-             krb5_config = _discover_path('krb5-config',
+-            krb5_config = _discover_path("krb5-config", "/usr/bin/krb5-config", kwargs)
--                                         '/usr/bin/krb5-config', kwargs)
++            krb5_config = _discover_path("krb5-config", "@krb5@/bin/krb5-config", kwargs)
-+                                         '@krb5@/bin/krb5-config', kwargs)
  
              try:
                  krb5_version = subprocess.check_output(
-@@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta):
+@@ -96,7 +96,7 @@ class K5Realm(metaclass=abc.ABCMeta):
+ 
                  # macOS output doesn't contain Heimdal
-                 if 'heimdal' in krb5_version.lower() or (
+                 if "heimdal" in krb5_version.lower() or (
-                         sys.platform == 'darwin' and
+-                    sys.platform == "darwin" and krb5_config == "/usr/bin/krb5-config"
--                        krb5_config == '/usr/bin/krb5-config'):
++                    sys.platform == "darwin" and krb5_config == "@krb5@/bin/krb5-config"
-+                        krb5_config == '@krb5@/bin/krb5-config'):
+                 ):
                      provider_cls = HeimdalRealm
                  else:
-                     provider_cls = MITRealm
+@@ -457,14 +457,14 @@ class MITRealm(K5Realm):
-@@ -434,14 +434,14 @@ class MITRealm(K5Realm):
      @property
      def _default_paths(self):
          return [
--            ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'),
+-            ("kdb5_util", "kdb5_util", "/usr/sbin/kdb5_util"),
--            ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'),
+-            ("krb5kdc", "krb5kdc", "/usr/sbin/krb5kdc"),
--            ('kadmin', 'kadmin', '/usr/bin/admin'),
+-            ("kadmin", "kadmin", "/usr/bin/kadmin"),
--            ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'),
+-            ("kadmin_local", "kadmin.local", "/usr/sbin/kadmin.local"),
--            ('kadmind', 'kadmind', '/usr/sbin/kadmind'),
+-            ("kadmind", "kadmind", "/usr/sbin/kadmind"),
--            ('kprop', 'kprop', '/usr/sbin/kprop'),
+-            ("kprop", "kprop", "/usr/sbin/kprop"),
--            ('_kinit', 'kinit', '/usr/bin/kinit'),
+-            ("_kinit", "kinit", "/usr/bin/kinit"),
--            ('_klist', 'klist', '/usr/bin/klist'),
+-            ("_klist", "klist", "/usr/bin/klist"),
-+            ('kdb5_util', 'kdb5_util', '@krb5@/bin/kdb5_util'),
++            ("kdb5_util", "kdb5_util", "@krb5@/bin/kdb5_util"),
-+            ('krb5kdc', 'krb5kdc', '@krb5@/bin/kdb5kdc'),
++            ("krb5kdc", "krb5kdc", "@krb5@/bin/krb5kdc"),
-+            ('kadmin', 'kadmin', '@krb5@/bin/admin'),
++            ("kadmin", "kadmin", "@krb5@/bin/kadmin"),
-+            ('kadmin_local', 'kadmin.local', '@krb5@/bin/kadmin.local'),
++            ("kadmin_local", "kadmin.local", "@krb5@/bin/kadmin.local"),
-+            ('kadmind', 'kadmind', '@krb5@/bin/kadmind'),
++            ("kadmind", "kadmind", "@krb5@/bin/kadmind"),
-+            ('kprop', 'kprop', '@krb5@/bin/kprop'),
++            ("kprop", "kprop", "@krb5@/bin/kprop"),
-+            ('_kinit', 'kinit', '@krb5@/bin/kinit'),
++            ("_kinit", "kinit", "@krb5@/bin/kinit"),
-+            ('_klist', 'klist', '@krb5@/bin/klist'),
++            ("_klist", "klist", "@krb5@/bin/klist"),
          ]
  
      @property
-@@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm):
+@@ -625,12 +625,12 @@ class HeimdalRealm(K5Realm):
  
          return [
-             ('krb5kdc', 'kdc', os.path.join(base, 'kdc')),
+             ("krb5kdc", "kdc", os.path.join(base, "kdc")),
--            ('kadmin', 'kadmin', '/usr/bin/kadmin'),
+-            ("kadmin", "kadmin", "/usr/bin/kadmin"),
--            ('kadmin_local', 'kadmin', '/usr/bin/kadmin'),
+-            ("kadmin_local", "kadmin", "/usr/bin/kadmin"),
-+            ('kadmin', 'kadmin', '@krb5@/bin/kadmin'),
++            ("kadmin", "kadmin", "@krb5@/bin/kadmin"),
-+            ('kadmin_local', 'kadmin', '@krb5@/bin/kadmin'),
++            ("kadmin_local", "kadmin", "@krb5@/bin/kadmin"),
-             ('kadmind', 'kadmind', os.path.join(base, 'kadmind')),
+             ("kadmind", "kadmind", os.path.join(base, "kadmind")),
--            ('_kinit', 'kinit', '/usr/bin/kinit'),
+-            ("_kinit", "kinit", "/usr/bin/kinit"),
--            ('_klist', 'klist', '/usr/bin/klist'),
+-            ("_klist", "klist", "/usr/bin/klist"),
--            ('_ktutil', 'ktutil', '/usr/bin/ktutil'),
+-            ("_ktutil", "ktutil", "/usr/bin/ktutil"),
-+            ('_kinit', 'kinit', '@krb5@/bin/kinit'),
++            ("_kinit", "kinit", "@krb5@/bin/kinit"),
-+            ('_klist', 'klist', '@krb5@/bin/klist'),
++            ("_klist", "klist", "@krb5@/bin/klist"),
-+            ('_ktutil', 'ktutil', '@krb5@/bin/ktutil'),
++            ("_ktutil", "ktutil", "@krb5@/bin/ktutil"),
          ]
  
      @property
-diff --git a/k5test/unit.py b/k5test/unit.py
-index 3c64b9e..59da1ab 100644
 --- a/k5test/unit.py
 +++ b/k5test/unit.py
-@@ -38,7 +38,7 @@ _KRB_VERSION = None
+@@ -39,7 +39,7 @@ _KRB_VERSION = None
  def krb_minversion_test(target_version, problem, provider=None):
      global _KRB_VERSION
      if _KRB_VERSION is None:
 -        _KRB_VERSION = _utils.get_output("krb5-config --version")
 +        _KRB_VERSION = _utils.get_output("@krb5Dev@/bin/krb5-config --version")
-         _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.')
+         _KRB_VERSION = _KRB_VERSION.split(" ")[-1].split(".")
  
      def make_ext_test(func):

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

@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, beniget
+, frilouz
+, gast
+, nbconvert
+, nbformat
+, pythonOlder
+, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "memestra";
+  version = "0.2.1";
+
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-6shwf9BoDfZMy0itP8esNP4ov6fw6LJpO3Y5ZahwDZw=";
+  };
+
+  propagatedBuildInputs = [
+    gast
+    beniget
+    frilouz
+    nbconvert
+    nbformat
+    pyyaml
+  ];
+
+  # Tests are not detected and so the checkPhase fails
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "memestra"
+  ];
+
+  meta = with lib; {
+    description = "A linter that tracks reference to deprecated functions.";
+    homepage = "https://github.com/QuantStack/memestra";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}

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

@@ -1,30 +1,36 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , cython
 , fetchPypi
 , jdk
-, lib
+, pythonOlder
-, six
 }:
 
 buildPythonPackage rec {
   pname = "pyjnius";
-  version = "1.4.2";
+  version = "1.5.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4=";
+    hash = "sha256-ZjRuJk8eIghrh8XINonqvP7xRQrGR2/YVr6kmLLhNz4=";
   };
-  propagatedBuildInputs = [
+
-    six
+  nativeBuildInputs = [
+    jdk
+    cython
   ];
 
-  nativeBuildInputs = [ jdk cython ];
+  pythonImportsCheck = [
-
+    "jnius"
-  pythonImportsCheck = [ "jnius" ];
+  ];
 
   meta = with lib; {
     description = "A Python module to access Java classes as Python classes using the Java Native Interface (JNI)";
     homepage = "https://github.com/kivy/pyjnius";
+    changelog = "https://github.com/kivy/pyjnius/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ ifurther ];
   };

pkgs/development/python-modules/pyls-memestra/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, deprecated
+, memestra
+, python-lsp-server
+}:
+
+buildPythonPackage rec {
+  pname = "pyls-memestra";
+  version = "0.0.16";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-zMVDd2uB4znw38z3yb0Nt7qQH5dGHTbQBIZO/qo1/t8=";
+  };
+
+  propagatedBuildInputs = [
+    deprecated
+    memestra
+    python-lsp-server
+  ];
+
+  # Tests fail because they rely on writting to read-only files
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pyls_memestra"
+  ];
+
+  meta = with lib; {
+    description = "Memestra plugin for the Python Language Server";
+    homepage = "https://github.com/QuantStack/pyls-memestra";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}

pkgs/development/python-modules/pylsp-rope/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, rope
+, pytestCheckHook
+, python-lsp-server
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pylsp-rope";
+  version = "0.1.11";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-SKrfmT2vpej8oRCLSlQxMUz4C8eM/91WQA6tnEB1U74=";
+  };
+
+  propagatedBuildInputs = [
+    rope
+    python-lsp-server
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pylsp_rope"
+  ];
+
+  meta = with lib; {
+    description = "Extended refactoring capabilities for Python LSP Server using Rope";
+    homepage = "https://github.com/python-rope/pylsp-rope";
+    license = licenses.mit;
+    maintainers = with maintainers; [ GaetanLepage ];
+  };
+}

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

@@ -1,14 +1,15 @@
 { lib
 , buildPythonPackage
-, fetchpatch
+, pythonOlder
 , fetchFromGitHub
+, fetchpatch
 , appdirs
 , lxml
 , packaging
 , py
 , pytestCheckHook
-, pythonOlder
 , wireshark-cli
+, stdenv
 }:
 
 buildPythonPackage rec {
@@ -48,6 +49,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ py pytestCheckHook wireshark-cli ];
 
+  disabledTests = lib.optionals stdenv.isDarwin [
+    # fails on darwin
+    # _pickle.PicklingError: logger cannot be pickled
+    "test_iterate_empty_psml_capture"
+  ];
+
   pythonImportsCheck = [ "pyshark" ];
 
   pytestFlagsArray = [ "../tests/" ];

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.39.0";
+  version = "0.39.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-PQOkwpyaKZ0oubDCzIKHXylpk1HWH39O0zonJ7Gfly4=";
+    hash = "sha256-N+1FfTKDITBmLaOjKZsahMd6s26W19ObcWXk8gGQ0QI=";
   };
 
   propagatedBuildInputs = [

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

@@ -16,10 +16,17 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zope_interface webob ];
 
+  # skip failing test
+  # OSError: [Errno 22] Invalid argument
+  preCheck = ''
+    rm repoze/who/plugins/tests/test_htpasswd.py
+  '';
+
   meta = with lib; {
     description = "WSGI Authentication Middleware / API";
     homepage = "http://www.repoze.org";
+    changelog = "https://github.com/repoze/repoze.who/blob/${version}/CHANGES.rst";
     license = licenses.bsd0;
+    maintainers = with maintainers; [ ];
   };
-
 }

pkgs/development/python-modules/torch/bin.nix

@@ -25,7 +25,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.0.0";
+  version = "2.0.1";
 in buildPythonPackage {
   inherit version;
 

pkgs/development/python-modules/torch/binary-hashes.nix

@@ -6,86 +6,86 @@
 # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
 
 version : builtins.getAttr version {
-  "2.0.0" = {
+  "2.0.1" = {
     x86_64-linux-38 = {
-      name = "torch-2.0.0-cp38-cp38-linux_x86_64.whl";
+      name = "torch-2.0.1-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp38-cp38-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-H4766/y7fsOWL9jHw74CxmZu/1OhIEMAanSdZHZWFj4=";
+      hash = "sha256-LOOKbk6nxLf1uqUeZSQ6X2h/bhmreRW6WypDEQX1C74=";
     };
     x86_64-linux-39 = {
-      name = "torch-2.0.0-cp39-cp39-linux_x86_64.whl";
+      name = "torch-2.0.1-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-6rl6n+WefjHWVisYb0NecXsd8zMcrcd25sBzIjmp7Tk=";
+      hash = "sha256-61XynbV0TtqKlvVZTmN9rtDVIngnMAXedZlw5nz6alo=";
     };
     x86_64-linux-310 = {
-      name = "torch-2.0.0-cp310-cp310-linux_x86_64.whl";
+      name = "torch-2.0.1-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-S2kOK3fyEHNQDGXYu56pZWuMtOlp81c3C7yZKjsHR2Q=";
+      hash = "sha256-p6SdRZv0hi9k97waaL7M+IgcL6nz4FaWCOFrpvhev3s=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.0.0-cp311-cp311-linux_x86_64.whl";
+      name = "torch-2.0.1-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp311-cp311-linux_x86_64.whl";
-      hash = "sha256-I4Vz02LFZBE0UQRvZwjDuBWP5rG39sA7cnMyfZVd61Q=";
+      hash = "sha256-FDtsZYwX1DN24t+6osEG01Y51hXl6N7EQpzx5RDdjWE=";
     };
     x86_64-darwin-38 = {
-      name = "torch-2.0.0-cp38-none-macosx_10_9_x86_64.whl";
+      name = "torch-2.0.1-cp38-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp38-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp38-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-zHiMu7vG60yQ5SxVDv0GdYbCaTCSzzZ8E1s0iTpkrng=";
+      hash = "sha256-Gttg02nyZQysjpqVsdV1jiXVJqNICPdEjQvVmeSukHI=";
     };
     x86_64-darwin-39 = {
-      name = "torch-2.0.0-cp39-none-macosx_10_9_x86_64.whl";
+      name = "torch-2.0.1-cp39-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp39-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp39-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-bguXvrA3oWVmnDElkfJCOC6RCaJA4gBU1aV4LZI2ytA=";
+      hash = "sha256-xi35k1K9buWlqNGDJFIRBDXReLUWTeRQgxo6jMFNxoA=";
     };
     x86_64-darwin-310 = {
-      name = "torch-2.0.0-cp310-none-macosx_10_9_x86_64.whl";
+      name = "torch-2.0.1-cp310-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp310-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp310-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-zptaSb1RPf95UKWgfW4mWU3VGYnO4FujiLA+jjZv1dU=";
+      hash = "sha256-Vn+E1lftxVgtcWkAVD5uYjU9videYc3DbtpJKeRt+ec=";
     };
     x86_64-darwin-311 = {
-      name = "torch-2.0.0-cp311-none-macosx_10_9_x86_64.whl";
+      name = "torch-2.0.1-cp311-none-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp311-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp311-none-macosx_10_9_x86_64.whl";
-      hash = "sha256-AYWGIPJfJeep7EtUf/OOXifJLTjsTMupz7+zHXBx7Zw=";
+      hash = "sha256-72VEJ9kWABKYZGRONd7qdh+x/hMXEBgLlSpvLiIHB14=";
     };
     aarch64-darwin-38 = {
-      name = "torch-2.0.0-cp38-none-macosx_11_0_arm64.whl";
+      name = "torch-2.0.1-cp38-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp38-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp38-none-macosx_11_0_arm64.whl";
-      hash = "sha256-0pJkDw/XK3oxsqbjtjXrUGX8vt1EePnK0aHnqeyGHTU=";
+      hash = "sha256-G8/8FrieKWgmszuY21Fm+ZDjtyZUorkGc+gXsWxQ4ys=";
     };
     aarch64-darwin-39 = {
-      name = "torch-2.0.0-cp39-none-macosx_11_0_arm64.whl";
+      name = "torch-2.0.1-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp39-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-KXpJGa/xwPmKWOvpaSAPcTUKHU1PmG2/1gwC/854Dpk=";
+      hash = "sha256-ZxolZeP2O4/o5Crj42rSSf5eVnQ16ie5TtqmcqfQxBY=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.0.0-cp310-none-macosx_11_0_arm64.whl";
+      name = "torch-2.0.1-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-U+HDPGiWWDzbmlg2k+IumSZkRMSkM5Ld3FYmQNOeVCs=";
+      hash = "sha256-eHtaeKp5F0Zem5Y5m4g5IMiKCPTrY7Wl0tGhbifS+Js=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.0.0-cp311-none-macosx_11_0_arm64.whl";
+      name = "torch-2.0.1-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.0.1-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-mi5TtXg+9YlqavM4s214LyjoPI3fwqxEtnsGbZ129Jg=";
+      hash = "sha256-JapDyoDc3zLxPaBMUD7Hr9+Od+OgGD3YXNPlOyhC5Sc=";
     };
     aarch64-linux-38 = {
-      name = "torch-2.0.0-cp38-cp38-manylinux2014_aarch64.whl";
+      name = "torch-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-2.0.0-cp38-cp38-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
-      hash = "sha256-EbA4T+PBjAG4/FmS5w/FGc3mXkTFHMh74YOMGAPa9C8=";
+      hash = "sha256-CIIkN1X/KIlejm3GvCbrz1qgkR7YGyoS8kH8SwkHWxM=";
     };
     aarch64-linux-39 = {
-      name = "torch-2.0.0-cp39-cp39-manylinux2014_aarch64.whl";
+      name = "torch-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-2.0.0-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
-      hash = "sha256-qDsmvWrjb79f7j1Wlz2YFuIALoo7fZIFUxFnwoqqOKc=";
+      hash = "sha256-Qj4K4le3VrtFpLSQcgRnctGtDFkiZcUIAHDgdn2k5JA=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.0.0-cp310-cp310-manylinux2014_aarch64.whl";
+      name = "torch-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-2.0.0-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
-      hash = "sha256-nwH+H2Jj8xvQThdXlG/WOtUxrjfyi7Lb9m9cgm7gifQ=";
+      hash = "sha256-NZv6rZTRzaAqt3XcHMOG1YVxIym7R7h0FgfvbvSVB0c=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.0.0-cp311-cp311-manylinux2014_aarch64.whl";
+      name = "torch-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torch-2.0.0-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torch-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
-      hash = "sha256-1Dmuw0nJjxKBnoVkuMVACORhPdRChYKvDm4UwkyoWHA=";
+      hash = "sha256-tgGbHeSXjpbaoh1qPrtB6IoLR0iY/iUf2WGJWHQIhz4=";
     };
   };
 }

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

@@ -55,6 +55,7 @@ let
   inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl;
 in
 
+assert cudaSupport -> stdenv.isLinux;
 assert cudaSupport -> (cudaPackages.cudaMajorVersion == "11");
 
 # confirm that cudatoolkits are sync'd across dependencies
@@ -133,7 +134,7 @@ let
 in buildPythonPackage rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
-  version = "2.0.0";
+  version = "2.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8.0";
@@ -149,7 +150,7 @@ in buildPythonPackage rec {
     repo = "pytorch";
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
-    hash = "sha256-cSw7+AYBUcZLz3UyK/+JWWjQxKwVBXcFvBq0XAcL3tE=";
+    hash = "sha256-xUj77yKz3IQ3gd/G32pI4OhL3LoN1zS7eFg0/0nZp5I=";
   };
 
   patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
@@ -414,7 +415,7 @@ in buildPythonPackage rec {
     homepage = "https://pytorch.org/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
-    platforms = with platforms; linux ++ lib.optionals (!cudaSupport || !rocmSupport) darwin;
+    platforms = with platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin;
     broken = rocmSupport && cudaSupport; # CUDA and ROCm are mutually exclusive
   };
 }

pkgs/development/python-modules/torchaudio/bin.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.0.1";
+  version = "2.0.2";
   format = "wheel";
 
   src =

pkgs/development/python-modules/torchaudio/binary-hashes.nix

@@ -6,86 +6,86 @@
 # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
 
 version : builtins.getAttr version {
-  "2.0.1" = {
+  "2.0.2" = {
     x86_64-linux-38 = {
-      name = "torchaudio-2.0.1-cp38-cp38-linux_x86_64.whl";
+      name = "torchaudio-2.0.2-cp38-cp38-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp38-cp38-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp38-cp38-linux_x86_64.whl";
-      hash = "sha256-lLDpx2ypHR4CiYlZIPv+jBF0ZNdXtktd+tsTCM+ZBPk=";
+      hash = "sha256-lU3njk8Gb+lvpvQYtfHX1Y0bD7z2otNzDwQaL9eW93I=";
     };
     x86_64-linux-39 = {
-      name = "torchaudio-2.0.1-cp39-cp39-linux_x86_64.whl";
+      name = "torchaudio-2.0.2-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp39-cp39-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp39-cp39-linux_x86_64.whl";
-      hash = "sha256-Bws4SWlhQr49keCycHbaHz+MtDKrzONc2VbRkfwNgYc=";
+      hash = "sha256-MixBw26OYv03qzURSmeSGuVCvNlA1YPNE+DhUUHISPk=";
     };
     x86_64-linux-310 = {
-      name = "torchaudio-2.0.1-cp310-cp310-linux_x86_64.whl";
+      name = "torchaudio-2.0.2-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp310-cp310-linux_x86_64.whl";
-      hash = "sha256-GcTvkBIyTE+4DqZpNFUbeAfZcUjChTji6rr+FqtQ6Rw=";
+      hash = "sha256-JmkmReoGGgBcV+xYGi0EJSEKxrqfkj7fEcybDvOhEek=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.0.1-cp311-cp311-linux_x86_64.whl";
+      name = "torchaudio-2.0.2-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.2%2Bcu118-cp311-cp311-linux_x86_64.whl";
-      hash = "sha256-GicitvZleO3FY+d7TMB6ItZjorte5cneJTlmGpihTbk=";
+      hash = "sha256-e8C1Cg2DokvcORYnDCOTQ0WshDUd92vTuwiDS9snHfY=";
     };
     x86_64-darwin-38 = {
-      name = "torchaudio-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl";
+      name = "torchaudio-2.0.2-cp38-cp38-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp38-cp38-macosx_10_9_x86_64.whl";
-      hash = "sha256-AiyhuqS7gZt4NDvUe1f/bcb5/Bn6TvJplGqt9+Yts8A=";
+      hash = "sha256-qCg91hxXnqWxTWdzu8C/hFc7ErN/BfArtLJCXXd2coQ=";
     };
     x86_64-darwin-39 = {
-      name = "torchaudio-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl";
+      name = "torchaudio-2.0.2-cp39-cp39-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp39-cp39-macosx_10_9_x86_64.whl";
-      hash = "sha256-48bI+eqfDi33oLk3Ww3PlVkG44/BL6tUK3KoYVZK+Oc=";
+      hash = "sha256-ETihw52iRFocrKIN3OHnfJZX6SJj6zQ3YCT1F/UoTUs=";
     };
     x86_64-darwin-310 = {
-      name = "torchaudio-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl";
+      name = "torchaudio-2.0.2-cp310-cp310-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp310-cp310-macosx_10_9_x86_64.whl";
-      hash = "sha256-tdIeu7VecEDUGNUGKw6IL5Zg1otHezj9Q2+mySzLtSo=";
+      hash = "sha256-gMZNq7nYwzvG8qjgx+vhfqh/UCiTHA1qL3O54WtSctA=";
     };
     x86_64-darwin-311 = {
-      name = "torchaudio-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl";
+      name = "torchaudio-2.0.2-cp311-cp311-macosx_10_9_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp311-cp311-macosx_10_9_x86_64.whl";
-      hash = "sha256-4qBHZ1STwKolj+xiHvQOiwGr49jbyHIVLktZmEGKo8U=";
+      hash = "sha256-psuoDZqzouwTF83Fy8BlShiaJuPYso75+DM2FZ/V5ek=";
     };
     aarch64-darwin-38 = {
-      name = "torchaudio-2.0.1-cp38-cp38-macosx_11_0_arm64.whl";
+      name = "torchaudio-2.0.2-cp38-cp38-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp38-cp38-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp38-cp38-macosx_11_0_arm64.whl";
-      hash = "sha256-oVOtXNti3o7J/RNgoNCAu6851XiuBOeI2yEVceZ1t+A=";
+      hash = "sha256-KMm+gwYI+TyQZ3Dre0iAli+P75vVJ1rFtIyFDzzEvDI=";
     };
     aarch64-darwin-39 = {
-      name = "torchaudio-2.0.1-cp39-cp39-macosx_11_0_arm64.whl";
+      name = "torchaudio-2.0.2-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp39-cp39-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-HQzwd5ozTsGGHp+ii862amM8Quj2szIuLjf/nyDQroE=";
+      hash = "sha256-3l2Uy4MFwAJo37xXbKfkRfQIkeAkqeXijGOtn4UeVBo=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.0.1-cp310-cp310-macosx_11_0_arm64.whl";
+      name = "torchaudio-2.0.2-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-bbzZOynXGi9QDzajTqXkZ/UQ93PahTIgmOa92MncmUg=";
+      hash = "sha256-FhlnNQD+CK6WtxlS8D7Px059CEPNmIIZPQZCqCck9Tc=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.0.1-cp311-cp311-macosx_11_0_arm64.whl";
+      name = "torchaudio-2.0.2-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.2-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-kaKOWH9wigMyDt28xKfdGtcVCz1IRrbBVX2FzImo0Gw=";
+      hash = "sha256-FTJxMrKPNJY7qm/hgTAwpjTSWBqpyhIPcwwej6vcEQI=";
     };
     aarch64-linux-38 = {
-      name = "torchaudio-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
+      name = "torchaudio-2.0.2-cp38-cp38-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp38-cp38-manylinux2014_aarch64.whl";
-      hash = "sha256-qlsjzsMVcWRKpn1s1QGzl/QmVX3F8y6NtuzbJ7GUClg=";
+      hash = "sha256-7gjsMDBQQFmY50oKNkmu5NFkCMLrS7H4x6cmMYsc4bc=";
     };
     aarch64-linux-39 = {
-      name = "torchaudio-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
+      name = "torchaudio-2.0.2-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp39-cp39-manylinux2014_aarch64.whl";
-      hash = "sha256-ry16SysebkDnnA7d0Qezu0MVkdBJTX+X7ffBhkN7XBo=";
+      hash = "sha256-p08z2gs8U7dw9YOgLKvVkZbwift3pl6znNXYEbWiHWM=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
+      name = "torchaudio-2.0.2-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp310-cp310-manylinux2014_aarch64.whl";
-      hash = "sha256-6f/6Y0Gbxl7Pg5Vo3QS+O6VibF9bJsmlZsA4KtKXcck=";
+      hash = "sha256-2t8je0/RVaPSE73+/+3tR/WlU9ODgXUAQ4tE8k+lOFE=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
+      name = "torchaudio-2.0.2-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/torchaudio-2.0.2-cp311-cp311-manylinux2014_aarch64.whl";
-      hash = "sha256-MkQuKxHfwJxMW2zEuSTT84wslGPuKOSGUi+fSLCbf7c=";
+      hash = "sha256-sirOqh7FozEMwVZC0Z3QDVOnzjmbkJatHeoLJOUJevM=";
     };
   };
 }

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

@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "audio";
     rev = "v${version}";
-    hash = "sha256-qrDWFY+6eVV9prUzUzb5yzyFYtEvaSyEW0zeKqAg2Vk=";
+    hash = "sha256-9lB4gLXq0nXHT1+DNOlbJQqNndt2I6kVoNwhMO/2qlE=";
   };
 
   postPatch = ''