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

.github/workflows/eval.yml

@@ -81,6 +81,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ attrs, get-merge-commit ]
     strategy:
+      fail-fast: false
       matrix:
         system: ${{ fromJSON(needs.attrs.outputs.systems) }}
     steps:

maintainers/maintainer-list.nix

@@ -2222,6 +2222,12 @@
     githubId = 354741;
     name = "Austin Butler";
   };
+  automathis = {
+    name = "AutoMathïs";
+    email = "automathis@protonmail.com";
+    github = "MathisFederico";
+    githubId = 60117466;
+  };
   autophagy = {
     email = "mail@autophagy.io";
     github = "autophagy";
@@ -12352,6 +12358,12 @@
     githubId = 11614750;
     name = "Alexander Sharov";
   };
+  kvik = {
+    email = "viktor@a-b.xyz";
+    github = "okvik";
+    githubId = 58425080;
+    name = "Viktor Pocedulić";
+  };
   kwaa = {
     name = "藍+85CD";
     email = "kwa@kwaa.dev";
@@ -13591,6 +13603,13 @@
     githubId = 1809783;
     name = "Marco Maggesi";
   };
+  magneticflux- = {
+    email = "skaggsm333@gmail.com";
+    github = "magneticflux-";
+    githubId = 9124288;
+    name = "Mitchell Skaggs";
+    keys = [ { fingerprint = "CA2A 3324 43A7 BD99 8FCE  DFC4 4EB0 FECB 84AE 8967"; } ];
+  };
   magnetophon = {
     email = "bart@magnetophon.nl";
     github = "magnetophon";
@@ -15812,6 +15831,12 @@
     githubId = 3747396;
     name = "Nathan Isom";
   };
