netboot: add bootloader-related stuff only if they are available on host platform

maintainers/maintainer-list.nix

@@ -309,12 +309,6 @@
     githubId = 2321000;
     name = "Ruslan Babayev";
   };
-  abustany = {
-    email = "adrien@bustany.org";
-    github = "abustany";
-    githubId = 2526296;
-    name = "Adrien Bustany";
-  };
   acairncross = {
     email = "acairncross@gmail.com";
     github = "acairncross";
@@ -2949,7 +2943,7 @@
   };
   citadelcore = {
     email = "alex@arctarus.co.uk";
-    github = "VertexA115";
+    github = "CitadelCore";
     githubId = 5567402;
     name = "Alex Zero";
     keys = [{
@@ -4958,12 +4952,6 @@
     githubId = 2512008;
     name = "Even Brenden";
   };
-  evilmav = {
-    email = "elenskiy.ilya@gmail.com";
-    github = "evilmav";
-    githubId = 6803717;
-    name = "Ilya Elenskiy";
-  };
   evils = {
     email = "evils.devils@protonmail.com";
     matrix = "@evils:nixos.dev";
@@ -5434,7 +5422,7 @@
     githubId = 7551358;
     name = "Frede Emil";
   };
-  Freed-Wu = {
+ Freed-Wu = {
     email = "wuzhenyu@ustc.edu";
     github = "Freed-Wu";
     githubId = 32936898;
@@ -5543,7 +5531,7 @@
   };
   fuzen = {
     email = "me@fuzen.cafe";
-    github = "LovingMelody";
+    github = "Fuzen-py";
     githubId = 17859309;
     name = "Fuzen";
   };
@@ -5897,6 +5885,15 @@
     githubId = 1621335;
     name = "Andrew Trachenko";
   };
+  gordias = {
+    name = "Gordias";
+    email = "gordias@disroot.org";
+    github = "gordiasdot";
+    githubId = 94724133;
+    keys = [{
+      fingerprint = "C006 B8A0 0618 F3B6 E0E4  2ECD 5D47 2848 30FA A4FA";
+    }];
+  };
   gotcha = {
     email = "gotcha@bubblenet.be";
     github = "gotcha";
@@ -6771,7 +6768,7 @@
   };
   ilya-kolpakov = {
     email = "ilya.kolpakov@gmail.com";
-    github = "1pakch";
+    github = "ilya-kolpakov";
     githubId = 592849;
     name = "Ilya Kolpakov";
   };
@@ -7173,7 +7170,7 @@
   jayesh-bhoot = {
     name = "Jayesh Bhoot";
     email = "jb@jayeshbhoot.com";
-    github = "bhootjb";
+    github = "jayeshbhoot";
     githubId = 1915507;
   };
   jayman2000 = {
@@ -7658,10 +7655,10 @@
     name = "Jocelyn Thode";
   };
   joedevivo = {
-    github = "joedevivo";
-    githubId = 55951;
-    name = "Joe DeVivo";
-  };
+     github = "joedevivo";
+     githubId = 55951;
+     name = "Joe DeVivo";
+   };
   joelancaster = {
     email = "joe.a.lancas@gmail.com";
     github = "JoeLancaster";
@@ -7991,7 +7988,7 @@
   };
   juaningan = {
     email = "juaningan@gmail.com";
-    github = "oneingan";
+    github = "uningan";
     githubId = 810075;
     name = "Juan Rodal";
   };
@@ -8954,7 +8951,7 @@
     github = "leifhelm";
     githubId = 31693262;
     name = "Jakob Leifhelm";
-    keys = [{
+    keys =[{
       fingerprint = "4A82 F68D AC07 9FFD 8BF0  89C4 6817 AA02 3810 0822";
     }];
   };
@@ -10011,7 +10008,7 @@
     githubId = 95194;
     name = "Mauricio Scheffer";
   };
-  maxbrunet = {
+   maxbrunet = {
     email = "max@brnt.mx";
     github = "maxbrunet";
     githubId = 32458727;
@@ -10383,7 +10380,7 @@
     name = "Michael Pacheco";
     github = "MichaelPachec0";
     githubId = 48970112;
-    keys = [{
+    keys = [ {
       fingerprint = "8D12 991F 5558 C501 70B2  779C 7811 46B0 B5F9 5F64";
     }];
   };
@@ -11980,15 +11977,6 @@
     github = "ony";
     githubId = 11265;
   };
-  ooliver1 = {
-    name = "Oliver Wilkes";
-    email = "oliverwilkes2006@icloud.com";
-    github = "ooliver1";
-    githubId = 34910574;
-    keys = [{
-      fingerprint = "D055 8A23 3947 B7A0 F966  B07F 0B41 0348 9833 7273";
-    }];
-  };
   opeik = {
     email = "sandro@stikic.com";
     github = "opeik";
@@ -17012,6 +17000,16 @@
     github = "wdavidw";
     githubId = 46896;
   };
+  WeebSorceress = {
+    name = "WeebSorceress";
+    email = "hello@weebsorceress.anonaddy.me";
+    matrix = "@weebsorceress:matrix.org";
+    github = "WeebSorceress";
+    githubId = 106774777;
+    keys = [{
+      fingerprint = "659A 9BC3 F904 EC24 1461  2EFE 7F57 3443 17F0 FA43";
+    }];
+  };
   wegank = {
     name = "Weijia Wang";
     email = "contact@weijia.wang";

maintainers/scripts/fix-maintainers.pl

@@ -42,7 +42,7 @@ while(my($k, $v) = each %$maintainers_json) {
     }
     my $resp_json = from_json($resp->content);
     my $api_user = %$resp_json{"login"};
-    if (lc($current_user) ne lc($api_user)) {
+    if ($current_user ne $api_user) {
         print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n";
         my $file = path($maintainers_list_nix);
         my $data = $file->slurp_utf8;

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

@@ -356,8 +356,6 @@ In addition to numerous new and updated packages, this release has the following
 
 - Only `k3s` version 1.26 is included. Users of the `k3s_1_24` or `k3s_1_25` packages should upgrade to use the `1.26` version of the package.
 
-- The `nerdfonts` package has been updated to major version 3, which includes potential [breaking changes](https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.0.0).
-
 ## Other Notable Changes {#sec-release-23.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

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

@@ -18,8 +18,6 @@
 
 ## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
 
-- `writeTextFile` now requires `executable` to be boolean, values like `null` or `""` will now fail to evaluate.
-
 - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
 
 - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.
@@ -28,10 +26,6 @@
 
 - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
 
-- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.
-
-- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.
-
 ## Other Notable Changes {#sec-release-23.11-notable-changes}
 
 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

nixos/modules/installer/netboot/netboot.nix

@@ -38,10 +38,7 @@ with lib;
     boot.loader.grub.enable = false;
 
     # !!! Hack - attributes expected by other modules.
-    environment.systemPackages = [ pkgs.grub2_efi ]
-      ++ (if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
-          then []
-          else [ pkgs.grub2 pkgs.syslinux ]);
+    environment.systemPackages = lib.filter (lib.meta.availableOn pkgs.stdenv.hostPlatform) [ pkgs.grub2_efi pkgs.grub2 pkgs.syslinux ];
 
     fileSystems."/" = mkImageMediaOverride
       { fsType = "tmpfs";

nixos/modules/services/mail/public-inbox.nix

@@ -9,6 +9,9 @@ let
   gitIni = pkgs.formats.gitIni { listsAsDuplicateKeys = true; };
   iniAtom = elemAt gitIni.type/*attrsOf*/.functor.wrapped/*attrsOf*/.functor.wrapped/*either*/.functor.wrapped 0;
 
+  useSpamAssassin = cfg.settings.publicinboxmda.spamcheck == "spamc" ||
+                    cfg.settings.publicinboxwatch.spamcheck == "spamc";
+
   publicInboxDaemonOptions = proto: defaultPort: {
     args = mkOption {
       type = with types; listOf str;
@@ -255,6 +258,12 @@ in
     nntp = {
       enable = mkEnableOption (lib.mdDoc "the public-inbox NNTP server");
     } // publicInboxDaemonOptions "nntp" 563;
+    spamAssassinRules = mkOption {
+      type = with types; nullOr path;
+      default = "${cfg.package.sa_config}/user/.spamassassin/user_prefs";
+      defaultText = literalExpression "\${cfg.package.sa_config}/user/.spamassassin/user_prefs";
+      description = lib.mdDoc "SpamAssassin configuration specific to public-inbox.";
+    };
     settings = mkOption {
       description = lib.mdDoc ''
         Settings for the [public-inbox config file](https://public-inbox.org/public-inbox-config.html).
@@ -266,8 +275,9 @@ in
           default = {};
           description = lib.mdDoc "public inboxes";
           type = types.submodule {
-            # Support both global options like `services.public-inbox.settings.publicinbox.imapserver`
-            # and inbox specific options like `services.public-inbox.settings.publicinbox.foo.address`.
+            # Keeping in line with the tradition of unnecessarily specific types, allow users to set
+            # freeform settings either globally under the `publicinbox` section, or for specific
+            # inboxes through additional nesting.
             freeformType = with types; attrsOf (oneOf [ iniAtom (attrsOf iniAtom) ]);
 
             options.css = mkOption {
@@ -275,24 +285,12 @@ in
               default = [];
               description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface.";
             };
-            options.imapserver = mkOption {
-              type = with types; listOf str;
-              default = [];
-              example = [ "imap.public-inbox.org" ];
-              description = lib.mdDoc "IMAP URLs to this public-inbox instance";
-            };
             options.nntpserver = mkOption {
               type = with types; listOf str;
               default = [];
               example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ];
               description = lib.mdDoc "NNTP URLs to this public-inbox instance";
             };
-            options.pop3server = mkOption {
-              type = with types; listOf str;
-              default = [];
-              example = [ "pop.public-inbox.org" ];
-              description = lib.mdDoc "POP3 URLs to this public-inbox instance";
-            };
             options.wwwlisting = mkOption {
               type = with types; enum [ "all" "404" "match=domain" ];
               default = "404";
@@ -308,7 +306,7 @@ in
           default = "none";
           description = lib.mdDoc ''
             If set to spamc, {manpage}`public-inbox-watch(1)` will filter spam
-            using SpamAssassin. This is currently not working in NixOS.
+            using SpamAssassin.
           '';
         };
         options.publicinboxwatch.spamcheck = mkOption {
@@ -316,7 +314,7 @@ in
           default = "none";
           description = lib.mdDoc ''
             If set to spamc, {manpage}`public-inbox-watch(1)` will filter spam
-            using SpamAssassin. This is currently not working in NixOS.
+            using SpamAssassin.
           '';
         };
         options.publicinboxwatch.watchspam = mkOption {
@@ -348,6 +346,25 @@ in
     openFirewall = mkEnableOption (lib.mdDoc "opening the firewall when using a port option");
   };
   config = mkIf cfg.enable {
+    assertions = [
+      { assertion = config.services.spamassassin.enable || !useSpamAssassin;
+        message = ''
+          public-inbox is configured to use SpamAssassin, but
+          services.spamassassin.enable is false.  If you don't need
+          spam checking, set `services.public-inbox.settings.publicinboxmda.spamcheck' and
+          `services.public-inbox.settings.publicinboxwatch.spamcheck' to null.
+        '';
+      }
+      { assertion = cfg.path != [] || !useSpamAssassin;
+        message = ''
+          public-inbox is configured to use SpamAssassin, but there is
+          no spamc executable in services.public-inbox.path.  If you
+          don't need spam checking, set
+          `services.public-inbox.settings.publicinboxmda.spamcheck' and
+          `services.public-inbox.settings.publicinboxwatch.spamcheck' to null.
+        '';
+      }
+    ];
     services.public-inbox.settings =
       filterAttrsRecursive (n: v: v != null) {
         publicinbox = mapAttrs (n: filterAttrs (n: v: n != "description")) cfg.inboxes;
@@ -486,7 +503,8 @@ in
         { public-inbox-watch = mkMerge [(serviceConfig "watch") {
           inherit (cfg) path;
           wants = [ "public-inbox-init.service" ];
-          requires = [ "public-inbox-init.service" ];
+          requires = [ "public-inbox-init.service" ] ++
+            optional (cfg.settings.publicinboxwatch.spamcheck == "spamc") "spamassassin.service";
           wantedBy = [ "multi-user.target" ];
           serviceConfig = {
             ExecStart = "${cfg.package}/bin/public-inbox-watch";
@@ -504,6 +522,11 @@ in
           script = ''
             set -ux
             install -D -p ${PI_CONFIG} ${stateDir}/.public-inbox/config
+            '' + optionalString useSpamAssassin ''
+              install -m 0700 -o spamd -d ${stateDir}/.spamassassin
+              ${optionalString (cfg.spamAssassinRules != null) ''
+                ln -sf ${cfg.spamAssassinRules} ${stateDir}/.spamassassin/user_prefs
+              ''}
             '' + concatStrings (mapAttrsToList (name: inbox: ''
               if [ ! -e ${stateDir}/inboxes/${escapeShellArg name} ]; then
                 # public-inbox-init creates an inbox and adds it to a config file.

nixos/modules/services/misc/gitlab.nix

@@ -1231,7 +1231,7 @@ in {
     services.dockerRegistry = optionalAttrs cfg.registry.enable {
       enable = true;
       enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
-      package = cfg.registry.package;
+      package = cfg.package;
       extraConfig = {
         auth.token = {
           realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth";

nixos/modules/services/web-servers/traefik.nix

@@ -48,11 +48,6 @@ let
     ''
   else
     cfg.staticConfigFile;
-
-  finalStaticConfigFile =
-    if cfg.environmentFiles == []
-    then staticConfigFile
-    else "/run/traefik/config.toml";
 in {
   options.services.traefik = {
     enable = mkEnableOption (lib.mdDoc "Traefik web server");
@@ -132,16 +127,6 @@ in {
       type = types.package;
       description = lib.mdDoc "Traefik package to use.";
     };
-
-    environmentFiles = mkOption {
-      default = [];
-      type = types.listOf types.path;
-      example = [ "/run/secrets/traefik.env" ];
-      description = lib.mdDoc ''
-        Files to load as environment file. Environment variables from this file
-        will be substituted into the static configuration file using envsubst.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
@@ -154,13 +139,8 @@ in {
       startLimitIntervalSec = 86400;
       startLimitBurst = 5;
       serviceConfig = {
-        EnvironmentFile = cfg.environmentFiles;
-        ExecStartPre = lib.optional (cfg.environmentFiles != [])
-          (pkgs.writeShellScript "pre-start" ''
-            umask 077
-            ${pkgs.envsubst}/bin/envsubst -i "${staticConfigFile}" > "${finalStaticConfigFile}"
-          '');
-        ExecStart = "${cfg.package}/bin/traefik --configfile=${finalStaticConfigFile}";
+        ExecStart =
+          "${cfg.package}/bin/traefik --configfile=${staticConfigFile}";
         Type = "simple";
         User = "traefik";
         Group = cfg.group;
@@ -175,7 +155,6 @@ in {
         ProtectHome = true;
         ProtectSystem = "full";
         ReadWriteDirectories = cfg.dataDir;
-        RuntimeDirectory = "traefik";
       };
     };
 

nixos/modules/system/boot/stage-1-init.sh

@@ -374,6 +374,22 @@ mountFS() {
 
     checkFS "$device" "$fsType"
 
+    # Optionally resize the filesystem.
+    case $options in
+        *x-nixos.autoresize*)
+            if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then
+                modprobe "$fsType"
+                echo "resizing $device..."
+                e2fsck -fp "$device"
+                resize2fs "$device"
+            elif [ "$fsType" = f2fs ]; then
+                echo "resizing $device..."
+                fsck.f2fs -fp "$device"
+                resize.f2fs "$device"
+            fi
+            ;;
+    esac
+
     # Create backing directories for overlayfs
     if [ "$fsType" = overlay ]; then
         for i in upper work; do

nixos/modules/system/boot/stage-1.nix

@@ -150,6 +150,12 @@ let
       copy_bin_and_libs ${pkgs.kmod}/bin/kmod
       ln -sf kmod $out/bin/modprobe
 
+      # Copy resize2fs if any ext* filesystems are to be resized
+      ${optionalString (any (fs: fs.autoResize && (lib.hasPrefix "ext" fs.fsType)) fileSystems) ''
+        # We need mke2fs in the initrd.
+        copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs
+      ''}
+
       # Copy multipath.
       ${optionalString config.services.multipath.enable ''
         copy_bin_and_libs ${config.services.multipath.package}/bin/multipath

nixos/modules/system/boot/systemd.nix

@@ -588,15 +588,6 @@ in
     systemd.services."systemd-backlight@".restartIfChanged = false;
     systemd.services."systemd-fsck@".restartIfChanged = false;
     systemd.services."systemd-fsck@".path = [ config.system.path ];
-    systemd.services."systemd-makefs@" = {
-      restartIfChanged = false;
-      path = [ pkgs.util-linux ] ++ config.system.fsPackages;
-      # Since there is no /etc/systemd/system/systemd-makefs@.service
-      # file, the units generated in /run/systemd/generator would
-      # override anything we put here. But by forcing the use of a
-      # drop-in in /etc, it does apply.
-      overrideStrategy = "asDropin";
-    };
     systemd.services.systemd-random-seed.restartIfChanged = false;
     systemd.services.systemd-remount-fs.restartIfChanged = false;
     systemd.services.systemd-update-utmp.restartIfChanged = false;

nixos/modules/system/boot/systemd/initrd.nix

@@ -56,6 +56,7 @@ let
     "systemd-ask-password-console.path"
     "systemd-ask-password-console.service"
     "systemd-fsck@.service"
+    "systemd-growfs@.service"
     "systemd-halt.service"
     "systemd-hibernate-resume@.service"
     "systemd-journald-audit.socket"
@@ -92,6 +93,7 @@ let
   fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
 
   needMakefs = lib.any (fs: fs.autoFormat) fileSystems;
+  needGrowfs = lib.any (fs: fs.autoResize) fileSystems;
 
   kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
   modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
@@ -398,6 +400,7 @@ in {
       storePaths = [
         # systemd tooling
         "${cfg.package}/lib/systemd/systemd-fsck"
+        (lib.mkIf needGrowfs "${cfg.package}/lib/systemd/systemd-growfs")
         "${cfg.package}/lib/systemd/systemd-hibernate-resume"
         "${cfg.package}/lib/systemd/systemd-journald"
         (lib.mkIf needMakefs "${cfg.package}/lib/systemd/systemd-makefs")

nixos/modules/tasks/filesystems.nix

@@ -112,9 +112,12 @@ let
       };
 
       formatOptions = mkOption {
-        visible = false;
-        type = types.unspecified;
-        default = null;
+        default = "";
+        type = types.str;
+        description = lib.mdDoc ''
+          If {option}`autoFormat` option is set specifies
+          extra options passed to mkfs.
+        '';
       };
 
       autoResize = mkOption {
@@ -136,11 +139,22 @@ let
 
     };
 
-    config.options = mkMerge [
-      (mkIf config.autoResize [ "x-systemd.growfs" ])
-      (mkIf config.autoFormat [ "x-systemd.makefs" ])
-      (mkIf (utils.fsNeededForBoot config) [ "x-initrd.mount" ])
-    ];
+    config = let
+      defaultFormatOptions =
+        # -F needed to allow bare block device without partitions
+        if (builtins.substring 0 3 config.fsType) == "ext" then "-F"
+        # -q needed for non-interactive operations
+        else if config.fsType == "jfs" then "-q"
+        # (same here)
+        else if config.fsType == "reiserfs" then "-q"
+        else null;
+    in {
+      options = mkMerge [
+        (mkIf config.autoResize [ "x-nixos.autoresize" ])
+        (mkIf (utils.fsNeededForBoot config) [ "x-initrd.mount" ])
+      ];
+      formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions);
+    };
 
   };
 
@@ -187,20 +201,23 @@ let
       skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs;
       # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
       escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
-    in fstabFileSystems: { rootPrefix ? "" }: concatMapStrings (fs:
+    in fstabFileSystems: { rootPrefix ? "", extraOpts ? (fs: []) }: concatMapStrings (fs:
       (optionalString (isBindMount fs) (escape rootPrefix))
       + (if fs.device != null then escape fs.device
          else if fs.label != null then "/dev/disk/by-label/${escape fs.label}"
          else throw "No device specified for mount point ‘${fs.mountPoint}’.")
       + " " + escape fs.mountPoint
       + " " + fs.fsType
-      + " " + escape (builtins.concatStringsSep "," fs.options)
+      + " " + escape (builtins.concatStringsSep "," (fs.options ++ (extraOpts fs)))
       + " 0 " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2")
       + "\n"
     ) fstabFileSystems;
 
     initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) {
       rootPrefix = "/sysroot";
+      extraOpts = fs:
+        (optional fs.autoResize "x-systemd.growfs")
+        ++ (optional fs.autoFormat "x-systemd.makefs");
     });
 
 in
@@ -302,13 +319,7 @@ in
 
     assertions = let
       ls = sep: concatMapStringsSep sep (x: x.mountPoint);
-      resizableFSes = [
-        "ext3"
-        "ext4"
-        "btrfs"
-        "xfs"
-      ];
-      notAutoResizable = fs: fs.autoResize && !(builtins.elem fs.fsType resizableFSes);
+      notAutoResizable = fs: fs.autoResize && !(hasPrefix "ext" fs.fsType || fs.fsType == "f2fs");
     in [
       { assertion = ! (fileSystems' ? cycle);
         message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}";
@@ -316,21 +327,8 @@ in
       { assertion = ! (any notAutoResizable fileSystems);
         message = let
           fs = head (filter notAutoResizable fileSystems);
-        in ''
-          Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = "${fs.fsType}"'
-          ${optionalString (fs.fsType == "auto") "fsType has to be explicitly set and"}
-          only the following support it: ${lib.concatStringsSep ", " resizableFSes}.
-        '';
-      }
-      {
-        assertion = ! (any (fs: fs.formatOptions != null) fileSystems);
-        message = let
-          fs = head (filter (fs: fs.formatOptions != null) fileSystems);
-        in ''
-          'fileSystems.<name>.formatOptions' has been removed, since
-          systemd-makefs does not support any way to provide formatting
-          options.
-        '';
+        in
+          "Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = \"${fs.fsType}\"':${optionalString (fs.fsType == "auto") " fsType has to be explicitly set and"} only the ext filesystems and f2fs support it.";
       }
     ];
 
@@ -379,7 +377,37 @@ in
         wants = [ "local-fs.target" "remote-fs.target" ];
       };
 
-    systemd.services = {
+    systemd.services =
+
+    # Emit systemd services to format requested filesystems.
+      let
+        formatDevice = fs:
+          let
+            mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount";
+            device'  = escapeSystemdPath fs.device;
+            device'' = "${device'}.device";
+          in nameValuePair "mkfs-${device'}"
+          { description = "Initialisation of Filesystem ${fs.device}";
+            wantedBy = [ mountPoint' ];
+            before = [ mountPoint' "systemd-fsck@${device'}.service" ];
+            requires = [ device'' ];
+            after = [ device'' ];
+            path = [ pkgs.util-linux ] ++ config.system.fsPackages;
+            script =
+              ''
+                if ! [ -e "${fs.device}" ]; then exit 1; fi
+                # FIXME: this is scary.  The test could be more robust.
+                type=$(blkid -p -s TYPE -o value "${fs.device}" || true)
+                if [ -z "$type" ]; then
+                  echo "creating ${fs.fsType} filesystem on ${fs.device}..."
+                  mkfs.${fs.fsType} ${fs.formatOptions} "${fs.device}"
+                fi
+              '';
+            unitConfig.RequiresMountsFor = [ "${dirOf fs.device}" ];
+            unitConfig.DefaultDependencies = false; # needed to prevent a cycle
+            serviceConfig.Type = "oneshot";
+          };
+      in listToAttrs (map formatDevice (filter (fs: fs.autoFormat && !(utils.fsNeededForBoot fs)) fileSystems)) // {
     # Mount /sys/fs/pstore for evacuating panic logs and crashdumps from persistent storage onto the disk using systemd-pstore.
     # This cannot be done with the other special filesystems because the pstore module (which creates the mount point) is not loaded then.
         "mount-pstore" = {

nixos/modules/tasks/filesystems/f2fs.nix

@@ -15,6 +15,11 @@ in
 
     boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) ''
       copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs
+      ${optionalString (any (fs: fs.autoResize) fileSystems) ''
+        # We need f2fs-tools' tools to resize filesystems
+        copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/resize.f2fs
+      ''}
+
     '';
   };
 }

nixos/tests/fsck.nix

@@ -30,7 +30,7 @@ import ./make-test-python.nix {
           else "fsck.ext4.*/dev/vda"}'")
 
     with subtest("mnt fs is fsckd"):
-        machine.succeed("journalctl -b | grep 'fsck.*vdb.*clean'")
+        machine.succeed("journalctl -b | grep 'fsck.*/dev/vdb.*clean'")
         machine.succeed(
             "grep 'Requires=systemd-fsck@dev-vdb.service' /run/systemd/generator/mnt.mount"
         )

nixos/tests/public-inbox.nix

@@ -14,7 +14,7 @@ in
 
   meta.maintainers = with pkgs.lib.maintainers; [ julm ];
 
-  nodes.machine = { config, pkgs, nodes, ... }: let
+  machine = { config, pkgs, nodes, ... }: let
     inherit (config.services) gitolite public-inbox;
     # Git repositories paths in Gitolite.
     # Only their baseNameOf is used for configuring public-inbox.
@@ -221,7 +221,7 @@ in
     # Delete a mail.
     # Note that the use of an extension not listed in the addresses
     # require to use --all
-    machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
-    machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
+    machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
+    machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
   '';
 })

nixos/tests/traefik.nix

@@ -52,13 +52,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             sendAnonymousUsage = false;
           };
 
-          entryPoints.web.address = ":\${HTTP_PORT}";
+          entryPoints.web.address = ":80";
 
           providers.docker.exposedByDefault = false;
         };
-        environmentFiles = [(pkgs.writeText "traefik.env" ''
-          HTTP_PORT=80
-        '')];
       };
 
       systemd.services.simplehttp = {

pkgs/applications/audio/yoshimi/default.nix

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yoshimi";
-  version = "2.3.0";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "Yoshimi";
     repo = pname;
     rev = version;
-    hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM=";
+    hash = "sha256-zVIOHm84wx6ZFK0seS9fWZfujDz259AXTv7zljbwrUk=";
   };
 
   sourceRoot = "source/src";

pkgs/applications/blockchains/ledger-live-desktop/default.nix

@@ -30,7 +30,7 @@ appimageTools.wrapType2 rec {
     description = "App for Ledger hardware wallets";
     homepage = "https://www.ledger.com/ledger-live/";
     license = licenses.mit;
-    maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ];
+    maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal WeebSorceress ];
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/applications/blockchains/stellar-core/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stellar-core";
-  version = "19.11.0";
+  version = "19.10.0";
 
   src = fetchFromGitHub {
     owner = "stellar";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-48fEVbK5yswPkTwlfemXB2ieAs2+SIM6dspqOBiRKCU=";
+    sha256 = "sha256-BcZsj2TbeJW91aiZ2I7NbDa+rgjfs6lQUsWOnhFQXtw=";
     fetchSubmodules = true;
   };
 

pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix

@@ -1,62 +0,0 @@
-/*
-
-# Updating
-
-To update the list of packages from ELPA,
-
-1. Run `./update-elpa-devel`.
-2. Check for evaluation errors:
-     # "../../../../../" points to the default.nix from root of Nixpkgs tree
-     env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.elpaDevelPackages
-3. Run `git commit -m "elpa-devel-packages $(date -Idate)" -- elpa-devel-generated.nix`
-
-## Update from overlay
-
-Alternatively, run the following command:
-
-./update-from-overlay
-
-It will update both melpa and elpa packages using
-https://github.com/nix-community/emacs-overlay. It's almost instantenous and
-formats commits for you.
-
-*/
-
-{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:
-
-self: let
-
-  markBroken = pkg: pkg.override {
-    elpaBuild = args: self.elpaBuild (args // {
-      meta = (args.meta or {}) // { broken = true; };
-    });
-  };
-
-  elpaBuild = import ../../../../build-support/emacs/elpa.nix {
-    inherit lib stdenv texinfo writeText gcc;
-    inherit (self) emacs;
-  };
-
-  # Use custom elpa url fetcher with fallback/uncompress
-  fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
-
-  generateElpa = lib.makeOverridable ({
-    generated ? ./elpa-devel-generated.nix
-  }: let
-
-    imported = import generated {
-      callPackage = pkgs: args: self.callPackage pkgs (args // {
-        inherit fetchurl;
-      });
-    };
-
-    super = removeAttrs imported [ "dash" ];
-
-    overrides = {
-    };
-
-    elpaDevelPackages = super // overrides;
-
-  in elpaDevelPackages // { inherit elpaBuild; });
-
-in generateElpa { }

pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix

@@ -4,8 +4,8 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "nix-community";
     repo = "emacs2nix";
-    rev = "7f07ac3c3f175630de68153d98a93b9fa24d1eb3";
-    sha256 = "sha256-Mh9G8LH3n1ccg+shBoWQRk67yAA+GEYGkk8tjM7W02Y=";
+    rev = "2e8d2c644397be57455ad32c2849f692eeac7797";
+    sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M=";
     fetchSubmodules = true;
   };
 in

pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel

@@ -1,4 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell --show-trace ./emacs2nix.nix -i bash
-
-exec elpa-devel-packages.sh --names $EMACS2NIX/names.nix -o elpa-devel-generated.nix

pkgs/applications/editors/ldtk/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, unzip
-, appimage-run, nix-update-script }:
+, appimage-run }:
 
 stdenv.mkDerivation rec {
   pname = "ldtk";
@@ -47,8 +47,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = with lib; {
     description = "Modern, lightweight and efficient 2D level editor";
     homepage = "https://ldtk.io/";

pkgs/applications/editors/pixelorama/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates, nix-update-script }:
+{ lib, stdenv, fetchFromGitHub, godot-headless, godot-export-templates }:
 
 let
   preset =
@@ -47,8 +47,6 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
-
   meta = with lib; {
     homepage = "https://orama-interactive.itch.io/pixelorama";
     description = "A free & open-source 2D sprite editor, made with the Godot Engine!";

pkgs/applications/emulators/blink/default.nix

@@ -1,34 +0,0 @@
-{ stdenv, fetchFromGitHub, lib }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "blink";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "jart";
-    repo = "blink";
-    rev = finalAttrs.version;
-    hash = "sha256-W7yL7Ut3MRygJhFGr+GIj/CK57MkuDTcenft8IvH7jU=";
-  };
-
-  # 'make check' requires internet connection
-  doCheck = true;
-  checkPhase = ''
-    make test
-  '';
-
-  meta = {
-    description = "Tiniest x86-64-linux emulator";
-    longDescription = ''
-      blink is a virtual machine that runs x86-64-linux programs on different operating systems and hardware architectures. It's designed to do the same thing as the qemu-x86_64 command, except that
-      - blink is much smaller in size than qemu-x86_64
-      - blink will run your Linux binaries on any POSIX platform, whereas qemu-x86_64 only supports Linux
-      - blink goes 2x faster than qemu-x86_64 on some benchmarks, such as SSE integer / floating point math. Blink is also faster at running ephemeral programs such as compilers
-    '';
-
-    homepage = "https://github.com/jart/blink";
-    license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ t4ccer ];
-    platforms = lib.platforms.all;
-  };
-})

pkgs/applications/gis/qgis/unwrapped-ltr.nix

@@ -73,14 +73,14 @@ let
     six
   ];
 in mkDerivation rec {
-  version = "3.28.7";
+  version = "3.28.5";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-RWQ3RlE8fPMuDGosxKNVgbjRTigZRolqNyaJoC1xdec=";
+    hash = "sha256-3fQB0oCIZSVEVMZzmeyvw8/Ew+JjzAFnTIsnsklAayI=";
   };
 
   passthru = {

pkgs/applications/misc/cobalt/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cobalt";
-  version = "0.18.5";
+  version = "0.18.4";
 
   src = fetchFromGitHub {
     owner = "cobalt-org";
     repo = "cobalt.rs";
     rev = "v${version}";
-    sha256 = "sha256-Y1rWKoh4cjLOvBJy4bXIHsvGtLmTu9n0aqf6PdflH6E=";
+    sha256 = "sha256-O7qFpp7Xr6K82o/KUMP0J5y2B32op+QBGUXo9Q5R5LQ=";
   };
 
-  cargoHash = "sha256-r0nxsDcdXNiZn9dVMTOAxlI/kd0nZFh7JvB2JYDR2aw=";
+  cargoHash = "sha256-ZBAF4BqQ+JMZ3Rpg2RxUhhVvPE5pN68qljVl0o2/VNA=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 

pkgs/applications/misc/comodoro/default.nix

@@ -1,47 +0,0 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, stdenv
-, installShellFiles
-, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
-, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
-, withTcp ? true
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "comodoro";
-  version = "0.0.8";
-
-  src = fetchFromGitHub {
-    owner = "soywod";
-    repo = "comodoro";
-    rev = "v${version}";
-    sha256 = "rGnVXyfWJkPHfpf1gRGbDJ6Y1ycKOOcCZ+Jx35fUo6M=";
-  };
-
-  cargoSha256 = "jpshuavywCLN03xD/gFgQeGbKtmHq5pULbxd+RUbaDk=";
-
-  nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles;
-
-  buildNoDefaultFeatures = true;
-  buildFeatures = lib.optional withTcp "tcp";
-
-  postInstall = lib.optionalString installManPages ''
-    mkdir -p $out/man
-    $out/bin/comodoro man $out/man
-    installManPage $out/man/*
-  '' + lib.optionalString installShellCompletions ''
-    installShellCompletion --cmd comodoro \
-      --bash <($out/bin/comodoro completion bash) \
-      --fish <($out/bin/comodoro completion fish) \
-      --zsh <($out/bin/comodoro completion zsh)
-  '';
-
-  meta = with lib; {
-    description = "CLI to manage your time.";
-    homepage = "https://pimalaya.org/comodoro/";
-    changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ soywod ];
-  };
-}

pkgs/applications/misc/far2l/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, ninja, pkg-config, m4, bash
 , xdg-utils, zip, unzip, gzip, bzip2, gnutar, p7zip, xz
-, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL, System
+, IOKit, Carbon, Cocoa, AudioToolbox, OpenGL
 , withTTYX ? true, libX11
 , withGUI ? true, wxGTK32
 , withUCD ? true, libuchardet
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ]
     ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin
     ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ])
-    ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ];
+    ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL ];
 
   postPatch = ''
     patchShebangs python/src/prebuild.sh
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
       --replace '"/bin/bash"' '"${bash}/bin/bash"'
     substituteInPlace far2l/src/cfg/config.cpp \
       --replace '"/bin/bash"' '"${bash}/bin/bash"'
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace WinPort/src/Backend/WX/CMakeLists.txt \
+      --replace "-framework System" -lSystem
   '';
 
   cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "yes" else "no"}") {

pkgs/applications/misc/mob/default.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "mob";
-  version = "4.4.3";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
     owner = "remotemobprogramming";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74=";
+    sha256 = "sha256-muKlzOrqtegy35QcGJvwYqIJ9XZsaAvyofsrWPqCi7k=";
   };
 
   vendorHash = null;

pkgs/applications/misc/tandoor-recipes/common.nix

@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "1.4.12";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "TandoorRecipes";
     repo = "recipes";
     rev = version;
-    sha256 = "sha256-ZGPXcpicDYCE+J9mC2Dk/Ds2NYfUETuKXqHxpAGH86w=";
+    sha256 = "sha256-h424lUm/wmCHXkMW2XejogvH3wL/+J67cG4m8rIWM1U=";
   };
 
   yarnSha256 = "sha256-LJ0uL66tcK6zL8Mkd2UB8dHsslMTtf8wQmgbZdvOT6s=";

pkgs/applications/misc/tandoor-recipes/default.nix

@@ -42,6 +42,12 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
   patches = [
     # Allow setting MEDIA_ROOT through environment variable
     ./media-root.patch
+    # Address CVE-2023-31047 on Django 4.2.1+
+    (fetchpatch {
+      name = "fix-multiple-file-field";
+      url = "https://github.com/TandoorRecipes/recipes/pull/2458/commits/6b04c922977317354a367487427b15a8ed619be9.patch";
+      hash = "sha256-KmfjJSrB/4tOWtU7zrDJ/AOG4XlmWy/halw8IEEXdZ0=";
+    })
   ];
 
   propagatedBuildInputs = with python.pkgs; [

pkgs/applications/misc/ttyper/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ttyper";
-  version = "1.2.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "max-niederman";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1frm41Vbo4t1BELq0rNGb1hY7RQLt8IJaEhtyNfNNdU=";
+    sha256 = "sha256-puChbaLjpm5FmpYIrb+3eKO9BSFu99R5j4ymKH5359Y=";
   };
 
-  cargoSha256 = "sha256-UyO8oX54qVQA7nFx6Y/cSgb33Cz3M0kFeiYqUrSbCe0=";
+  cargoSha256 = "sha256-DKpZQZgMR+gbcxxAD8ru5O4o7vr6n4seBVqor3HrYtY=";
 
   meta = with lib; {
     description = "Terminal-based typing test";

pkgs/applications/networking/browsers/chromium/upstream-info.json

@@ -19,9 +19,22 @@
     }
   },
   "beta": {
-    "version": "115.0.5790.13",
-    "sha256": "0ias5jn8lwpds3gsmjps0rlks58ln5znwx52h767f8mc9y24fagx",
-    "sha256bin64": "11v374p82k8xbak37c377km9y2hvy8avw6mjl9az5kzb2am3g566",
+    "version": "114.0.5735.45",
+    "sha256": "1z7z4mq3yw9i17xprza3v33wx28zpk7s3g8xcgapdydw0rgxz30v",
+    "sha256bin64": "1387x7mab2sh3wg39z48gl8fjhq39jllbcgzic8rdzpbhlcgs7br",
+    "deps": {
+      "gn": {
+        "version": "2023-04-19",
+        "url": "https://gn.googlesource.com/gn",
+        "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
+        "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
+      }
+    }
+  },
+  "dev": {
+    "version": "115.0.5790.3",
+    "sha256": "1haai0jabghwl37k929138s4l6izmifssdvn2wgsig9jhiihxz29",
+    "sha256bin64": "12avl8ilvhmlvbag045yhnx0bbbsyx5d3jqh5af07pmbcxksgf96",
     "deps": {
       "gn": {
         "version": "2023-05-19",
@@ -31,19 +44,6 @@
       }
     }
   },
-  "dev": {
-    "version": "116.0.5803.2",
-    "sha256": "0s3l0wvbvy0wcwxipbl9vlbp1441yfj8ylrwhlh7gy898ajl9q0j",
-    "sha256bin64": "0qgp0m67bpaali7w6bxy1jzw0aig4iiqqgg023k1q32712s192cs",
-    "deps": {
-      "gn": {
-        "version": "2023-05-26",
-        "url": "https://gn.googlesource.com/gn",
-        "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8",
-        "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j"
-      }
-    }
-  },
   "ungoogled-chromium": {
     "version": "113.0.5672.126",
     "sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",

pkgs/applications/networking/browsers/mullvad-browser/default.nix

@@ -6,7 +6,6 @@
 , makeWrapper
 , writeText
 , wrapGAppsHook
-, callPackage
 
 # Common run-time dependencies
 , zlib
@@ -80,7 +79,7 @@ let
 
   version = "12.0.6";
 
-  sources = {
+  srcs = {
     x86_64-linux = fetchurl {
       url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz";
       hash = "sha256-XE6HFU38FhnikxGHRHxIGS3Z3Y2JNWH0yq2NejqbROI=";
@@ -104,7 +103,7 @@ stdenv.mkDerivation rec {
   pname = "mullvad-browser";
   inherit version;
 
-  src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+  src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
   nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ];
 
@@ -220,19 +219,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru = {
-    inherit sources;
-    updateScript = callPackage ../tor-browser-bundle-bin/update.nix {
-      inherit pname version meta;
-      baseUrl = "https://cdn.mullvad.net/browser/";
-      prefix = "mullvad-browser-";
-    };
-  };
-
   meta = with lib; {
     description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
     homepage = "https://mullvad.net/en/browser";
-    platforms = attrNames sources;
+    platforms = attrNames srcs;
     maintainers = with maintainers; [ felschr ];
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
     # the compound is "libre" in a strict sense (some components place certain

pkgs/applications/networking/browsers/opera/default.nix

@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "opera";
-  version = "99.0.4788.31";
+  version = "98.0.4759.39";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-73A47Yl454ZyOkglLvnp10zjoE1bf8v5tm4Rng3UBac=";
+    hash = "sha256-3HVgEOscds+VBn9ajmkRnPdqNi9lLItJrb3uRH6L96Q=";
   };
 
   unpackPhase = "dpkg-deb -x $src .";

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

@@ -2,7 +2,6 @@
 , fetchurl
 , makeDesktopItem
 , writeText
-, callPackage
 
 # Common run-time dependencies
 , zlib
@@ -93,7 +92,7 @@ let
 
   lang = "ALL";
 
-  sources = {
+  srcs = {
     x86_64-linux = fetchurl {
       urls = [
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
@@ -132,7 +131,7 @@ stdenv.mkDerivation rec {
   pname = "tor-browser-bundle-bin";
   inherit version;
 
-  src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+  src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
   preferLocalBuild = true;
   allowSubstitutes = false;
@@ -448,13 +447,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  passthru = {
-    inherit sources;
-    updateScript = callPackage ./update.nix {
-      inherit pname version meta;
-    };
-  };
-
   meta = with lib; {
     description = "Tor Browser Bundle built by torproject.org";
     longDescription = ''
@@ -468,7 +460,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.torproject.org/";
     changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
-    platforms = attrNames sources;
+    platforms = attrNames srcs;
     maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ];
     mainProgram = "tor-browser";
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether

pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix

@@ -1,62 +0,0 @@
-{ lib
-, writeShellScript
-, coreutils
-, gnused
-, gnugrep
-, curl
-, gnupg
-, nix
-, common-updater-scripts
-
-# options
-, pname
-, version
-, meta
-, baseUrl ? "https://dist.torproject.org/torbrowser/"
-# prefix used to match published archive
-, prefix ? "tor-browser-"
-# suffix used to match published archive
-, suffix ? "_ALL.tar.xz"
-}:
-
-writeShellScript "update-${pname}" ''
-  PATH="${lib.makeBinPath [ coreutils curl gnugrep gnused gnupg nix common-updater-scripts ]}"
-  set -euo pipefail
-
-  trap
-
-  url=${baseUrl}
-  version=$(curl -s $url \
-            | sed -rne 's,^.*href="([0-9]+(\.[0-9]+)*)/".*,\1,p' \
-            | sort --version-sort | tail -1)
-
-  if [[ "${version}" = "$version" ]]; then
-      echo "The new version same as the old version."
-      exit 0
-  fi
-
-  HOME=$(mktemp -d)
-  export GNUPGHOME=$(mktemp -d)
-  trap 'rm -rf "$HOME" "$GNUPGHOME"' EXIT
-
-  gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
-  gpg --output $HOME/tor.keyring --export 0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290
-
-  curl --silent --show-error --fail -o $HOME/shasums "$url$version/sha256sums-signed-build.txt"
-  curl --silent --show-error --fail -o $HOME/shasums.asc "$url$version/sha256sums-signed-build.txt.asc"
-  gpgv --keyring=$HOME/tor.keyring $HOME/shasums.asc $HOME/shasums
-
-  declare -A platforms=(
-    ['x86_64-linux']='linux64'
-    ['i686-linux']='linux32'
-  )
-
-  for platform in ${lib.escapeShellArgs meta.platforms}; do
-    arch="''${platforms[$platform]}"
-    sha256=$(cat "$HOME/shasums" | grep "${prefix}""$arch-$version""${suffix}" | cut -d" " -f1)
-    hash=$(nix hash to-sri --type sha256 "$sha256")
-
-    update-source-version "${pname}" "0" "sha256-${lib.fakeSha256}" --source-key="sources.$platform"
-    update-source-version "${pname}" "$version" "$hash" --source-key="sources.$platform"
-  done
-''

pkgs/applications/networking/browsers/vivaldi/default.nix

@@ -23,7 +23,7 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "6.0.2979.22";
+  version = "6.0.2979.18";
 
   suffix = {
     aarch64-linux = "arm64";
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash = {
-      aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME=";
-      x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg=";
+      aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs=";
+      x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64=";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

pkgs/applications/networking/cluster/karmor/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "karmor";
-  version = "0.13.2";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "kubearmor";
     repo = "kubearmor-client";
     rev = "v${version}";
-    hash = "sha256-IKvWS1c7u1a3Fm2+uyhhgyuM680ZYiq9Xq2Tg/Y6HJo=";
+    hash = "sha256-HSMyGA4S8VjEA2u4TbmH+qS5ZCsWBg+aTNhAbt4S6yY=";
   };
 
-  vendorHash = "sha256-xBtKKq6oUjazRac1FozRXBNRv1rFXYAulWu0Rs8ETvQ=";
+  vendorHash = "sha256-Rxm96sgdZFKuyQzT76WJHvzEM0tG2rvqnl7+umoFIMY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/networking/cluster/kluctl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kluctl";
-  version = "2.20.2";
+  version = "2.19.4";
 
   src = fetchFromGitHub {
     owner = "kluctl";
     repo = "kluctl";
     rev = "v${version}";
-    hash = "sha256-VCPRGICbALYoD1LIrNnPXQLWGqWr+IznQP70K+L4tvk=";
+    hash = "sha256-q/LWUTaf0PlNGhUZZIvMTjILmrYAO+jQGrUCqBkbDVM=";
   };
 
-  vendorHash = "sha256-z0eiWU5CFMfK6fz+LUtxtSP/MAuVn7iOHB+A7Uv2OQY=";
+  vendorHash = "sha256-AywaABegaM32HnPN4b3xnnG/sggr1Z1Jubfbi1VA1k8=";
 
   ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
 
@@ -23,10 +23,6 @@ buildGoModule rec {
     version = "v${version}";
   };
 
-  postInstall = ''
-    mv $out/bin/{cmd,kluctl}
-  '';
-
   meta = with lib; {
     description = "The missing glue to put together large Kubernetes deployments";
     homepage = "https://kluctl.io/";

pkgs/applications/networking/cluster/nomad/default.nix

@@ -3,7 +3,6 @@
 , buildGo120Module
 , fetchFromGitHub
 , nixosTests
-, installShellFiles
 }:
 
 let
@@ -24,18 +23,11 @@ let
         inherit sha256;
       };
 
-      nativeBuildInputs = [ installShellFiles ];
-
       # ui:
       #  Nomad release commits include the compiled version of the UI, but the file
       #  is only included if we build with the ui tag.
       tags = [ "ui" ];
 
-      postInstall = ''
-        echo "complete -C $out/bin/nomad nomad" > nomad.bash
-        installShellCompletion nomad.bash
-      '';
-
       meta = with lib; {
         homepage = "https://www.nomadproject.io/";
         description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";

pkgs/applications/networking/cluster/pachyderm/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pachyderm";
-  version = "2.6.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "pachyderm";
     repo = "pachyderm";
     rev = "v${version}";
-    hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I=";
+    hash = "sha256-QWlNDnhcFXfCtX4J0V/hq6nFN0RjzYv29mI2zE2fyFo=";
   };
 
   vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";

pkgs/applications/networking/cluster/yor/default.nix

@@ -1,42 +0,0 @@
-{ buildGoModule
-, fetchFromGitHub
-, lib
-}:
-
-buildGoModule rec {
-  pname = "yor";
-  version = "0.1.177";
-
-  src = fetchFromGitHub {
-    owner = "bridgecrewio";
-    repo = pname;
-    rev = version;
-    hash = "sha256-tOYRd3LxSlAvXCW89LAm4GWWukDBZhsgYIWYlEVKokE=";
-  };
-
-  vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E=";
-
-  doCheck = false;
-
-  # https://github.com/bridgecrewio/yor/blob/main/set-version.sh
-  preBuild = ''
-    cat << EOF > src/common/version.go
-    package common
-
-    const Version = "${version}"
-    EOF
-  '';
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  meta = with lib; {
-    description = "Extensible auto-tagger for your IaC files. The ultimate way to link entities in the cloud back to the codified resource which created it.";
-    homepage = "https://github.com/bridgecrewio/yor";
-    changelog = "https://github.com/bridgecrewio/yor/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ivankovnatsky ];
-  };
-}

pkgs/applications/networking/flexget/default.nix

@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.7.4";
+  version = "3.7.2";
   format = "pyproject";
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-x5hwuc2yXDw8qWGLRJDH4V4rmvxjBKZaogmv4SxXoz4=";
+    hash = "sha256-K71nawQhFYLPRg79rcZKJ+US+3M5JAU0eg+ZiFwB6n8=";
   };
 
   postPatch = ''

pkgs/applications/networking/gabutdm/default.nix

@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gabutdm";
-  version = "2.1.6";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "gabutakut";
     repo = pname;
     rev = version;
-    hash = "sha256-ai5LsoK21XwXqL4LRuKsOR1/JV6LnP+1ZJ9fMHpj178=";
+    hash = "sha256-8fV7STYSpmNnLyoAjz+RuF/0nFeNiu8AIxkON1MbWr4=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Simple and fast download manager";
+    description = "Simple and faster download manager";
     homepage = "https://github.com/gabutakut/gabutdm";
     license = licenses.lgpl21Plus;
     mainProgram = "com.github.gabutakut.gabutdm";

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

@@ -2,13 +2,13 @@
 
 (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20230603-2";
+  version = "20230531";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = pname;
     rev = version;
-    hash = "sha256-BcvC50K5yt2aoStyoJ2XZYs3hb2YnVDL3kRpU/Y23Z4=";
+    hash = "sha256-VK2/LaWO/zXMqSpeEjUM/PBd4MG76HaXY6kENwADN1k=";
   };
 
   postPatch = ''

pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix

@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "whatsapp-for-linux";
-  version = "1.6.3";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "eneshecan";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g=";
+    sha256 = "sha256-odE5syAFasGosc1WMU/pvQtk3YxuCci1YevZqNKfzYw=";
   };
 
   nativeBuildInputs = [

pkgs/applications/networking/newsreaders/raven-reader/default.nix

@@ -2,10 +2,10 @@
 
 let
   pname = "raven-reader";
-  version = "1.0.80";
+  version = "1.0.78";
   src = fetchurl {
     url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage";
-    sha256 = "sha256-RkpUWM1hAH73ePpQPj2C3SOukLpcPXbaXmb1VbcHaSU=";
+    sha256 = "sha256-H9V2zTD80fBuIuNZnGDR21IYAAl/b6iYrde5rfsMECQ=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 

pkgs/applications/radio/cloudlog/default.nix

@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.4.3";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM=";
+    sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8=";
   };
 
   postPath = ''

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

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "diamond";
-  version = "2.1.7";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
     rev = "v${version}";
-    sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys=";
+    sha256 = "sha256-2FxJTF/fF/Xi0TglXDlf3sSwncv2f6gc129nTbk8YU0=";
   };
 
 

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

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fastp";
-  version = "0.23.4";
+  version = "0.23.3";
 
   src = fetchFromGitHub {
     owner = "OpenGene";
     repo = "fastp";
     rev = "v${version}";
-    sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8=";
+    sha256 = "sha256-9YHm5LIKJJpMavlWMZXD5ZgTgT5w9eXuXwQVa/prux8=";
   };
 
   buildInputs = [ zlib libdeflate isa-l ];

pkgs/applications/science/math/R/default.nix

@@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "R";
-  version = "4.3.0";
+  version = "4.2.3";
 
   src = let
     inherit (finalAttrs) pname version;
   in fetchurl {
     url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-RdzEi2zyfTYQIPd/3ho5IJ6Ze4FAKzZjyhwBAFampgk=";
+    sha256 = "sha256-VeSpptQ74xTiwD0CZqb6VESv3OULMDv8O4Kzl5UW4HQ=";
   };
 
   dontUseImakeConfigure = true;
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
     pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
-    bison imake which blas lapack curl tcl tk jdk tzdata
+    bison imake which blas lapack curl tcl tk jdk
   ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
 
   patches = [

pkgs/applications/video/adl/default.nix

@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     description = "popcorn anime-downloader + trackma wrapper";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ WeebSorceress ];
   };
 }

pkgs/applications/video/anime-downloader/default.nix

@@ -49,6 +49,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "A simple but powerful anime downloader and streamer";
     license = licenses.unlicense;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ WeebSorceress ];
   };
 }

pkgs/applications/video/filebot/default.nix

@@ -1,6 +1,5 @@
 { lib, stdenv, fetchurl, coreutils, openjdk17, makeWrapper, autoPatchelfHook
 , zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib
-, genericUpdater, writeShellScript
 }:
 
 let
@@ -44,13 +43,6 @@ in stdenv.mkDerivation rec {
     ln -s $out/opt/filebot.sh $out/bin/filebot
   '';
 
-  passthru.updateScript = genericUpdater {
-    versionLister = writeShellScript "filebot-versionLister" ''
-      curl -s https://www.filebot.net \
-        | sed -rne 's,^.*FileBot_([0-9]*\.[0-9]+\.[0-9]+)-portable.tar.xz.*,\1,p'
-    '';
-  };
-
   meta = with lib; {
     description = "The ultimate TV and Movie Renamer";
     longDescription = ''

pkgs/applications/video/handbrake/default.nix

@@ -97,12 +97,12 @@ let
   # Handbrake maintains a set of ffmpeg patches. In particular, these
   # patches are required for subtitle timing to work correctly. See:
   # https://github.com/HandBrake/HandBrake/issues/4029
-  ffmpeg-version = "5.1.2";
+  ffmpeg-version = "5.1.1";
   ffmpeg-hb = ffmpeg_5-full.overrideAttrs (old: {
     version = ffmpeg-version;
     src = fetchurl {
       url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2";
-      hash = "sha256-OaC8yNmFSfFsVwYkZ4JGpqxzbAZs69tAn5UC6RWyLys=";
+      hash = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs=";
     };
     patches = old.patches or [ ] ++ [
       "${src}/contrib/ffmpeg/A01-qsv-libavfilter-qsvvpp-change-the-output-frame-s-width-a.patch"
@@ -133,8 +133,7 @@ let
       "${src}/contrib/ffmpeg/A26-Update-the-min-version-to-1.4.23.0-for-AMF-SDK.patch"
       "${src}/contrib/ffmpeg/A27-avcodec-amfenc-Fixes-the-color-information-in-the-ou.patch"
       "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch"
-      # This patch is not applying since ffmpeg 5.1.1, probably it was backported by upstream
-      # "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch"
+      "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch"
     ];
   });
 

pkgs/applications/video/mpv/scripts/thumbfast.nix

@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation {
   name = "mpv-thumbfast";
-  version = "unstable-2023-06-04";
+  version = "unstable-2023-05-12";
 
   src = fetchFromGitHub {
     owner = "po5";
     repo = "thumbfast";
-    rev = "6f1d92da25a7b807427f55f085e7ad4d60c4e0d7";
-    hash = "sha256-7CCxMPmZZRDIcWn+YbV4xzZFL80qZS5UFA25E+Y2P2Q=";
+    rev = "10e9f6133d4ea88e3e5d154969abfaee17173570";
+    hash = "sha256-3fzkAR/itgheXQHTr30XPQR3NpYpIVeZfkcBxEoAnGg=";
   };
 
   postPatch = ''
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "High-performance on-the-fly thumbnailer for mpv";
     homepage = "https://github.com/po5/thumbfast";
-    license = lib.licenses.mpl20;
+    license = lib.licenses.unfree; # no explicit licensing information available at this time
     maintainers = with lib.maintainers; [ apfelkuchen6 ];
   };
 }

pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix

@@ -18,15 +18,15 @@
 , obs-vkcapture32
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "obs-vkcapture";
-  version = "1.3.3";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "nowrep";
-    repo = finalAttrs.pname;
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-pvJzzDbsmsu46C8Jki+eMfCZLejkgvqns2hVNDtpSk0=";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-UQQ8oBEnOxmSN4ZyW4LdPZYvd5eB9EmdR0UvE1wgMZw=";
   };
 
   cmakeFlags = lib.optionals stdenv.isi686 [
@@ -60,9 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "OBS Linux Vulkan/OpenGL game capture";
     homepage = "https://github.com/nowrep/obs-vkcapture";
-    changelog = "https://github.com/nowrep/obs-vkcapture/releases/tag/v${finalAttrs.version}";
     maintainers = with maintainers; [ atila pedrohlc ];
     license = licenses.gpl2Only;
     platforms = platforms.linux;
   };
-})
+}

pkgs/applications/virtualization/containerd/default.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.7.2";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    hash = "sha256-L4zaA+kMBz2tRMbitZUxb9/wdimSO2njx6ozvyKKlkk=";
+    hash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY=";
   };
 
   vendorHash = null;

pkgs/build-support/trivial-builders/default.nix

@@ -141,7 +141,7 @@ rec {
     runCommand name
       { inherit text executable checkPhase allowSubstitutes preferLocalBuild;
         passAsFile = [ "text" ];
-        meta = lib.optionalAttrs (executable && matches != null) {
+        meta = lib.optionalAttrs (toString executable != "" && matches != null) {
           mainProgram = lib.head matches;
         } // meta;
       }

pkgs/data/icons/kora-icon-theme/default.nix

@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec  {
   pname = "kora-icon-theme";
-  version = "1.5.7";
+  version = "1.5.6";
 
   src = fetchFromGitHub  {
     owner = "bikass";
     repo = "kora";
     rev = "v${version}";
-    sha256 = "sha256-VAlfrUWgxcG17ZTlA357gengXTilwuZOBscIzadAsaU=";
+    sha256 = "sha256-vAeml+upESUVlJ95Rm0+vlZ+NQZWEZl00scDkb3W7Yo=";
   };
 
   nativeBuildInputs = [

pkgs/data/misc/sing-geoip/default.nix

@@ -8,16 +8,21 @@
 let
   generator = buildGoModule rec {
     pname = "sing-geoip";
-    version = "20230512";
+    version = "unstable-2022-07-05";
 
     src = fetchFromGitHub {
       owner = "SagerNet";
       repo = pname;
-      rev = "refs/tags/${version}";
-      hash = "sha256-Zm+5N/37hoHpH/TLNJrHeaBXI8G1jEpM1jz6Um8edNE=";
+      rev = "2ced72c94da4c9259c40353c375319d9d28a78f3";
+      hash = "sha256-z8aP+OfTuzQNwOT3EEnI9uze/vbHTJLEiCPqIrnNUHw=";
     };
 
-    vendorHash = "sha256-ejXAdsJwXhqet+Ca+pDLWwu0gex79VcIxW6rmhRnbTQ=";
+    vendorHash = "sha256-lr0XMLFxJmLqIqCuGgmsFh324jmZVj71blmStMn41Rs=";
+
+    postPatch = ''
+      # The codes args should start from the third args
+      substituteInPlace main.go --replace "os.Args[2:]" "os.Args[3:]"
+    '';
 
     meta = with lib; {
       description = "GeoIP data for sing-box";

pkgs/data/misc/v2ray-geoip/default.nix

@@ -1,69 +1,28 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, pkgsBuildBuild
-, jq
-, moreutils
-, dbip-country-lite
-}:
+{ lib, stdenv, fetchFromGitHub }:
 
-let
-  generator = pkgsBuildBuild.buildGoModule {
-    pname = "v2ray-geoip";
-    version = "unstable-2023-03-27";
+stdenv.mkDerivation rec {
+  pname = "v2ray-geoip";
+  version = "202306010100";
 
-    src = fetchFromGitHub {
-      owner = "v2fly";
-      repo = "geoip";
-      rev = "9321a7f5e301a957228eba44845144b4555b6658";
-      hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs=";
-    };
-
-    vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc=";
-
-    meta = with lib; {
-      description = "GeoIP for V2Ray";
-      homepage = "https://github.com/v2fly/geoip";
-      license = licenses.cc-by-sa-40;
-      maintainers = with maintainers; [ nickcao ];
-    };
+  src = fetchFromGitHub {
+    owner = "v2fly";
+    repo = "geoip";
+    rev = "d8faa6ba0754c083a89898610942d1d1d978ef7f";
+    sha256 = "sha256-Aumk+YPsxZl3F/DQv6w0rE5f5hduLNYApCKQIvRUSIw=";
   };
-  input = {
-    type = "maxmindMMDB";
-    action = "add";
-    args = {
-      uri = dbip-country-lite.mmdb;
-    };
-  };
-in
-stdenvNoCC.mkDerivation {
-  inherit (generator) pname src;
-  inherit (dbip-country-lite) version;
-
-  nativeBuildInputs = [
-    jq
-    moreutils
-  ];
-
-  postPatch = ''
-    jq '.input[0] |= ${builtins.toJSON input}' config.json | sponge config.json
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    ${generator}/bin/geoip
-    runHook postBuild
-  '';
 
   installPhase = ''
     runHook preInstall
-    install -Dm444 -t "$out/share/v2ray" output/dat/{cn,geoip-only-cn-private,geoip,private}.dat
+    install -m 0644 geoip.dat -D $out/share/v2ray/geoip.dat
     runHook postInstall
   '';
 
-  passthru.generator = generator;
+  passthru.updateScript = ./update.sh;
 
-  meta = generator.meta // {
-    inherit (dbip-country-lite.meta) license;
+  meta = with lib; {
+    description = "GeoIP for V2Ray";
+    homepage = "https://github.com/v2fly/geoip";
+    license = licenses.cc-by-sa-40;
+    maintainers = with maintainers; [ nickcao ];
   };
 }

pkgs/data/misc/v2ray-geoip/update.sh

@@ -0,0 +1,6 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p common-updater-scripts curl jq
+set -euo pipefail
+
+COMMIT=$(curl "https://api.github.com/repos/v2fly/geoip/commits/release?per_page=1")
+update-source-version v2ray-geoip "$(echo $COMMIT | jq -r .commit.message)" --file=pkgs/data/misc/v2ray-geoip/default.nix --rev="$(echo $COMMIT | jq -r .sha)"

pkgs/desktops/gnome/core/mutter/43/default.nix

@@ -51,13 +51,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "43.6";
+  version = "43.5";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    sha256 = "F1oiDSFv8Z8YLWeqc89eUaJVIL6bruaCAA4QRECkciU=";
+    sha256 = "/JAP4ahA2aeTyOLSDUTJCqCH1fv9x5Su5wluHYoJZxo=";
   };
 
   patches = [

pkgs/desktops/plasma-5/kwayland-integration.nix

@@ -14,9 +14,4 @@ mkDerivation {
   pname = "kwayland-integration";
   nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
   buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ];
-
-  meta = {
-    description = "Integration plugins for various KDE frameworks for the Wayland windowing system";
-    homepage = "https://invent.kde.org/plasma/kwayland-integration";
-  };
 }

pkgs/desktops/plasma-5/plasma-browser-integration.nix

@@ -33,9 +33,4 @@ mkDerivation {
     kactivities
     plasma-workspace
   ];
-
-  meta = {
-    description = "Components necessary to integrate browsers into the Plasma Desktop";
-    homepage = "https://community.kde.org/Plasma/Browser_Integration";
-  };
 }

pkgs/desktops/plasma-5/plasma-integration/default.nix

@@ -33,9 +33,4 @@ mkDerivation {
     wayland-protocols
     plasma-wayland-protocols
   ];
-
-  meta = {
-    description = "A set of plugins responsible for better integration of Qt applications when running on a KDE Plasma workspace";
-    homepage = "https://invent.kde.org/plasma/plasma-integration";
-  };
 }

pkgs/development/compilers/pforth/default.nix

@@ -1,36 +1,36 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-}:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
+  version = "28";
   pname = "pforth";
-  version = "2.0.1";
-
   src = fetchFromGitHub {
     owner = "philburk";
     repo = "pforth";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-vEjFeHSJl+yAtatYJEnu+r9hmOr/kZOgIbSUXR/c8WU=";
+    rev = "9190005e32c6151b76ac707b30eeb4d5d9dd1d36";
+    sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x";
   };
 
-  dontConfigure = true;
+  patches = [
+    (fetchpatch {
+      name = "gnumake-4.3-fix.patch";
+      url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch";
+      sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7";
+    })
+  ];
 
-  preBuild = ''
-    cd platforms/unix
-  '';
+  makeFlags = [ "SRCDIR=." ];
+  makefile = "build/unix/Makefile";
 
   installPhase = ''
     install -Dm755 pforth_standalone $out/bin/pforth
   '';
 
+
   meta = {
+    description = "Portable ANSI style Forth written in ANSI C";
     homepage = "http://www.softsynth.com/pforth/";
-    description = "Portable Portable ANS-like Forth written in ANSI 'C'";
-    changelog = "https://github.com/philburk/pforth/blob/v${finalAttrs.version}/RELEASES.md";
-    license = lib.licenses.bsd0;
-    maintainers = with lib.maintainers; [ AndersonTorres yrashk ];
+    license = lib.licenses.publicDomain;
     platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ yrashk ];
   };
-})
-# TODO: option for install the non-standalone executable
+}

pkgs/development/interpreters/angelscript/default.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "angelscript";
-  version = "2.36.1";
+  version = "2.36.0";
 
   src = fetchurl {
     url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "sha256-WLt0mvnH44YwRwX05uYnrkHf4D4LanPD0NLgF8T8lI8=";
+    sha256 = "sha256-M/lfdZe8DYiwl9NeexMg0VQZ/8V3mFHZ0qbMzsV4EbM=";
   };
 
   nativeBuildInputs = [ unzip cmake ];

pkgs/development/interpreters/wasmtime/default.nix

@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "9.0.3";
+  version = "9.0.2";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-b/GioFixPpbCUiYfOLwJ1NCsLGqIm+v9ODuq6kD8JeE=";
+    hash = "sha256-Fnc3iepxHr7WjorFoabHE6ZM/zK1T5W/gkxL+AEcVgU=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-AYb6dbmvoFYbvgik9rdyOnxdHdnhR8thnrQShGxRLFA=";
+  cargoHash = "sha256-7Q5aJU0sYzRLgjiSNLIrydYRJ3ozABjDo4VtmexS3po=";
 
   cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
 

pkgs/development/libraries/cista/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cista";
-  version = "0.14";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "felixguendling";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-E2B+dNFk0ssKhT9dULNFzpa8auRQ9Q0czuUjX6hxWPw=";
+    sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/faudio/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "faudio";
-  version = "23.06";
+  version = "23.05";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "sha256-V5t9YliyXxoWNnKwp3TTOCyCIzpcyg1X4DaI0WFlfeQ=";
+    sha256 = "sha256-uZSKbLQ36Kw6useAKyDoxLKD1xtKbigq/ejWErxvkcE=";
   };
 
   nativeBuildInputs = [cmake];

pkgs/development/libraries/kde-frameworks/default.nix

@@ -82,7 +82,7 @@ let
                 homepage = meta.homepage or "https://kde.org";
                 license = meta.license or license;
                 maintainers = (meta.maintainers or []) ++ maintainers;
-                platforms = meta.platforms or lib.platforms.all;
+                platforms = meta.platforms or lib.platforms.linux;
               };
 
           in mkDerivation (args // {

pkgs/development/libraries/kde-frameworks/kauth/default.nix

@@ -1,7 +1,7 @@
 {
-  lib, stdenv, mkDerivation, propagate,
+  lib, mkDerivation, propagate,
   extra-cmake-modules, kcoreaddons, qttools,
-  enablePolkit ? stdenv.isLinux, polkit-qt
+  enablePolkit ? true, polkit-qt
 }:
 
 mkDerivation {

pkgs/development/libraries/kde-frameworks/kcoreaddons.nix

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, stdenv,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, qttools, shared-mime-info
 }:
@@ -18,7 +18,4 @@ mkDerivation ({
   postInstall = ''
     moveToOutput "mkspecs" "$dev"
   '';
-} // lib.optionalAttrs stdenv.isDarwin {
-  # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/327
-  env.NIX_CFLAGS_COMPILE = "-DSOCK_CLOEXEC=0";
 })

pkgs/development/libraries/kde-frameworks/kdoctools/default.nix

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, stdenv, fetchpatch,
+  mkDerivation,
   extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns,
   karchive, ki18n, qtbase,
   perl, perlPackages
@@ -20,15 +20,7 @@ mkDerivation {
   ];
   buildInputs = [ karchive ki18n ];
   outputs = [ "out" "dev" ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ]
-    # kf.doctools.core: Error: Could not find kdoctools catalogs
-    ++ lib.optionals stdenv.isDarwin [
-    (fetchpatch {
-      name = "kdoctools-relocate-datapath.patch";
-      url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch";
-      hash = "sha256-MlokdrabXavWHGXYmdz9zZDJQIwAdNxebJBSAH2Z3vI=";
-    })
-  ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"

pkgs/development/libraries/kde-frameworks/ktexteditor.nix

@@ -1,12 +1,12 @@
 {
-  mkDerivation, lib, stdenv,
+  mkDerivation,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
   qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols,
   editorconfig-core-c
 }:
 
-mkDerivation ({
+mkDerivation {
   pname = "ktexteditor";
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [
@@ -15,9 +15,4 @@ mkDerivation ({
     editorconfig-core-c
   ];
   propagatedBuildInputs = [ kparts ];
-} // lib.optionalAttrs stdenv.isDarwin {
-  postPatch = ''
-    substituteInPlace src/part/CMakeLists.txt \
-      --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop"
-  '';
-})
+}

pkgs/development/libraries/openimageio/default.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openimageio";
-  version = "2.4.12.0";
+  version = "2.4.11.1";
 
   src = fetchFromGitHub {
     owner = "OpenImageIO";
     repo = "oiio";
     rev = "v${version}";
-    hash = "sha256-0Jilfe4jNNnpsbodJBFIyxjWqOA99MwmzAriwJgvqVs=";
+    hash = "sha256-Q8Gb/zscZre7fJPyLlZn04Xp3VFFbr6Z007mDPzownc=";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];

pkgs/development/libraries/tbox/default.nix

@@ -1,37 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-}:
-
-stdenv.mkDerivation rec {
-  pname = "tbox";
-  version = "1.7.3";
-
-  src = fetchFromGitHub {
-    owner = "tboox";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-6SqMvwxKSiJO7Z33xx7cJoECu5AJ1gWF8ZsiERWx8DU=";
-  };
-
-  configureFlags = [
-    "--hash=y"
-    "--charset=y"
-    "--float=y"
-    "--demo=n"
-  ];
-
-  postInstall = ''
-    mkdir -p $out/lib/pkgconfig
-    substituteAll ${./libtbox.pc.in} $out/lib/pkgconfig/libtbox.pc
-  '';
-
-  meta = with lib; {
-    description = "A glib-like multi-platform c library";
-    homepage = "https://docs.tboox.org";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ rewine ];
-  };
-}
-

pkgs/development/libraries/tbox/libtbox.pc.in

@@ -1,10 +0,0 @@
-prefix=@out@
-exec_prefix=${prefix}
-libdir=@out@/lib
-includedir=@out@/include
-
-Name: tbox
-Description: A glib-like multi-platform c library
-Version: @version@
-Libs: -L${libdir} -ltbox
-Cflags: -I${includedir}

pkgs/development/libraries/wxsqlite3/default.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wxsqlite3";
-  version = "4.9.4";
+  version = "4.9.3";
 
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
     rev = "v${version}";
-    hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U=";
+    hash = "sha256-HdsPCdZF1wMTGYFaXzq+f4bUFjgCAklsKhhdyMKaxp8=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/development/libraries/xmake-core-sv/default.nix

@@ -1,30 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xmake-core-sv";
-  version = "1.1";
-
-  src = fetchFromGitHub {
-    owner = "xmake-io";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY=";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
-
-  meta = with lib; {
-    description = "Public domain cross-platform semantic versioning in c99";
-    homepage = "https://github.com/xmake-io/xmake-core-sv";
-    license = licenses.unlicense;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ rewine ];
-  };
-}
-

pkgs/development/misc/resholve/test.nix

@@ -20,7 +20,7 @@
 , runDemo ? false
 , binlore
 , sqlite
-, unixtools
+, util-linux
 , gawk
 , rlwrap
 , gnutar
@@ -29,7 +29,7 @@
 
 let
   default_packages = [ bash file findutils gettext ];
-  parsed_packages = [ coreutils sqlite unixtools.script gnused gawk findutils rlwrap gnutar bc ];
+  parsed_packages = [ coreutils sqlite util-linux gnused gawk findutils rlwrap gnutar bc ];
 in
 rec {
   module1 = resholve.mkDerivation {

pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch

@@ -1,23 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 52dc7a8..407c056 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,4 +2,4 @@
- # Copyright 2012 Google Inc. wrightt@google.com
- 
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = src include examples
-+SUBDIRS = src include
-diff --git a/configure.ac b/configure.ac
-index ac2a278..a4104b7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,7 +82,7 @@ fi
- 
- AC_CHECK_FUNCS([memmove memset regcomp select socket strcasecmp strncasecmp strchr strdup strndup strrchr strstr strtol strcasestr getline])
- 
--AC_CONFIG_FILES([Makefile src/Makefile include/Makefile examples/Makefile])
-+AC_CONFIG_FILES([Makefile src/Makefile include/Makefile])
- 
- CFLAGS="${CFLAGS} -Wall -Werror"
- 

pkgs/development/mobile/ios-webkit-debug-proxy/default.nix

@@ -1,57 +0,0 @@
-{ stdenv
-, autoconf
-, automake
-, fetchFromGitHub
-, fetchpatch
-, lib
-, libimobiledevice
-, libusb1
-, libplist
-, libtool
-, openssl
-, pkg-config
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ios-webkit-debug-proxy";
-  version = "1.9.0";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
-  };
-
-  patches = [
-    # OpenSSL 3.0 compatibility
-    (fetchpatch {
-      url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch";
-      sha256 = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
-    })
-    # Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399
-    ./0001-Don-t-compile-examples.patch
-  ];
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
-  buildInputs = [ libimobiledevice libusb1 libplist openssl ];
-
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh
-  '';
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector).";
-    longDescription = ''
-      The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd
-      daemon over a websocket connection, allowing developers to send commands
-      to MobileSafari and UIWebViews on real and simulated iOS devices.
-    '';
-    homepage = "https://github.com/google/ios-webkit-debug-proxy";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.abustany ];
-  };
-}

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

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "aiosmtplib";
-  version = "2.0.2";
+  version = "2.0.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "cole";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Wo9WH3fwGN1upLAyj6aThxpQE7hortISjaCATTPee40=";
+    hash = "sha256-Py/44J9J8FdrsSpEM2/DR2DQH8x8Ub7y0FPIN2gcmmA=";
   };
 
   nativeBuildInputs = [

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

@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "1.4.0";
+  version = "1.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4xUFNIVNrFPU8Hg42Mv7Is4NRdQuugX5bWbE9IQ81Vo=";
+    hash = "sha256-LFDBml3UExex9lnFKyGpkP6+bBXghGQiihzo5gmPEb8=";
   };
 
   nativeBuildInputs = [

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "asyncstdlib";
-  version = "3.10.8";
+  version = "3.10.7";
   format = "flit";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "maxfischer2781";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4=";
+    hash = "sha256-lX5mOcoZTb6EfRHT0qTTWst3NErLti4jZwAeQx4pHGA=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/azure-mgmt-compute/default.nix

@@ -3,27 +3,25 @@
 , fetchPypi
 , azure-mgmt-common
 , azure-mgmt-core
-, isodate
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-compute";
-  version = "30.0.0";
+  version = "29.1.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg=";
+    hash = "sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg=";
   };
 
   propagatedBuildInputs = [
     azure-mgmt-common
     azure-mgmt-core
-    isodate
   ];
 
   pythonNamespaces = [

pkgs/development/python-modules/azure-mgmt-core/default.nix

@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.3.2";
   pname = "azure-mgmt-core";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    hash = "sha256-0ZUgg0AJT5jlpmYbeBzeb2oFHnnOMXyqvY/5cDCps64=";
+    hash = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,47 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pythonOlder
-, setuptools
-, versioningit
-, numpy
-, matplotlib
-, schema
-, hypothesis
-, pytestCheckHook
-}:
-
-buildPythonPackage rec {
-  pname = "broadbean";
-  version = "0.11.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8=";
-  };
-
-  nativeBuildInputs = [ setuptools versioningit ];
-
-  propagatedBuildInputs = [
-    numpy
-    matplotlib
-    schema
-  ];
-
-  nativeCheckInputs = [
-    hypothesis
-    pytestCheckHook
-  ];
-
-  pythonImportsCheck = [ "broadbean" ];
-
-  meta = {
-    homepage = "https://qcodes.github.io/broadbean";
-    description = "A library for making pulses that can be leveraged with QCoDeS";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ evilmav ];
-  };
-}

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

@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "A Python module to bypass Cloudflare's anti-bot page";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ WeebSorceress ];
   };
 }

pkgs/development/python-modules/django-stubs-ext/default.nix

@@ -9,16 +9,19 @@
 
 buildPythonPackage rec {
   pname = "django-stubs-ext";
-  version = "4.2.1";
+  version = "4.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JpbW99hTg0GwYM/6lWXHLqeX6GZofgQLhtKcrYeZ5f4=";
+    hash = "sha256-d4nwyuynFS/vB61rlN7HMQoF0Ljat395eeGdsAN7USc=";
   };
 
+  # setup.cfg tries to pull in nonexistent LICENSE.txt file
+  postPatch = "rm setup.cfg";
+
   propagatedBuildInputs = [
     django
     typing-extensions

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "frigidaire";
-  version = "0.18.13";
+  version = "0.18.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "bm1549";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-FikBV4KjutQfupGPXcVT1h+BfQ099WRrmbrEJOaVCQI=";
+    hash = "sha256-U6ko6P5/ANGy84GQDuSQq+YArou0TrXH5SIc5x4euvU=";
   };
 
   postPatch = ''

pkgs/development/python-modules/google-auth/default.nix

@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.19.1";
+  version = "2.18.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qc+oiz4WGWhF5ko2WOuVOZISnROsczewZMZUb3fBcYM=";
+    hash = "sha256-16MkkCfn9GT7v9fugxmgitCdLupRV4V1xL02D/oEnMs=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix

@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-storage";
-  version = "2.20.0";
+  version = "2.19.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-F61ZHBaE8cEaQl0+7wyWcrjQlk66QHQiUbUasjyjfZw=";
+    hash = "sha256-DZtfQqcD8yELSzrUWhgTkZH5NHQP3zYpsbIv2VrfC7o=";
   };
 
   propagatedBuildInputs = [