Merge remote-tracking branch 'origin/staging-next' into staging

doc/languages-frameworks/android.section.md

@@ -50,6 +50,7 @@ let
     platformVersions = [
       "34"
       "35"
+      "latest"
     ];
     systemImageTypes = [ "google_apis_playstore" ];
     abiVersions = [
@@ -130,7 +131,8 @@ For each requested system image we can specify the following options:
   be included. Defaults to `armeabi-v7a` and `arm64-v8a`.
 
 Most of the function arguments have reasonable default settings, preferring the latest
-versions of tools when possible.
+versions of tools when possible. You can additionally specify "latest" for any plugin version
+that you do not care about, and just want the latest of.
 
 You can specify license names:
 

doc/release-notes/rl-2505.section.md

@@ -57,6 +57,10 @@
   The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`.
   For more information, [check the docs](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750).
 
+- `opensmtpd-extras` has been deprecated by upstream and is not compatible with
+  OpenSMTPD 7.6.0 or later. The package has been removed in favor of a set of new
+  `opensmtpd-table-*` packages.
+
 - The hand written `perlPackages.SearchXapian` bindings have been dropped in favor of the (mostly compatible)
   `perlPackages.Xapian`.
 

maintainers/maintainer-list.nix

@@ -3604,6 +3604,13 @@
     github = "brianmcgillion";
     githubId = 1044263;
   };
+  bricked = {
+    name = "bricked";
+    email = "hello@bricked.dev";
+    github = "brckd";
+    githubId = 92804487;
+    keys = [ { fingerprint = "58A2 81E6 2FBD 6E4E 664C  B603 7B4D 2A02 BB0E C28C"; } ];
+  };
   britter = {
     name = "Benedikt Ritter";
     email = "beneritter@gmail.com";
@@ -6634,6 +6641,13 @@
     github = "dsymbol";
     githubId = 88138099;
   };
+  dtomvan = {
+    email = "18gatenmaker6@gmail.com";
+    github = "dtomvan";
+    githubId = 51440893;
+    name = "Tom van Dijk";
+    keys = [ { fingerprint = "D044 F07B 8863 B681 26BD  79FE 7A98 4C82 07AD BA51"; } ];
+  };
   dtzWill = {
     email = "w@wdtz.org";
     github = "dtzWill";
@@ -8664,6 +8678,12 @@
     githubId = 4065244;
     name = "Gary Guo";
   };
+  gauravghodinde = {
+    email = "gauravghodinde@gmail.com";
+    github = "gauravghodinde";
+    githubId = 65962770;
+    name = "Gaurav Ghodinde";
+  };
   gavin = {
     email = "gavin.rogers@holo.host";
     github = "gavinrogers";
@@ -24736,6 +24756,12 @@
     githubId = 13155277;
     name = "Tom Houle";
   };
+  tomjnixon = {
+    name = "Tom Nixon";
+    email = "nixpkgs@tomn.co.uk";
+    github = "tomjnixon";
+    githubId = 178226;
+  };
   tomkoid = {
     email = "tomaszierl@outlook.com";
     name = "Tomkoid";

nixos/modules/installer/sd-card/sd-image.nix

@@ -185,7 +185,7 @@ in
   config = {
     hardware.enableAllHardware = true;
 
-    fileSystems = lib.mkImageMediaOverride {
+    fileSystems = {
       "/boot/firmware" = {
         device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";
         fsType = "vfat";

nixos/modules/services/mail/opensmtpd.nix

@@ -76,8 +76,8 @@ in
         description = ''
           Packages to search for filters, tables, queues, and schedulers.
 
-          Add OpenSMTPD-extras here if you want to use the filters, etc. from
-          that package.
+          Add packages here if you want to use them as as such, for example
+          from the opensmtpd-table-* packages.
         '';
       };
     };
@@ -132,14 +132,14 @@ in
         procEnv = pkgs.buildEnv {
           name = "opensmtpd-procs";
           paths = [ cfg.package ] ++ cfg.procPackages;
-          pathsToLink = [ "/libexec/opensmtpd" ];
+          pathsToLink = [ "/libexec/smtpd" ];
         };
       in
       {
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
-        environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
+        environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/smtpd";
       };
   };
 }

nixos/modules/services/networking/kresd.nix

@@ -68,8 +68,7 @@ in
       description = ''
         Whether to enable knot-resolver domain name server.
         DNSSEC validation is turned on by default.
-        You can run `sudo nc -U /run/knot-resolver/control/1`
-        and give commands interactively to kresd@1.service.
+        You can run `kresd-cli 1` and give commands interactively to kresd@1.service.
       '';
     };
     package = lib.mkPackageOption pkgs "knot-resolver" {
@@ -135,7 +134,25 @@ in
 
   ###### implementation
   config = lib.mkIf cfg.enable {
-    environment.etc."knot-resolver/kresd.conf".source = configFile; # not required
+    environment = {
+      etc."knot-resolver/kresd.conf".source = configFile; # not required
+      systemPackages = [
+        (pkgs.writeShellScriptBin "kresd-cli" ''
+          if [[ ''${1:-} == -h || ''${1:-} == --help ]]; then
+            echo "Usage: $0 [X]"
+            echo
+            echo "  X is number of the control socket and corresponds to the number of the template unit."
+            exit
+          fi
+
+          exec=exec
+          if [[ "$USER" != knot-resolver ]]; then
+            exec='exec /run/wrappers/bin/sudo -u knot-resolver'
+          fi
+          $exec ${lib.getExe pkgs.socat} - /run/knot-resolver/control/''${1:-1}
+        '')
+      ];
+    };
 
     networking.resolvconf.useLocalResolver = lib.mkDefault true;
 

nixos/modules/services/networking/mycelium.nix

@@ -73,7 +73,13 @@ in
 
     systemd.services.mycelium = {
       description = "Mycelium network";
-      after = [ "network.target" ];
+      after = [
+        "network.target"
+        "network-online.target"
+      ];
+      wants = [
+        "network-online.target"
+      ];
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [
         cfg.keyFile

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

@@ -72,6 +72,19 @@ in
         example = "require";
         default = "refuse";
       };
+
+      discard = lib.mkOption {
+        type = lib.types.bool;
+        description = ''
+          Controls whether to issue the BLKDISCARD I/O control command on the
+          space taken up by any added partitions or on the space in between them.
+          Usually, it's a good idea to issue this request since it tells the underlying
+          hardware that the covered blocks shall be considered empty, improving performance.
+
+          See {manpage}`systemd-repart(8)` for details.
+        '';
+        default = true;
+      };
     };
 
     systemd.repart = {
@@ -163,6 +176,7 @@ in
                                   --definitions=/etc/repart.d \
                                   --dry-run=no \
                                   --empty=${initrdCfg.empty} \
+                                  --discard=${lib.boolToString initrdCfg.discard} \
                                   ${lib.optionalString (initrdCfg.device != null) initrdCfg.device}
               ''
             ];

nixos/modules/virtualisation/azure-image.nix

@@ -113,7 +113,7 @@ in
       '';
     };
 
-    fileSystems = lib.mkImageMediaOverride {
+    fileSystems = {
       "/" = {
         device = "/dev/disk/by-label/${cfg.label}";
         inherit (cfg) label;

nixos/modules/virtualisation/digital-ocean-config.nix

@@ -39,7 +39,7 @@ with lib;
     in
     mkMerge [
       {
-        fileSystems."/" = lib.mkImageMediaOverride {
+        fileSystems."/" = lib.mkDefault {
           device = "/dev/disk/by-label/nixos";
           autoResize = true;
           fsType = "ext4";

nixos/modules/virtualisation/disk-image.nix

@@ -37,7 +37,7 @@ in
     boot.loader.systemd-boot.enable = lib.mkDefault cfg.efiSupport;
     boot.growPartition = lib.mkDefault true;
 
-    fileSystems = lib.mkImageMediaOverride {
+    fileSystems = {
       "/" = {
         device = "/dev/disk/by-label/nixos";
         autoResize = true;

nixos/modules/virtualisation/google-compute-config.nix

@@ -21,7 +21,7 @@ in
     ../profiles/qemu-guest.nix
   ];
 
-  fileSystems."/" = lib.mkImageMediaOverride {
+  fileSystems."/" = {
     fsType = "ext4";
     device = "/dev/disk/by-label/nixos";
     autoResize = true;

nixos/modules/virtualisation/hyperv-image.nix

@@ -73,17 +73,15 @@ in
       inherit config lib pkgs;
     };
 
-    fileSystems = lib.mkImageMediaOverride {
-      "/" = {
-        device = "/dev/disk/by-label/nixos";
-        autoResize = true;
-        fsType = "ext4";
-      };
+    fileSystems."/" = {
+      device = "/dev/disk/by-label/nixos";
+      autoResize = true;
+      fsType = "ext4";
+    };
 
-      "/boot" = {
-        device = "/dev/disk/by-label/ESP";
-        fsType = "vfat";
-      };
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
     };
 
     boot.growPartition = true;

nixos/modules/virtualisation/kubevirt.nix

@@ -12,7 +12,7 @@
   ];
 
   config = {
-    fileSystems."/" = lib.mkImageMediaOverride {
+    fileSystems."/" = {
       device = "/dev/disk/by-label/nixos";
       fsType = "ext4";
       autoResize = true;

nixos/modules/virtualisation/linode-config.nix

@@ -1,8 +1,10 @@
 {
+  config,
   lib,
   pkgs,
   ...
 }:
+with lib;
 {
   imports = [ ../profiles/qemu-guest.nix ];
 
@@ -10,7 +12,7 @@
     enable = true;
 
     settings.PermitRootLogin = "prohibit-password";
-    settings.PasswordAuthentication = lib.mkDefault false;
+    settings.PasswordAuthentication = mkDefault false;
   };
 
   networking = {
@@ -32,13 +34,13 @@
     sysstat
   ];
 
-  fileSystems."/" = lib.mkImageMediaOverride {
+  fileSystems."/" = {
     fsType = "ext4";
     device = "/dev/sda";
     autoResize = true;
   };
 
-  swapDevices = lib.mkDefault [ { device = "/dev/sdb"; } ];
+  swapDevices = mkDefault [ { device = "/dev/sdb"; } ];
 
   # Enable LISH and Linode Booting w/ GRUB
   boot = {

nixos/modules/virtualisation/oci-common.nix

@@ -30,17 +30,15 @@ in
 
   boot.growPartition = true;
 
-  fileSystems = lib.mkImageMediaOverride {
-    "/" = {
-      device = "/dev/disk/by-label/nixos";
-      fsType = "ext4";
-      autoResize = true;
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+    autoResize = true;
+  };
 
-    "/boot" = lib.mkIf cfg.efi {
-      device = "/dev/disk/by-label/ESP";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = lib.mkIf cfg.efi {
+    device = "/dev/disk/by-label/ESP";
+    fsType = "vfat";
   };
 
   boot.loader.efi.canTouchEfiVariables = false;

nixos/modules/virtualisation/openstack-config.nix

@@ -33,22 +33,18 @@ in
   ];
 
   config = {
-    fileSystems."/" = mkIf (!cfg.zfs.enable) (
-      lib.mkImageMediaOverride {
-        device = "/dev/disk/by-label/nixos";
-        fsType = "ext4";
-        autoResize = true;
-      }
-    );
+    fileSystems."/" = mkIf (!cfg.zfs.enable) {
+      device = "/dev/disk/by-label/nixos";
+      fsType = "ext4";
+      autoResize = true;
+    };
 
-    fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) (
-      lib.mkImageMediaOverride {
-        # The ZFS image uses a partition labeled ESP whether or not we're
-        # booting with EFI.
-        device = "/dev/disk/by-label/ESP";
-        fsType = "vfat";
-      }
-    );
+    fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) {
+      # The ZFS image uses a partition labeled ESP whether or not we're
+      # booting with EFI.
+      device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
+    };
 
     boot.growPartition = true;
     boot.kernelParams = [ "console=tty1" ];

nixos/modules/virtualisation/openstack-options.nix

@@ -70,14 +70,12 @@ in
           _: value: ((value.mount or null) != null)
         ) config.openstack.zfs.datasets;
       in
-      lib.mkImageMediaOverride (
-        lib.mapAttrs' (
-          dataset: opts:
-          lib.nameValuePair opts.mount {
-            device = dataset;
-            fsType = "zfs";
-          }
-        ) mountable
-      );
+      lib.mapAttrs' (
+        dataset: opts:
+        lib.nameValuePair opts.mount {
+          device = dataset;
+          fsType = "zfs";
+        }
+      ) mountable;
   };
 }

nixos/modules/virtualisation/proxmox-image.nix

@@ -306,13 +306,7 @@ with lib;
           ''
             ${vma}/bin/vma create "${config.image.baseName}.vma" \
               -c ${
-                cfgFile "qemu-server.conf" (
-                  (builtins.removeAttrs cfg.qemuConf [ "diskSize" ])
-                  // {
-                    inherit (config.virtualisation) diskSize;
-                  }
-                  // cfg.qemuExtraConf
-                )
+                cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
               }/qemu-server.conf drive-virtio0=$diskImage
             rm $diskImage
             ${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
@@ -352,16 +346,14 @@ with lib;
         ];
       };
 
-      fileSystems = lib.mkImageMediaOverride {
-        "/" = {
-          device = "/dev/disk/by-label/nixos";
-          autoResize = true;
-          fsType = "ext4";
-        };
-        "/boot" = lib.mkIf hasBootPartition {
-          device = "/dev/disk/by-label/ESP";
-          fsType = "vfat";
-        };
+      fileSystems."/" = {
+        device = "/dev/disk/by-label/nixos";
+        autoResize = true;
+        fsType = "ext4";
+      };
+      fileSystems."/boot" = lib.mkIf hasBootPartition {
+        device = "/dev/disk/by-label/ESP";
+        fsType = "vfat";
       };
 
       networking = mkIf cfg.cloudInit.enable {

nixos/modules/virtualisation/virtualbox-image.nix

@@ -275,7 +275,7 @@ in
     };
 
     fileSystems =
-      lib.mkImageMediaOverride {
+      {
         "/" = {
           device = "/dev/disk/by-label/nixos";
           autoResize = true;

nixos/modules/virtualisation/vmware-image.nix

@@ -83,17 +83,15 @@ in
       inherit config lib pkgs;
     };
 
-    fileSystems = lib.mkImageMediaOverride {
-      "/" = {
-        device = "/dev/disk/by-label/nixos";
-        autoResize = true;
-        fsType = "ext4";
-      };
+    fileSystems."/" = {
+      device = "/dev/disk/by-label/nixos";
+      autoResize = true;
+      fsType = "ext4";
+    };
 
-      "/boot" = {
-        device = "/dev/disk/by-label/ESP";
-        fsType = "vfat";
-      };
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
     };
 
     boot.growPartition = true;

pkgs/applications/audio/vorbis-tools/default.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   libogg,
   libvorbis,
   libao,
@@ -16,22 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vorbis-tools";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz";
-    sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv";
+    hash = "sha256-of493Gd3vc6/a3l+ft/gQ3lUskdW/8yMa4FrY+BGDd4=";
   };
 
-  patches = [
-    # Fixes a call to undeclared function `utf8_decode`.
-    # https://github.com/xiph/vorbis-tools/pull/33
-    (fetchpatch {
-      url = "https://github.com/xiph/vorbis-tools/commit/8a645f78b45ae7e370c0dc2a52d0f2612aa6110b.patch";
-      hash = "sha256-RkT9Xa0pRu/oO9E9qhDa17L0luWgYHI2yINIkPZanmI=";
-    })
-  ];
-
   # ld64 on darwin doesn't support nested archives and as the nested lib
   # (libbase64.a) is not required to build so leave it out
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/applications/editors/bluefish/default.nix

@@ -1,45 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  wrapGAppsHook3,
-  pkg-config,
-  gtk,
-  libxml2,
-  enchant,
-  gucharmap,
-  python3,
-  adwaita-icon-theme,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "bluefish";
-  version = "2.2.16";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2";
-    sha256 = "sha256-FOZHb87o+jJvf2Px9pPSUhlfncsWrw/jyRXEmbr13XQ=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    adwaita-icon-theme
-    gtk
-    libxml2
-    enchant
-    gucharmap
-    python3
-  ];
-
-  meta = with lib; {
-    description = "Powerful editor targeted towards programmers and webdevelopers";
-    homepage = "https://bluefish.openoffice.nl/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ vbgl ];
-    platforms = platforms.all;
-    mainProgram = "bluefish";
-  };
-}

pkgs/applications/misc/cubocore-packages/coreaction/default.nix

@@ -1,44 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtsvg,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreaction";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y=";
+    repo = "coreaction";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-R/pzudaxs85etbI4hh2NwHNtO7EqI+vgJALY/4rIvrs=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtsvg
-    qtbase
+    qt6.qtsvg
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Side bar for showing widgets from the C Suite";
     mainProgram = "coreaction";
     homepage = "https://gitlab.com/cubocore/coreapps/coreaction";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corearchiver/default.nix

@@ -1,8 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   libarchive,
   libarchive-qt,
   cmake,
@@ -11,36 +11,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corearchiver";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk=";
+    repo = "corearchiver";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+XaBe1fNpAQf3cqXV+A1cZ1tPck3bCpgEDmFeF536q4=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libarchive-qt
     libarchive
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Archiver from the C Suite to create and extract archives";
     mainProgram = "corearchiver";
     homepage = "https://gitlab.com/cubocore/coreapps/corearchiver";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corefm/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corefm";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4=";
+    repo = "corefm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VsnbWknkMJp/2MDXbJuEQomotGqTXhZcUvu+ODJOjdM=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Lightwight filemanager from the C Suite";
     mainProgram = "corefm";
     homepage = "https://gitlab.com/cubocore/coreapps/corefm";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coregarage/default.nix

@@ -1,8 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   libarchive,
   libarchive-qt,
   cmake,
@@ -11,36 +11,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coregarage";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4=";
+    repo = "coregarage";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-boe7z8KPnMaoWekBFS4g/Ay98rpREeLMAsHOr2olYws=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libarchive
     libarchive-qt
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Settings manager for the C Suite";
     mainProgram = "coregarage";
     homepage = "https://gitlab.com/cubocore/coreapps/coregarage";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corehunt/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corehunt";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo=";
+    repo = "corehunt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QJJ+e+5UKka1Hbrtyn+agpJ7FLADHupZt41K8Mq8H4c=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "File finder utility from the C Suite";
     mainProgram = "corehunt";
     homepage = "https://gitlab.com/cubocore/coreapps/corehunt";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coreimage/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreimage";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA=";
+    repo = "coreimage";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-sgOxDKACb9D/TvjjHz09JwBpFoE8eXA4HixcbN+0FoE=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Image viewer from the C Suite";
     mainProgram = "coreimage";
     homepage = "https://gitlab.com/cubocore/coreapps/coreimage";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coreinfo/default.nix

@@ -1,35 +1,36 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
   libzen,
   libmediainfo,
   zlib,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreinfo";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U=";
+    repo = "coreinfo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/L69lrkJZh+SJRoNxvogdJ5KRIorwcBzm7WGxrNpexM=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libzen
     libmediainfo
     zlib
@@ -37,12 +38,12 @@ mkDerivation rec {
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "File information tool from the C Suite";
     mainProgram = "coreinfo";
     homepage = "https://gitlab.com/cubocore/coreapps/coreinfo";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix

@@ -1,9 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtx11extras,
+  qt6,
   xorg,
   cmake,
   ninja,
@@ -11,37 +10,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corekeyboard";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg=";
+    repo = "corekeyboard";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-n7QbvRPZFMeUl/P4XiGYZDglZCA8Ftf08s5uzPmSyIQ=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
+    qt6.qtbase
     xorg.libXtst
     xorg.libX11
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Virtual keyboard for X11 from the C Suite";
     mainProgram = "corekeyboard";
     homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corepad/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepad";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY=";
+    repo = "corepad";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oGF2N0bUuvc/ixmh2nefEJKh0kDipvcL/dwaXNxwo84=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Document editor from the C Suite";
     mainProgram = "corepad";
     homepage = "https://gitlab.com/cubocore/coreapps/corepad";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corepaint/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepaint";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4=";
+    repo = "corepaint";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ARFyBtkGYFMKnUD1h93GcQiKV6mFXxJvLEVeSXlaHZI=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Paint app from the C Suite";
     mainProgram = "corepaint";
     homepage = "https://gitlab.com/cubocore/coreapps/corepaint";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corepdf/default.nix

@@ -1,46 +1,49 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  poppler,
-  qtwebengine,
+  kdePackages,
   cmake,
   ninja,
+  pkg-config,
   libcprime,
   libcsys,
+  qdocumentview,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepdf";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8=";
+    repo = "corepdf";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fhEuMk15yCA6IUasD9rJPR8sB+h0tz8niOQtXFIe7Uc=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    pkg-config
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    poppler
-    qtwebengine
+    kdePackages.qtbase
+    kdePackages.qtwebengine
+    kdePackages.poppler
+    qdocumentview
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "PDF viewer from the C Suite";
     mainProgram = "corepdf";
     homepage = "https://gitlab.com/cubocore/coreapps/corepdf";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corepins/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepins";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ=";
+    repo = "corepins";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-noMdI2qk3cYc1FfRWd4rwpZBbeHiD557Z1T0ZxIhaTw=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Bookmarking app from the C Suite";
     mainProgram = "corepins";
     homepage = "https://gitlab.com/cubocore/coreapps/corepins";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corerenamer/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corerenamer";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs=";
+    repo = "corerenamer";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9e8Gm7h0zWVQeb7eFcUmp8uTdSboenLa7baZpKc3HEQ=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Batch file renamer from the C Suite";
     mainProgram = "corerenamer";
     homepage = "https://gitlab.com/cubocore/coreapps/corerenamer";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coreshot/default.nix

@@ -1,44 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtx11extras,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreshot";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU=";
+    repo = "coreshot";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5KGaMCL9BCGZwK7HQz87B1qrNvx5SQyMooZw4MwMdCc=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Screen capture utility from the C Suite";
     mainProgram = "coreshot";
     homepage = "https://gitlab.com/cubocore/coreapps/coreshot";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corestats/default.nix

@@ -1,8 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   lm_sensors,
   cmake,
   ninja,
@@ -10,35 +10,36 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corestats";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI=";
+    repo = "corestats";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0d03y3AYWxXh9DZrbPWqk34yq7iy5xUn/oMmJBu5GqQ=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     lm_sensors
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "System resource viewer from the C Suite";
     mainProgram = "corestats";
     homepage = "https://gitlab.com/cubocore/coreapps/corestats";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch

@@ -1,11 +1,11 @@
 --- a/corestuff/CMakeLists.txt	2022-01-29 14:09:02.699700817 +0700
 +++ b/CMakeLists.txt	2022-01-29 14:09:23.211754633 +0700
-@@ -120,8 +120,3 @@
- install( FILES org.cubocore.CoreStuff.desktop DESTINATION share/applications )
- install( FILES org.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ )
+@@ -121,7 +121,3 @@
+ install( FILES cc.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ )
  install( FILES background/default.svg DESTINATION share/coreapps/background )
--
+
 -if ( DEFINED ADD_AUTOSTART )
--	message("INSTALLING TO AUTOSTART LOCATION")
--	install( FILES org.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart )
+-    message("INSTALLING TO AUTOSTART LOCATION")
+-    install( FILES cc.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart )
 -endif()
+

pkgs/applications/misc/cubocore-packages/corestuff/default.nix

@@ -1,10 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtx11extras,
-  kglobalaccel,
+  kdePackages,
   xorg,
   cmake,
   ninja,
@@ -12,15 +10,15 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corestuff";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ=";
+    repo = "corestuff";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/EI7oM7c7GKEQ+XQSiWwkJ7uNrJkxgLXEXZ6r5Jqh70=";
   };
 
   patches = [
@@ -31,23 +29,25 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    kglobalaccel
+    kdePackages.qtbase
+    kdePackages.kglobalaccel
     xorg.libXcomposite
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Activity viewer from the C Suite";
     mainProgram = "corestuff";
     homepage = "https://gitlab.com/cubocore/coreapps/corestuff";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
+    # Address boundary error
+    broken = true;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coreterminal/default.nix

@@ -1,9 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtserialport,
+  qt6,
   qtermwidget,
   cmake,
   ninja,
@@ -11,36 +10,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreterminal";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0=";
+    repo = "coreterminal";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CSPZ1mbZ5ylfMQAwzj+hNodhEuyC7klvlKU5bj+HiyE=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtserialport
+    qt6.qtbase
+    qt6.qtserialport
     qtermwidget
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Terminal emulator from the C Suite";
     mainProgram = "coreterminal";
     homepage = "https://gitlab.com/cubocore/coreapps/coreterminal";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coretime/default.nix

@@ -1,44 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtmultimedia,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coretime";
-  version = "4.5.0";
+  version = "5.0.1";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs=";
+    repo = "coretime";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RgaIYZ410/M/PHTJC3ja7wEb3HqPrNkBpEIsUK102qw=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    qt6.qtbase
+    qt6.qtmultimedia
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Time related task manager from the C Suite";
     mainProgram = "coretime";
     homepage = "https://gitlab.com/cubocore/coreapps/coretime";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch

@@ -1,8 +1,8 @@
 --- a/corepkit/CMakeLists.txt	2021-12-25 17:52:20.000000000 +0700
 +++ b/corepkit/CMakeLists.txt	2021-12-29 17:58:09.298024297 +0700
-@@ -32,4 +32,4 @@
- target_link_libraries( corepkit  Qt5::Core )
- 
+@@ -31,4 +31,4 @@
+ target_link_libraries( corepkit  Qt6::Core )
+
  install( TARGETS corepkit DESTINATION libexec/coreapps/ )
--install( FILES org.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ )
-+install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ )
+-install( FILES cc.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ )
++install( FILES cc.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ )

pkgs/applications/misc/cubocore-packages/coretoppings/default.nix

@@ -1,13 +1,11 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
+  qt6,
   ffmpeg,
   cmake,
   ninja,
-  qtbase,
-  qtx11extras,
-  qtconnectivity,
   v4l-utils,
   grim,
   wf-recorder,
@@ -29,15 +27,15 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coretoppings";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0=";
+    repo = "coretoppings";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wHVdZqXn8DXqLbCdKz2fI8BjNVai5dRq3a45HVCvLa8=";
   };
 
   patches = [
@@ -48,12 +46,12 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qtconnectivity
+    qt6.qtbase
+    qt6.qtconnectivity
     libdbusmenu
     ffmpeg
     v4l-utils
@@ -78,12 +76,12 @@ mkDerivation rec {
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Additional features,plugins etc for CuboCore Application Suite";
     mainProgram = "shareIT";
     homepage = "https://gitlab.com/cubocore/coreapps/coretoppings";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix

@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreuniverse";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q=";
+    repo = "coreuniverse";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-T5BYHzOqSED40hOc5VwD+oLTwBJ1wARvS8MwiYOWlXM=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Shows information about apps from the C Suite";
     mainProgram = "coreuniverse";
     homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch

@@ -11,20 +11,20 @@ diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp
 index 4c40d4c..5dbb6ff 100644
 --- a/cprime/systemxdg.cpp
 +++ b/cprime/systemxdg.cpp
-@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp
- 
+@@ -343,9 +343,10 @@
+
  SystemXdgMime::SystemXdgMime()
  {
--    appsDirs << QDir::home().filePath(".local/share/applications/");
--    appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/");
--    appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/");
-+    appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
-+    appsDirs << "/run/current-system/sw/share/applications/";
-+    appsDirs << "/run/current-system/sw/share/applications/kde4/";
-+    appsDirs << "/run/current-system/sw/share/gnome/applications/";
+-	appsDirs << QDir::home().filePath(".local/share/applications/");
+-	appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/");
+-	appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/");
++	appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
++	appsDirs << "/run/current-system/sw/share/applications/";
++	appsDirs << "/run/current-system/sw/share/applications/kde4/";
++	appsDirs << "/run/current-system/sw/share/gnome/applications/";
  }
- 
- 
+
+
 -- 
 2.39.0
 

pkgs/applications/misc/cubocore-packages/libcprime/default.nix

@@ -1,23 +1,22 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
   libnotify,
   cmake,
   ninja,
-  qtbase,
-  qtconnectivity,
+  qt6,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libcprime";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og=";
+    repo = "libcprime";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3tAbF4CoZJf92Z2/M/Cq7ruPew34Hl5Ojks7fI6kPbU=";
   };
 
   patches = [
@@ -30,16 +29,18 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
-    qtconnectivity
+    qt6.qtbase
+    qt6.qtconnectivity
     libnotify
   ];
 
-  meta = with lib; {
+  dontWrapQtApps = true;
+
+  meta = {
     description = "Library for bookmarking, saving recent activites, managing settings of C-Suite";
-    homepage = "https://gitlab.com/cubocore/coreapps/libcprime";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    homepage = "https://gitlab.com/cubocore/libcprime";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/misc/cubocore-packages/libcsys/default.nix

@@ -1,22 +1,22 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
   udisks2,
-  qtbase,
+  qt6,
   cmake,
   ninja,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libcsys";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc=";
+    repo = "libcsys";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-53vneIR2uy3VtbnOlEHl1anj3nXA3MU2KQt1PWm7KGI=";
   };
 
   nativeBuildInputs = [
@@ -25,15 +25,17 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     udisks2
   ];
 
-  meta = with lib; {
+  dontWrapQtApps = true;
+
+  meta = {
     description = "Library for managing drive and getting system resource information in real time";
     homepage = "https://gitlab.com/cubocore/libcsys";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix

@@ -1855,5 +1855,623 @@
       arch = "linux-aarch64";
       sha256 = "8bca45e1549d5dedb8e3ff67a6df7b3f212e82de1f6e21dbe1bb3cc355db03b4";
     }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ach/Firefox%20138.0b9.dmg";
+      locale = "ach";
+      arch = "mac";
+      sha256 = "704566715587cad8fc8c1cd52ef8d3c4f815faee724a68ebf89492f15dbda2af";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/af/Firefox%20138.0b9.dmg";
+      locale = "af";
+      arch = "mac";
+      sha256 = "7a033a9c5f3a4eebdc186b9c2047def8d39adbd806b6007e3a0e2936fa1a1f32";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/an/Firefox%20138.0b9.dmg";
+      locale = "an";
+      arch = "mac";
+      sha256 = "3b3a2dad4f63b0bb6f7dcba9897795b5d350e45c4a56c7eae0140103f01b823c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ar/Firefox%20138.0b9.dmg";
+      locale = "ar";
+      arch = "mac";
+      sha256 = "cf3722eeec71e9d1ce255cc743a41d725e16bd225d91d0ee90bc19476d28f1fe";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ast/Firefox%20138.0b9.dmg";
+      locale = "ast";
+      arch = "mac";
+      sha256 = "c3068dfb53ae4345fd4398791c08d4b6c846356210ea4e8091256234c2f0102d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/az/Firefox%20138.0b9.dmg";
+      locale = "az";
+      arch = "mac";
+      sha256 = "5ac5265d619ce1ccafadb21e5a1f8031124657a339785afabf4c449f7421564c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/be/Firefox%20138.0b9.dmg";
+      locale = "be";
+      arch = "mac";
+      sha256 = "79ded4e62dd66a83192c1e4afd81d93af76d85df568d43a6b565da8e036707d6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/bg/Firefox%20138.0b9.dmg";
+      locale = "bg";
+      arch = "mac";
+      sha256 = "cde769b656efe32b766e5b045a1d7ba395ece9022e59e7147b20fedc16a20435";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/bn/Firefox%20138.0b9.dmg";
+      locale = "bn";
+      arch = "mac";
+      sha256 = "40e8c536f47cfc1170bc49e84717aaecad8d8e95dd522aed1e3bc22bcadd6af6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/br/Firefox%20138.0b9.dmg";
+      locale = "br";
+      arch = "mac";
+      sha256 = "155dd91509391531cc1b057a387a86f26561b3f379652cdd94934282dc035321";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/bs/Firefox%20138.0b9.dmg";
+      locale = "bs";
+      arch = "mac";
+      sha256 = "ee4b6328596fbfa7cd425e719968337a9ba51e10463652973a54095d7bfbb00c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ca-valencia/Firefox%20138.0b9.dmg";
+      locale = "ca-valencia";
+      arch = "mac";
+      sha256 = "f29315cb28ac947201426ab3e7de5bf07f83b6e5864eb5e5e612111f6e23f317";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ca/Firefox%20138.0b9.dmg";
+      locale = "ca";
+      arch = "mac";
+      sha256 = "2dfabc1fed36e656ff41bce78bbbcf1ecb048840bc1a362fc81943c5d3bb6106";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/cak/Firefox%20138.0b9.dmg";
+      locale = "cak";
+      arch = "mac";
+      sha256 = "6e2f152f42d9ace48f5513d1902efeb4908de7692a61e9f0b91f180c00eab647";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/cs/Firefox%20138.0b9.dmg";
+      locale = "cs";
+      arch = "mac";
+      sha256 = "d3af14d3117c290ec3f778beb8646d637776efb5d2a549411caf2576ad66d80c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/cy/Firefox%20138.0b9.dmg";
+      locale = "cy";
+      arch = "mac";
+      sha256 = "5f44a98b482302e84db3a791d44db29195e390d02b27518f38de24425c6c80f6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/da/Firefox%20138.0b9.dmg";
+      locale = "da";
+      arch = "mac";
+      sha256 = "9459407652e55491a5699664fb645527ba76906a2d464b720a34f8d47d2d22d9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/de/Firefox%20138.0b9.dmg";
+      locale = "de";
+      arch = "mac";
+      sha256 = "9b37b1b597dfa7950b5570c3d91cbef38a98b4037d85cff70a81e1575da583c0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/dsb/Firefox%20138.0b9.dmg";
+      locale = "dsb";
+      arch = "mac";
+      sha256 = "940b93d3cd1abe656102366974330e3900e860ea58df47f637d6b383e3840bb4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/el/Firefox%20138.0b9.dmg";
+      locale = "el";
+      arch = "mac";
+      sha256 = "99f460aeea77c9ae5ca9513c2375617415d0a0db5a1b2ff1c004424f5fd03bb5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/en-CA/Firefox%20138.0b9.dmg";
+      locale = "en-CA";
+      arch = "mac";
+      sha256 = "b76456d751c540bad476f4f327e8f90479ea8181bc7e0b2a8169b1522b59c2cb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/en-GB/Firefox%20138.0b9.dmg";
+      locale = "en-GB";
+      arch = "mac";
+      sha256 = "95f59434f43990b0095d74ccbdd914477fdad55cc3ffb1665cf5a241032c1219";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/en-US/Firefox%20138.0b9.dmg";
+      locale = "en-US";
+      arch = "mac";
+      sha256 = "4e1749becc9427c908865af93cf245fc82895236eb8ad160798342a9d6714dde";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/eo/Firefox%20138.0b9.dmg";
+      locale = "eo";
+      arch = "mac";
+      sha256 = "7f5925dcd2882f1ca8d769f215c52695321b8399a432c7ea85cf8fb9c9607003";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/es-AR/Firefox%20138.0b9.dmg";
+      locale = "es-AR";
+      arch = "mac";
+      sha256 = "ae855d0b172a3f7605d139d768127bd3af32bcbac8daa2e562095cc29254ce5c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/es-CL/Firefox%20138.0b9.dmg";
+      locale = "es-CL";
+      arch = "mac";
+      sha256 = "a3769be026b0bde428d19f1eaee83954ec8e7847704dda90dca6cdd7f9465fb2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/es-ES/Firefox%20138.0b9.dmg";
+      locale = "es-ES";
+      arch = "mac";
+      sha256 = "b76fa9230af9d17a267a318bec1e00996019f50018feb5016ce363af8ba8ce2f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/es-MX/Firefox%20138.0b9.dmg";
+      locale = "es-MX";
+      arch = "mac";
+      sha256 = "6e149934a4921963ecea0040a18638f33ffbb2fcd25286a0db39c53660067bc7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/et/Firefox%20138.0b9.dmg";
+      locale = "et";
+      arch = "mac";
+      sha256 = "a71ca7b1da16600680552fabf3fa420cf307e1bc48d8e4097739e6e334eb63cc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/eu/Firefox%20138.0b9.dmg";
+      locale = "eu";
+      arch = "mac";
+      sha256 = "076b083319c8cc55fd63f2327f97075d37d3d00b13854d0c5f7ea1187be9347a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/fa/Firefox%20138.0b9.dmg";
+      locale = "fa";
+      arch = "mac";
+      sha256 = "c8b868d223a4b1268931893e51baaad44d9f70429c5e0a402b5a8e51a8d0ce4c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ff/Firefox%20138.0b9.dmg";
+      locale = "ff";
+      arch = "mac";
+      sha256 = "856735c6a084559e435efebbd6b14a4cdf9fa34a9d7c4b5c407803c798f3ddb9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/fi/Firefox%20138.0b9.dmg";
+      locale = "fi";
+      arch = "mac";
+      sha256 = "c39f69bd36ec4866502edfb7b82c65fccf961c264f869e481f97c0a0866d47dc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/fr/Firefox%20138.0b9.dmg";
+      locale = "fr";
+      arch = "mac";
+      sha256 = "47bb44aac78077e8f21b8068151b7490535be66e50a8f900a14a88250ed9de2b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/fur/Firefox%20138.0b9.dmg";
+      locale = "fur";
+      arch = "mac";
+      sha256 = "ff0bed78580b116b1e340d31ed247a497d37781c0f38759df0efe7c9876c710c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/fy-NL/Firefox%20138.0b9.dmg";
+      locale = "fy-NL";
+      arch = "mac";
+      sha256 = "17015ae2c568260ad811354b84f68baffa8eaa3526b1d0c205e7a44002f9b445";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ga-IE/Firefox%20138.0b9.dmg";
+      locale = "ga-IE";
+      arch = "mac";
+      sha256 = "2b8c9d55717a039dae56e33017ae8c8c2dfd7d399c625427e56c9bd716e0cba9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/gd/Firefox%20138.0b9.dmg";
+      locale = "gd";
+      arch = "mac";
+      sha256 = "92c388b1468b4fbbbb0a199b77b6daf6fea110f36adc9707c3111f44191df863";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/gl/Firefox%20138.0b9.dmg";
+      locale = "gl";
+      arch = "mac";
+      sha256 = "ea7f5e485b8254daeb2712877bd7fc44328e78095febae1dbc2a1023bed14ff2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/gn/Firefox%20138.0b9.dmg";
+      locale = "gn";
+      arch = "mac";
+      sha256 = "2aca86345f02e59de582607169da8f6a3149956184fa5897db0b90b87c36162c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/gu-IN/Firefox%20138.0b9.dmg";
+      locale = "gu-IN";
+      arch = "mac";
+      sha256 = "536e6699c8db863ad7331c79abd14775b53e603575b7d2b233316efd975c2e1d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/he/Firefox%20138.0b9.dmg";
+      locale = "he";
+      arch = "mac";
+      sha256 = "a5e8d6914f834e88e98ce1e4e2f8ea117d59562e014780f749165089b06b4c45";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/hi-IN/Firefox%20138.0b9.dmg";
+      locale = "hi-IN";
+      arch = "mac";
+      sha256 = "3e8a34e66245e9fee6bba2c74a92a4bf43938d2f8f85d988def896fb2b4e5d44";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/hr/Firefox%20138.0b9.dmg";
+      locale = "hr";
+      arch = "mac";
+      sha256 = "4aca2c5bf54e54a1ecb990d3da28ba700120ae86c7d14f85c0261c947f0a339b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/hsb/Firefox%20138.0b9.dmg";
+      locale = "hsb";
+      arch = "mac";
+      sha256 = "d7a977eefb6c4a0d5fbfcfdf982e0b884f0dd3ae0d3f83a9a985023bb973e5fd";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/hu/Firefox%20138.0b9.dmg";
+      locale = "hu";
+      arch = "mac";
+      sha256 = "9da536b281d893334d7b4d13b77bf8e10b799bf487b477a1bc5c906b12d19408";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/hy-AM/Firefox%20138.0b9.dmg";
+      locale = "hy-AM";
+      arch = "mac";
+      sha256 = "df88cbd8bc0886c45afb1c9377cc790ae6ec80c4462fe0ae293b1a79d5d9ca99";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ia/Firefox%20138.0b9.dmg";
+      locale = "ia";
+      arch = "mac";
+      sha256 = "f62114e7ba4e413c7daf688e457ca55b702af36985a40fe352906c5d6271be9e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/id/Firefox%20138.0b9.dmg";
+      locale = "id";
+      arch = "mac";
+      sha256 = "b1eb12c44cd65825ab924a2c7966305b7ebbc8c9d4b3001eb3058e9060a685ca";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/is/Firefox%20138.0b9.dmg";
+      locale = "is";
+      arch = "mac";
+      sha256 = "aae9f88492be5e9edf4dad60c121ee41dc5dcec7dbd579fcd0e1a71168fa4f4e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/it/Firefox%20138.0b9.dmg";
+      locale = "it";
+      arch = "mac";
+      sha256 = "91014d8e78fba73483f827e4c94d12eb9b6dee60b551f1c5ae675e79e881f6b9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ja-JP-mac/Firefox%20138.0b9.dmg";
+      locale = "ja-JP-mac";
+      arch = "mac";
+      sha256 = "4e6e0a5b23736d505cff12c0cf153f8776427c09d4b62b83e3990b0a37865854";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ka/Firefox%20138.0b9.dmg";
+      locale = "ka";
+      arch = "mac";
+      sha256 = "2018f0ddb30cd52d69b809ddfc7f57fe07df13a77214a78e375629116c3b34ac";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/kab/Firefox%20138.0b9.dmg";
+      locale = "kab";
+      arch = "mac";
+      sha256 = "70aed48159901bb579c788683bb884034d94bed5908d25a9d4a30712d7d40ddc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/kk/Firefox%20138.0b9.dmg";
+      locale = "kk";
+      arch = "mac";
+      sha256 = "92952252a5e3f778cfdc8ea3d2ca930dab07f63a680106d444ae90352bc0fa70";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/km/Firefox%20138.0b9.dmg";
+      locale = "km";
+      arch = "mac";
+      sha256 = "50de8e02f3387fd96cffafdb1435225220d608bb268776cba23fc2982592314a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/kn/Firefox%20138.0b9.dmg";
+      locale = "kn";
+      arch = "mac";
+      sha256 = "da3597ff63b7ffc203f9cd5ca22072bf2880c85cb6fda4baf172d04dadfa3869";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ko/Firefox%20138.0b9.dmg";
+      locale = "ko";
+      arch = "mac";
+      sha256 = "5b0ce4624a789aec0bd4d9c84f95576ea995b0f653387d3f2818671735d8ca5f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/lij/Firefox%20138.0b9.dmg";
+      locale = "lij";
+      arch = "mac";
+      sha256 = "27cfe7f05bb823e02b9b2b7c6b4f97fe12fefaaf641310268a05fbf577b117f7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/lt/Firefox%20138.0b9.dmg";
+      locale = "lt";
+      arch = "mac";
+      sha256 = "dc514b8ed0707b70b8da3cd818d5bcaa61954911771b01767d2ffe8f5778fad0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/lv/Firefox%20138.0b9.dmg";
+      locale = "lv";
+      arch = "mac";
+      sha256 = "407ede996ffa39cbaaf589f75b88447e6b0002097d39ad65218abc8be2a39489";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/mk/Firefox%20138.0b9.dmg";
+      locale = "mk";
+      arch = "mac";
+      sha256 = "d59dcc175dac97bbff7c0339005a2086be0509a97cecde142733a49bc69a83ea";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/mr/Firefox%20138.0b9.dmg";
+      locale = "mr";
+      arch = "mac";
+      sha256 = "02fcbb20c662fa7c34e34bb13c4ef23b34bdecf431cbac6bc195b520e231f8a0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ms/Firefox%20138.0b9.dmg";
+      locale = "ms";
+      arch = "mac";
+      sha256 = "b8a90c41482b10c6ff5e6ce0429752b4b21e749b190b9fb566f41ca36ccb4659";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/my/Firefox%20138.0b9.dmg";
+      locale = "my";
+      arch = "mac";
+      sha256 = "0f1a46a91324491a4f00690fca93effb1ca445a61bd7b317ed246e9718efacd8";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/nb-NO/Firefox%20138.0b9.dmg";
+      locale = "nb-NO";
+      arch = "mac";
+      sha256 = "3e94a8833cd210cfacc9ae799b45100f2777bf335ce89cd10daa6782fa5d827b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ne-NP/Firefox%20138.0b9.dmg";
+      locale = "ne-NP";
+      arch = "mac";
+      sha256 = "edc8ae56c5e5f733fb4f1f3797ddcc18648beab71a6dcb5710d58c88bcdabc0e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/nl/Firefox%20138.0b9.dmg";
+      locale = "nl";
+      arch = "mac";
+      sha256 = "b5ea1492bdde9f331941e3a144c0cf39dd9f6d1ad0b14c665fbc16ee5bcbbad9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/nn-NO/Firefox%20138.0b9.dmg";
+      locale = "nn-NO";
+      arch = "mac";
+      sha256 = "dab593a0d0da7e1de4a594334d46a01c15559acf99ff0b3ec7c9de96606e989b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/oc/Firefox%20138.0b9.dmg";
+      locale = "oc";
+      arch = "mac";
+      sha256 = "1a997538b490ae7b0ffa5730bd512fee30ed16b6481efc9f4b8865cdcc11a711";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/pa-IN/Firefox%20138.0b9.dmg";
+      locale = "pa-IN";
+      arch = "mac";
+      sha256 = "6cf83df70c0305777d507ff8f08403e3ecc8a13357cbaa7d794b8b620a6b3bb8";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/pl/Firefox%20138.0b9.dmg";
+      locale = "pl";
+      arch = "mac";
+      sha256 = "7a103ffd83a1fc9c90557763788da0f2f685880cfdc484cfeca8c03d99c9ec13";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/pt-BR/Firefox%20138.0b9.dmg";
+      locale = "pt-BR";
+      arch = "mac";
+      sha256 = "5d712dc61dc863f6d258664eee0eea47a2b98d01673b5a8f23314fc144eb96c5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/pt-PT/Firefox%20138.0b9.dmg";
+      locale = "pt-PT";
+      arch = "mac";
+      sha256 = "117a6ccedfb44aee39e1b33d67918850beb248941133b946b1ba2eb3937ce65c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/rm/Firefox%20138.0b9.dmg";
+      locale = "rm";
+      arch = "mac";
+      sha256 = "ea9fd934bc2ea79b4f60a236e4f08b9ee29849a97a00f275c35a39ec1a549810";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ro/Firefox%20138.0b9.dmg";
+      locale = "ro";
+      arch = "mac";
+      sha256 = "210cf58461088963f09df095c9e7e28c5d3c28ef54c13e2d663207a06df4dbc9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ru/Firefox%20138.0b9.dmg";
+      locale = "ru";
+      arch = "mac";
+      sha256 = "f4a9f43946d0080def586c05d6dae8d99ca254564b25c98b589f2ada28179541";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sat/Firefox%20138.0b9.dmg";
+      locale = "sat";
+      arch = "mac";
+      sha256 = "b9f4766bef95d0396c3e514e2147263031f2ace47e95cf03a914008f82f1d711";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sc/Firefox%20138.0b9.dmg";
+      locale = "sc";
+      arch = "mac";
+      sha256 = "e3ec447d9bd7ca3c5e6faf787219c51616939af353d138eb046a9c3a7dd0e41b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sco/Firefox%20138.0b9.dmg";
+      locale = "sco";
+      arch = "mac";
+      sha256 = "cc68ae965a5fc76db8913c825277a713c4354f17990699aca44e2615dcc1352c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/si/Firefox%20138.0b9.dmg";
+      locale = "si";
+      arch = "mac";
+      sha256 = "c967bf36c8407e96640023e3ea2767788326f1e4a603c57ba1802558e32cf378";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sk/Firefox%20138.0b9.dmg";
+      locale = "sk";
+      arch = "mac";
+      sha256 = "261ffcc7347c30721c6599df5e1cc6eff4c6af91469249b7b83de9f77a48c80c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/skr/Firefox%20138.0b9.dmg";
+      locale = "skr";
+      arch = "mac";
+      sha256 = "b9304083643702e16f3d2b045bb4f12ed4b4d1fa6038fc355b10ff9ac2a4cbe1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sl/Firefox%20138.0b9.dmg";
+      locale = "sl";
+      arch = "mac";
+      sha256 = "d9398bcb4c6704adeda82ff69e85ea2954eb1b8d1ad4510ced3b666ce7229e64";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/son/Firefox%20138.0b9.dmg";
+      locale = "son";
+      arch = "mac";
+      sha256 = "8336f98e45c49f598ba5e42abf42dca1c1a1bd112a74af624dfdc7f7046590f2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sq/Firefox%20138.0b9.dmg";
+      locale = "sq";
+      arch = "mac";
+      sha256 = "eed332ecd7d369babc277cb01b4bd4a8b1b20e57c31557c6e4443208277f58e5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sr/Firefox%20138.0b9.dmg";
+      locale = "sr";
+      arch = "mac";
+      sha256 = "6e9ceffdc326f8426328f47880babe33f91105902cc409468b9169b9cb88e89d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/sv-SE/Firefox%20138.0b9.dmg";
+      locale = "sv-SE";
+      arch = "mac";
+      sha256 = "8c578aaee4d92e6964938502978e0926c48ab3af6b3babaf5ffff2766eaf58b4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/szl/Firefox%20138.0b9.dmg";
+      locale = "szl";
+      arch = "mac";
+      sha256 = "0ce5ef3648a2ba59a1f33f5566d75c28a0dc113693d8d4008444694c25d85298";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ta/Firefox%20138.0b9.dmg";
+      locale = "ta";
+      arch = "mac";
+      sha256 = "b89cadad05326eb7e29536142d555470da1f0ff350917bdc80762ebeed176ce8";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/te/Firefox%20138.0b9.dmg";
+      locale = "te";
+      arch = "mac";
+      sha256 = "3c8b3d44566221b99ff22761805d0b7a94d7ca15b0787784430c6fd3d3777961";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/tg/Firefox%20138.0b9.dmg";
+      locale = "tg";
+      arch = "mac";
+      sha256 = "8d13e2287ae584984ea5fe003be41a2daa68a45c6ff5bf1deb831f92cb65f43a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/th/Firefox%20138.0b9.dmg";
+      locale = "th";
+      arch = "mac";
+      sha256 = "c2bb5558608b6f0d96c37dc07670c805f4cecb55a458e080bc11620e76257295";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/tl/Firefox%20138.0b9.dmg";
+      locale = "tl";
+      arch = "mac";
+      sha256 = "5dabe32efc1397c394a7e22923051f06d9f75ded910ec5a15214fbdf36022236";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/tr/Firefox%20138.0b9.dmg";
+      locale = "tr";
+      arch = "mac";
+      sha256 = "9c8f928cb0e77aa76c24939dae8a3354565d3eb8c2742525cbf5763f630613d0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/trs/Firefox%20138.0b9.dmg";
+      locale = "trs";
+      arch = "mac";
+      sha256 = "d63637985e4553f169fdfcb0effd58563f86f6654104a621ca9204398092cdbc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/uk/Firefox%20138.0b9.dmg";
+      locale = "uk";
+      arch = "mac";
+      sha256 = "9e576005d0681428663e83a98ad6183297018d23b9828523fc3f5d6c27871376";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/ur/Firefox%20138.0b9.dmg";
+      locale = "ur";
+      arch = "mac";
+      sha256 = "4b6a547f494b0dee7e3816b3b87f559d8cf7cada6c109651f7c40199665f409d";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/uz/Firefox%20138.0b9.dmg";
+      locale = "uz";
+      arch = "mac";
+      sha256 = "c3cd03656d793e466e35b4e5c3a80ae24ef0bee61dd05067905c1e8e3bb067ee";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/vi/Firefox%20138.0b9.dmg";
+      locale = "vi";
+      arch = "mac";
+      sha256 = "ab613b23aa13b3f44433a2a79a11f3078a91edfead7064dc72f8f7c973c33197";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/xh/Firefox%20138.0b9.dmg";
+      locale = "xh";
+      arch = "mac";
+      sha256 = "6efc90bf0b7bc76ba95a5277d20a36cec37c59d93b2fd2c64c106b5738dfbcdb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/zh-CN/Firefox%20138.0b9.dmg";
+      locale = "zh-CN";
+      arch = "mac";
+      sha256 = "d8c2531a5da4c7a53847b741115dc97db3555e8d1cf366ee11647aeec0afcd73";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/138.0b9/mac/zh-TW/Firefox%20138.0b9.dmg";
+      locale = "zh-TW";
+      arch = "mac";
+      sha256 = "231cd243c38f4cc8e0da4c3f47a7e3729832bae411c81640af2117a68a2cc0b4";
+    }
   ];
 }

pkgs/applications/networking/browsers/firefox-bin/default.nix

@@ -27,18 +27,23 @@
   systemLocale ? config.i18n.defaultLocale or "en_US",
   patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections
   applicationName ? "Firefox",
+  undmg,
 }:
 
 let
 
   inherit (generated) version sources;
 
-  binaryName = if channel == "release" then "firefox" else "firefox-${channel}";
+  binaryName =
+    if (channel == "release" || stdenv.hostPlatform.isDarwin) then "firefox" else "firefox-${channel}";
 
   mozillaPlatforms = {
     i686-linux = "linux-i686";
     x86_64-linux = "linux-x86_64";
     aarch64-linux = "linux-aarch64";
+    # bundles are universal and can be re-used for both darwin architectures
+    aarch64-darwin = "mac";
+    x86_64-darwin = "mac";
   };
 
   arch = mozillaPlatforms.${stdenv.hostPlatform.system};
@@ -71,40 +76,58 @@ stdenv.mkDerivation {
 
   src = fetchurl { inherit (source) url sha256; };
 
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    autoPatchelfHook
-    patchelfUnstable
-  ];
-  buildInputs = [
+  sourceRoot = lib.optional stdenv.hostPlatform.isDarwin ".";
+
+  nativeBuildInputs =
+    [
+      wrapGAppsHook3
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      autoPatchelfHook
+      patchelfUnstable
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      undmg
+    ];
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     gtk3
     adwaita-icon-theme
     alsa-lib
     dbus-glib
     libXtst
   ];
-  runtimeDependencies = [
-    curl
-    libva.out
-    pciutils
-  ];
-  appendRunpaths = [
+  runtimeDependencies =
+    [
+      curl
+      pciutils
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      libva.out
+    ];
+  appendRunpaths = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     "${pipewire}/lib"
   ];
   # Firefox uses "relrhack" to manually process relocations from a fixed offset
   patchelfFlags = [ "--no-clobber-old-sections" ];
 
-  installPhase = ''
-    mkdir -p "$prefix/lib/firefox-bin-${version}"
-    cp -r * "$prefix/lib/firefox-bin-${version}"
+  installPhase =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mkdir -p $out/Applications
+        mv Firefox*.app "$out/Applications/${applicationName}.app"
+      ''
+    else
+      ''
+        mkdir -p "$prefix/lib/firefox-bin-${version}"
+        cp -r * "$prefix/lib/firefox-bin-${version}"
 
-    mkdir -p "$out/bin"
-    ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}"
+        mkdir -p "$out/bin"
+        ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}"
 
-    # See: https://github.com/mozilla/policy-templates/blob/master/README.md
-    mkdir -p "$out/lib/firefox-bin-${version}/distribution";
-    ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json";
-  '';
+        # See: https://github.com/mozilla/policy-templates/blob/master/README.md
+        mkdir -p "$out/lib/firefox-bin-${version}/distribution";
+        ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json";
+      '';
 
   passthru = {
     inherit applicationName binaryName;

pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix

@@ -1855,5 +1855,623 @@
       arch = "linux-aarch64";
       sha256 = "cddd4934d1ecc6e20fa82ec79d7c9d7846956aacb51e5a8d8e3b4283558a1bb1";
     }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ach/Firefox%20138.0b9.dmg";
+      locale = "ach";
+      arch = "mac";
+      sha256 = "f16aaa1c7d06e9258a97ec2b123a68ab3cfd1f27a5b6f549e37342cec75f723f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/af/Firefox%20138.0b9.dmg";
+      locale = "af";
+      arch = "mac";
+      sha256 = "a4f26af070bf41e52d315740ae81e92a829b8a8b26d3e3028e8436f6b776ec4f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/an/Firefox%20138.0b9.dmg";
+      locale = "an";
+      arch = "mac";
+      sha256 = "748dca08b9e3bcc60a2e17e5f9212a9b37b15165d9a3b1a2017c82da20acdb64";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ar/Firefox%20138.0b9.dmg";
+      locale = "ar";
+      arch = "mac";
+      sha256 = "9b9192ab7eb74de7260ee13e7e4b5d57b23173d436c0cb3c1940ffe2cc125bce";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ast/Firefox%20138.0b9.dmg";
+      locale = "ast";
+      arch = "mac";
+      sha256 = "b8e96659fea5fe7136cdf218eaa28857612669466d5ca9242c71b8ca3763361b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/az/Firefox%20138.0b9.dmg";
+      locale = "az";
+      arch = "mac";
+      sha256 = "f4ae09d520edb6a6204b63eef3b2fc4da0e3385c20ed71d197e65f3feee52c20";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/be/Firefox%20138.0b9.dmg";
+      locale = "be";
+      arch = "mac";
+      sha256 = "6ed6b1370d89bdeae53da1b6287ca32d2b8fa4c77853fab8e1529afaebb04e94";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/bg/Firefox%20138.0b9.dmg";
+      locale = "bg";
+      arch = "mac";
+      sha256 = "57ef32acf2eeb948d36940aa29f58ee2543cabd60aee47c87b65d9ca0dc924bb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/bn/Firefox%20138.0b9.dmg";
+      locale = "bn";
+      arch = "mac";
+      sha256 = "99581fe38193ba9f7876fa2ebf130e52c70ca9ac3a6c70779ef6a5288b7aefac";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/br/Firefox%20138.0b9.dmg";
+      locale = "br";
+      arch = "mac";
+      sha256 = "0bcc71acfd3ea87771d2cecd47f55cb24dd5ae63ca80588ee236403458bf01cb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/bs/Firefox%20138.0b9.dmg";
+      locale = "bs";
+      arch = "mac";
+      sha256 = "a64271a08afacdb305db4b05638b75c3ffe3fcc0ab890b09b0bb5411dc621681";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ca-valencia/Firefox%20138.0b9.dmg";
+      locale = "ca-valencia";
+      arch = "mac";
+      sha256 = "ce58692f94ae70792f0004bce2aaac0260e77cb65631369010bb3546a58b0581";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ca/Firefox%20138.0b9.dmg";
+      locale = "ca";
+      arch = "mac";
+      sha256 = "8c2edaa2f8de77a4b8db4b21ee863db3a11902c8660756dd0d44d0ce6abd5646";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/cak/Firefox%20138.0b9.dmg";
+      locale = "cak";
+      arch = "mac";
+      sha256 = "5318882cb77d6b01c26e3bc8d7ed7887a21d8c8db1512d46fa36afc8beb69e56";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/cs/Firefox%20138.0b9.dmg";
+      locale = "cs";
+      arch = "mac";
+      sha256 = "a47ec63c2d3be1716d2f63f7ba99d4c129c4fb254ee9ac49be892a9f55d5f355";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/cy/Firefox%20138.0b9.dmg";
+      locale = "cy";
+      arch = "mac";
+      sha256 = "4b3b767307d0a7f150711752448b9e76e2e2c7143d946845fb703b7e61a9600a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/da/Firefox%20138.0b9.dmg";
+      locale = "da";
+      arch = "mac";
+      sha256 = "407eeda772ccf8f6b40eab71b8e196b486fd950a354b2ab7ebc9138faedbaca7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/de/Firefox%20138.0b9.dmg";
+      locale = "de";
+      arch = "mac";
+      sha256 = "c7dc4e0739d38681e3e3d929a8846dd95dc232cd7d40bb9c721e1d4f5c91d747";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/dsb/Firefox%20138.0b9.dmg";
+      locale = "dsb";
+      arch = "mac";
+      sha256 = "1fa583b777f7da47cccbb2797d6a7dc1c2555d3bc423c2e094525d5b0aec1269";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/el/Firefox%20138.0b9.dmg";
+      locale = "el";
+      arch = "mac";
+      sha256 = "4dd57f9ccd4286ef841b91d167388db3ed1fbada1ffd24559b600b5d24b5847c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/en-CA/Firefox%20138.0b9.dmg";
+      locale = "en-CA";
+      arch = "mac";
+      sha256 = "da249a05afd2c1fcd6b9b4d66b33d35889ece78617046ef05e8853fcc025c97b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/en-GB/Firefox%20138.0b9.dmg";
+      locale = "en-GB";
+      arch = "mac";
+      sha256 = "6c53175c3f521f59934aa0042c266ddeb01ee38c5150504b9bdf3fc90c8c29c0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/en-US/Firefox%20138.0b9.dmg";
+      locale = "en-US";
+      arch = "mac";
+      sha256 = "1928e7d43428543441066bbbcc37904ca99cff7c276f0a3250ab1e532ef91eb2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/eo/Firefox%20138.0b9.dmg";
+      locale = "eo";
+      arch = "mac";
+      sha256 = "9199838a3ec6f4f143c339a3cd8f0315f358d50a7bdaba5c8f1fcba3a6927a2e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/es-AR/Firefox%20138.0b9.dmg";
+      locale = "es-AR";
+      arch = "mac";
+      sha256 = "8842c617cbb26dba783a8b5bd6888e90357364abdf482842006b8ed845b94896";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/es-CL/Firefox%20138.0b9.dmg";
+      locale = "es-CL";
+      arch = "mac";
+      sha256 = "7efecd4d9c0c59c11daa1461950017ec2ecc417bde4aa6723ba13b06bf1486d4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/es-ES/Firefox%20138.0b9.dmg";
+      locale = "es-ES";
+      arch = "mac";
+      sha256 = "2e73e8428ff91a6a2d462bbae9b3bc13ad03a009d128612f3f46b27f7d8547d0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/es-MX/Firefox%20138.0b9.dmg";
+      locale = "es-MX";
+      arch = "mac";
+      sha256 = "951e240ccc4bbc4a572e43f882a4ef67d9e3e7080d0d136bd24a2fcb17c1c481";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/et/Firefox%20138.0b9.dmg";
+      locale = "et";
+      arch = "mac";
+      sha256 = "679ac2b0ad732dc5ac63d1f03379b48a9136b5b1c982092c62ceaa1afecfe909";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/eu/Firefox%20138.0b9.dmg";
+      locale = "eu";
+      arch = "mac";
+      sha256 = "5a1b9132f6c9dcd435afb52305b72b67c31830068c1e151225c0bc7d96c3f341";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/fa/Firefox%20138.0b9.dmg";
+      locale = "fa";
+      arch = "mac";
+      sha256 = "3e29b20cff850ceed615c05c9b194a66a9235cec5fc57515769ae5c621e7c216";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ff/Firefox%20138.0b9.dmg";
+      locale = "ff";
+      arch = "mac";
+      sha256 = "8ac269f2fbf37f43f0740043f73d0bb169f8bfa36a579a43f524c578c060aa21";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/fi/Firefox%20138.0b9.dmg";
+      locale = "fi";
+      arch = "mac";
+      sha256 = "4423d222fecab2ac5faa457bb6be781468398c1ffb75fb85ca68afe2610d1e94";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/fr/Firefox%20138.0b9.dmg";
+      locale = "fr";
+      arch = "mac";
+      sha256 = "94e141b9540e7a03e26333d144ca6c62c37df6873c6a338d7518c115dfeb7710";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/fur/Firefox%20138.0b9.dmg";
+      locale = "fur";
+      arch = "mac";
+      sha256 = "0b1caaa181e32d56a956cd4ea7b860e389e2259fc9f0310ae2d304dcccfff436";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/fy-NL/Firefox%20138.0b9.dmg";
+      locale = "fy-NL";
+      arch = "mac";
+      sha256 = "cf98dd9ac0cb34cbde90ddd8df45e55adbf5521a56a70b25730b8f3a757eac95";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ga-IE/Firefox%20138.0b9.dmg";
+      locale = "ga-IE";
+      arch = "mac";
+      sha256 = "1928c84f64105784b45ccf9ab5c59a0248efbadae972f89770daec9de2efa95f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/gd/Firefox%20138.0b9.dmg";
+      locale = "gd";
+      arch = "mac";
+      sha256 = "4a6b6c1268dfde09a5ecb2782c7e18da1ca92c27809c80621e2a1dbb0574b55b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/gl/Firefox%20138.0b9.dmg";
+      locale = "gl";
+      arch = "mac";
+      sha256 = "8708cb4676b855bac483dbbfd4c71dfdf0dc873da77a4b961eb23cc1d84e1a77";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/gn/Firefox%20138.0b9.dmg";
+      locale = "gn";
+      arch = "mac";
+      sha256 = "54c90e850c89b1d84e3bc5745c6453068ccf8f3cc55b89ffacd53e09bd5071fe";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/gu-IN/Firefox%20138.0b9.dmg";
+      locale = "gu-IN";
+      arch = "mac";
+      sha256 = "4d956301a3832bb97846999c813026496e947f27679b9bc4bfea9aa7229eb8bc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/he/Firefox%20138.0b9.dmg";
+      locale = "he";
+      arch = "mac";
+      sha256 = "7f1a258a7d86e49188f1258c1de419d683c5dd5c36a7e220750d8538437e8deb";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/hi-IN/Firefox%20138.0b9.dmg";
+      locale = "hi-IN";
+      arch = "mac";
+      sha256 = "2359b5853b836e1c6dd178af6c5b07bb46d177fa2aa6a15cb984c26111f2091a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/hr/Firefox%20138.0b9.dmg";
+      locale = "hr";
+      arch = "mac";
+      sha256 = "db82d8ca672cfcc78b65dbead43f4689297974e04d54916b34591d04f280c15e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/hsb/Firefox%20138.0b9.dmg";
+      locale = "hsb";
+      arch = "mac";
+      sha256 = "55e4095aba3ccaa0724780d205c5e75191888b3be4569400f42e296a5a33af66";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/hu/Firefox%20138.0b9.dmg";
+      locale = "hu";
+      arch = "mac";
+      sha256 = "81745d3e3cdfdc898c9c738c1d4455e67762deabc04950342b95eca75430ec05";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/hy-AM/Firefox%20138.0b9.dmg";
+      locale = "hy-AM";
+      arch = "mac";
+      sha256 = "f24d0148058248a249e5746c4c678675b2e28caa7f9615b0d878d21b97e1efaf";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ia/Firefox%20138.0b9.dmg";
+      locale = "ia";
+      arch = "mac";
+      sha256 = "780be86df62cf01cf2988862f9c3d0f573c28b8e1ac04fe17ae16685b7ccc07c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/id/Firefox%20138.0b9.dmg";
+      locale = "id";
+      arch = "mac";
+      sha256 = "08d2c7633736a0115d2b786aa9da6c3215ccc8d0a57a59ca577796bef04b4e1f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/is/Firefox%20138.0b9.dmg";
+      locale = "is";
+      arch = "mac";
+      sha256 = "f11af3e325dfec142c322a771b23cec7d7e5f56689ba8d1389b0f4e633bf0cea";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/it/Firefox%20138.0b9.dmg";
+      locale = "it";
+      arch = "mac";
+      sha256 = "cc85c3d6dcb61aeabe3d9d3c98ce49d356dda2c65b7fdd2ff8caa816ee494efa";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ja-JP-mac/Firefox%20138.0b9.dmg";
+      locale = "ja-JP-mac";
+      arch = "mac";
+      sha256 = "8d47998f26d394b8538279df8c82af57c165effd1e4252e2fea8a08a47f58bfa";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ka/Firefox%20138.0b9.dmg";
+      locale = "ka";
+      arch = "mac";
+      sha256 = "bd436b875b3826aee56e1b02b6c407c718b84133542c11ee1cc829aeeb322ec5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/kab/Firefox%20138.0b9.dmg";
+      locale = "kab";
+      arch = "mac";
+      sha256 = "90e1b4adf97b0c73be13657dc0b4fa3ad3841adf5253d477adb6990620593713";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/kk/Firefox%20138.0b9.dmg";
+      locale = "kk";
+      arch = "mac";
+      sha256 = "b6df592986db6f64e5940fe60d97d9c20305c03cf484dd64a45819fe9602cf53";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/km/Firefox%20138.0b9.dmg";
+      locale = "km";
+      arch = "mac";
+      sha256 = "1c8a8d1dfacd1dc3cca19d7068880db7c7a38e268e13e7c9426779811e65702b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/kn/Firefox%20138.0b9.dmg";
+      locale = "kn";
+      arch = "mac";
+      sha256 = "a130ac6c94f1f7fe7094cf548b8a100f1f4c8c8579234664b586a81a7520b7d5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ko/Firefox%20138.0b9.dmg";
+      locale = "ko";
+      arch = "mac";
+      sha256 = "6b686f94ed0a477c02a05abd0c767efc3531a5ebf213b68aec1d5d2e4b36efe3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/lij/Firefox%20138.0b9.dmg";
+      locale = "lij";
+      arch = "mac";
+      sha256 = "0a748348a5241a089e84e72aa08575a4cccaa6d5f74dac9d68e6422646864036";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/lt/Firefox%20138.0b9.dmg";
+      locale = "lt";
+      arch = "mac";
+      sha256 = "bdad3471953afbbf7b20219c88d6d1c03035d796467b48250fc944cfdf1d45f6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/lv/Firefox%20138.0b9.dmg";
+      locale = "lv";
+      arch = "mac";
+      sha256 = "84cf526f9957ced620386fa4696db19c486baa177f5d5f13be750bb7575bb7b3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/mk/Firefox%20138.0b9.dmg";
+      locale = "mk";
+      arch = "mac";
+      sha256 = "ac7fa688aa0fa08e0ef9b3c224161d9aaeda35ec281e20be054c0376445fd27c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/mr/Firefox%20138.0b9.dmg";
+      locale = "mr";
+      arch = "mac";
+      sha256 = "3f01185df68935935c6ce10fba66596f95edb02a0716f441fcea40305d073fec";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ms/Firefox%20138.0b9.dmg";
+      locale = "ms";
+      arch = "mac";
+      sha256 = "519ad6efb4c3d6f7b15485db28ee12cf9e4ccafef966b0d3d18da879c7276270";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/my/Firefox%20138.0b9.dmg";
+      locale = "my";
+      arch = "mac";
+      sha256 = "d7ed3fdc18e708cd3b18b0c52893268e26409b5c11d019f422e4563f008817ff";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/nb-NO/Firefox%20138.0b9.dmg";
+      locale = "nb-NO";
+      arch = "mac";
+      sha256 = "7c4fa894a1881b573ca38b31700d315d4fba92217bcfee35fbc60ed15b702c82";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ne-NP/Firefox%20138.0b9.dmg";
+      locale = "ne-NP";
+      arch = "mac";
+      sha256 = "32274157c0ade1ec3fbb5296a841d0e20c1f2970baf89d7d6a909aa2bcaa78e2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/nl/Firefox%20138.0b9.dmg";
+      locale = "nl";
+      arch = "mac";
+      sha256 = "5222d8400ac660b726ebbd0ca4422b5e6c2e03092d0a41045bf6434b756abb65";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/nn-NO/Firefox%20138.0b9.dmg";
+      locale = "nn-NO";
+      arch = "mac";
+      sha256 = "815635860e90b641aa6d27038368111dc6a813f66e20771da724b507b1bb07f7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/oc/Firefox%20138.0b9.dmg";
+      locale = "oc";
+      arch = "mac";
+      sha256 = "d0c48241aa98d4096e5d80755e8b396be8e2d22a706703eab9884f6c5bc4039b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/pa-IN/Firefox%20138.0b9.dmg";
+      locale = "pa-IN";
+      arch = "mac";
+      sha256 = "7ea16ca2b7dd92190bb22e57c73c7d457bbab381dcb3797afd29cf8104c8e829";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/pl/Firefox%20138.0b9.dmg";
+      locale = "pl";
+      arch = "mac";
+      sha256 = "7620eda590121caf39ddfea9c5a01ebfb386a6d25fddae4e3184825318b8842c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/pt-BR/Firefox%20138.0b9.dmg";
+      locale = "pt-BR";
+      arch = "mac";
+      sha256 = "22f6c19233136a60097bb1fcda1e592f59461f50632c3630f5fc42fd753af9f5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/pt-PT/Firefox%20138.0b9.dmg";
+      locale = "pt-PT";
+      arch = "mac";
+      sha256 = "09aa3d2ac600478cdb91f958ae91ee589f26b53bf0ea63bcab61317e814dbcef";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/rm/Firefox%20138.0b9.dmg";
+      locale = "rm";
+      arch = "mac";
+      sha256 = "311c460ad1f7f43d403a36839c41acac7a9fbbc64282fc6f6b172ba78143b0ff";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ro/Firefox%20138.0b9.dmg";
+      locale = "ro";
+      arch = "mac";
+      sha256 = "f830532fd8dcf9d3011b2ffb38dd9ed8440fd666bc7f9235aaa192b89f1228f7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ru/Firefox%20138.0b9.dmg";
+      locale = "ru";
+      arch = "mac";
+      sha256 = "3a791a07a6ec029cce3a97e0d4cedff52eb373a53c0ff7199109e4a0034577dd";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sat/Firefox%20138.0b9.dmg";
+      locale = "sat";
+      arch = "mac";
+      sha256 = "d59a5e968bba826e9a61826f80bf46b09288cf09158c3e4262d725464d086b32";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sc/Firefox%20138.0b9.dmg";
+      locale = "sc";
+      arch = "mac";
+      sha256 = "bcf54832dc38bae93ff4e240b6b55fb53128cc646d30063881ed1e193c21707f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sco/Firefox%20138.0b9.dmg";
+      locale = "sco";
+      arch = "mac";
+      sha256 = "56745e834123ef58a1b093336c98662a4cf5d7d0b53ae1a1a82ef6f2e7db83d7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/si/Firefox%20138.0b9.dmg";
+      locale = "si";
+      arch = "mac";
+      sha256 = "9b8d08c4e9ebea51c75976c61741a24bd2459f8a749d1885a63e1d9d6fccf7f9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sk/Firefox%20138.0b9.dmg";
+      locale = "sk";
+      arch = "mac";
+      sha256 = "8fedb3aec74dd09aba8620b3f1254175f71b8df9e370ef1d46df8302c23f03cd";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/skr/Firefox%20138.0b9.dmg";
+      locale = "skr";
+      arch = "mac";
+      sha256 = "b5c58a7b4a78b30b23ffb702eff0000fd7b392cfe587882b6ccd95f02fe92915";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sl/Firefox%20138.0b9.dmg";
+      locale = "sl";
+      arch = "mac";
+      sha256 = "8550540b87639dbbf8412dbdf044080ec2762fdbcab1c438e65aa9b2faec4c34";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/son/Firefox%20138.0b9.dmg";
+      locale = "son";
+      arch = "mac";
+      sha256 = "c5807a3c9c68d6bb937777c37d37eef366387e479c171b6969ec1e3ce4b1a813";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sq/Firefox%20138.0b9.dmg";
+      locale = "sq";
+      arch = "mac";
+      sha256 = "c15d746dd045e6ba6b81e0c774733917eca43053bab4d697ef87e7f5935427c2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sr/Firefox%20138.0b9.dmg";
+      locale = "sr";
+      arch = "mac";
+      sha256 = "6d2ddd968bb2f6506b0ccd3990cf835c6b0956852fbdfd8e4f169bf2372cd1bc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/sv-SE/Firefox%20138.0b9.dmg";
+      locale = "sv-SE";
+      arch = "mac";
+      sha256 = "a3a776286d4a20caf9c98bde4dba4158e4b0d00d607463fb3f0ee3803dfb731c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/szl/Firefox%20138.0b9.dmg";
+      locale = "szl";
+      arch = "mac";
+      sha256 = "5ccbbceb25286d1344e2020a8c486024cf80d76a2c50535fc14d2f49c3097463";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ta/Firefox%20138.0b9.dmg";
+      locale = "ta";
+      arch = "mac";
+      sha256 = "bee41039daaa29c140ae79e1ab86d1a81e1061f4fe3a87d841cd564343c7a400";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/te/Firefox%20138.0b9.dmg";
+      locale = "te";
+      arch = "mac";
+      sha256 = "c94b46cdcc0024a49d11c6138ba84361f493b5dd57c57d40968e7aa738eeddd2";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/tg/Firefox%20138.0b9.dmg";
+      locale = "tg";
+      arch = "mac";
+      sha256 = "affd63df767b9ccde250be2ebf23599cb17059cf8e26e01a3c8b814510b66517";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/th/Firefox%20138.0b9.dmg";
+      locale = "th";
+      arch = "mac";
+      sha256 = "550e76b45b1044179c85b83afb90f5f324958b79e4bf5ce9d4659079e6810c46";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/tl/Firefox%20138.0b9.dmg";
+      locale = "tl";
+      arch = "mac";
+      sha256 = "1ffa245874edc7e8f298b4da5cfb91723afeb01466bf2467e3cc53a041d69ff6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/tr/Firefox%20138.0b9.dmg";
+      locale = "tr";
+      arch = "mac";
+      sha256 = "203633af220213388a2e47aec6f06ad64e50de5123dfabdd3b15fd4a990d78be";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/trs/Firefox%20138.0b9.dmg";
+      locale = "trs";
+      arch = "mac";
+      sha256 = "30c5e51c18f7700668bb979c165b50bf5bfef517f7fc09ce100eabcdcc277636";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/uk/Firefox%20138.0b9.dmg";
+      locale = "uk";
+      arch = "mac";
+      sha256 = "afbf11dbc54dc25aaa1b70a66ca936c880a9b9508a6fd5b10f3112622348054f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/ur/Firefox%20138.0b9.dmg";
+      locale = "ur";
+      arch = "mac";
+      sha256 = "3880f1b3a1f105165e5203d9bdf21cbf515abed7a4b3567fd02962856717e07a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/uz/Firefox%20138.0b9.dmg";
+      locale = "uz";
+      arch = "mac";
+      sha256 = "1620a450289d62767529490999ef37650af73d42b0214282c75aee10f39c5a82";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/vi/Firefox%20138.0b9.dmg";
+      locale = "vi";
+      arch = "mac";
+      sha256 = "b5d6f085045d77109f6813accccae4cbebf53f81cc3cfbd21392f58f17d75bd1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/xh/Firefox%20138.0b9.dmg";
+      locale = "xh";
+      arch = "mac";
+      sha256 = "7e73f47a4f5b3d8b7c9718fe522d30a52a1cd8240b43b48cc0d60e1ddab5e00b";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/zh-CN/Firefox%20138.0b9.dmg";
+      locale = "zh-CN";
+      arch = "mac";
+      sha256 = "d2e781ddb98ee3a7dfe92ef77b56a55b3473e8de212124a497d63f946f3487a9";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/devedition/releases/138.0b9/mac/zh-TW/Firefox%20138.0b9.dmg";
+      locale = "zh-TW";
+      arch = "mac";
+      sha256 = "8916e9ebce3d560e3c5bbb78d5fb1fb79c422fa1425d2e447f08febf45dfadbc";
+    }
   ];
 }

pkgs/applications/networking/browsers/firefox-bin/update.nix

@@ -29,7 +29,7 @@ writeScript "update-${pname}" ''
   HOME=`mktemp -d`
   export GNUPGHOME=`mktemp -d`
 
-  curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import -
+  curl https://keys.openpgp.org/vks/v1/by-fingerprint/09BEED63F3462A2DFFAB3B875ECB6497C1A20256 | gpg --import -
 
   tmpfile=`mktemp`
   url=${baseUrl}
@@ -60,27 +60,28 @@ writeScript "update-${pname}" ''
 
   # this is a list of sha256 and tarballs for both arches
   # Upstream files contains python repr strings like b'somehash', hence the sed dance
-  shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.tar\.[a-z0-9]\+'`
+  shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.\(tar\.[a-z0-9]\+\|dmg\)$' | grep -v mac-EME-free`
 
   cat > $tmpfile <<EOF
   {
     version = "$version";
     sources = [
   EOF
-  for arch in linux-x86_64 linux-i686 linux-aarch64; do
+  for arch in linux-x86_64 linux-i686 linux-aarch64 mac; do
     # retriving a list of all tarballs for each arch
     #  - only select tarballs for current arch
     #  - only select tarballs for current version
     #  - rename space with colon so that for loop doesnt
     #  - inteprets sha and path as 2 lines
+    IFS=$'\n'
     for line in `echo "$shasums" | \
                  grep $arch | \
-                 grep "${baseName}-$version"'\.tar\.[a-z0-9]\+$' | \
-                 tr " " ":"`; do
+                 grep -i "${baseName}.$version"'\.\(tar\.[a-z0-9]\+\|dmg\)$' | \
+                 sed "s/ /:/ ; s/ /:/"`; do
       # create an entry for every locale
       cat >> $tmpfile <<EOF
       {
-        url = "$url$version/`echo $line | cut -d":" -f3`";
+        url = "$url$version/`echo $line | cut -d":" -f3 | sed "s/ /%20/"`";
         locale = "`echo $line | cut -d":" -f3 | sed "s/$arch\///" | sed "s/\/.*//"`";
         arch = "$arch";
         sha256 = "`echo $line | cut -d":" -f1`";

pkgs/applications/networking/browsers/firefox/common.nix

@@ -98,6 +98,7 @@ in
 
   # Darwin
   apple-sdk_14,
+  apple-sdk_15,
   cups,
   rsync, # used when preparing .app directory
 
@@ -582,7 +583,7 @@ buildStdenv.mkDerivation {
       zip
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_14
+      (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)
       cups
     ]
     ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (

pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix

@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "128.9.0esr";
+  version = "128.10.0esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "c0c8ac8374291cc93279064c73c17786c6f4fba7505ebc2cbd7a4ce7c82710620abdae7be15f60c43f9d10c3614fc9fd31f094e787105d528031c6f0510f7339";
+    sha512 = "c0f349cba626e6ec16ff0b52b7d21e05681acd1377fd1111992860f8079373f631ff997d833a3596c72a6d8c6e4f1d051927fa719f1d37a72553dcbd5348659c";
   };
 
   meta = {

pkgs/applications/networking/browsers/firefox/packages/firefox.nix

@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "137.0.2";
+  version = "138.0";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "82140c4325233ea2e2f579088cebb98c0e8db8848b4018cff95d4ed42bf847049ed6520fc051d930ee267a5acb008908170825d381589da0d109ca04a61e1c24";
+    sha512 = "265eef505216f70d50ebb95a6b23983d0b70430320e7e2dcf497127890d7bbdff1c49c64790010c85b8e3fe0da5c90e95b2d44fb1adca64b1755428ccb2b91a2";
   };
 
   meta = {

pkgs/applications/networking/browsers/firefox/update.nix

@@ -33,7 +33,7 @@ writeScript "update-${attrPath}" ''
   set -eux
   HOME=`mktemp -d`
   export GNUPGHOME=`mktemp -d`
-  curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import -
+  curl https://keys.openpgp.org/vks/v1/by-fingerprint/09BEED63F3462A2DFFAB3B875ECB6497C1A20256 | gpg --import -
 
   url=${baseUrl}
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -207,13 +207,13 @@
     "vendorHash": "sha256-DUc06D22wqYG/O27NkOxJ2bu+dwirReAq9Y6p135ICY="
   },
   "buildkite": {
-    "hash": "sha256-U3D5BRlAATspWMPP8wZk+x4PmS0sEipKaC5rVGVHltA=",
+    "hash": "sha256-i16wgxO2rhs/wg1In+3VYstuUrfuj/ChVO4un5wDmgk=",
     "homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
     "owner": "buildkite",
     "repo": "terraform-provider-buildkite",
-    "rev": "v1.17.1",
+    "rev": "v1.17.2",
     "spdx": "MIT",
-    "vendorHash": "sha256-6B0YRn7SLMea54bZpfCUSLLUvd3h5L5KIX8ja7vl0vE="
+    "vendorHash": "sha256-/pzkQautZ1Db5ZUcoaLUPwP6QYqGrYYX442l5ucrocs="
   },
   "ccloud": {
     "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
@@ -507,13 +507,13 @@
     "vendorHash": "sha256-3URc3A1kkcVQ/riB2/THuIEiCq9MrifxgRL73cjsbDA="
   },
   "google": {
-    "hash": "sha256-GuwIiAyZwa66Vl6dIKdmzHYhWdNrfISy3YKLJQva92U=",
+    "hash": "sha256-3KgXUlxU9kyQJOC6MIr1X3FlnBUlSQllXNmuZ2iCHgw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v6.30.0",
+    "rev": "v6.32.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oGO+++WMiXUTCLFdBH2/uAzdN3RtrSNDSUBVMIYmI14="
+    "vendorHash": "sha256-2Vb0z/afqf9EnPW1skik5wE66kevwpMLXljT7ivxm8E="
   },
   "google-beta": {
     "hash": "sha256-3E3CvuZ6n5B8PsMmZeO98CxQzTlZExdfCs8t9R5UEwg=",
@@ -1318,11 +1318,11 @@
     "vendorHash": null
   },
   "tfe": {
-    "hash": "sha256-qjLk+otEUaNgbFKi+UzCuQG2uHCqJca6XD2Vwm6O9mM=",
+    "hash": "sha256-hMpCuLAnwwAb8ugKxKDuFvtII2k/lcwYYL0sCvZewOY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.65.1",
+    "rev": "v0.65.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-PSUob2u8hue5ii+kV4bGcvexkIQxzWsHbbEbYO0celU="
   },

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

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxmaxima";
-  version = "25.01.0";
+  version = "25.04.0";
 
   src = fetchFromGitHub {
     owner = "wxMaxima-developers";
     repo = "wxmaxima";
     rev = "Version-${finalAttrs.version}";
-    hash = "sha256-XFlEBmKxpi7NnUxVXV2F+zQKrvR4r93aLtHOoVZ7SPw=";
+    hash = "sha256-AEy2a8BahV1yH67RIjcsVipuo5eUZcQZxR3HygSYGlU=";
   };
 
   buildInputs = [

pkgs/applications/science/misc/convertall/default.nix

@@ -1,49 +1,28 @@
 {
   lib,
-  stdenv,
+  flutter329,
   fetchFromGitHub,
-  python3,
-  wrapQtAppsHook,
 }:
 
-let
-  inherit (python3.pkgs) wrapPython pyqt5;
-in
-stdenv.mkDerivation rec {
+flutter329.buildFlutterApplication rec {
   pname = "convertall";
-  version = "0.8.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "doug-101";
     repo = "ConvertAll";
-    rev = "v${version}";
-    sha256 = "02xxasgbjbivsbhyfpn3cpv52lscdx5kc95s6ns1dvnmdg0fpng0";
+    tag = "v${version}";
+    hash = "sha256-wsSe7dVjEgLDOIavcMzdxW9LKZcZPaQMcw4RhsPS0jU=";
   };
 
-  nativeBuildInputs = [
-    python3
-    wrapPython
-    wrapQtAppsHook
-  ];
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  propagatedBuildInputs = [ pyqt5 ];
-
-  installPhase = ''
-    python3 install.py -p $out -x
-  '';
-
-  postFixup = ''
-    buildPythonPath $out
-    patchPythonScript $out/share/convertall/convertall.py
-    makeQtWrapper $out/share/convertall/convertall.py $out/bin/convertall
-  '';
-
-  meta = with lib; {
-    homepage = "https://convertall.bellz.org/";
+  meta = {
+    homepage = "https://convertall.bellz.org";
     description = "Graphical unit converter";
     mainProgram = "convertall";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ orivej ];
-    platforms = pyqt5.meta.platforms;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/applications/science/misc/convertall/pubspec.lock.json

@@ -0,0 +1,792 @@
+{
+  "packages": {
+    "archive": {
+      "dependency": "transitive",
+      "description": {
+        "name": "archive",
+        "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.6"
+    },
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "direct main",
+      "description": {
+        "name": "async",
+        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.12.0"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "characters": {
+      "dependency": "transitive",
+      "description": {
+        "name": "characters",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
+    "cli_util": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_util",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.2"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2"
+    },
+    "collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.6"
+    },
+    "cupertino_icons": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cupertino_icons",
+        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.8"
+    },
+    "decimal": {
+      "dependency": "direct main",
+      "description": {
+        "name": "decimal",
+        "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.3"
+    },
+    "eval_ex": {
+      "dependency": "direct main",
+      "description": {
+        "name": "eval_ex",
+        "sha256": "3f8853d996ee41955f2232ad3730e95698fb1040d03f6ebc6ab01f1c2bc3be53",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.8"
+    },
+    "fake_async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fake_async",
+        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.2"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "flutter": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_launcher_icons": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_launcher_icons",
+        "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.14.3"
+    },
+    "flutter_lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_lints",
+        "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "flutter_markdown_selectionarea": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_markdown_selectionarea",
+        "sha256": "d4bc27e70a5c40ebdab23a4b81f75d53696a214d4d1f13c12045b38a0ddc58a2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.17+1"
+    },
+    "flutter_spinbox": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_spinbox",
+        "sha256": "38d8c1a3a39f0fa72823d4470785f5e165f2deb53531ca7803b54ba45e4dbd46",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.13.1"
+    },
+    "flutter_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_web_plugins": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "image": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.5.4"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.9.0"
+    },
+    "leak_tracker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker",
+        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.0.8"
+    },
+    "leak_tracker_flutter_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_flutter_testing",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.9"
+    },
+    "leak_tracker_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_testing",
+        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.1"
+    },
+    "lints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "lints",
+        "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "markdown": {
+      "dependency": "transitive",
+      "description": {
+        "name": "markdown",
+        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.3.0"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.17"
+    },
+    "material_color_utilities": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_color_utilities",
+        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.11.1"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.16.0"
+    },
+    "nested": {
+      "dependency": "transitive",
+      "description": {
+        "name": "nested",
+        "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "package_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "package_info_plus",
+        "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.0"
+    },
+    "package_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_info_plus_platform_interface",
+        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "path": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "path_provider_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_linux",
+        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "path_provider_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_platform_interface",
+        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "path_provider_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_windows",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.0"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.6"
+    },
+    "plugin_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "plugin_platform_interface",
+        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.8"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.2"
+    },
+    "provider": {
+      "dependency": "direct main",
+      "description": {
+        "name": "provider",
+        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.4"
+    },
+    "rational": {
+      "dependency": "transitive",
+      "description": {
+        "name": "rational",
+        "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.3"
+    },
+    "screen_retriever": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever",
+        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.9"
+    },
+    "shared_preferences": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shared_preferences",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.3"
+    },
+    "shared_preferences_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_android",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.10"
+    },
+    "shared_preferences_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_foundation",
+        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.4"
+    },
+    "shared_preferences_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_linux",
+        "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shared_preferences_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_platform_interface",
+        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "shared_preferences_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_web",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.3"
+    },
+    "shared_preferences_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_windows",
+        "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "sky_engine": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.1"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.4"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "url_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "url_launcher",
+        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.1"
+    },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.16"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.3"
+    },
+    "url_launcher_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_linux",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.1"
+    },
+    "url_launcher_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_macos",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "url_launcher_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_platform_interface",
+        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "url_launcher_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_web",
+        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
+    },
+    "url_launcher_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_windows",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.4"
+    },
+    "vector_math": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_math",
+        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "14.3.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
+    "win32": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32",
+        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.12.0"
+    },
+    "window_manager": {
+      "dependency": "direct main",
+      "description": {
+        "name": "window_manager",
+        "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.9"
+    },
+    "xdg_directories": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xdg_directories",
+        "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.0"
+    },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.7.0 <4.0.0",
+    "flutter": ">=3.27.0"
+  }
+}

pkgs/applications/version-management/qgit/default.nix

@@ -8,13 +8,13 @@
 
 mkDerivation rec {
   pname = "qgit";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
     rev = "${pname}-${version}";
-    sha256 = "sha256-xM0nroWs4WByc2O469zVeAlzKn6LLr+8WDlEdSjtRYI=";
+    sha256 = "sha256-DmwxOy71mIklLQ7V/qMzi8qCMtKa9nWHlkjEr/9HJIU=";
   };
 
   buildInputs = [ qtbase ];

pkgs/applications/version-management/svn-all-fast-export/default.nix

@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.0.18";
+  version = "1.0.19";
 in
 stdenv.mkDerivation {
   pname = "svn-all-fast-export";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     owner = "svn-all-fast-export";
     repo = "svn2git";
     rev = version;
-    sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6";
+    sha256 = "sha256-r8tS1fbpSWp9btC2hkCg304G4lftQZ09QXWwC943miU=";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/kodi/addons/keymap/default.nix

@@ -11,11 +11,11 @@
 buildKodiAddon rec {
   pname = "keymap";
   namespace = "script.keymap";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    sha256 = "sha256-931iJv9wsY20pXckvTlEhxGCDFSBHonpGO2c2OYiqrI=";
+    sha256 = "sha256-y9bREG1fGY6TJYW4xMUBbsAp6DSzb78tY1+iyUrGjgQ=";
   };
 
   propagatedBuildInputs = [

pkgs/applications/video/obs-studio/default.nix

@@ -6,7 +6,6 @@
   ninja,
   nv-codec-headers-12,
   fetchFromGitHub,
-  fetchpatch,
   addDriverRunpath,
   autoAddDriverRunpath,
   cudaSupport ? config.cudaSupport,
@@ -40,7 +39,7 @@
   pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
   libpulseaudio,
   browserSupport ? true,
-  libcef,
+  cef-binary,
   pciutils,
   pipewireSupport ? stdenv.hostPlatform.isLinux,
   withFdk ? true,
@@ -66,6 +65,18 @@
 let
   inherit (lib) optional optionals;
 
+  cef = cef-binary.overrideAttrs (oldAttrs: {
+    version = "127.3.5";
+    gitRevision = "114ea2a";
+    chromiumVersion = "127.0.6533.120";
+
+    srcHash =
+      {
+        aarch64-linux = "sha256-s8dR97rAO0mCUwbpYnPWyY3t8movq05HhZZKllhZdBs=";
+        x86_64-linux = "sha256-57E7bZKpViWno9W4AaaSjL9B4uxq+rDXAou1tsiODUg=";
+      }
+      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
+  });
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
@@ -85,33 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Lets obs-browser build against CEF 90.1.0+
     ./Enable-file-access-and-universal-access-for-file-URL.patch
     ./fix-nix-plugin-path.patch
-    # TODO: remove when CHROME_VERSION_BUILD(libcef) >= 6367
-    (fetchpatch {
-      name = "Check-source-validity-before-attempting-to-log-rende.patch";
-      url = "https://github.com/obsproject/obs-browser/pull/478.patch";
-      revert = true;
-      stripLen = 1;
-      extraPrefix = "plugins/obs-browser/";
-      hash = "sha256-mQVhK4r8LlK2F9/jlDHA1V6M29mAfxWAU/VsMXYNrhU=";
-    })
-    # TODO: remove when CHROME_VERSION_BUILD(libcef) >= 6367
-    (fetchpatch {
-      name = "Print-browser-source-renderer-crashes-to-OBS-log.patch";
-      url = "https://github.com/obsproject/obs-browser/pull/475.patch";
-      revert = true;
-      stripLen = 1;
-      extraPrefix = "plugins/obs-browser/";
-      hash = "sha256-ha77OYpWn57JovPNE+izyDOB/2KlF3qWVv/PGEgyu84=";
-    })
-    # TODO: remove when CHROME_VERSION_BUILD(libcef) >= 6367
-    (fetchpatch {
-      name = "Log-error-if-CefInitialize-fails.patch.patch";
-      url = "https://github.com/obsproject/obs-browser/pull/477.patch";
-      revert = true;
-      stripLen = 1;
-      extraPrefix = "plugins/obs-browser/";
-      hash = "sha256-MMLFQtpWjfpti/38qEcOuXr1L3s1MPRHjuaZCjNmvt0=";
-    })
   ];
 
   nativeBuildInputs =
@@ -168,20 +152,12 @@ stdenv.mkDerivation (finalAttrs: {
       pipewire
       libdrm
     ]
-    ++ optional browserSupport libcef
+    ++ optional browserSupport cef
     ++ optional withFdk fdk_aac;
 
   # Copied from the obs-linuxbrowser
   postUnpack = lib.optionalString browserSupport ''
-    mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
-    for i in ${libcef}/share/cef/*; do
-      ln -s $i cef/Release/
-      ln -s $i cef/Resources/
-    done
-    ln -s ${libcef}/lib/*.so* cef/Release/
-    ln -s ${libcef}/libexec/cef/chrome-sandbox cef/Release/
-    ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
-    ln -s ${libcef}/include cef/
+    ln -s ${cef} cef
   '';
 
   postPatch = ''
@@ -243,8 +219,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     (lib.optionalString browserSupport ''
       # Link cef components again after patchelfing other libs
-      ln -s ${libcef}/lib/* $out/lib/obs-plugins/
-      ln -s ${libcef}/libexec/cef/* $out/lib/obs-plugins/
+      ln -sf ${cef}/${cef.buildType}/* $out/lib/obs-plugins/
     '')
   ];
 

pkgs/build-support/appimage/default.nix

@@ -247,6 +247,7 @@ rec {
 
         libsecret # For bitwarden
         libmpg123 # Slippi launcher
+        brotli # TwitchDropsMiner
       ];
   };
 }

pkgs/by-name/ad/addr-book-combine/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromSourcehut,
+  nix-update-script,
+}:
+buildGoModule {
+  pname = "addr-book-combine";
+  version = "0-unstable-2022-12-14";
+
+  src = fetchFromSourcehut {
+    owner = "~jcc";
+    repo = "addr-book-combine";
+    rev = "11696f4726b981c774ad1d4858f1a935ac71e9ac";
+    hash = "sha256-SENur3p5LxMNnjo/+qiVdrEs+i+rI1PT1wYYdLLqWrg=";
+  };
+
+  vendorHash = null;
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Combine multiple aerc-style address books into a single address book";
+    homepage = "https://jasoncarloscox.com/creations/addr-book-combine/";
+    downloadPage = "https://git.sr.ht/~jcc/addr-book-combine";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "addr-book-combine";
+    maintainers = with lib.maintainers; [ antonmosich ];
+  };
+}

pkgs/by-name/ag/age-plugin-se/package.nix

@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
     swiftpm
   ];
 
+  # Can't find libdispatch without this on NixOS. (swift 5.8)
+  LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${swiftPackages.Dispatch}/lib";
+
   postPatch =
     let
       swift-crypto = fetchFromGitHub {
@@ -58,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
       remko
     ];
     mainProgram = "age-plugin-se";
-    platforms = lib.platforms.darwin;
+    platforms = lib.platforms.unix;
   };
 })

pkgs/by-name/al/alisthelper/package.nix

@@ -0,0 +1,77 @@
+{
+  lib,
+  fetchFromGitHub,
+  flutter327,
+  libayatana-appindicator,
+  copyDesktopItems,
+  makeDesktopItem,
+  runCommand,
+  yq,
+  alisthelper,
+  _experimental-update-script-combinators,
+  gitUpdater,
+}:
+
+flutter327.buildFlutterApplication {
+  pname = "alisthelper";
+  version = "0.2.0-unstable-2025-01-04";
+
+  src = fetchFromGitHub {
+    owner = "Xmarmalade";
+    repo = "alisthelper";
+    rev = "181a1207df0c9eb8336097b9a9249342dd9df097";
+    hash = "sha256-6FJd+8eJoRK3cEdkLCgr7q4L6kEeSsMMkiVRx6Pa5jk=";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    libayatana-appindicator
+  ];
+
+  preBuild = ''
+    packageRun build_runner build
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "alisthelper";
+      exec = "alisthelper";
+      icon = "alisthelper";
+      desktopName = "Alist Helper";
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 assets/alisthelper.png -t $out/share/pixmaps
+  '';
+
+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          buildInputs = [ yq ];
+          inherit (alisthelper) src;
+        }
+        ''
+          cat $src/pubspec.lock | yq > $out
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (gitUpdater { rev-prefix = "v"; })
+      (_experimental-update-script-combinators.copyAttrOutputToFile "alisthelper.pubspecSource" ./pubspec.lock.json)
+    ];
+  };
+
+  meta = {
+    description = "Designed to simplify the use of the desktop version of alist";
+    homepage = "https://github.com/Xmarmalade/alisthelper";
+    mainProgram = "alisthelper";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ emaryn ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/at/athens/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "athens";
-  version = "0.15.4";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "gomods";
     repo = "athens";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU=";
+    hash = "sha256-vynO6J69VTJ/CYp/W7BNzFWMLQG8PHXfS90uCCIp8rA=";
   };
 
-  vendorHash = "sha256-W65lQYGrRg8LwFERj5MBOPFAn2j+FE7ep4ANuAGmfgM=";
+  vendorHash = "sha256-XM/ft+1u4KH77uOEh6ZO2YKy7jK2UUn+w7CDZeYqjFc=";
 
   env.CGO_ENABLED = "0";
   ldflags = [

pkgs/by-name/au/auth0-cli/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth0-cli";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${version}";
-    hash = "sha256-iLq316kCCk8Z4eOufbmeYi8tzSelUlwu/Q+h6j1ZMHk=";
+    hash = "sha256-T3AJYDPdVkFYsvZUIdqndaxsJmsoJeeyr0316rafg7Q=";
   };
 
-  vendorHash = "sha256-bWirZgmgL/zZzT14X/VcpUN/lk3WRRJ+vbsabmjXznk=";
+  vendorHash = "sha256-/F3GNGCfsa9LM1F+eYJ+okqqjIuKfxHDT90ZS9gsJzs=";
 
   ldflags = [
     "-s"

pkgs/by-name/az/azurehound/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-12ae0y3hjeNPwB33J+XP26h+JfFN5M8+bF8CSon1jp4=";
+    hash = "sha256-FGLca0586oxvbdi9UsWQfXXx4l5Ap3CpM+xxQ/EM5+A=";
   };
 
   vendorHash = "sha256-FG3207OTzkMEoSvQsTH7Ky9T3ur7glG7k0ERfd12SO0=";

pkgs/by-name/ba/basedpyright/package.nix

@@ -16,13 +16,13 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.29.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-KWzyWWnNMBvsn+sFUmI94FnpCNVGZCYCxIhHlqbnGIE=";
+    hash = "sha256-DUcrR4UwqbP968QYPsjivf2FOUL6hwr5ZAGH+qA8Xtw=";
   };
 
   npmDepsHash = "sha256-wzetOJxHJXK7oY1cwOG9YOrKKIDhFPD17em6UQ2859M=";

pkgs/by-name/bi/bitcomet/package.nix

@@ -1,16 +1,19 @@
 {
   lib,
-  fetchurl,
   appimageTools,
+  fetchurl,
   webkitgtk_4_1,
 }:
+
 let
   pname = "bitcomet";
-  version = "2.12.1";
+  version = "2.13.1";
+
   src = fetchurl {
     url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage";
-    hash = "sha256-iaUPf9gSTd2m641Ja9/5v4wkO3H4+R08YXohLCeFuTQ=";
+    hash = "sha256-s8kCsPKr5XoS/Y6KzuiQV9ARq2UIo2PPKRinvik0aRo=";
   };
+
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
 appimageTools.wrapType2 {
@@ -24,11 +27,10 @@ appimageTools.wrapType2 {
     ];
 
   extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    install -m 444 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop
+    install -Dm644 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop
     substituteInPlace $out/share/applications/bitcomet.desktop \
       --replace-fail 'Exec=usr/bin/BitComet' 'Exec=bitcomet'
-    cp -r ${appimageContents}/usr/share/icons $out/share
+    cp -r ${appimageContents}/usr/share/icons $out/share/icons
   '';
 
   meta = {

pkgs/by-name/bl/blender/package.nix

@@ -311,7 +311,7 @@ stdenv'.mkDerivation (finalAttrs: {
       ps.requests
       ps.zstandard
     ]
-    ++ lib.optional openUsdSupport [ pyPkgsOpenusd ];
+    ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ];
 
   blenderExecutable =
     placeholder "out"

pkgs/by-name/bl/bluefish/package.nix

@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  wrapGAppsHook3,
+  pkg-config,
+  gtk3,
+  libxml2,
+  enchant,
+  gucharmap,
+  python3,
+  adwaita-icon-theme,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bluefish";
+  version = "2.2.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/bluefish/bluefish-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-Onn2Ql4Uk56hNPlsFCTjqsBb7pWQS+Q0WBiDB4p7clM=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    adwaita-icon-theme
+    gtk3
+    libxml2
+    enchant
+    gucharmap
+    python3
+  ];
+
+  # infb_gui.c:143:61: error: implicit declaration of function 'xmlNanoHTTPFetch' [-Wimplicit-function-declaration]
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+
+  meta = {
+    description = "Powerful editor targeted towards programmers and webdevelopers";
+    homepage = "https://bluefish.openoffice.nl/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ vbgl ];
+    platforms = lib.platforms.all;
+    mainProgram = "bluefish";
+  };
+})

pkgs/by-name/bo/bolt-launcher/package.nix

@@ -7,81 +7,31 @@
   ninja,
   libarchive,
   libz,
-  libcef,
+  cef-binary,
   luajit,
   xorg,
   libgbm,
   glib,
-  nss,
-  nspr,
-  atk,
-  at-spi2-atk,
-  libdrm,
-  expat,
-  libxkbcommon,
-  gtk3,
   jdk17,
   pango,
   cairo,
-  alsa-lib,
-  dbus,
-  at-spi2-core,
-  cups,
-  systemd,
   buildFHSEnv,
   makeDesktopItem,
   copyDesktopItems,
   enableRS3 ? false,
 }:
 let
-  cef = libcef.overrideAttrs (oldAttrs: {
-    installPhase =
-      let
-        gl_rpath = lib.makeLibraryPath [
-          stdenv.cc.cc.lib
-        ];
-        rpath = lib.makeLibraryPath [
-          glib
-          nss
-          nspr
-          atk
-          at-spi2-atk
-          libdrm
-          expat
-          xorg.libxcb
-          libxkbcommon
-          xorg.libX11
-          xorg.libXcomposite
-          xorg.libXdamage
-          xorg.libXext
-          xorg.libXfixes
-          xorg.libXrandr
-          libgbm
-          gtk3
-          pango
-          cairo
-          alsa-lib
-          dbus
-          at-spi2-core
-          cups
-          xorg.libxshmfence
-          systemd
-        ];
-      in
-      ''
-        mkdir -p $out/lib/ $out/share/cef/
-        cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
-        cp -r ../Resources/* $out/lib/
-        cp -r ../Release/* $out/lib/
-        patchelf --set-rpath "${rpath}" $out/lib/libcef.so
-        patchelf --set-rpath "${gl_rpath}" $out/lib/libEGL.so
-        patchelf --set-rpath "${gl_rpath}" $out/lib/libGLESv2.so
-        cp ../Release/*.bin $out/share/cef/
-        cp -r ../Resources/* $out/share/cef/
-        cp -r ../include $out
-        cp -r ../libcef_dll $out
-        cp -r ../cmake $out
-      '';
+  cef = cef-binary.overrideAttrs (oldAttrs: {
+    version = "126.2.18";
+    gitRevision = "3647d39";
+    chromiumVersion = "126.0.6478.183";
+
+    srcHash =
+      {
+        aarch64-linux = "sha256-Ni5aEbI+WuMnbT8gPWMONN5NkTySw7xJvnM6U44Njao=";
+        x86_64-linux = "sha256-YwND4zsndvmygJxwmrCvaFuxjJO704b6aDVSJqpEOKc=";
+      }
+      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   });
 in
 let
@@ -122,19 +72,8 @@ let
     ];
 
     preConfigure = ''
-      mkdir -p cef/dist/Release cef/dist/Resources cef/dist/include
-
-      ln -s ${cef}/lib/* cef/dist/Release
-
-      ln -s ${cef}/share/cef/*.pak cef/dist/Resources
-      ln -s ${cef}/share/cef/icudtl.dat cef/dist/Resources
-      ln -s ${cef}/share/cef/locales cef/dist/Resources
-
-      ln -s ${cef}/include/* cef/dist/include
-      ln -s ${cef}/libcef_dll cef/dist/libcef_dll
-
-      ln -s ${cef}/cmake cef/dist/cmake
-      ln -s ${cef}/CMakeLists.txt cef/dist
+      mkdir -p cef
+      ln -s ${cef} cef/dist
     '';
 
     postFixup = ''

pkgs/by-name/bo/bombono/package.nix

@@ -6,7 +6,7 @@
   fetchpatch,
   fetchpatch2,
   scons,
-  boost,
+  boost183,
   dvdauthor,
   dvdplusrwtools,
   enca,
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    boost
+    boost183
     dvdauthor
     dvdplusrwtools
     enca

pkgs/by-name/bo/borgmatic/package.nix

@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "2.0.2";
+  version = "2.0.4";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Zem1Zn+S01/rpPOOPhTaRaAgIqq2UixEdjEOodbkk5w=";
+    hash = "sha256-keQ92kSbJ8c1JUZQdHnXdanMhnJie1xtsfzBZ8S6ILk=";
   };
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/bo/boulder/package.nix

@@ -4,16 +4,17 @@
   buildGoModule,
   testers,
   boulder,
+  nix-update-script,
 }:
 
 buildGoModule rec {
   pname = "boulder";
-  version = "2024-07-16";
+  version = "2025-04-17";
 
   src = fetchFromGitHub {
     owner = "letsencrypt";
     repo = "boulder";
-    rev = "release-${version}";
+    tag = "release-${version}";
     leaveDotGit = true;
     postFetch = ''
       pushd $out
@@ -21,7 +22,7 @@ buildGoModule rec {
       find $out -name .git -print0 | xargs -0 rm -rf
       popd
     '';
-    hash = "sha256-mIUT9qVBPWrL0ySORwgEH6azaQmzMCl7ha/eYRtvAg4=";
+    hash = "sha256-FXk+JZJ1azpgN6IQ9aYmpUEO1CGs9/3sog1NjrfB4d8=";
   };
 
   vendorHash = null;
@@ -58,6 +59,7 @@ buildGoModule rec {
     "TestAddPrecertificateKeyHash"
     "TestAddPrecertificateNoOCSP"
     "TestAddRegistration"
+    "TestAddReplacementOrder"
     "TestAddSerial"
     "TestAdministrativelyRevokeCertificate"
     "TestAuthorization500"
@@ -81,6 +83,7 @@ buildGoModule rec {
     "TestCheckCertReturnsDNSNames"
     "TestCheckExactCertificateLimit"
     "TestCheckFQDNSetRateLimitOverride"
+    "TestCheckIdentifiersPaused"
     "TestCheckWildcardCert"
     "TestCheckWildcardCert"
     "TestClientTransportCredentials"
@@ -99,6 +102,7 @@ buildGoModule rec {
     "TestDeactivateAuthorization"
     "TestDeactivateRegistration"
     "TestDedupOnRegistration"
+    "TestDialerTimeout"
     "TestDirectory"
     "TestDontFindRevokedCert"
     "TestEarlyOrderRateLimiting"
@@ -106,9 +110,11 @@ buildGoModule rec {
     "TestEnforceJWSAuthType"
     "TestExactPublicSuffixCertLimit"
     "TestExtractJWK"
+    "TestFQDNSetExists"
     "TestFQDNSetTimestampsForWindow"
     "TestFQDNSets"
     "TestFQDNSetsExists"
+    "TestFQDNSetsExists"
     "TestFailExit"
     "TestFasterGetOrderForNames"
     "TestFinalizeAuthorization2"
@@ -116,6 +122,7 @@ buildGoModule rec {
     "TestFinalizeOrderWildcard"
     "TestFinalizeOrderWithMixedSANAndCN"
     "TestFinalizeSCTError"
+    "TestFinalizeWithMustStaple"
     "TestFindCertsAtCapacity"
     "TestFindExpiringCertificates"
     "TestFindIDs"
@@ -145,6 +152,8 @@ buildGoModule rec {
     "TestGetOrder"
     "TestGetOrderExpired"
     "TestGetOrderForNames"
+    "TestGetPausedIdentifiers"
+    "TestGetPausedIdentifiersOnlyUnpausesOneAccount"
     "TestGetPendingAuthorization2"
     "TestGetRevokedCerts"
     "TestGetSerialMetadata"
@@ -221,12 +230,15 @@ buildGoModule rec {
     "TestPOST404"
     "TestPanicStackTrace"
     "TestParseJWSRequest"
+    "TestPauseIdentifiers"
     "TestPendingAuthorizationsUnlimited"
     "TestPerformValidationAlreadyValid"
     "TestPerformValidationBadChallengeType"
     "TestPerformValidationExpired"
     "TestPerformValidationSuccess"
     "TestPerformValidationVAError"
+    "TestPerformValidation_FailedThenSuccessfulValidationResetsPauseIdentifiersRatelimit"
+    "TestPerformValidation_FailedValidationsTriggerPauseIdentifiersRatelimit"
     "TestPrepAuthzForDisplay"
     "TestPreresolvedDialerTimeout"
     "TestProcessCerts"
@@ -242,6 +254,7 @@ buildGoModule rec {
     "TestRegistrationsPerIPOverrideUsage"
     "TestRehydrateHostPort"
     "TestRelativeDirectory"
+    "TestReplacementOrderExists"
     "TestReplicationLagRetries"
     "TestResolveContacts"
     "TestRevokeCertByApplicant_Controller"
@@ -260,6 +273,7 @@ buildGoModule rec {
     "TestSerialsFromPrivateKey"
     "TestSetAndGet"
     "TestSetOrderProcessing"
+    "TestSetReplacementOrderFinalized"
     "TestSingleton"
     "TestStart"
     "TestStatusForOrder"
@@ -268,6 +282,7 @@ buildGoModule rec {
     "TestTLSALPN01DialTimeout"
     "TestTLSConfigLoad"
     "TestTimeouts"
+    "TestUnpauseAccount"
     "TestUpdateCRLShard"
     "TestUpdateChallengeFinalizedAuthz"
     "TestUpdateChallengeRAError"
@@ -275,6 +290,8 @@ buildGoModule rec {
     "TestUpdateMissingAuthorization"
     "TestUpdateNowWithAllFailingSRV"
     "TestUpdateNowWithOneFailingSRV"
+    "TestUpdateRegistrationContact"
+    "TestUpdateRegistrationKey"
     "TestUpdateRegistrationSame"
     "TestUpdateRevokedCertificate"
     "TestValidJWSForKey"
@@ -302,12 +319,15 @@ buildGoModule rec {
     done
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = boulder;
-    inherit version;
+  passthru = {
+    tests.version = testers.testVersion {
+      package = boulder;
+      inherit version;
+    };
+    updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/letsencrypt/boulder";
     description = "ACME-based certificate authority, written in Go";
     longDescription = ''
@@ -317,7 +337,7 @@ buildGoModule rec {
       revoke certificates for their domains. Boulder is the software that runs
       Let's Encrypt.
     '';
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
     mainProgram = "boulder";
     maintainers = [ ];
   };

pkgs/by-name/bu/budgie-desktop/package.nix

@@ -77,6 +77,13 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch";
       hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws=";
     })
+
+    # Add override for overlay-key to prevent crash with mutter-common v48-rc
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683
+    (fetchpatch {
+      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch";
+      hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0=";
+    })
   ];
 
   nativeBuildInputs = [

pkgs/by-name/bu/budgie-gsettings-overrides/package.nix

@@ -35,9 +35,6 @@ let
     [org.gnome.desktop.wm.preferences:Budgie]
     titlebar-font="Noto Sans Bold 10"
 
-    [org.gnome.mutter:Budgie]
-    edge-tiling=true
-
     [com.solus-project.budgie-menu:Budgie]
     use-default-menu-icon=true
 

pkgs/by-name/bu/butterfly/package.nix

@@ -1,7 +1,7 @@
 {
   lib,
+  flutter329,
   fetchFromGitHub,
-  flutter327,
   runCommand,
   butterfly,
   yq,
@@ -9,15 +9,15 @@
   gitUpdater,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "butterfly";
-  version = "2.2.4";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "LinwoodDev";
     repo = "Butterfly";
     tag = "v${version}";
-    hash = "sha256-lf1CCpLd7eM4iJvTsR2AI6xGCQ2NJ1mlYkR0hW03SRA=";
+    hash = "sha256-ih+oADHEBB8fOt1Uoxc98BNr6BuoONnFNt8wHQxgpfA=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -25,19 +25,18 @@ flutter327.buildFlutterApplication rec {
   sourceRoot = "${src.name}/app";
 
   gitHashes = {
-    dart_leap = "sha256-eEyUqdVToybQoDwdmz47H0f3/5zRdJzmPv1d/5mTOgA=";
-    lw_file_system = "sha256-0LLSADBWq19liQLtJIJEuTEqmeyIWP61zRRjjpdV6SM=";
-    flutter_secure_storage_web = "sha256-ULYXcFjz9gKMjw1Q1KAmX2J7EcE8CbW0MN/EnwmaoQY=";
-    networker = "sha256-1b8soPRbHOGAb2wpsfw/uETnAlaCJZyLmynVRDX9Y8s=";
-    lw_file_system_api = "sha256-ctz9+HEWGV47XUWa+RInS2gHnkrJQqgafnrbI8m3Yfo=";
+    dart_leap = "sha256-oO5851cIdrW/asgOePxvwUgjn1XchkH9CKJUruvlLYI=";
+    lw_file_system = "sha256-l04sXm9FXHF0ZUdQplnGoih483PczMQvlFF0r/UEuao=";
+    networker = "sha256-/3jFIZj66hWbTcIQx9OB5QRrukcBT4zpek+56AVaGIA=";
+    lw_file_system_api = "sha256-/Ur9zu4Ovb4x8j1n6Q6FWFuJ9yp92YQG3b7H5CMf3II=";
     lw_sysapi = "sha256-OYVHBiAshYKRH/6BEcY+BXm9VIfSAFnFBOBWlQIO5Tc=";
-    material_leap = "sha256-MF0wN4JsmKVzwwWjBKqY0DaLLdUuY0abyLF1VilTslM=";
-    networker_socket = "sha256-8LRyo5HzreUMGh5j39vL+Gqzxp4MN/jhHYpDxbFV0Ao=";
-    perfect_freehand = "sha256-dMJ8CyhoQWbBRvUQyzPc7vdAhCzcAl1X7CcaT3u6dWo=";
-    pdf = "sha256-cIBSgePv5LIFRbc7IIx1fSVJceGEmzdZzDkOiD1z92E=";
-    pdf_widget_wrapper = "sha256-hXDFdgyu2DvIqwVBvk6TVDW+FdlMGAn5v5JZKQwp8fA=";
+    material_leap = "sha256-l04sXm9FXHF0ZUdQplnGoih483PczMQvlFF0r/UEuao=";
+    networker_crypto = "sha256-nI0luldloScjjix75kR5yOE1ZX8KFxMIC2N4whKlXUg=";
+    networker_socket = "sha256-5y1oy0IYDs7nhiIx653vI5Gfh5jrVewkRFxB1mjxlE4=";
+    perfect_freehand = "sha256-eBiid097rkF82n65Yg6a4VkKPv+70HIOYJT+9sCD//U=";
+    network_info_plus = "sha256-fOh/Qm7T65jDtckMTB3ZP2xT7UH6Wi/x5i61xXNbWac=";
+    swamp_api = "sha256-ONaCXeMwEEHDvVmbo3o66O3CTCx4xGR3T5ZtSEwPvaw=";
     reorderable_grid = "sha256-g30DSPL/gsk0r8c2ecoKU4f1P3BF15zLnBVO6RXvDGQ=";
-    printing = "sha256-0JdMld1TN2EtJVQSuYdSIfi/q96roVUJEAY8dWK9xCM=";
   };
 
   postInstall = ''

pkgs/by-name/cd/cdncheck/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.15";
+  version = "1.1.16";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-iIK/MnhX+1mZCHeGPEsdUO8T4HOpSA3Fy0fnjgVzG5g=";
+    hash = "sha256-7piHR6BlPz34pkgkj6cmi8OR2h2mZEF+hy8dwS+lras=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

pkgs/by-name/ce/cef-binary/package.nix

@@ -0,0 +1,15 @@
+{
+  libcef,
+}:
+
+libcef.overrideAttrs (oldAttrs: {
+  pname = "cef-binary";
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r .. $out
+
+    runHook postInstall
+  '';
+})

pkgs/by-name/ch/chatmcp/package.nix

@@ -1,6 +1,6 @@
 {
   lib,
-  flutter327,
+  flutter329,
   fetchFromGitHub,
   autoPatchelfHook,
   copyDesktopItems,
@@ -12,15 +12,15 @@
   gitUpdater,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "chatmcp";
-  version = "0.0.21-alpha";
+  version = "0.0.26-alpha";
 
   src = fetchFromGitHub {
     owner = "daodao97";
     repo = "chatmcp";
     tag = "v${version}";
-    hash = "sha256-T0HVvnMBH/Tnhks7NTCdE3QkHPbg4XaPnT1aJ+LSH6E=";
+    hash = "sha256-ayGpP1Tiz2437YDSXIwuFNXWpqReHUuI0Nuaf/aus+Q=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

pkgs/by-name/ch/chatmcp/pubspec.lock.json

@@ -296,16 +296,6 @@
       "source": "hosted",
       "version": "1.0.8"
     },
-    "curl_logger_dio_interceptor": {
-      "dependency": "direct main",
-      "description": {
-        "name": "curl_logger_dio_interceptor",
-        "sha256": "f20d89187a321d2150e1412bca30ebf4d89130bafc648ce21bd4f1ef4062b214",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
     "dart_style": {
       "dependency": "transitive",
       "description": {
@@ -316,26 +306,6 @@
       "source": "hosted",
       "version": "3.0.1"
     },
-    "dio": {
-      "dependency": "direct main",
-      "description": {
-        "name": "dio",
-        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.8.0+1"
-    },
-    "dio_web_adapter": {
-      "dependency": "transitive",
-      "description": {
-        "name": "dio_web_adapter",
-        "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
     "dotenv": {
       "dependency": "direct main",
       "description": {
@@ -432,6 +402,16 @@
       "source": "hosted",
       "version": "5.2.1"
     },
+    "flutter_form_builder": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_form_builder",
+        "sha256": "aa3901466c70b69ae6c7f3d03fcbccaec5fde179d3fded0b10203144b546ad28",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.0.1"
+    },
     "flutter_highlight": {
       "dependency": "direct main",
       "description": {
@@ -658,6 +638,16 @@
       "source": "hosted",
       "version": "2.0.24"
     },
+    "flutter_popup": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_popup",
+        "sha256": "8f93cb4ec7341330ee585b4624ac6596f02587aaefc47297344cb7b5af26aa07",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.3.4"
+    },
     "flutter_statusbarcolor_ns": {
       "dependency": "direct main",
       "description": {
@@ -678,6 +668,16 @@
       "source": "hosted",
       "version": "2.0.17"
     },
+    "flutter_switch": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_switch",
+        "sha256": "b91477f926bba135d2d203d7b24367492662d8d9c3aa6adb960b14c1087d3c41",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.2"
+    },
     "flutter_test": {
       "dependency": "direct dev",
       "description": "flutter",
@@ -690,6 +690,16 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "form_builder_validators": {
+      "dependency": "direct main",
+      "description": {
+        "name": "form_builder_validators",
+        "sha256": "cd617fa346250293ff3e2709961d0faf7b80e6e4f0ff7b500126b28d7422dd67",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "11.1.2"
+    },
     "frontend_server_client": {
       "dependency": "transitive",
       "description": {
@@ -761,7 +771,7 @@
       "version": "1.3.2"
     },
     "http": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "http",
         "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
@@ -840,6 +850,16 @@
       "source": "hosted",
       "version": "4.9.0"
     },
+    "jsonc": {
+      "dependency": "direct main",
+      "description": {
+        "name": "jsonc",
+        "sha256": "326a3c5c774a77c3c4e327f359e0268bff34135d0c16078beee6d921c49a16ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.3"
+    },
     "keyboard_dismisser": {
       "dependency": "direct main",
       "description": {
@@ -1958,7 +1978,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0-0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "dart": ">=3.7.0 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }

pkgs/by-name/ch/chatzone-desktop/package.nix

@@ -35,12 +35,13 @@ stdenvNoCC.mkDerivation {
       terminal = false;
       desktopName = "Chatzone";
       genericName = "Ozon corporate messenger";
-      comment = "Mattermost Desktop application for Linux";
+      comment = "Chatzone Desktop application for Linux";
       categories = [
         "Network"
         "InstantMessaging"
         "Chat"
       ];
+      startupWMClass = "Chatzone";
       mimeTypes = [ "x-scheme-handler/mattermost" ];
     })
   ];

pkgs/by-name/ch/checkov/package.nix

@@ -25,14 +25,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.408";
+  version = "3.2.411";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-QvM45kgRnzmDjYLnO3g1gMYEJpof7W9z/gCPwXExdgc=";
+    hash = "sha256-7hsZxIoSSy8rnKfYTgqvlxp3RSoS4LEjAQ09erwk7F4=";
   };
 
   pythonRelaxDeps = [

pkgs/by-name/ch/checkstyle/package.nix

@@ -7,12 +7,12 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "10.23.0";
+  version = "10.23.1";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-4KMZ2WNntgMEjoOSECPko6zi89Zesb/t6oM+uZEKEDc=";
+    sha256 = "sha256-bF0U+SLjVoCLTZLbdtFy98HZtYK7uw0zew2gGuisdH8=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

pkgs/by-name/ch/cherry-studio/missing-hashes.json

@@ -0,0 +1,92 @@
+{
+    "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16",
+    "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05",
+    "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d",
+    "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703",
+    "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a",
+    "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283",
+    "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6",
+    "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4",
+    "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f",
+    "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386",
+    "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a",
+    "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58",
+    "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654",
+    "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718",
+    "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87",
+    "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb",
+    "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c",
+    "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73",
+    "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17",
+    "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802",
+    "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5",
+    "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f",
+    "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296",
+    "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2",
+    "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75",
+    "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983",
+    "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5",
+    "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8",
+    "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363",
+    "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68",
+    "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae",
+    "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e",
+    "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674",
+    "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea",
+    "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304",
+    "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1",
+    "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1",
+    "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173",
+    "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85",
+    "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5",
+    "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a",
+    "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5",
+    "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366",
+    "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0",
+    "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be",
+    "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090",
+    "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1",
+    "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9",
+    "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a",
+    "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b",
+    "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8",
+    "@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6",
+    "@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5",
+    "@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0",
+    "@libsql/win32-x64-msvc@npm:0.4.7": "2fcb8715b6f0571dec145eaaf3fd53c7c5aa5bf408fe1be9d84b10adc8a909bb6ee60b45e0d7052b0c1722c30ac212356a3f1adcdf7f57d5a59b48f36ca5bdf5",
+    "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
+    "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
+    "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
+    "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750",
+    "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144",
+    "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1",
+    "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e",
+    "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0",
+    "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690",
+    "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d",
+    "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
+    "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
+    "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
+    "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419",
+    "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc",
+    "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572",
+    "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b",
+    "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d",
+    "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b",
+    "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1",
+    "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c",
+    "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c",
+    "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630",
+    "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2",
+    "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab",
+    "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e",
+    "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6",
+    "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4",
+    "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a",
+    "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db",
+    "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d",
+    "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5",
+    "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28",
+    "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
+    "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43"
+}

pkgs/by-name/ch/cherry-studio/package.nix

@@ -1,9 +1,10 @@
 {
   lib,
-  stdenvNoCC,
+  stdenv,
   fetchFromGitHub,
-  cacert,
-  yarn-berry,
+  yarn-berry_4,
+  nodejs,
+  python3,
   electron,
   makeWrapper,
   writableTmpDirAsHomeHook,
@@ -12,64 +13,41 @@
   commandLineArgs ? "",
 }:
 
-stdenvNoCC.mkDerivation (finalAttrs: {
+let
+  yarn-berry = yarn-berry_4;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.2.4";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vBE3yKNuL8yAuZrR5DrT+n1idmPor3ygPD1qMGGGgps=";
+    hash = "sha256-Pxxv6f6YHjc1BAT93ASY2XUsB0CGVo4F/DcM7tReS9U=";
   };
 
-  yarnOfflineCache = stdenvNoCC.mkDerivation {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-offline-cache";
-    inherit (finalAttrs) src;
+  missingHashes = ./missing-hashes.json;
 
-    nativeBuildInputs = [
-      cacert
-      yarn-berry
-      writableTmpDirAsHomeHook
-    ];
-
-    postConfigure = ''
-      yarn config set enableTelemetry false
-      yarn config set enableGlobalCache false
-      yarn config set --json supportedArchitectures.os '[ "linux", "darwin" ]'
-      yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]'
-      yarn config set cacheFolder $out
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      yarn install --mode=skip-build
-
-      runHook postBuild
-    '';
-
-    outputHashMode = "recursive";
-    outputHash = "sha256-A0YuGvNCsrYzp/oZ4Ob1Sp9HFc+psa9Yv5fb/8rQqZY=";
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-I5K0JEFOuk9ugLBz/TON8RxBx4MojMk8Ol9XRg0Rxi8=";
   };
 
   nativeBuildInputs = [
+    yarn-berry.yarnBerryConfigHook
     yarn-berry
     makeWrapper
     writableTmpDirAsHomeHook
     copyDesktopItems
+    (python3.withPackages (ps: with ps; [ setuptools ]))
+    nodejs
   ];
 
-  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-
-  postConfigure = ''
-    yarn config set enableTelemetry false
-    yarn config set enableGlobalCache false
-    export cachePath=$(mktemp -d)
-    cp -r $yarnOfflineCache/* $cachePath
-    yarn config set cacheFolder $cachePath
-    yarn install --mode=skip-build
-  '';
+  env = {
+    YARN_ENABLE_SCRIPTS = "false";
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  };
 
   buildPhase = ''
     runHook preBuild
@@ -93,6 +71,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       icon = "cherry-studio";
       startupWMClass = "Cherry Studio";
       categories = [ "Utility" ];
+      mimeTypes = [ "x-scheme-handler/cherrystudio" ];
     })
   ];
 
@@ -105,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \
       --inherit-argv0 \
       --add-flags $out/lib/cherry-studio/resources/app.asar \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
@@ -120,9 +99,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "cherry-studio";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ ];
-    license = with lib.licenses; [
-      asl20
-      unfree
-    ];
+    license = with lib.licenses; [ agpl3Only ];
   };
 })

pkgs/by-name/ch/chez-matchable/package.nix

@@ -7,12 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "chez-matchable";
+  # nixpkgs-update: no auto update
   version = "0.2";
 
   src = fetchFromGitHub {
     owner = "fedeinthemix";
     repo = "chez-matchable";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "sha256-UYoT8Kp1FTfiL22ntrFXFcAB1HGVrJ6p9JgvhUKi+Yo=";
   };
 

pkgs/by-name/ch/chirp/package.nix

@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-04-17";
+  version = "0.4.0-unstable-2025-04-27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "a96c6df2617034673ebb30ffe2c2206d7b42efbd";
-    hash = "sha256-FBRUrpHTp/SaJ6aR9dQ+dcdhU2++n6R2h7rFVRiXH/U=";
+    rev = "8967238a8670c5992c3d5a65b2fdeef5cded7889";
+    hash = "sha256-eTVEUhvbdTLot5C7X+lt2rsYFVchfbwUc8iwU/HSUh0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ch/chirpstack-concentratord/package.nix

@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-concentratord";
-  version = "4.4.7";
+  version = "4.4.8";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-concentratord";
     rev = "v${version}";
-    hash = "sha256-RFjBeFGK0HzRPeCCU5Un3c3XSg8hmXo+7DWP6tfsDgw=";
+    hash = "sha256-koEzUTbeuTjeoHmZc6hP2cZM66d0toI9YExGRtDjNBQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-phTYdiVxeC6eOBzz6RvgrSN56+RRcXUiktxNzy/qLY0=";
+  cargoHash = "sha256-JRcVigA5yDsW4otPMvi3udjasQWQNrWJQ6zd6XXyQIk=";
 
   buildInputs = [
     libloragw-2g4

pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix

@@ -9,17 +9,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-mqtt-forwarder";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-mqtt-forwarder";
     rev = "v${version}";
-    hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU=";
+    hash = "sha256-JsRhgSEA5xdpeljdA9/h5bVGytt6rIvX3FqI6ZiCLys=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ks92eXKWWiEIhNhEMMN2VH970u64nBWLGObOda74c0o=";
+  cargoHash = "sha256-6kN4ml7JVW6Ygw9+wg79h+1zv/HPNjTw1FZlOOl7jGc=";
 
   nativeBuildInputs = [ protobuf ];
 

pkgs/by-name/ch/chirpstack-rest-api/package.nix

@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "chirpstack-rest-api";
-  version = "4.11.0";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-rest-api";
     rev = "v${version}";
-    hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4=";
+    hash = "sha256-0OeWrE+9YJTf72+1KTpySutjlY53QYqSdl8bwS2MY10=";
   };
 
-  vendorHash = "sha256-UZ1todyWnxRTnqEGc/2rM+JCZPWYG/WA+OnivpB6JGI=";
+  vendorHash = "sha256-5fP2v5JTsBkJ1SLx94HWLKwf5Jb3desLen3VxwER9vE=";
 
   ldflags = [
     "-s"

pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix

@@ -9,17 +9,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-udp-forwarder";
-  version = "4.1.8";
+  version = "4.1.10";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-udp-forwarder";
     rev = "v${version}";
-    hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4=";
+    hash = "sha256-71pzD1wF6oNgi2eP/f/buX/vWpZda5DpD2mN1F7n3lk=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ntY0Ze9MlbdRnmzA5AJN4Hjlhv18Iboj83gba8A4xHw=";
+  cargoHash = "sha256-3RrFA/THO9fWfk41nVbFGFv/VeFOcdN2mWgshC5PODw=";
 
   nativeBuildInputs = [ protobuf ];