+  negatethis = {
+    email = "negatethis@envs.net";
+    github = "negatethis";
+    githubId = 26014535;
+    name = "Negate This";
+  };
   neilmayhew = {
     email = "nix@neil.mayhew.name";
     github = "neilmayhew";

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

@@ -165,6 +165,12 @@
   ```
   This changed follows a deprecation period of one year started in NixOS 24.05 (see [PR #283818](https://github.com/NixOS/nixpkgs/pull/283818)).
 
+- The values of `services.borgbackup.jobs.*.extraArgs` and other `extra*Args` options are now represented as Bash arrays. If these arguments were modified using `services.borgbackup.jobs.*.preHook`, they will need to be adjusted to append to these arrays, i.e.
+  ```diff
+  -extraCreateArgs="$extraCreateArgs --exclude /some/path"
+  +extraCreateArgs+=("--exclude" "/some/path")
+  ```
+
 - `nodePackages.ganache` has been removed, as the package has been deprecated by upstream.
 
 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release.
@@ -223,6 +229,8 @@
 - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).
   `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable.
 
+- `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Other Notable Changes {#sec-release-25.05-notable-changes}

nixos/modules/programs/clash-verge.nix

@@ -6,6 +6,11 @@
 }:
 
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "programs" "clash-verge" "tunMode" ] ''
+      The tunMode will work with service mode which is enabled by default.
+    '')
+  ];
   options.programs.clash-verge = {
     enable = lib.mkEnableOption "Clash Verge";
     package = lib.mkOption {
@@ -15,10 +20,10 @@
         clash-verge-rev and clash-nyanpasu, both are forks of
         the original clash-verge project.
       '';
-      example = "pkgs.clash-verge-rev";
+      default = pkgs.clash-verge-rev;
+      defaultText = lib.literalExpression "pkgs.clash-verge-rev";
     };
     autoStart = lib.mkEnableOption "Clash Verge auto launch";
-    tunMode = lib.mkEnableOption "Clash Verge TUN mode";
   };
 
   config =
@@ -37,13 +42,19 @@
         ))
       ];
 
-      security.wrappers.clash-verge = lib.mkIf cfg.tunMode {
-        owner = "root";
-        group = "root";
-        capabilities = "cap_net_bind_service,cap_net_admin=+ep";
-        source = "${lib.getExe cfg.package}";
+      systemd.services.clash-verge = {
+        enable = true;
+        description = "Clash Verge Service Mode";
+        serviceConfig = {
+          ExecStart = "${cfg.package}/bin/clash-verge-service";
+          Restart = "on-failure";
+        };
+        wantedBy = [ "multi-user.target" ];
       };
     };
 
-  meta.maintainers = with lib.maintainers; [ zendo ];
+  meta.maintainers = with lib.maintainers; [
+    bot-wxt1221
+    Guanran928
+  ];
 }

nixos/modules/services/backup/borgbackup.nix

@@ -20,8 +20,19 @@ let
     lib.concatStringsSep " "
       (lib.mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep);
 
+  mkExtraArgs = cfg:
+    # Create BASH arrays of extra args
+    lib.concatLines
+      (lib.mapAttrsToList (name: values: ''
+        ${name}=(${values})
+      '')
+  { inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs extraCompactArgs; });
+
   mkBackupScript = name: cfg: pkgs.writeShellScript "${name}-script" (''
     set -e
+
+    ${mkExtraArgs cfg}
+
     on_exit()
     {
       exitStatus=$?
@@ -46,35 +57,35 @@ let
     ${cfg.preHook}
   '' + lib.optionalString cfg.doInit ''
     # Run borg init if the repo doesn't exist yet
-    if ! borgWrapper list $extraArgs > /dev/null; then
-      borgWrapper init $extraArgs \
+    if ! borgWrapper list "''${extraArgs[@]}" > /dev/null; then
+      borgWrapper init "''${extraArgs[@]}" \
         --encryption ${cfg.encryption.mode} \
-        $extraInitArgs
+        "''${extraInitArgs[@]}"
       ${cfg.postInit}
     fi
   '' + ''
     (
       set -o pipefail
       ${lib.optionalString (cfg.dumpCommand != null) ''${lib.escapeShellArg cfg.dumpCommand} | \''}
-      borgWrapper create $extraArgs \
+      borgWrapper create "''${extraArgs[@]}" \
         --compression ${cfg.compression} \
         --exclude-from ${mkExcludeFile cfg} \
         --patterns-from ${mkPatternsFile cfg} \
-        $extraCreateArgs \
+        "''${extraCreateArgs[@]}" \
         "::$archiveName$archiveSuffix" \
         ${if cfg.paths == null then "-" else lib.escapeShellArgs cfg.paths}
     )
   '' + lib.optionalString cfg.appendFailedSuffix ''
-    borgWrapper rename $extraArgs \
+    borgWrapper rename "''${extraArgs[@]}" \
       "::$archiveName$archiveSuffix" "$archiveName"
   '' + ''
     ${cfg.postCreate}
   '' + lib.optionalString (cfg.prune.keep != { }) ''
-    borgWrapper prune $extraArgs \
+    borgWrapper prune "''${extraArgs[@]}" \
       ${mkKeepArgs cfg} \
       ${lib.optionalString (cfg.prune.prefix != null) "--glob-archives ${lib.escapeShellArg "${cfg.prune.prefix}*"}"} \
-      $extraPruneArgs
-    borgWrapper compact $extraArgs $extraCompactArgs
+      "''${extraPruneArgs[@]}"
+    borgWrapper compact "''${extraArgs[@]}" "''${extraCompactArgs[@]}"
     ${cfg.postPrune}
   '');
 
@@ -120,7 +131,6 @@ let
       };
       environment = {
         BORG_REPO = cfg.repo;
-        inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs extraCompactArgs;
       } // (mkPassEnv cfg) // cfg.environment;
     };
 
@@ -236,7 +246,7 @@ let
   };
 
 in {
-  meta.maintainers = with lib.maintainers; [ dotlambda ];
+  meta.maintainers = with lib.maintainers; [ dotlambda Scrumplex ];
   meta.doc = ./borgbackup.md;
 
   ###### interface
@@ -581,7 +591,7 @@ in {
             default = "";
             example = ''
               # To add excluded paths at runtime
-              extraCreateArgs="$extraCreateArgs --exclude /some/path"
+              extraCreateArgs+=("--exclude" "/some/path")
             '';
           };
 

nixos/modules/services/misc/gitlab.nix

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

nixos/modules/services/misc/jackett.nix

@@ -60,6 +60,55 @@ in
         Group = cfg.group;
         ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --Port ${toString cfg.port} --DataFolder '${cfg.dataDir}'";
         Restart = "on-failure";
+
+        # Sandboxing
+        CapabilityBoundingSet = [
+          "CAP_NET_BIND_SERVICE"
+        ];
+        ExecPaths = [
+          "${builtins.storeDir}"
+        ];
+        LockPersonality = true;
+        NoExecPaths = [
+          "/"
+        ];
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        ReadWritePaths = [
+          "${config.users.users.${cfg.user}.home}"
+        ];
+        RemoveIPC = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@clock"
+          "~@cpu-emulation"
+          "~@debug"
+          "~@obsolete"
+          "~@reboot"
+          "~@module"
+          "~@mount"
+          "~@swap"
+        ];
+        UMask = "0077";
       };
     };
 

nixos/modules/services/networking/bind.nix

@@ -246,29 +246,68 @@ in
       };
     users.groups.${bindUser} = {};
 
+    systemd.tmpfiles.settings."bind" = lib.mkIf (cfg.directory != "/run/named") {
+      ${cfg.directory} = {
+        d = {
+          user = bindUser;
+          group = bindUser;
+          age = "-";
+        };
+      };
+    };
     systemd.services.bind = {
       description = "BIND Domain Name Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
-        mkdir -m 0755 -p /etc/bind
         if ! [ -f "/etc/bind/rndc.key" ]; then
-          ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
+          ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -a -A hmac-sha256 2>/dev/null
         fi
-
-        ${pkgs.coreutils}/bin/mkdir -p /run/named
-        chown ${bindUser} /run/named
-
-        ${pkgs.coreutils}/bin/mkdir -p ${cfg.directory}
-        chown ${bindUser} ${cfg.directory}
       '';
 
       serviceConfig = {
         Type = "forking"; # Set type to forking, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900788
-        ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}";
+        ExecStart = "${bindPkg.out}/sbin/named ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile}";
         ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
         ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
+        User = bindUser;
+        RuntimeDirectory = "named";
+        RuntimeDirectoryPreserve = "yes";
+        ConfigurationDirectory = "bind";
+        ReadWritePaths = [
+          (lib.mapAttrsToList (name: config: if (lib.hasPrefix "/" config.file) then ("-${dirOf config.file}") else "") cfg.zones)
+          cfg.directory
+        ];
+        CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
+        AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+        # Security
+        NoNewPrivileges = true;
+        # Sandboxing
+        ProtectSystem = "strict";
+        ReadOnlyPaths = "/sys";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        ProtectHostname = true;
+        ProtectClock = true;
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectKernelLogs = true;
+        ProtectControlGroups = true;
+        ProtectProc = "invisible";
+        ProcSubset = "pid";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6 AF_NETLINK" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        RestrictNamespaces = true;
+        # System Call Filtering
+        SystemCallArchitectures = "native";
+        SystemCallFilter = "~@mount @debug @clock @reboot @resources @privileged @obsolete acct modify_ldt add_key adjtimex clock_adjtime delete_module fanotify_init finit_module get_mempolicy init_module io_destroy io_getevents iopl ioperm io_setup io_submit io_cancel kcmp kexec_load keyctl lookup_dcookie migrate_pages move_pages open_by_handle_at perf_event_open process_vm_readv process_vm_writev ptrace remap_file_pages request_key set_mempolicy swapoff swapon uselib vmsplice";
       };
 
       unitConfig.Documentation = "man:named(8)";

nixos/modules/services/networking/mullvad-vpn.nix

@@ -10,7 +10,6 @@ with lib;
       default = false;
       description = ''
         This option enables Mullvad VPN daemon.
-        This sets {option}`networking.firewall.checkReversePath` to "loose", which might be undesirable for security.
       '';
     };
 
@@ -36,12 +35,6 @@ with lib;
 
     environment.systemPackages = [ cfg.package ];
 
-    # mullvad-daemon writes to /etc/iproute2/rt_tables
-    networking.iproute2.enable = true;
-
-    # See https://github.com/NixOS/nixpkgs/issues/113589
-    networking.firewall.checkReversePath = "loose";
-
     # See https://github.com/NixOS/nixpkgs/issues/176603
     security.wrappers.mullvad-exclude = mkIf cfg.enableExcludeWrapper {
       setuid = true;
@@ -59,13 +52,9 @@ with lib;
         "NetworkManager.service"
         "systemd-resolved.service"
       ];
-      path = [
-        pkgs.iproute2
-        # Needed for ping
-        "/run/wrappers"
-        # See https://github.com/NixOS/nixpkgs/issues/262681
-      ] ++ (lib.optional config.networking.resolvconf.enable
-        config.networking.resolvconf.package);
+      # See https://github.com/NixOS/nixpkgs/issues/262681
+      path = lib.optional config.networking.resolvconf.enable
+        config.networking.resolvconf.package;
       startLimitBurst = 5;
       startLimitIntervalSec = 20;
       serviceConfig = {

nixos/tests/borgbackup.nix

@@ -3,6 +3,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
 let
   passphrase = "supersecret";
   dataDir = "/ran:dom/data";
+  subDir = "not_anything_here";
+  excludedSubDirFile = "not_this_file_either";
   excludeFile = "not_this_file";
   keepFile = "important_file";
   keepFileData = "important_data";
@@ -69,6 +71,7 @@ in {
             yearly = 5;
           };
           exclude = [ "*/${excludeFile}" ];
+          extraCreateArgs = [ "--exclude-caches" "--exclude-if-present" ".dont backup" ];
           postHook = "echo post";
           startAt = [ ]; # Do not run automatically
         };
@@ -166,8 +169,10 @@ in {
     )
     client.succeed("chmod 0600 /root/id_ed25519.appendOnly")
 
-    client.succeed("mkdir -p ${dataDir}")
+    client.succeed("mkdir -p ${dataDir}/${subDir}")
     client.succeed("touch ${dataDir}/${excludeFile}")
+    client.succeed("touch '${dataDir}/${subDir}/.dont backup'")
+    client.succeed("touch ${dataDir}/${subDir}/${excludedSubDirFile}")
     client.succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}")
 
     with subtest("local"):
@@ -180,6 +185,10 @@ in {
         client.fail(
             "{} list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'".format(borg)
         )
+        # Make sure excludedSubDirFile has been excluded
+        client.fail(
+            "{} list '${localRepo}::${archiveName}' | grep -qF '${subDir}/${excludedSubDirFile}".format(borg)
+        )
         # Make sure keepFile has the correct content
         client.succeed("{} extract '${localRepo}::${archiveName}'".format(borg))
         assert "${keepFileData}" in client.succeed("cat ${dataDir}/${keepFile}")

pkgs/applications/audio/jamulus/default.nix

@@ -1,43 +0,0 @@
-{ mkDerivation
-, lib
-, fetchFromGitHub
-, pkg-config
-, qtscript
-, qmake
-, qtbase
-, qtmultimedia
-, qtdeclarative
-, libjack2
-}:
-
-mkDerivation rec {
-  pname = "jamulus";
-  version = "3.10.0";
-  src = fetchFromGitHub {
-    owner = "jamulussoftware";
-    repo = "jamulus";
-    rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-uqBre1Hcdmmifm/gii3MlP9LiAovQVsAaPZTmVm1nnM=";
-  };
-
-  nativeBuildInputs = [ pkg-config qmake ];
-  buildInputs = [
-    qtscript
-    qtbase
-    qtmultimedia
-    qtdeclarative
-    libjack2
-  ];
-
-  qmakeFlags = [ "CONFIG+=noupcasename" ];
-
-  meta = {
-    description = "Enables musicians to perform real-time jam sessions over the internet";
-    longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details";
-    homepage = "https://github.com/corrados/jamulus/wiki";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    mainProgram = "jamulus";
-    maintainers = [ lib.maintainers.seb314 ];
-  };
-}

pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch

@@ -1,52 +0,0 @@
-From 2e1e9b3ffce9d1069fca0b27b8011f85c7547c3b Mon Sep 17 00:00:00 2001
-From: Francesco Gazzetta <fgaz@fgaz.me>
-Date: Wed, 19 Aug 2020 15:06:19 +0200
-Subject: [PATCH 1/2] Remove coherency checks >:)
-
-As far as I can see, they are just to make sure that the types can fit
-in the word length, but this check was written when 64 bits weren't a
-possibility and didn't take that into account,
-so although the types do fit, the checks fail.
-Indeed, the program seems to work well on 64 bits.
-More info here:
-https://github.com/Mdashdotdashn/LittleGPTracker/issues/4
----
- sources/Externals/Soundfont/DATATYPE.H | 22 ----------------------
- 1 file changed, 22 deletions(-)
-
-diff --git a/sources/Externals/Soundfont/DATATYPE.H b/sources/Externals/Soundfont/DATATYPE.H
-index 762a724..f6b031f 100644
---- a/sources/Externals/Soundfont/DATATYPE.H
-+++ b/sources/Externals/Soundfont/DATATYPE.H
-@@ -123,28 +123,6 @@ typedef short               SHORT;     /* 16 bit signed value was: INT */
- ********************************************************************/
- typedef unsigned short        EMUSTAT;
- 
--/********************************************************************
--* Compare <limits.h> values with SoundFont Enabler limits.  Fail compile
--* if discrepency. If compile fails due to one of these errors, then
--* the SoundFont enabler will not work with your system or the state of your
--* development environment.
--********************************************************************/
--#if (SCHAR_MAX != CHAR_MAXVAL) || (UCHAR_MAX != BYTE_MAXVAL)
--  #error <datatype.h>: char is out of range!
--#endif
--
--#if (SHRT_MAX != SHRT_MAXVAL)
--  #error <datatype.h>: short is out of range!
--#endif
--
--#if (LONG_MAX != LONG_MAXVAL)
--  #error <datatype.h>: long is out of range!
--#endif
--
--#if (ULONG_MAX != DWORD_MAXVAL)
--  #error <datatype.h>: unsigned long is out of range!
--#endif
--
- #ifdef __BYTE_COHERENT
- 
- /********************************************************************
--- 
-2.25.4
-

pkgs/applications/audio/littlegptracker/default.nix

@@ -1,75 +1,78 @@
-{ lib, stdenv
-, fetchFromGitHub
-, unstableGitUpdater
-, SDL
-, jack2
-, Foundation
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  SDL2,
+  python3,
+  jack2,
+  Foundation,
+  alsa-lib,
+  pkg-config,
 }:
-
-stdenv.mkDerivation {
+let
+  python = python3.withPackages (ps: with ps; [ pillow ]);
+  platform = if stdenv.hostPlatform.isDarwin then "OSX" else "X64";
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "littlegptracker";
-  version = "0-unstable-2020-11-26";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
-    owner = "Mdashdotdashn";
+    owner = "djdiskmachine";
     repo = "littlegptracker";
-    rev = "4aca8cd765e1ad586da62decd019e66cb64b45b8";
-    sha256 = "0f2ip8z5wxk8fvlw47mczsbcrzh4nh1hgw1fwf5gjrqnzm8v111x";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE=";
   };
 
-  buildInputs = [
-    SDL
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin Foundation
-  ++ lib.optional stdenv.hostPlatform.isLinux jack2;
+  nativeBuildInputs = [
+    pkg-config
+    python
+  ];
+  buildInputs =
+    [ SDL2 ]
+    ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib
+    ++ lib.optional stdenv.hostPlatform.isDarwin Foundation
+    ++ lib.optional stdenv.hostPlatform.isLinux jack2;
 
-  patches = [
-    # Remove outdated (pre-64bit) checks that would fail on modern platforms
-    # (see description in patch file)
-    ./0001-Remove-coherency-checks.patch
+  preBuild = ''
+    cd projects
+  '';
+
+  makeFlags = [
+    "CXX=${stdenv.cc.targetPrefix}c++"
+    "PLATFORM=${platform}"
   ];
 
-  preBuild = "cd projects";
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation";
 
-  makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux  [ "PLATFORM=DEB" ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PLATFORM=OSX" ];
-
-  env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++
-    lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing");
-
-  NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-framework Foundation";
-
-  installPhase = let extension = if stdenv.hostPlatform.isDarwin then "app" else "deb-exe";
-    in "install -Dm555 lgpt.${extension} $out/bin/lgpt";
-
-  passthru.updateScript = unstableGitUpdater {
-    url = "https://github.com/Mdashdotdashn/littlegptracker.git";
-  };
-
-  meta = with lib; {
-    description = "Music tracker similar to lsdj optimised to run on portable game consoles";
-    longDescription = ''
-      LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised
-      to run on portable game consoles. It is currently running on Game Park's
-      GP2x & Caanoo, PSP, Dingoo, Windows, Mac OSX (intel/ppc) & Linux (Debian).
-
-      It implements the user interface of littlesounddj, a very famous tracker
-      for the Gameboy platform that has been tried and tested by many users over
-      the years, leading to a little complex but yet extremely efficent way of
-      working.
-
-      Piggy currently supports 8 monophonic 16Bit/44.1Khz stereo sample playback
-      channels. Additionally, the program can drive MIDI instruments (with the
-      gp32 and gp2x a custom MIDI interface is required).
+  installPhase =
+    let
+      extension = if stdenv.hostPlatform.isDarwin then "app" else "x64";
+    in
+    ''
+      runHook preInstall
+      install -Dm555 lgpt.${extension} $out/lib/lgpt/lgpt
+      install -Dm444 resources/${platform}/{config,mapping}.xml $out/lib/lgpt/
+      mkdir -p $out/bin
+      ln -s $out/lib/lgpt/lgpt $out/bin/
+      runHook postInstall
     '';
-    homepage = "https://www.littlegptracker.com/";
-    downloadPage = "https://www.littlegptracker.com/download.php";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
-    # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821
-    broken = stdenv.hostPlatform.isDarwin;
+
+  meta = {
+    description = "Music tracker optimised to run on portable game consoles";
+    longDescription = ''
+      Little Piggy Tracker (f.k.a 'LittleGPTracker') is a music tracker optimised to run on portable game consoles.
+      It is currently running on Windows, MacOS (intel/arm) & Linux, PSP, Miyoo Mini, and a collection of other retro gaming handhelds.
+      It implements the user interface of littlesounddj and precedes M8 tracker, two popular trackers greatly loved in the tracker community.
+    '';
+    homepage = "https://github.com/djdiskmachine/LittleGPTracker";
+    downloadPage = "https://github.com/djdiskmachine/LittleGPTracker/releases";
     mainProgram = "lgpt";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
+
+    # https://github.com/NixOS/nixpkgs/pull/352617#issuecomment-2495663097
+    broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

pkgs/applications/editors/sublime/4/packages.nix

@@ -5,15 +5,15 @@ let
 in
 {
   sublime4 = common {
-    buildVersion = "4186";
-    x64sha256 = "Rw/N2uSsMb6uMvMt9lEzBFSAvAePFTwfX09ARDX1mSs=";
-    aarch64sha256 = "6RKaSIDj0zOqjYAGb77q3+sKqmp+VFqcgODyU06ajrc=";
+    buildVersion = "4189";
+    x64sha256 = "0vEG2FfLK+93UtpYV9iWl187iN79Tozm38Vh6lbzW7A=";
+    aarch64sha256 = "ZyLnbvpyxvJfyfu663ED0Yn5M37As+jy6TREZMgSHgI=";
   } { };
 
   sublime4-dev = common {
-    buildVersion = "4187";
+    buildVersion = "4188";
     dev = true;
-    x64sha256 = "4Xcpnvplj3ik3kWtwJ6ZT//nRgMCw/ceN7bVuEDApDA=";
-    aarch64sha256 = "EreN+SjVnm1Kt+Oz72AQ86AKdgm9n72lv/JQvefb8YU=";
+    x64sha256 = "b7JyJ9cPxb/Yjy9fvcz/m6OLETxMd8rwkmrEyMGAjjc=";
+    aarch64sha256 = "oGL0UtQge21oH6p6BNsRkxqgvdi9PkT/uwZTYygu+ng=";
   } { };
 }

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

@@ -552,13 +552,13 @@
     "vendorHash": null
   },
   "harbor": {
-    "hash": "sha256-JdCBeUYB6rkSNhfTTIoRV8Bz4FnlHJFJxEZZbqyzAyc=",
+    "hash": "sha256-NDOFrW7VeunxAJPkcJ4DFrjrt0fL5B5+gT9H19L1Cos=",
     "homepage": "https://registry.terraform.io/providers/goharbor/harbor",
     "owner": "goharbor",
     "repo": "terraform-provider-harbor",
-    "rev": "v3.10.15",
+    "rev": "v3.10.17",
     "spdx": "MIT",
-    "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI="
+    "vendorHash": "sha256-YkTXwx3RjIbzJnagfcYgb5IRnF0sHEDBDzdHf+GS8xI="
   },
   "hcloud": {
     "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=",

pkgs/applications/networking/rymdport/default.nix

@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "rymdport";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "Jacalz";
     repo = "rymdport";
     rev = "v${version}";
-    hash = "sha256-PMCetU+E0Kl50K7sJB6UiHVouWPtfW8ALXFacxCvAhE=";
+    hash = "sha256-o+FmAG+Zcuud2CKtMLQkdLkXyJ41kaXn3qp/O6rUXJA=";
   };
 
-  vendorHash = "sha256-RsmwTRVjhEgKAT9aekSfkRuai2165KG7q5aFjAiLSPU=";
+  vendorHash = "sha256-daOYPZri/ikshTUh3Lk2qHTbeD9mNUUue35aG/b4c88=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/applications/office/qownnotes/default.nix

@@ -20,14 +20,14 @@
 let
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "24.12.1";
+  version = "24.12.4";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
-    hash = "sha256-OiaZmd50kOTJSJesBYFdjjKzNUc/m7XrU5S27z0mtAI=";
+    hash = "sha256-1DHBi++7GlSxnA8fAWC4rHej9wi8jDvI2pQduqZhNZQ=";
   };
 
   nativeBuildInputs = [

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

@@ -10,13 +10,13 @@
 
 buildLua rec {
   pname = "mpvacious";
-  version = "0.36";
+  version = "0.37";
 
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "mpvacious";
     rev = "v${version}";
-    sha256 = "sha256-j8K9coa8kyA7AgRQaBXJJmeTpNtfDKkOGnAP9Up7biA=";
+    sha256 = "sha256-sT74uDGtEUSDMJqSTJ6bI9XvdpRnQDNvKebWMx0CRcE=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 

pkgs/applications/virtualization/docker/compose.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.31.0";
+  version = "2.32.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    hash = "sha256-l+xSd7eIpEy6A1mtx3WrcPQl7071IdJkbHKXbe4uFdA=";
+    hash = "sha256-b+HaFXi3Z2vOU2saEvg22uLHbJLdM4dGEZeI6lvI/dk=";
   };
 
   postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
     rm -rf e2e/
   '';
 
-  vendorHash = "sha256-nBexI2hr+lKPe4HCYiNVtmc0Rl5Hhj/+TwSftYWVdQw=";
+  vendorHash = "sha256-AOLAyyg8ZFPjreK/PEY+TJy4puxqMCg5kjEyBfEfmPk=";
 
   ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
 

pkgs/applications/virtualization/virtualbox/default.nix

@@ -76,8 +76,8 @@ let
   virtualboxVersion = "7.1.4";
   virtualboxSha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e";
 
-  kvmPatchVersion = "20240828";
-  kvmPatchHash = "sha256-g0esJbB1IGyLGZMLFJIY8ZYdHWuiM5IZtLMHZvCY6bs=";
+  kvmPatchVersion = "20241220";
+  kvmPatchHash = "sha256-SYyD79iN6Sp/Mxat+ml3fee9X1vFUFyrwHPnQNboc1c=";
 
   # The KVM build is not compatible to VirtualBox's kernel modules. So don't export
   # modsrc at all.

pkgs/by-name/be/beszel/0001-fix-build.patch

@@ -1,405 +0,0 @@
-From 402b2d72ad3bcc4a8cdb0115220888154bdb3c39 Mon Sep 17 00:00:00 2001
-From: wxt <3264117476@qq.com>
-Date: Tue, 29 Oct 2024 19:32:07 +0800
-Subject: [PATCH] fix build
-
----
- package-lock.json | 368 ++++++++++++++++++++++++++++++++++
- 1 file changed, 368 insertions(+)
-
-diff --git a/package-lock.json b/package-lock.json
-index 8e4532e..d3b3605 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -679,6 +679,262 @@
- 				"node": ">=6.9.0"
- 			}
- 		},
-+		"node_modules/@esbuild/aix-ppc64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-+			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-+			"cpu": [
-+				"ppc64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"aix"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/android-arm": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-+			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-+			"cpu": [
-+				"arm"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"android"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/android-arm64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-+			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-+			"cpu": [
-+				"arm64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"android"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/android-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-+			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"android"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/darwin-arm64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-+			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-+			"cpu": [
-+				"arm64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"darwin"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/darwin-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-+			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"darwin"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/freebsd-arm64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-+			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-+			"cpu": [
-+				"arm64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"freebsd"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/freebsd-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-+			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"freebsd"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-arm": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-+			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-+			"cpu": [
-+				"arm"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-arm64": {
-+			"version": "0.24.0",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
-+			"integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
-+			"cpu": [
-+				"arm64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=18"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-ia32": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-+			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-+			"cpu": [
-+				"ia32"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-loong64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-+			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-+			"cpu": [
-+				"loong64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-mips64el": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-+			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-+			"cpu": [
-+				"mips64el"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-ppc64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-+			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-+			"cpu": [
-+				"ppc64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-riscv64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-+			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-+			"cpu": [
-+				"riscv64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/linux-s390x": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-+			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-+			"cpu": [
-+				"s390x"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
- 		"node_modules/@esbuild/linux-x64": {
- 			"version": "0.21.5",
- 			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-@@ -695,6 +951,102 @@
- 				"node": ">=12"
- 			}
- 		},
-+		"node_modules/@esbuild/netbsd-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-+			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"netbsd"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/openbsd-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-+			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"openbsd"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/sunos-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-+			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"sunos"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/win32-arm64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-+			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-+			"cpu": [
-+				"arm64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"win32"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/win32-ia32": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-+			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-+			"cpu": [
-+				"ia32"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"win32"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
-+		"node_modules/@esbuild/win32-x64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-+			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-+			"cpu": [
-+				"x64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"win32"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
- 		"node_modules/@floating-ui/core": {
- 			"version": "1.6.4",
- 			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.4.tgz",
-@@ -3545,6 +3897,22 @@
- 				"@esbuild/win32-x64": "0.21.5"
- 			}
- 		},
-+		"node_modules/esbuild/node_modules/@esbuild/linux-arm64": {
-+			"version": "0.21.5",
-+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-+			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-+			"cpu": [
-+				"arm64"
-+			],
-+			"license": "MIT",
-+			"optional": true,
-+			"os": [
-+				"linux"
-+			],
-+			"engines": {
-+				"node": ">=12"
-+			}
-+		},
- 		"node_modules/escalade": {
- 			"version": "3.1.2",
- 			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
--- 
-2.46.1
-

pkgs/by-name/be/beszel/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "beszel";
-  version = "0.6.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
     rev = "refs/tags/v${version}";
-    hash = "sha256-x9HU+sDjxRthC4ROJaKbuKHPHgxFSpyn/dywyGWE/v8=";
+    hash = "sha256-VB3ICoJrBIwP27jZJASQin4xzQ04089VqwFp7hfqZaQ=";
   };
 
   webui = buildNpmPackage {
@@ -28,17 +28,11 @@ buildGoModule rec {
 
     npmFlags = [ "--legacy-peer-deps" ];
 
-    patches = [
-      # add missing @esbuild for multi platform
-      # https://github.com/henrygd/beszel/pull/235
-      # add missing @esbuild for multi platform
-      # https://github.com/henrygd/beszel/pull/235
-      ./0001-fix-build.patch
-    ];
-
     buildPhase = ''
       runHook preBuild
 
+      npx lingui extract --overwrite
+      npx lingui compile
       node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
 
       runHook postBuild
@@ -55,12 +49,12 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/beszel/site";
 
-    npmDepsHash = "sha256-t7Qcuvqbt0sPHAu3vcZaU8/Ij2yY5/g1TguozlKu0mU=";
+    npmDepsHash = "sha256-ObLulUnCCcKetDW6XKdC8u0NuKBLVUl37jebCGloGoE=";
   };
 
   sourceRoot = "${src.name}/beszel";
 
-  vendorHash = "sha256-/FePQkqoeuH63mV81v1NxpFw9osMUCcZ1bP+0yN1Qlo=";
+  vendorHash = "sha256-yvHsmA4FtENIxKNMS8Bm9bC4dbE64XCX5KP9JYkTtKc=";
 
   preBuild = ''
     mkdir -p site/dist

pkgs/by-name/cl/clash-verge-rev/package.nix

@@ -10,40 +10,27 @@
   v2ray-domain-list-community,
   copyDesktopItems,
   makeDesktopItem,
+  libsoup,
 }:
 let
   pname = "clash-verge-rev";
-  version = "1.7.7";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-rev";
-    rev = "v${version}";
-    hash = "sha256-5sd0CkUCV52wrBPo0IRIa1uqf2QNkjXuZhE33cZW3SY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QLvJO1JFHPFOsVxNi6SCu2QuJQ9hCsO1+WKOjZL944w=";
   };
 
   src-service = fetchFromGitHub {
     owner = "clash-verge-rev";
     repo = "clash-verge-service";
-    rev = "e74e419f004275cbf35a427337d3f8c771408f07"; # no meaningful tags in this repo. The only way is updating manully every time.
-    hash = "sha256-HyRTOqPj4SnV9gktqRegxOYz9c8mQHOX+IrdZlHhYpo=";
+    rev = "8b676086f2770e213cffea08ef31b54b886f8f11"; # no meaningful tags in this repo. The only way is updating manully every time.
+    hash = "sha256-vF26Bp52y2kNHwwtBjy3Of75qJpTriqvul29KmudHww=";
   };
 
-  meta-unwrapped = {
-    description = "Clash GUI based on tauri";
-    homepage = "https://github.com/clash-verge-rev/clash-verge-rev";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      Guanran928
-      bot-wxt1221
-    ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-  };
-
-  service-cargo-hash = "sha256-NBeHR6JvdCp06Ug/UEtLY2tu3iCmlsCU0x8umRbJXLU=";
+  service-cargo-hash = "sha256-pMOCifffUyBkcXC8inZFZeZVHeaOt0LAu2jZUGQ7QdM=";
 
   service = callPackage ./service.nix {
     inherit
@@ -51,8 +38,8 @@ let
       src-service
       service-cargo-hash
       pname
+      meta
       ;
-    meta = meta-unwrapped;
   };
 
   webui = callPackage ./webui.nix {
@@ -60,22 +47,24 @@ let
       version
       src
       pname
+      meta
+      npm-hash
       ;
-    meta = meta-unwrapped;
-
   };
 
-  sysproxy-hash = "sha256-TEC51s/viqXUoEH9rJev8LdC2uHqefInNcarxeogePk=";
+  npm-hash = "sha256-zsgZhLC+XUzlCUKKGAJV5MlSpWsoLmAgMwKkmAkAX9Q=";
+  vendor-hash = "sha256-fk3OdJ1CKNHkeUjquJtJgM7PDyPpQ7tssDnFZHMbQHI=";
 
   unwrapped = callPackage ./unwrapped.nix {
     inherit
       pname
       version
       src
-      sysproxy-hash
+      vendor-hash
       webui
+      meta
+      libsoup
       ;
-    meta = meta-unwrapped;
   };
 
   meta = {
@@ -87,10 +76,7 @@ let
       Guanran928
       bot-wxt1221
     ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
+    platforms = lib.platforms.linux;
   };
 in
 stdenv.mkDerivation {

pkgs/by-name/cl/clash-verge-rev/service.nix

@@ -5,7 +5,6 @@
   pkg-config,
   openssl,
   pname,
-  webkitgtk_4_0,
   service-cargo-hash,
   meta,
 }:
@@ -18,12 +17,10 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [
     pkg-config
-    rustPlatform.cargoSetupHook
   ];
 
   buildInputs = [
     openssl
-    webkitgtk_4_0
   ];
 
   env = {

pkgs/by-name/cl/clash-verge-rev/unwrapped.nix

@@ -3,13 +3,15 @@
   version,
   src,
   libayatana-appindicator,
-  sysproxy-hash,
+  vendor-hash,
+  glib,
   webui,
   pkg-config,
+  libsoup,
   rustPlatform,
   makeDesktopItem,
   meta,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   openssl,
 }:
 rustPlatform.buildRustPackage {
@@ -17,24 +19,26 @@ rustPlatform.buildRustPackage {
   pname = "${pname}-unwrapped";
   sourceRoot = "${src.name}/src-tauri";
 
-  cargoLock = {
-    lockFile = ./Cargo-tauri.lock;
-    outputHashes = {
-      "sysproxy-0.3.0" = sysproxy-hash;
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = vendor-hash;
 
   env = {
     OPENSSL_NO_VENDOR = 1;
   };
 
   postPatch = ''
-    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-      --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-    substituteInPlace ./tauri.conf.json \
-      --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \
-      --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""'
-    sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json
+    ls $cargoDepsCopy
+      substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+        --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+
+      substituteInPlace $cargoDepsCopy/sysproxy-*/src/linux.rs \
+        --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"'
+
+      substituteInPlace ./tauri.conf.json \
+        --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \
+        --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""'
+      sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json
+      sed -i -e '/sidecar/d' -e '/resources/d' tauri.linux.conf.json
   '';
 
   nativeBuildInputs = [
@@ -44,7 +48,8 @@ rustPlatform.buildRustPackage {
 
   buildInputs = [
     openssl
-    webkitgtk_4_0
+    libsoup
+    webkitgtk_4_1
   ];
 
   postInstall = ''

pkgs/by-name/cl/clash-verge-rev/webui.nix

@@ -6,13 +6,14 @@
   nodejs,
   stdenv,
   meta,
+  npm-hash,
 }:
 stdenv.mkDerivation {
   inherit version src meta;
   pname = "${pname}-webui";
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-ZKDhBdVyLIPf7CQaYUvj9dJd3lA3zsqroSjTyvOmunQ=";
+    hash = npm-hash;
   };
 
   nativeBuildInputs = [

pkgs/by-name/co/code-cursor/package.nix

@@ -8,11 +8,11 @@
 }:
 let
   pname = "cursor";
-  version = "0.43.6";
+  version = "0.44.5";
   appKey = "230313mzl4w4u92";
   src = fetchurl {
-    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.6-build-241206z7j6me2e2-x86_64.AppImage";
-    hash = "sha256-adEyDExGvxwpvAT0qYiCfvkpINP9BJ6a+LSwQHQ/H/U=";
+    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.44.5-build-241220s3ux0e1tv-x86_64.AppImage";
+    hash = "sha256-5IbIsOyJdIzDpxOd+CLe8UdxaocJFJckiZvNSuGXtys=";
   };
   appimageContents = appimageTools.extractType2 { inherit version pname src; };
 in
@@ -62,6 +62,7 @@ stdenvNoCC.mkDerivation {
   meta = {
     description = "AI-powered code editor built on vscode";
     homepage = "https://cursor.com";
+    changelog = "https://cursor.com/changelog";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ sarahec ];

pkgs/by-name/cp/cpm-cmake/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cpm-cmake";
-  version = "0.40.2";
+  version = "0.40.3";
 
   src = fetchFromGitHub {
     owner = "cpm-cmake";
     repo = "cpm.cmake";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KIRVztkE72juIgXquZlC6AYo78QKHBD7iCvCa+ri66k=";
+    hash = "sha256-3V4XLfhDy6TIOcfSJjkvTRCxo/e5/Kt/+xxAXlZo0XM=";
   };
 
   postPatch = ''

pkgs/by-name/cr/crates-tui/package.nix

@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.1.23";
+  version = "0.1.24";
 in
 rustPlatform.buildRustPackage {
   pname = "crates-tui";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
     owner = "ratatui";
     repo = "crates-tui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-d5paevf7bFpC+dZ5fZ5n1F5yFtTWfqrGN4dTkwU0oLQ=";
+    hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU=";
   };
 
-  cargoHash = "sha256-1E77Rz2MjR8NbLFO2oD7JWb5okLmV+/L5DBmHdPrwDg=";
+  cargoHash = "sha256-d79NgOGdxkg6zRpnBlievmPEVWIkY8gYLWdTMpGSPqo=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

pkgs/by-name/da/dafny/package.nix

@@ -1,12 +1,41 @@
-{ lib
-, buildDotnetModule
-, fetchFromGitHub
-, writeScript
-, jdk11
-, z3
-, dotnetCorePackages
+{
+  lib,
+  buildDotnetModule,
+  fetchFromGitHub,
+  runCommand,
+  dafny,
+  writeScript,
+  jdk11,
+  z3,
+  dotnetCorePackages,
 }:
 
+let
+  examples = fetchFromGitHub {
+    owner = "gaberch";
+    repo = "Various-Algorithms-Verified-With-Dafny";
+    rev = "50e451bbcd15e52e27d5bbbf66b0b4c4abbff41c";
+    hash = "sha256-Ng5wve/4gQr/2hsFWUFFcTL3K2xH7dP9w8IrmvWMKyg=";
+  };
+
+  tests = {
+    verify = runCommand "dafny-test" { } ''
+      mkdir $out
+      cp ${examples}/SlowMax.dfy $out
+      ${dafny}/bin/dafny verify --allow-warnings $out/SlowMax.dfy
+    '';
+
+    # Broken, cannot compile generated .cs files for now
+    #run = runCommand "dafny-test" { } ''
+    #    mkdir $out
+    #    cp ${examples}/SlowMax.dfy $out
+    #    ${dafny}/bin/dafny run --allow-warnings $out/SlowMax.dfy
+    #  '';
+
+    # TODO: Ensure then tests that dafny can generate to and compile other
+    # languages (Java, Cpp, etc.)
+  };
+in
 buildDotnetModule rec {
   pname = "Dafny";
   version = "4.8.0";
@@ -24,12 +53,11 @@ buildDotnetModule rec {
       runtimeJarVersion = "4.6.0";
     in
     ''
-      cp ${
-        writeScript "fake-gradlew-for-dafny" ''
-          mkdir -p build/libs/
-          javac $(find -name "*.java" | grep "^./src/main") -d classes
-          jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny
-        ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
+      cp ${writeScript "fake-gradlew-for-dafny" ''
+        mkdir -p build/libs/
+        javac $(find -name "*.java" | grep "^./src/main") -d classes
+        jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny
+      ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
 
       # Needed to fix
       # "error NETSDK1129: The 'Publish' target is not supported without
@@ -62,6 +90,8 @@ buildDotnetModule rec {
     ln -s "$out/bin/Dafny" "$out/bin/dafny" || true
   '';
 
+  passthru.tests = tests;
+
   meta = with lib; {
     description = "Programming language with built-in specification constructs";
     homepage = "https://research.microsoft.com/dafny";

pkgs/by-name/do/dooit-extras/package.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  python311,
+  dooit,
+  nix-update-script,
+}:
+let
+  python3 = python311;
+in
+python3.pkgs.buildPythonPackage rec {
+  pname = "dooit-extras";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dooit-org";
+    repo = "dooit-extras";
+    tag = "v${version}";
+    hash = "sha256-ZBzzH8k4oC3ovLF9+9rzzFZaDDoOvcbX5NCh1WBedK4=";
+  };
+
+  build-system = with python3.pkgs; [ poetry-core ];
+  buildInputs = [ dooit ];
+
+  # No tests available
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script {
+  };
+
+  meta = with lib; {
+    description = "Extra Utilities for Dooit";
+    homepage = "https://github.com/dooit-org/dooit-extras";
+    changelog = "https://github.com/dooit-org/dooit-extras/blob/${src.tag}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      kraanzu
+    ];
+  };
+}

pkgs/by-name/dy/dysk/package.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dysk";
-  version = "2.9.1";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "dysk";
     rev = "v${version}";
-    hash = "sha256-PGl2pUeLPznut/ETJdaQlin9thDBPvqBE30cgXwV+KM=";
+    hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA=";
   };
 
-  cargoHash = "sha256-ppOAQ6Y9GJNLwGbbg1qfQ7ArVKiYxt26oEEWMOjbu0w=";
+  cargoHash = "sha256-QE7gHHKNKqyMmqovzGR3zKgE7SEzGFkc2mYkBG6V6j0=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/ex/exo/package.nix

@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication {
   pname = "exo";
-  version = "0-unstable-2024-12-07";
+  version = "0-unstable-2024-12-15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "exo-explore";
     repo = "exo";
-    rev = "db9de97fa6ecef51d1b7eec6758b55c402da786e";
-    hash = "sha256-1tChxxP8saeBjLsOpL8GYCNyhlXkN2Mg2LruyB3K3/g=";
+    rev = "cfedcec3a651f27085e1913f4bd42a699fa82076";
+    hash = "sha256-OPGWmIfIVW/1lJg+4iXRvzN6bY8+LzWx8SOgBUXjPQ0=";
   };
 
   build-system = with python3Packages; [ setuptools ];

pkgs/by-name/fa/faas-cli/package.nix

@@ -18,13 +18,13 @@ let
 in
 buildGoModule rec {
   pname = "faas-cli";
-  version = "0.16.37";
+  version = "0.16.38";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = version;
-    sha256 = "sha256-DGtIoX0cvhnHYD+xBV6lW703onupLpF/QYH75rt23Q4=";
+    sha256 = "sha256-X+lPky5oR+ngQ4nRePU0FzMBjJQinhSadoVsXeXzr+Q=";
   };
 
   vendorHash = null;

pkgs/by-name/fa/factorio/versions.json

@@ -3,38 +3,37 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.23.tar.xz"
+          "factorio_linux_2.0.28.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.23.tar.xz",
+        "name": "factorio_alpha_x64-2.0.28.tar.xz",
         "needsAuth": true,
-        "sha256": "3a3f27a5364d33896c8b35d352d0d2d6086b4ba98627eda71b26e57127309bfb",
+        "sha256": "d3acf17e4ca56e3332e920a015d5ca53aea73088460c8b2f67e04b04e7b912bb",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.23/alpha/linux64",
-        "version": "2.0.23"
+        "url": "https://factorio.com/get-download/2.0.28/alpha/linux64",
+        "version": "2.0.28"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.23.tar.xz"
+          "factorio_linux_2.0.28.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.23.tar.xz",
+        "name": "factorio_alpha_x64-2.0.28.tar.xz",
         "needsAuth": true,
-        "sha256": "3a3f27a5364d33896c8b35d352d0d2d6086b4ba98627eda71b26e57127309bfb",
+        "sha256": "d3acf17e4ca56e3332e920a015d5ca53aea73088460c8b2f67e04b04e7b912bb",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.23/alpha/linux64",
-        "version": "2.0.23"
+        "url": "https://factorio.com/get-download/2.0.28/alpha/linux64",
+        "version": "2.0.28"
       }
     },
     "demo": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_demo_x64_1.1.110.tar.xz"
+          "factorio_demo_x64_2.0.27.tar.xz"
         ],
-        "name": "factorio_demo_x64-1.1.110.tar.xz",
+        "name": "factorio_demo_x64-2.0.27.tar.xz",
         "needsAuth": false,
-        "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.110/demo/linux64",
-        "version": "1.1.110"
+        "url": "https://factorio.com/get-download/2.0.27/demo/linux64",
+        "version": "2.0.27"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -51,51 +50,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.23.tar.xz"
+          "factorio-space-age_linux_2.0.28.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.23.tar.xz",
+        "name": "factorio_expansion_x64-2.0.28.tar.xz",
         "needsAuth": true,
-        "sha256": "8c6bb2c3afd198b8d5e1042f2babcb2db2d55645d1e84d9cfbba77cd83ae9e6a",
+        "sha256": "e3eee33c439abaffa305dd5c86edea97fbaa2a2b34c368cae3595c1d5d22739e",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.23/expansion/linux64",
-        "version": "2.0.23"
+        "url": "https://factorio.com/get-download/2.0.28/expansion/linux64",
+        "version": "2.0.28"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.23.tar.xz"
+          "factorio-space-age_linux_2.0.28.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.23.tar.xz",
+        "name": "factorio_expansion_x64-2.0.28.tar.xz",
         "needsAuth": true,
-        "sha256": "8c6bb2c3afd198b8d5e1042f2babcb2db2d55645d1e84d9cfbba77cd83ae9e6a",
+        "sha256": "e3eee33c439abaffa305dd5c86edea97fbaa2a2b34c368cae3595c1d5d22739e",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.23/expansion/linux64",
-        "version": "2.0.23"
+        "url": "https://factorio.com/get-download/2.0.28/expansion/linux64",
+        "version": "2.0.28"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.23.tar.xz",
-          "factorio_headless_x64_2.0.23.tar.xz"
+          "factorio-headless_linux_2.0.28.tar.xz",
+          "factorio_headless_x64_2.0.28.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.23.tar.xz",
+        "name": "factorio_headless_x64-2.0.28.tar.xz",
         "needsAuth": false,
-        "sha256": "e819fc9ad6df061bf9d4bffc91988dd18d0e3982c8b1c22c0525d78bda3ef216",
+        "sha256": "ea9937b6adc7a18e17a4e1e64992ec389407497b36e68280bb14fcdd4c884dd3",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.23/headless/linux64",
-        "version": "2.0.23"
+        "url": "https://factorio.com/get-download/2.0.28/headless/linux64",
+        "version": "2.0.28"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.23.tar.xz",
-          "factorio_headless_x64_2.0.23.tar.xz"
+          "factorio-headless_linux_2.0.28.tar.xz",
+          "factorio_headless_x64_2.0.28.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.23.tar.xz",
+        "name": "factorio_headless_x64-2.0.28.tar.xz",
         "needsAuth": false,
-        "sha256": "e819fc9ad6df061bf9d4bffc91988dd18d0e3982c8b1c22c0525d78bda3ef216",
+        "sha256": "ea9937b6adc7a18e17a4e1e64992ec389407497b36e68280bb14fcdd4c884dd3",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.23/headless/linux64",
-        "version": "2.0.23"
+        "url": "https://factorio.com/get-download/2.0.28/headless/linux64",
+        "version": "2.0.28"
       }
     }
   }

pkgs/by-name/fi/firebase-tools/package.nix

@@ -8,19 +8,19 @@
 }:
 
 let
-  version = "13.28.0";
+  version = "13.29.1";
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bOuOBzEEfVi+0lGqKgZQVmxKUBWoWWdaQ1jlCR1xBcM=";
+    hash = "sha256-j6luT+L/vN9qaGjjeMW+8QGuzjJxzbn0sMGDjhqoeZA=";
   };
 in
 buildNpmPackage {
   pname = "firebase-tools";
   inherit version src;
 
-  npmDepsHash = "sha256-3wc1DPZ+yYlBtUTWpa4XFaetS7caNqX5JFSXkmzHyqg=";
+  npmDepsHash = "sha256-3+XeXK3VGIs4Foi9iW9Kho/Y0JsTQZ7p+582MPgdH1A=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

pkgs/by-name/fm/fmtoy/package.nix

@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fmtoy";
-  version = "0-unstable-2024-11-13";
+  version = "0-unstable-2024-12-15";
 
   src = fetchFromGitHub {
     owner = "vampirefrog";
     repo = "fmtoy";
-    rev = "6bf6a72bf35afd2fb3bdf17a97553d122751e391";
+    rev = "6858fc8ad3171df2c9b90cb1e62719af9fc4f7c2";
     fetchSubmodules = true;
-    hash = "sha256-aAZUCI711d0FqKYcEIiEClH3hMcUzMzXF3XflpTTrjM=";
+    hash = "sha256-OiPKtFPlTxdMNSTLJXcXZkqjzUiGQKXSF2udHePBpho=";
   };
 
   postPatch = ''

pkgs/by-name/fo/foliate/package.nix

@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "foliate";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "johnfactotum";
     repo = "foliate";
     rev = "refs/tags/${version}";
-    hash = "sha256-y4c/nlFk0hlr773/O2yvW7VzUx0NZWpcDtk8b9wlL2s=";
+    hash = "sha256-NU4lM+J5Tpd9Fl+eVbBy7WnCQ6LJ7oeWVkBxp6euTHU=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/fs/fscan/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "fscan";
-  version = "1.8.4";
+  version = "2.0.0-build1";
 
   src = fetchFromGitHub {
     owner = "shadow1ng";
     repo = "fscan";
     rev = version;
-    hash = "sha256-5uFSvEkTBy0veMdeeg9BmSqu+qSqCwuozK0J3kerAdE=";
+    hash = "sha256-ZJVdjdON7qgjxWU8/eOsmct0g/xr77fEH3PfV4JUOdw=";
   };
 
-  vendorHash = "sha256-FFYqvGEFe7sUEb4G3ApQOuYoiDXeA54P7spmKfRiEF0=";
+  vendorHash = "sha256-WDq08flKiMCN4SS9xHH3B0nCX6us6huX8SF9BPuNzoo=";
 
   meta = with lib; {
     description = "Intranet comprehensive scanning tool";

pkgs/by-name/ga/gatus/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.13.1";
+  version = "5.14.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-OY8f4FGlWeE5Jg4ESnVGo/oiTBVavBSXdGKB+uceC7U=";
+    hash = "sha256-WYD456l1XdyqhBzsMvruvn24DYspCYt9m7rzqd3dSK4=";
   };
 
-  vendorHash = "sha256-FAlf+tGI3ssugHf8PsNc2Fb+rH8MqgS3BWXaee+khZw=";
+  vendorHash = "sha256-UeKQwqDHj1DFjlnGAl8asW7OpmClGi9aB/IbMzR9WvU=";
 
   subPackages = [ "." ];
 

pkgs/by-name/ge/gepetto-viewer/package.nix

@@ -20,13 +20,13 @@
 let
   gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
     pname = "gepetto-viewer";
-    version = "5.2.0";
+    version = "6.0.0";
 
     src = fetchFromGitHub {
       owner = "gepetto";
       repo = "gepetto-viewer";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM=";
+      hash = "sha256-nbA+JNogtlktkByUD2Urx3kJpe/8jgIjO59XXOAPpNs=";
     };
 
     cmakeFlags = [

pkgs/by-name/gi/git-repo/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.49.3";
+  version = "2.50.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    hash = "sha256-DZtwQQg8jyanRx5JKYLTsn4v7IBJBIl9yQemVOioCPY=";
+    hash = "sha256-HJdXdFaC8yFef2gMJpSfZ2TDxEZkZLWZcum41dfG/DQ=";
   };
 
   # Fix 'NameError: name 'ssl' is not defined'

pkgs/by-name/go/goat-cli/mock-fix.patch

@@ -0,0 +1,12 @@
+diff --git a/pkg/goatfile/unmarshal_test.go b/pkg/goatfile/unmarshal_test.go
+index 089e89f..5b4191b 100644
+--- a/pkg/goatfile/unmarshal_test.go
++++ b/pkg/goatfile/unmarshal_test.go
+@@ -8,7 +8,6 @@ import (
+ 
+ 	"github.com/golang/mock/gomock"
+ 	"github.com/stretchr/testify/assert"
+-	"github.com/studio-b12/goat/mocks"
+ 	"github.com/studio-b12/goat/pkg/set"
+ )
+ 

pkgs/by-name/go/goat-cli/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  fetchpatch,
+}:
+
+buildGoModule rec {
+  pname = "goat-cli";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    repo = "goat";
+    owner = "studio-b12";
+    rev = "v${version}";
+    hash = "sha256-H7ea3XOBfQ7bIX5SbxPd+fcSlMurSWXGXe+/LsqSc0A=";
+  };
+
+  vendorHash = "sha256-DtEXgGYSkWO876so6LEOkhVwDt/zrflDZdY4O2lz1mw=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/studio-b12/goat/internal/version.Version=${version}"
+    "-X github.com/studio-b12/goat/internal/version.CommitHash=${src.rev}"
+  ];
+
+  patches = [
+    ./mock-fix.patch
+  ];
+
+  # Checks currently fail because of an issue with github.com/studio-b12/goat/mocks
+  doCheck = false;
+
+  meta = {
+    description = "Integration testing tool for HTTP APIs using a simple script language";
+    homepage = "https://studio-b12.github.io/goat/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ kashw2 ];
+    mainProgram = "goat";
+  };
+
+}

pkgs/by-name/hc/hcl2json/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "hcl2json";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "tmccombs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-aYsE4Tmi2h+XiLZH0faoB17UA7xHht8bec5Kud+NLIk=";
+    sha256 = "sha256-LU74vm36NuA1ApJWtEf/ub3los6yVR8yiQTfM0Wnvyo=";
   };
 
-  vendorHash = "sha256-Rjpru0SfGm9hdMQwvk8yM/E65YFB0NicaJ7a56/uwLE=";
+  vendorHash = "sha256-nm+KvpcOUTR9Nm0eQtqCWxMiFTvL5xKLhsPaJlsVpkQ=";
 
   subPackages = [ "." ];
 

pkgs/by-name/im/imapdedup/package.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "imapdedup";
+  version = "1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "quentinsf";
+    repo = "IMAPdedup";
+    rev = "refs/tags/${version}";
+    hash = "sha256-s49nnMjX1beZKTrlcjzp0nESIVRb/LZDycpnzz8fG+o=";
+  };
+
+  build-system = with python3Packages; [ hatchling ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [ "imapdedup" ];
+
+  meta = {
+    description = "Duplicate email message remover";
+    homepage = "https://github.com/quentinsf/IMAPdedup";
+    maintainers = with lib.maintainers; [ sigmanificient ];
+    license = with lib.licenses; [ gpl2Only ];
+    mainProgram = "imapdedup";
+  };
+}

pkgs/by-name/in/inputplumber/package.nix

@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.39.2";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Glq7iJ1AHy99AGXYg5P3wAd3kAMJnt5P2vZzyn7qBY4=";
+    hash = "sha256-qo22x+eTqUUJ8Qnjv91QgBTy2SHFYv8JxPaGSnpIN9M=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-pcbW/Od5f+hFCrVpH2yioq+qCmlZ1m3TbUc6rBkYCEs=";
+  cargoHash = "sha256-atGFfl20FrEDVAO422fGsP6+ONLcH5XXOAWD/aWUup4=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/in/intentrace/package.nix

@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.2.6";
+  version = "0.4.1";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage {
     owner = "sectordistrict";
     repo = "intentrace";
     rev = "refs/tags/v${version}";
-    hash = "sha256-e47hauVg5Ncp0C5y6RkfKfxMHbBvpKrVoUq3aJxTf2E=";
+    hash = "sha256-9BlCDtWnBDJuo6ovDi347jAQSOG8LizJAyQ/xN+HJ0w=";
   };
 
-  cargoHash = "sha256-MAbOEJdMkt6efTGdmimMpYAx39JnQlnOlbIHIGICgp8=";
+  cargoHash = "sha256-eJlAQpkI+RgfpDJGP9evWH28nU891PF4jeRpf2Os4Ts=";
 
   meta = {
     description = "Prettified Linux syscall tracing tool (like strace)";

pkgs/by-name/ip/ipopt/package.nix

@@ -19,13 +19,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "ipopt";
-  version = "3.14.16";
+  version = "3.14.17";
 
   src = fetchFromGitHub {
     owner = "coin-or";
     repo = "Ipopt";
     rev = "releases/${version}";
-    sha256 = "sha256-ZuiZZMq7NzOm6CCJgMBgEWs8PEfM3pVr2yOWbS42l8U=";
+    sha256 = "sha256-0IRHryADQArhhtfbQjCy+EDvVRi/ywc51IwiQOfWlR4=";
   };
 
   CXXDEFS = [

pkgs/by-name/ja/jamulus/package.nix

@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  libsForQt5,
+  libjack2,
+}:
+stdenv.mkDerivation rec {
+  pname = "jamulus";
+  version = "3.11.0";
+
+  src = fetchFromGitHub {
+    owner = "jamulussoftware";
+    repo = "jamulus";
+    tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-YxXSSVm3n96YzE51cXpWf4z2nQBSguvcEp/kU0a6iBA=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    libsForQt5.qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtdeclarative
+    libjack2
+  ];
+
+  qmakeFlags = [ "CONFIG+=noupcasename" ];
+
+  meta = {
+    description = "Enables musicians to perform real-time jam sessions over the internet";
+    longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details";
+    homepage = "https://github.com/corrados/jamulus";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    mainProgram = "jamulus";
+    maintainers = with lib.maintainers; [ seb314 ];
+  };
+}

pkgs/by-name/ka/kanidm/1_4.nix

@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "1.4.4";
-  hash = "sha256-AXgq9ohnSeQvq1IIhxMhe+FhX6/hyvRsJCI4VaiN/MQ=";
-  cargoHash = "sha256-/PsQ9yqyhSub1Qg2A3wOsgucq4rM0CU4uA8tEOJhtAU=";
+  version = "1.4.5";
+  hash = "sha256-0nn/ZyjkLXWXBZasNhbeEynEN52cmZQAcgg3hLmRpdo=";
+  cargoHash = "sha256-sLz1EdczSj0/ACLUpWex3i8ZUhNeyU/RVwuAqccLIz8=";
 }

pkgs/by-name/li/librewolf-bin/package.nix

@@ -6,11 +6,11 @@
 
 let
   pname = "librewolf-bin";
-  upstreamVersion = "131.0.2-1";
+  upstreamVersion = "133.0.3-1";
   version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion;
   src = fetchurl {
     url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage";
-    hash = "sha256-Sj3WkY3t8UHsh2v3xPaDb0IGp66YQIw9MKmmFFQCGvk=";
+    hash = "sha256-mQR1hvMcAiNI8Xhwqfy6oysJ29Dbu12RPZg8xN4zPyw=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in
@@ -27,7 +27,7 @@ appimageTools.wrapType2 {
     description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)";
     homepage = "https://librewolf.net";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ dwrege ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "librewolf";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

pkgs/by-name/li/linuxwave/deps.nix

@@ -0,0 +1,13 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{ linkFarm, fetchzip }:
+
+linkFarm "zig-packages" [
+  {
+    name = "122062d301a203d003547b414237229b09a7980095061697349f8bef41be9c30266b";
+    path = fetchzip {
+      url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.9.1.tar.gz";
+      hash = "sha256-pscDsE1jJK1Nktq7rv/ScvsDqvvklFvtiGqOFf2eWvY=";
+    };
+  }
+]

pkgs/by-name/li/linuxwave/package.nix

@@ -3,26 +3,37 @@
   stdenv,
   fetchFromGitHub,
   installShellFiles,
-  zig_0_10,
+  zig_0_13,
+  apple-sdk_11,
+  callPackage,
 }:
 
+let
+  zig = zig_0_13;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "linuxwave";
-  version = "0.1.5";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "linuxwave";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-5c8h9bAe3Qv7PJ3PPcwMJYKPlWsmnqshe6vLIgtdDiQ=";
+    hash = "sha256-mPBtffqd0+B7J8FxolzOarCyJIZBWkWPBbqZlhX0VSY=";
   };
 
+  postPatch = ''
+    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  '';
+
   nativeBuildInputs = [
     installShellFiles
-    zig_0_10.hook
+    zig.hook
   ];
 
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
+
   postInstall = ''
     installManPage man/linuxwave.1
   '';
@@ -33,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ figsoda ];
-    inherit (zig_0_10.meta) platforms;
+    inherit (zig.meta) platforms;
     mainProgram = "linuxwave";
   };
 })

pkgs/by-name/ma/mautrix-whatsapp/package.nix

@@ -13,19 +13,19 @@
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    hash = "sha256-yl/vDshjbJqGj6Kwhl6VnosbyrDCwt/0f3kHaxjYJmU=";
+    hash = "sha256-3S4aNoxK99iExhTJQP/JNq0GajCUjbdq4cUgCBudyXI=";
   };
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";
 
-  vendorHash = "sha256-Uv4xoyBmmC3pCiJv5bhof73y30e52mdqfUZ5GORjMUM=";
+  vendorHash = "sha256-9iX+pzken+/7+nqYa71rcc1olCdpmu3UfR09ag3KSKs=";
 
   doCheck = false;
 

pkgs/by-name/mi/miniflux/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "miniflux";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     rev = "refs/tags/${version}";
-    hash = "sha256-B/joQJ64/NPiZo1JEAhcrHLQ67m1oVTbmBk3drZ8lC4=";
+    hash = "sha256-h5bOZPaYu5DlN4trwf+iMafzfcyXemNdssTYpM6NCZY=";
   };
 
-  vendorHash = "sha256-hzgfuwewJDIz/iaBU3lyB2/mAxYGTWsKkaqAiCkPQQ0=";
+  vendorHash = "sha256-UR1nxza+rZtiSpY5hwAdCU4yiLm8weOCkrZHTqXQEpQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/mr/mrkd/package.nix

@@ -1,55 +0,0 @@
-{
-  lib,
-  python3,
-  fetchPypi,
-}:
-
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # https://github.com/refi64/mrkd/pull/6
-      mistune = super.mistune.overridePythonAttrs (old: rec {
-        version = "0.8.4";
-        src = fetchPypi {
-          inherit (old) pname;
-          inherit version;
-          hash = "sha256-WaNCnbU8ULXGvMigf4hIywDX3IvbQxpKtBkg0gHUdW4=";
-        };
-        meta = old.meta // {
-          knownVulnerabilities = [
-            "CVE-2022-34749"
-          ];
-        };
-      });
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
-  pname = "mrkd";
-  version = "0.2.0";
-
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "456f8c1be99da268554b29c6b5383532e58119def5a65d85270bc6a0ecc26aaf";
-  };
-
-  propagatedBuildInputs = with python.pkgs; [
-    jinja2
-    mistune
-    pygments
-    setuptools
-  ];
-
-  pythonImportsCheck = [ "mrkd" ];
-
-  meta = with lib; {
-    description = "Write man pages using Markdown, and convert them to Roff or HTML";
-    homepage = "https://github.com/refi64/mrkd";
-    license = licenses.bsd2;
-    mainProgram = "mrkd";
-    maintainers = with maintainers; [ prusnak ];
-  };
-}

pkgs/by-name/na/navicat-premium/package.nix

@@ -2,14 +2,25 @@
   fetchurl,
   appimageTools,
   lib,
+  stdenv,
 }:
 let
   pname = "navicat-premium";
-  version = "17.1.6";
-  src = fetchurl {
-    url = "https://web.archive.org/web/20241127151816/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
-    hash = "sha256-pH5hjHRuN29yBvsBrskCcwgXRUZ95iwEse2O3IiIvGo=";
-  };
+  version = "17.1.7";
+
+  src =
+    {
+      x86_64-linux = fetchurl {
+        url = "https://web.archive.org/web/20241217004300/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
+        hash = "sha256-5dzZh06Ld8t4tgE3tWGPAaBuKcT9iSxi8KpSdO4Un64=";
+      };
+      aarch64-linux = fetchurl {
+        url = "https://web.archive.org/web/20241217005701/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
+        hash = "sha256-4NvjdNTo/WUlZIRAzA2D39NupqMjlCvjHSWk06spqRc=";
+      };
+    }
+    .${stdenv.hostPlatform.system};
+
   appimageContents = appimageTools.extractType2 {
     inherit pname version src;
   };
@@ -25,12 +36,15 @@ appimageTools.wrapType2 {
 
   meta = {
     homepage = "https://www.navicat.com/products/navicat-premium";
-    changelog = "https://www.navicat.com/en/products/navicat-premium-release-note";
+    changelog = "https://www.navicat.com/products/navicat-premium-release-note";
     description = "Database development tool that allows you to simultaneously connect to many databases";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ aucub ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     mainProgram = "navicat-premium";
   };
 }

pkgs/by-name/ne/nextcloud-talk-desktop/package.nix

@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-talk-desktop";
-  version = "1.0.0";
+  version = "1.0.1";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-    hash = "sha256-XQa4Fa9eEaFlYrWa00S9aMWKJOPPFGSo4NAlRqE23jM=";
+    hash = "sha256-ZSNeuKZ+oi6tHO61RshtJ6ndtxvUJbY4gyhDwKpHXZI=";
     stripRoot = false;
   };
 

pkgs/by-name/no/nova/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nova";
-  version = "3.11";
+  version = "3.11.1";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-gkEUc2mhm1r69XzAnglLhdyYI4jQ24oEk/NRMgeyw60=";
+    hash = "sha256-E35GeGFWlo5HEaWZ257iJorrR6F2jtyBbXJLrYldC8E=";
   };
 
-  vendorHash = "sha256-v3ld3bHpVWNJgQ6K5iS7q8QV4ft4RE42wKi+f4++yqY=";
+  vendorHash = "sha256-tWUE3OUpacxRpShbJQtFbHhjEDt4ULL1wc4vfX4DJ2c=";
 
   ldflags = [
     "-X main.version=${version}"

pkgs/by-name/nu/nu_scripts/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nu_scripts";
-  version = "0-unstable-2024-12-08";
+  version = "0-unstable-2024-12-18";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = pname;
-    rev = "b5385a2af002b4a69fc061f1c45afb60f0bbd269";
-    hash = "sha256-0i5dnYb2kQuL+F2/316pPun0Jtuwb2EDDpSJpyqctPM=";
+    rev = "be6411ef4a8775d1db61b6c04cf9225b0322c899";
+    hash = "sha256-yFmijPQ6enQDep020ZFVNrRa/Ze0+cmMSkOlmNlPCOA=";
   };
 
   installPhase = ''

pkgs/by-name/op/opencommit/package.nix

@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "opencommit";
-  version = "3.2.1";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "di-sukharev";
     repo = "opencommit";
     rev = "v${version}";
-    hash = "sha256-+uKb7qhQJEbuatPsewSGgVd5J6WtsrNO+hE59/KZIJI=";
+    hash = "sha256-6bC3irUyIppu7QVT3jGwMe+r/5WuHA0pLLH/gYORDOM=";
   };
 
-  npmDepsHash = "sha256-6tzV4iP7YzlbqOTgYf9XoTmIFPSBug0wYDelc6wcbCA=";
+  npmDepsHash = "sha256-exjK00MuzBsjlW34seaaAj8s0bPrzi7zBdJqQ0SuIWM=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/op/opencomposite/package.nix

@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation {
   pname = "opencomposite";
-  version = "0-unstable-2024-11-11";
+  version = "0-unstable-2024-12-20";
 
   src = fetchFromGitLab {
     owner = "znixian";
     repo = "OpenOVR";
-    rev = "34311dabf430d6051d7e97f6081842a5394d2a67";
+    rev = "b9069698f2ed420a5f1ae783c02b88fbde775fc2";
     fetchSubmodules = true;
-    hash = "sha256-sjgnai7RJemIXuviXhW6+L/zioz7UePaOUh3mVteGww=";
+    hash = "sha256-ow10yTvZyB5fLTwgxspjS/atxK1QTGcLJtkWpQgYaeQ=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/os/osv-scanner/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-s288EHtF/YRkPVwe7b1+q/1ky8tQdHvzb8GaOPpRqTw=";
+    hash = "sha256-Db5AgFvyrUOlW+1rcw8jPUzTBwQcFelLk5Rqk9HsbCo=";
   };
 
-  vendorHash = "sha256-DNUkUmxzej/NDwJ3lgPek/6C3/ytjlHmFIb1IvKvAQs=";
+  vendorHash = "sha256-4e+aEOo/hu2lC0c1sT8XJXdjrlcsqmPjpgvvdakHnmc=";
 
   subPackages = [
     "cmd/osv-scanner"

pkgs/by-name/pk/pkgsite/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "pkgsite";
-  version = "0-unstable-2024-12-09";
+  version = "0-unstable-2024-12-16";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "73fd41ea89d263e617d2539ba9e73a4f46becfa5";
-    hash = "sha256-dxtfQKzUOqAY3DIJwUNPcNcXSe5+nvfk4QtJsw/Vchc=";
+    rev = "06c6edf28e6c1a9f5567f7141512681ba5b75f60";
+    hash = "sha256-zsb4NxTxyH354fHtVo8xtFxzOw7XeEnxupfQlh4fAHo=";
   };
 
   vendorHash = "sha256-Ijcj1Nq4WjXcUqmoDkpO9I4rl/4/TMXFMQVAlEK11R8=";

pkgs/by-name/pu/pur/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pur";
-  version = "7.3.2";
+  version = "7.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alanhamlett";
     repo = "pip-update-requirements";
-    rev = "refs/tags/${version}";
-    hash = "sha256-XLI9U9ej3+tS0zzmCDGwZ0pAb3mKnrqBtm90f5N6rMw=";
+    tag = version;
+    hash = "sha256-zSEzYYpDmu3fennTZNvQjAoMekzxoMDUEqvSjN6hNUk=";
   };
 
   build-system = with python3.pkgs; [

pkgs/by-name/re/reindeer/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2024.12.09.00";
+  version = "2024.12.16.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G58W1biDHx/m73wC0gRQEcE4EhZMS6zGt8UHh0rQm7g=";
+    hash = "sha256-yM+iVX+5caiSW6K45EbkHgHEhceIvauCIYwlLTYpzbQ=";
   };
 
-  cargoHash = "sha256-lOvvkgJ4+jX0Modvwp9JiYM5XHbq4xY83oC3C98vmaA=";
+  cargoHash = "sha256-TWu2p6d/jec7zZpFP8Gly4RdgkL18yU2VWsFHVZLDJY=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/re/rerun/package.nix

@@ -1,36 +1,51 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
-  pkg-config,
-  stdenv,
+
+  # nativeBuildInputs
   binaryen,
-  rustfmt,
   lld,
-  darwin,
+  pkg-config,
+  protobuf,
+  rustfmt,
+
+  # buildInputs
   freetype,
   glib,
   gtk3,
   libxkbcommon,
   openssl,
-  protobuf,
   vulkan-loader,
   wayland,
+  apple-sdk_11,
+
+  versionCheckHook,
+
+  # passthru
+  nix-update-script,
   python3Packages,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rerun";
-  version = "0.20.2";
+  version = "0.21.0";
+
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
-    rev = "refs/tags/${version}";
-    hash = "sha256-AoI+BKDqHRsBrZAAwrE17xCduIP9wI7WPSSpn7SMz/M=";
+    tag = version;
+    hash = "sha256-U+Q8u1XKBD9c49eXAgc5vASKytgyAEYyYv8XNfftlZU=";
   };
 
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-LB8P9ceHN4zq+8qv1h0nDKW9FVTEbSrX/Zbv2WB29ck=";
+  # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
+  postPatch = ''
+    substituteInPlace rerun_py/build.rs \
+      --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
+  '';
+
+  cargoHash = "sha256-d68dNAAGY+a0DpL82S/qntu2XOsoVqHpfU2L9NcoJQc=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
   cargoTestFlags = [ "--package rerun-cli" ];
@@ -57,18 +72,12 @@ rustPlatform.buildRustPackage rec {
       libxkbcommon
       vulkan-loader
     ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.CoreFoundation
-      darwin.apple_sdk.frameworks.CoreGraphics
-      darwin.apple_sdk.frameworks.CoreServices
-      darwin.apple_sdk.frameworks.Foundation
-      darwin.apple_sdk.frameworks.IOKit
-      darwin.apple_sdk.frameworks.Metal
-      darwin.apple_sdk.frameworks.QuartzCore
-      darwin.apple_sdk.frameworks.Security
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
+      # Undefined symbols for architecture x86_64: "_NSAccessibilityTabButtonSubrole"
+      # ld: symbol(s) not found for architecture x86_64
+      apple-sdk_11
+    ];
 
   addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
     lib.optionals stdenv.hostPlatform.isLinux [
@@ -97,21 +106,28 @@ rustPlatform.buildRustPackage rec {
 
   postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
-  # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
-  patches = [ ./tests.patch ];
-  passthru.tests = {
-    inherit (python3Packages) rerun-sdk;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      inherit (python3Packages) rerun-sdk;
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate.  Built in Rust using egui";
     homepage = "https://github.com/rerun-io/rerun";
-    changelog = "https://github.com/rerun-io/rerun/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
+    changelog = "https://github.com/rerun-io/rerun/blob/${src.tag}/CHANGELOG.md";
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       SomeoneSerge
       robwalt
     ];

pkgs/by-name/re/rerun/tests.patch

@@ -1,16 +0,0 @@
- rerun_py/build.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rerun_py/build.rs b/rerun_py/build.rs
-index 3d292c55b..28e54f06b 100644
---- a/rerun_py/build.rs
-+++ b/rerun_py/build.rs
-@@ -17,7 +17,7 @@ fn main() {
-         #[cfg(not(target_os = "windows"))]
-         let rerun_bin = std::env::current_dir()
-             .expect("std::env::current_dir() failed")
--            .join("rerun_sdk/rerun_cli/rerun");
-+            .join("rerun_sdk/rerun");
- 
-         if !rerun_bin.exists() {
-             eprintln!("ERROR: Expected to find `rerun` at `{rerun_bin:?}`.");

pkgs/by-name/re/rescrobbled/package.nix

@@ -0,0 +1,46 @@
+{ lib
+, bash
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+, dbus
+}:
+
+rustPlatform.buildRustPackage rec {
+
+  pname = "rescrobbled";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "InputUsername";
+    repo = "rescrobbled";
+    rev = "v${version}";
+    hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4=";
+  };
+
+  cargoHash = "sha256-ZJbyYFvGTuXt1aqhGOATcDRrkTk7SorWXkN81sUoDdo=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl dbus ];
+
+  postPatch = ''
+    # Required for tests
+    substituteInPlace src/filter.rs --replace '#!/usr/bin/bash' '#!${bash}/bin/bash'
+  '';
+
+  postInstall = ''
+    substituteInPlace rescrobbled.service --replace '%h/.cargo/bin/rescrobbled' "$out/bin/rescrobbled"
+    install -Dm644 rescrobbled.service -t "$out/share/systemd/user"
+  '';
+
+  meta = with lib; {
+    description = "MPRIS music scrobbler daemon";
+    homepage = "https://github.com/InputUsername/rescrobbled";
+    license = licenses.gpl3Plus;
+    mainProgram = "rescrobbled";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ negatethis ];
+  };
+}

pkgs/by-name/re/restman/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  testers,
+  restman,
+}:
+
+buildGoModule rec {
+  pname = "restman";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    repo = "restman";
+    owner = "jackMort";
+    rev = "v${version}";
+    hash = "sha256-KN3iahDdPSHPnGEacsmaVMRNI3mV9qrH3HyJOTtB2hA=";
+  };
+
+  vendorHash = "sha256-hXd7E6yowuY3+ZpGyCzlcqwFqFrQzXBWYRMjsrxBlwI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+  ];
+
+  doInstallCheck = true;
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = restman;
+      version = "restman version ${version}";
+      command = "restman --version";
+    };
+  };
+
+  meta = {
+    description = "CLI for streamlined RESTful API testing and management";
+    homepage = "https://github.com/jackMort/Restman";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ kashw2 ];
+    mainProgram = "restman";
+  };
+}

pkgs/by-name/ro/rofi-screenshot/package.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-screenshot";
-  version = "2023-07-02";
+  version = "2024-09-27";
 
   src = fetchFromGitHub {
     owner = "ceuk";
     repo = pname;
-    rev = "365cfa51c6c7deb072d98d7bfd68cf4038bf2737";
-    hash = "sha256-M1cab+2pOjZ2dElMg0Y0ZrIxRE0VwymVwcElgzFrmVs=";
+    rev = "09a07d9c2ff2efbf75b1753bb412f4f8f086708f";
+    hash = "sha256-3UpYdXAX3LD1ZAQ429JkzWWooiBpuf/uPf0CRh5EXd8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/sd/sd-local/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sd-local";
-  version = "1.0.56";
+  version = "1.0.57";
 
   src = fetchFromGitHub {
     owner = "screwdriver-cd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qgfckqF33fXphAsdxd5r6/rebNEURPfazw/AQgB5jiI=";
+    sha256 = "sha256-CBEdE15lAMMawTsfc45ptHsC2AbqFP6v4/nnktytwvc=";
   };
 
   vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw=";

pkgs/by-name/sh/shaka-packager/package.nix

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shaka-packager";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "shaka-project";
     repo = "shaka-packager";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-4ZxBE1jpFR93OigAd7xOpUHXSZ5o9keNBJXuS2pNjpo=";
+    hash = "sha256-xXKgL8sUP+meFXV9S/i7dao7BIkIx+e/ujjpew7xGL0=";
   };
 
   patches = [

pkgs/by-name/si/sing-box/package.nix

@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "sing-box";
-  version = "1.10.3";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Xornyh9FT4ZqR0QjYMlgPhWEDFGb1DEPCngGpuix4A0=";
+    hash = "sha256-gVbOJsGY8s2fVugd7Tha1dAhS9rxZbN6m3FVza0WUdc=";
   };
 
-  vendorHash = "sha256-3YRtwYkyvtMtMUN1O6yb1JQnSXdsb8KnQ9WsnGtvGnk=";
+  vendorHash = "sha256-b0SPUVGL1ESeseWn27xQ2YFFIxJeBAfukZG6lynAIik=";
 
   tags = [
     "with_quic"

pkgs/by-name/so/soft-serve/package.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "soft-serve";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
     rev = "v${version}";
-    hash = "sha256-BXawviNMkb7y0svsOD+ItmnoWwVSDDdMpdjWNIDPCes=";
+    hash = "sha256-rbwDFAnRS+Q7f0uTOsw2Fm43NeLiAGePGAl8h4DbUNI=";
   };
 
-  vendorHash = "sha256-sAnUDZt62cBJYxXxIQVGhXeBn/9gDw1bFgJ28fgYWag=";
+  vendorHash = "sha256-lqSNKexd5bXlBBp3tLKE+pneA+ZOMKubnItJfKRkbso=";
 
   doCheck = false;
 

pkgs/by-name/sp/speedtest-go/package.nix

@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "speedtest-go";
-  version = "1.7.9";
+  version = "1.7.10";
 
   src = fetchFromGitHub {
     owner = "showwin";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-SFdUl06lCf+ObPZanEwvD2rSzPM0ia2J/XSuel5XGqg=";
+    hash = "sha256-w0gIyeoQP+MfA9Q2CD7+laABmSrJ9u836E+UIhJeWdk=";
   };
 
-  vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E=";
+  vendorHash = "sha256-2z241HQOckNFvQWkxfjVVmmdFW4XevQBLj8huxYAheg=";
 
   excludedPackages = [ "example" ];
 

pkgs/by-name/st/stevenblack-blocklist/package.nix

@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.14.139";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-rPK7Y7Upwdus0fCK4OZLpgx9MwRt6mWP8YjNmHA9vJ8=";
+    hash = "sha256-CMafExAcNPDOjFd518MHK1rWYhapP6eBIXKk6YAjJqc=";
   };
 
   outputs = [

pkgs/by-name/su/supabase-cli/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-lSmB+UC/dJzrK5C9o+11Hq/ZzbJrzofqaqc0JSy9pxE=";
+    hash = "sha256-z29xiaKd/xyZU9s+QyMrb5+g4zsqJ1QpRYJooCTxFqw=";
   };
 
-  vendorHash = "sha256-WygbrpE+FIWBs2Q34EAFlOm458vqnuIy+seZb+4Wf+I=";
+  vendorHash = "sha256-sn8W10HhBLl4MqfnjUZKx6/wlKDBzMNi2EOc+OPtrFo=";
 
   ldflags = [
     "-s"

pkgs/by-name/te/textidote/package.nix

@@ -0,0 +1,124 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ant,
+  jdk11,
+  makeWrapper,
+  stripJavaArchivesHook,
+  testers,
+}:
+
+let
+  pname = "textidote";
+  version = "0.8.3";
+  # We can't compile with > Java 11 yet because that's the last version that supports targeting Java 6
+  jdk = jdk11;
+
+  # Manually create a fixed-output derivation to populate the dependencies for the rest of the build
+  # The Ant buildscript downloads dependencies and stores them alongside the source code in a non-standard way
+  # https://github.com/sylvainhalle/AntRun
+  populated-src = stdenv.mkDerivation {
+    pname = "textidote-populated-src";
+    inherit version;
+
+    src = fetchFromGitHub {
+      owner = "sylvainhalle";
+      repo = "textidote";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-QMSoxk5jDn6qsdxffXJ/S4eTIzLjJdAEbdaK8MZIavI=";
+    };
+
+    nativeBuildInputs = [
+      ant
+      jdk
+    ];
+
+    # Only run dependency-downloading tasks here to pre-download the dependencies for later
+    buildPhase = ''
+      runHook preBuild
+
+      ant download-deps junit jacoco
+
+      runHook postBuild
+    '';
+
+    # Copy the entire directory to the output including sources and resolved dependencies
+    installPhase = ''
+      runHook preInstall
+
+      cp -a . $out
+
+      runHook postInstall
+    '';
+
+    dontFixup = true;
+    outputHashMode = "recursive";
+    outputHash = "sha256-LrFClt8zN/ma42+Yoqwoy03TCuC3JfAeb02vehkljBo=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname version;
+
+  src = populated-src;
+
+  nativeBuildInputs = [
+    ant
+    makeWrapper
+    stripJavaArchivesHook
+  ];
+
+  buildInputs = [
+    jdk
+  ];
+
+  # `javac` encoding only defaults to UTF-8 after Java 18
+  env.ANT_OPTS = "-Dfile.encoding=utf8";
+
+  buildPhase = ''
+    runHook preBuild
+
+    ant jar
+
+    runHook postBuild
+  '';
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+
+    ant test
+
+    runHook postCheck
+  '';
+
+  # Recreates the wrapper from the `.deb`
+  # The `.deb` seems to be manually created for every release; there's no script in the repo
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 textidote.jar $out/share/textidote/textidote.jar
+
+    makeWrapper ${lib.getExe jdk} $out/bin/textidote \
+      --add-flags "-jar $out/share/textidote/textidote.jar --name textidote"
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      version = "TeXtidote v${finalAttrs.version}";
+    };
+  };
+
+  meta = {
+    homepage = "https://sylvainhalle.github.io/textidote/";
+    downloadPage = "https://github.com/sylvainhalle/textidote/releases";
+    description = "Correction tool for LaTeX documents";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ magneticflux- ];
+    mainProgram = "textidote";
+    inherit (jdk.meta) platforms;
+  };
+})

pkgs/by-name/ti/tinty/package.nix

@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "0.23.0";
+  version = "0.24.0";
 in
 rustPlatform.buildRustPackage {
   pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "tinted-theming";
     repo = "tinty";
     tag = "v${version}";
-    hash = "sha256-5KrXvE+RLkypqKg01Os09XGxrqv0fCMkeSD//E5WrZc=";
+    hash = "sha256-Yvwls9bh8YN8/jKC889soCSotLSBU9hJWz95szOdJ2k=";
   };
 
-  cargoHash = "sha256-qTHlSP9WN39KgU7Q/4/iS1H2XOikXiCAiZ/NSAFS9mM=";
+  cargoHash = "sha256-jSKhKcBcURjizUZlqZmL5UT19gvNzHinD4rMQ3jMgVw=";
 
   # Pretty much all tests require internet access
   doCheck = false;

pkgs/by-name/to/tonelib-metal/package.nix

@@ -1,38 +1,33 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-, dpkg
-, alsa-lib
-, freetype
-, libglvnd
-, libgbm
-, curl
-, libXcursor
-, libXinerama
-, libXrandr
-, libXrender
-, libjack2
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  alsa-lib,
+  freetype,
+  libglvnd,
+  libgbm,
+  curl,
+  libXcursor,
+  libXinerama,
+  libXrandr,
+  libXrender,
+  libjack2,
 }:
-
 stdenv.mkDerivation rec {
   pname = "tonelib-metal";
-  version = "1.2.6";
+  version = "1.3.0";
 
   src = fetchurl {
-    url = "https://tonelib.net/download/221222/ToneLib-Metal-amd64.deb";
-    sha256 = "sha256-G80EKAsXomdk8GsnNyvjN8shz3YMKhqdWWYyVB7xTsU=";
+    url = "https://tonelib.vip/download/24-10-24/ToneLib-Metal-amd64.deb";
+    hash = "sha256-H19ZUOFI7prQJPo9NWWAHSOwpZ4RIbpRJHfQVjDp/VA=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook dpkg ];
-
-  buildInputs = [
-    (lib.getLib stdenv.cc.cc)
-    alsa-lib
-    freetype
-    libglvnd
-    libgbm
-  ] ++ runtimeDependencies;
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
 
   runtimeDependencies = map lib.getLib [
     curl
@@ -43,19 +38,30 @@ stdenv.mkDerivation rec {
     libjack2
   ];
 
-  unpackCmd = "dpkg -x $curSrc source";
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+    libgbm
+  ] ++ runtimeDependencies;
 
   installPhase = ''
-    mv usr $out
-    substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/
- '';
+    runHook preInstall
 
-  meta = with lib; {
+    cp -r usr $out
+    substituteInPlace $out/share/applications/ToneLib-Metal.desktop \
+      --replace-fail "/usr/" "$out/"
+
+    runHook postInstall
+  '';
+
+  meta = {
     description = "ToneLib Metal – Guitar amp simulator targeted at metal players";
-    homepage = "https://tonelib.net/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ dan4ik605743 ];
+    homepage = "https://tonelib.net";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "ToneLib-Metal";
   };

pkgs/by-name/to/tonelib-noisereducer/package.nix

@@ -1,38 +1,33 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-, dpkg
-, alsa-lib
-, freetype
-, libglvnd
-, libgbm
-, curl
-, libXcursor
-, libXinerama
-, libXrandr
-, libXrender
-, libjack2
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  alsa-lib,
+  freetype,
+  libglvnd,
+  libgbm,
+  curl,
+  libXcursor,
+  libXinerama,
+  libXrandr,
+  libXrender,
+  libjack2,
 }:
-
 stdenv.mkDerivation rec {
   pname = "tonelib-noisereducer";
-  version = "1.2.0";
+  version = "2.0";
 
   src = fetchurl {
-    url = "https://tonelib.net/download/221222/ToneLib-NoiseReducer-amd64.deb";
-    sha256 = "sha256-27JuFVmamIUUKRrpjlsE0E6x+5X9RutNGPiDf5dxitI=";
+    url = "https://tonelib.vip/download/24-12-01/ToneLib-NoiseReducer-amd64.deb";
+    hash = "sha256-R+JXoc6waKGPMaghlJ8BkLumDcjC7Oq0jx8tFjAKegE=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook dpkg ];
-
-  buildInputs = [
-    (lib.getLib stdenv.cc.cc)
-    alsa-lib
-    freetype
-    libglvnd
-    libgbm
-  ] ++ runtimeDependencies;
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
 
   runtimeDependencies = map lib.getLib [
     curl
@@ -43,18 +38,28 @@ stdenv.mkDerivation rec {
     libjack2
   ];
 
-  unpackCmd = "dpkg -x $curSrc source";
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+    freetype
+    libglvnd
+    libgbm
+  ] ++ runtimeDependencies;
 
   installPhase = ''
-    mv usr $out
- '';
+    runHook preInstall
 
-  meta = with lib; {
+    cp -r usr $out
+
+    runHook postInstall
+  '';
+
+  meta = {
     description = "ToneLib NoiseReducer – two-unit noise reduction rack effect plugin";
     homepage = "https://tonelib.net/tl-noisereducer.html";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ orivej ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ orivej ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "ToneLib-NoiseReducer";
   };

pkgs/by-name/ui/uiua/unstable.nix

@@ -1,7 +1,7 @@
 rec {
-  version = "0.14.0-rc.2";
+  version = "0.14.0-rc.3";
   rev = version;
-  hash = "sha256-8jYoZpzepgqeM3EsyJguoU6LVPE3kywbE20Nz/8/fTQ=";
-  cargoHash = "sha256-5narrhVxM2Yl6hZIfFijxST3jfy5q0ox3Y7v+2VggUE=";
+  hash = "sha256-znHHohWMoVttubvYx5h3b7pQcQVYhn3nZLFoHrJsits=";
+  cargoHash = "sha256-d+N5ij5zbQRZwkLtwLAM7BY82G/tNsdkUb6/7wnD51g=";
   updateScript = ./update-unstable.sh;
 }

pkgs/by-name/v2/v2rayn/package.nix

@@ -15,16 +15,17 @@
   makeDesktopItem,
   copyDesktopItems,
   bash,
+  xorg,
 }:
 buildDotnetModule rec {
   pname = "v2rayn";
-  version = "7.3.2";
+  version = "7.4.1";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = version;
-    hash = "sha256-mWfWpleUVbq6Z31oh6QoG0j9eT3d7yF6z7e4lRe6+cM=";
+    hash = "sha256-mtmuEwZy72LPYFf7hzE8TYiSh2kK6xe2CRdkOSbg2h4=";
   };
 
   projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj";
@@ -32,14 +33,8 @@ buildDotnetModule rec {
   nugetDeps = ./deps.json;
 
   postPatch = ''
-    substituteInPlace v2rayN/AmazTool/UpgradeApp.cs \
-      --replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");'
-    substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \
-      --replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");'
     substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \
       --replace-fail "/bin/bash" "${bash}/bin/bash"
-    substituteInPlace v2rayN/ServiceLib/ServiceLib.csproj \
-      --replace-fail "0.16.20" "0.16.14"
   '';
 
   dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ];
@@ -66,6 +61,16 @@ buildDotnetModule rec {
     (lib.getLib stdenv.cc.cc)
   ];
 
+  runtimeDeps = [
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libICE
+    xorg.libSM
+    xorg.libXcursor
+    xorg.libXext
+  ];
+
   postBuild =
     let
       selectSystem =

pkgs/by-name/vi/visp/package.nix

@@ -0,0 +1,104 @@
+{
+  cmake,
+  coin3d,
+  darwin,
+  doxygen,
+  eigen,
+  fetchFromGitHub,
+  fetchpatch,
+  lapack,
+  lib,
+  libdc1394,
+  libdmtx,
+  libglvnd,
+  libjpeg, # this is libjpeg-turbo
+  libpng,
+  librealsense,
+  libxml2,
+  libX11,
+  nlohmann_json,
+  #ogre,
+  openblas,
+  opencv,
+  pkg-config,
+  python3Packages,
+  stdenv,
+  texliveSmall,
+  v4l-utils,
+  xorg,
+  zbar,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "visp";
+  version = "3.6.0";
+
+  src = fetchFromGitHub {
+    owner = "lagadic";
+    repo = "visp";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-m5Tmr+cZab7eSjmbXb8HpJpFHb0UYFTyimY+CkfBIAo=";
+  };
+
+  patches = [
+    # fix for absolute install paths
+    # this was merged upstream, and can be removed on next release
+    (fetchpatch {
+      url = "https://github.com/lagadic/visp/pull/1416/commits/fdda5620389badee998fe1926ddd3b46f7a6bcd8.patch";
+      hash = "sha256-W3vvBdQdp59WAMjuucNoWI0eCyPHjWerl7VCNcPVvzI=";
+    })
+
+    # fix for opencv new Universal Intrinsic API
+    # this was merged upstream, and can be removed on next release
+    (fetchpatch {
+      url = "https://github.com/lagadic/visp/pull/1310/commits/9ed0300507e13dddd83fd62a799f5039025ea44e.patch";
+      hash = "sha256-xrJ7B/8mEfi9dM/ToMr6vCAwX/FMw+GA/W0zFYgT32s=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    pkg-config
+    texliveSmall
+  ];
+
+  buildInputs =
+    [
+      eigen
+      lapack
+      libdc1394
+      libdmtx
+      libglvnd
+      libjpeg
+      libpng
+      librealsense
+      libX11
+      libxml2
+      nlohmann_json
+      #ogre
+      openblas
+      opencv
+      python3Packages.numpy
+      xorg.libpthreadstubs
+      zbar
+      zlib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      coin3d
+      v4l-utils
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Open Source Visual Servoing Platform";
+    homepage = "https://visp.inria.fr";
+    changelog = "https://github.com/lagadic/visp/blob/v${finalAttrs.version}/ChangeLog.txt";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ nim65s ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/wa/wasm-tools/package.nix

@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.221.2";
+  version = "1.222.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-agntGQkwXNMJSm7AgjhYDeWyCxCh/0edNxJgvbeUyfU=";
+    hash = "sha256-mSDbdmepLUiwqEjNfrG89lnt14IJa6hDwnnRea/Asl8=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-il9Zdj50XBMCxiOyQwyToOtaP34hcklOwlDuVGEmyVY=";
+  cargoHash = "sha256-SqqOPFR+MkZTZ2eD/X9dcLGzxDQ0BOD1B67rhzCQ/PI=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

pkgs/by-name/xp/xpipe/package.nix

@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-dnTivsRK5cEDiY8lOWc6XA8T7IJ9EDhPD36i9+G/jsM=";
+      x86_64-linux = "sha256-6h6Rtmo9XV9fk6G+ff5A1apwmJ7L5s+pTJDS759OOgk=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "13.4.3";
+  version = "13.4.4";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

pkgs/by-name/zo/zoom-us/package.nix

@@ -50,23 +50,23 @@ let
   # and often with different versions.  We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.2.11.43613";
-  versions.x86_64-darwin = "6.2.11.43613";
-  versions.x86_64-linux = "6.2.11.5069";
+  versions.aarch64-darwin = "6.3.0.44805";
+  versions.x86_64-darwin = "6.3.0.44805";
+  versions.x86_64-linux = "6.3.0.5527";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-3W0ohT62vn6vdzGq4YVcaM1kEe9oRxWOavGP/+1fhZc=";
+      hash = "sha256-S4uBJw0FPcPv1O2zcTbEaEONrNLkRCkWYazpR5chYbE=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-NnnY31fj0Bl1DLEghajf1bH2/bCewzzWZGP4bvIvvyk=";
+      hash = "sha256-PKIxhy+bnBpMn0oUL1cAfhOT+osXPDBIRoY1HLgO26s=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw=";
+      hash = "sha256-5Tk8lU6D0cgyr5pe1oVZFCURQ1YznBpWPPM9nogOT6Q=";
     };
   };
 

pkgs/development/interpreters/php/8.3.nix

@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.14";
-      hash = "sha256-9W+mac5MAUUqKSH0ADTXedjCuX0HSUk61HgYE7kiHPg=";
+      version = "8.3.15";
+      hash = "sha256-sWdaT/cwtYEbjmp2h0iMQug14Vapl3aqPm8Ber2jvpg=";
     }
   );
 in

pkgs/development/interpreters/wasmtime/default.nix

@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "27.0.0";
+  version = "28.0.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Xqj680MZ8LpBChEU0ia+GGjSceRM55tF5uWJLMuBuQ0=";
+    hash = "sha256-A5Fr8w2zwo3/BdPFbymwZUH37qhN2fWiIX8Q55icnwA=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-qpPXP815kpIIFOiQQDUUgI5blRV1ly2it/XC09UnmVU=";
+  cargoHash = "sha256-SDu2ae9UHsMdfbxfW/C2JjXXsoKQOlSMAmSQAXlvfA4=";
   cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
 
   outputs = [ "out" "dev" ];

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aiovodafone";
-  version = "0.7.1";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aiovodafone";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-BVuDnIp9K+f4jZPPfCABMD+fpPXDQE6/RWTZ8k7ftMI=";
+    tag = "v${version}";
+    hash = "sha256-JRZEMu5Lv0JQkTM1w3g3yzdaG/FM8xwT1MuEBHAic1Y=";
   };
 
   postPatch = ''

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

@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "b2sdk";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Backblaze";
     repo = "b2-sdk-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-nYsbcRRNh6WEelur/GvzE800Yg0h51FDhxJwBryVs4w=";
+    tag = "v${version}";
+    hash = "sha256-QY2/uWCnIlOHo5wTLxu2Pvh2oNPWRcyDL5TpnZHob7I=";
   };
 
   build-system = [ pdm-backend ];

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

@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  cyclonedds,
+  setuptools,
+  rich-click,
+
+  pytestCheckHook,
+  pytest-mock,
+  pytest-cov-stub,
+}:
+
+buildPythonPackage rec {
+  pname = "cyclonedds-python";
+  version = "0.10.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "eclipse-cyclonedds";
+    repo = "cyclonedds-python";
+    rev = "refs/tags/${version}";
+    hash = "sha256-MN3Z5gqsD+cr5Awmsia9+uCHL/a2KQP2uMS13rVc1Hw=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+        --replace-fail "pytest-cov" ""
+  '';
+
+  build-system = [ setuptools ];
+
+  buildInputs = [ cyclonedds ];
+
+  dependencies = [ rich-click ];
+
+  env.CYCLONEDDS_HOME = "${cyclonedds.out}";
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-mock
+    pytest-cov-stub
+  ];
+
+  meta = {
+    description = "Python binding for Eclipse Cyclone DDS";
+    homepage = "https://github.com/eclipse-cyclonedds/cyclonedds-python";
+    changelog = "https://github.com/eclipse-cyclonedds/cyclonedds-python/releases/tag/${version}";
+    license = lib.licenses.epl20;
+    maintainers = with lib.maintainers; [ kvik ];
+  };
+}

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

@@ -5,40 +5,45 @@
   pysimplesoap,
   pythonOlder,
   setuptools,
+  distutils,
 }:
 
 buildPythonPackage rec {
   pname = "python-debianbts";
-  version = "4.0.2";
+  version = "4.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-JbPb0lZND96XLZNU97wMuT9iGNXVN2KTsZC2St6FfuU=";
+    inherit version;
+    pname = "python_debianbts";
+    hash = "sha256-9EOxjOJBGzcxA3hHFeZwffA09I2te+OHppF7FuFU15M=";
   };
 
   postPatch = ''
     sed -i "/--cov/d" pyproject.toml
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ pysimplesoap ];
+  dependencies = [
+    pysimplesoap
+    distutils
+  ];
 
   # Most tests require network access
   doCheck = false;
 
   pythonImportsCheck = [ "debianbts" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python interface to Debian's Bug Tracking System";
     mainProgram = "debianbts";
     homepage = "https://github.com/venthur/python-debianbts";
     downloadPage = "https://pypi.org/project/python-debianbts/";
     changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nicoo ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nicoo ];
   };
 }

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

@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # Runtime dependencies
+  networkx,
+  matplotlib,
+  numpy,
+  tqdm,
+  scipy,
+
+  # Build, dev and test dependencies
+  setuptools-scm,
+  pytestCheckHook,
+  pytest-check,
+  pytest-mock,
+}:
+
+buildPythonPackage rec {
+  pname = "hebg";
+  version = "0.2.4";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-11bz+FbnaEVLiXT1eujMw8lvABlzVOeROOsdVgsyfjQ=";
+  };
+
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
+    networkx
+    matplotlib
+    numpy
+    tqdm
+    scipy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-check
+    pytest-mock
+  ];
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { MPLBACKEND = "Agg"; };
+  pythonImportsCheck = [ "hebg" ];
+
+  meta = {
+    description = "Hierachical Explainable Behaviors using Graphs";
+    homepage = "https://github.com/IRLL/HEB_graphs";
+    changelog = "https://github.com/IRLL/HEB_graphs/releases/tag/${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ automathis ];
+  };
+}

pkgs/development/python-modules/pallets-sphinx-themes/default.nix

@@ -4,33 +4,38 @@
   fetchFromGitHub,
   sphinx,
   packaging,
+  flit-core,
+  sphinx-notfound-page,
 }:
 
 buildPythonPackage rec {
   pname = "pallets-sphinx-themes";
-  version = "2.1.3";
-  format = "setuptools";
+  version = "2.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "pallets-sphinx-themes";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-uXSejJLVmYpzRCP92JQKHosnlx7dgZlFf5XzbxOfvII=";
+    tag = version;
+    hash = "sha256-+etmWzjCiYbM8cHSnJr0tHs3DpvozNYShQ6x60UADS4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    flit-core
+  ];
+
+  dependencies = [
     packaging
     sphinx
+    sphinx-notfound-page
   ];
 
   pythonImportsCheck = [ "pallets_sphinx_themes" ];
 
-  doCheck = false;
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/pallets/pallets-sphinx-themes";
     description = "Sphinx theme for Pallets projects";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ kaction ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ kaction ];
   };
 }

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

@@ -5,6 +5,8 @@
   setuptools,
   pandas,
   pythonOlder,
+  numpy,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -17,31 +19,25 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "DynamicsAndNeuralSystems";
     repo = "pycatch22";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-NvZrjOdC6rV4hwCuGcc2Br/VDhLwZcYpfnNvQpqU134=";
   };
 
   nativeBuildInputs = [ setuptools ];
 
-  nativeCheckInputs = [ pandas ];
-
-  # This packages does not have real tests
-  # But we can run this file as smoketest
-  checkPhase = ''
-    runHook preCheck
-
-    python tests/testing.py
-
-    runHook postCheck
-  '';
+  nativeCheckInputs = [
+    pandas
+    numpy
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "pycatch22" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python implementation of catch22";
     homepage = "https://github.com/DynamicsAndNeuralSystems/pycatch22";
     changelog = "https://github.com/DynamicsAndNeuralSystems/pycatch22/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mbalatsko ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }

pkgs/development/python-modules/python-docs-theme/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "python-docs-theme";
-  version = "2024.10";
+  version = "2024.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python";
     repo = "python-docs-theme";
-    rev = "refs/tags/${version}";
-    hash = "sha256-JwuIV+hkBIst8EtC3Xmu/KYTV+SZvD4rb9wHimKLL94=";
+    tag = version;
+    hash = "sha256-LZFcKmFnALZ5ZV8XbRfT74Wv5r7he/y58mCu4uydgw8=";
   };
 
   build-system = [ flit-core ];