Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -2225,6 +2225,12 @@
     githubId = 18467667;
     name = "Alexander Bantyev";
   };
+  bananad3v = {
+    email = "banana@banana.is-cool.dev";
+    github = "BANanaD3V";
+    githubId = 68944906;
+    name = "Nikita";
+  };
   bandresen = {
     email = "bandresen@gmail.com";
     github = "bennyandresen";
@@ -20020,6 +20026,12 @@
     githubId = 6457015;
     name = "Taha Gharib";
   };
+  taha-yassine = {
+    email = "taha.yssne@gmail.com";
+    github = "taha-yassine";
+    githubId = 40228615;
+    name = "Taha Yassine";
+  };
   taikx4 = {
     email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion";
     github = "taikx4";

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

@@ -27,6 +27,8 @@
 
 ## New Services {#sec-release-24.11-new-services}
 
+- [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver).
+
 - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.
 
 - [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable).

nixos/modules/module-list.nix

@@ -846,6 +846,7 @@
   ./services/misc/tabby.nix
   ./services/misc/tandoor-recipes.nix
   ./services/misc/taskserver
+  ./services/misc/taskchampion-sync-server.nix
   ./services/misc/tautulli.nix
   ./services/misc/tiddlywiki.nix
   ./services/misc/tp-auto-kbbl.nix

nixos/modules/services/misc/taskchampion-sync-server.nix

@@ -0,0 +1,85 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib) types;
+  cfg = config.services.taskchampion-sync-server;
+in
+{
+  options.services.taskchampion-sync-server = {
+    enable = lib.mkEnableOption "TaskChampion Sync Server for Taskwarrior 3";
+    package = lib.mkPackageOption pkgs "taskchampion-sync-server" { };
+    user = lib.mkOption {
+      description = "Unix User to run the server under";
+      type = types.str;
+      default = "taskchampion";
+    };
+    group = lib.mkOption {
+      description = "Unix Group to run the server under";
+      type = types.str;
+      default = "taskchampion";
+    };
+    port = lib.mkOption {
+      description = "Port on which to serve";
+      type = types.port;
+      default = 10222;
+    };
+    openFirewall = lib.mkEnableOption "Open firewall port for taskchampion-sync-server";
+    dataDir = lib.mkOption {
+      description = "Directory in which to store data";
+      type = types.path;
+      default = "/var/lib/taskchampion-sync-server";
+    };
+    snapshot = {
+      versions = lib.mkOption {
+        description = "Target number of versions between snapshots";
+        type = types.ints.positive;
+        default = 100;
+      };
+      days = lib.mkOption {
+        description = "Target number of days between snapshots";
+        type = types.ints.positive;
+        default = 14;
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    users.users.${cfg.user} = {
+      isSystemUser = true;
+      inherit (cfg) group;
+    };
+    users.groups.${cfg.group} = { };
+    networking.firewall.allowedTCPPorts = lib.mkIf (cfg.openFirewall) [ cfg.port ];
+    systemd.tmpfiles.settings = {
+      "10-taskchampion-sync-server" = {
+        "${cfg.dataDir}" = {
+          d = {
+            inherit (cfg) group user;
+            mode = "0750";
+          };
+        };
+      };
+    };
+
+    systemd.services.taskchampion-sync-server = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        DynamicUser = false;
+        ExecStart = ''
+          ${lib.getExe cfg.package} \
+            --port ${builtins.toString cfg.port} \
+            --data-dir ${cfg.dataDir} \
+            --snapshot-versions ${builtins.toString cfg.snapshot.versions} \
+            --snapshot-days ${builtins.toString cfg.snapshot.days}
+        '';
+      };
+    };
+  };
+}

nixos/modules/services/misc/taskserver/default.md

@@ -1,10 +1,18 @@
 # Taskserver {#module-services-taskserver}
 
-Taskserver is the server component of
+Taskserver is the server component of the now deprecated version 2 of
 [Taskwarrior](https://taskwarrior.org/), a free and
 open source todo list application.
 
-*Upstream documentation:* <https://taskwarrior.org/docs/#taskd>
+[Taskwarrior 3.0.0 was released in March
+2024](https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v3.0.0),
+and the sync functionality was rewritten entirely. With it, a NixOS module
+named
+[`taskchampion-sync-server`](options.html#opt-services.taskchampion-sync-server.enable)
+was added to Nixpkgs. Many people still want to use the old [Taskwarrior
+2.6.x](https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v2.6.2),
+and Taskserver along with it. Hence this module and this documentation will
+stay here for the near future.
 
 ## Configuration {#module-services-taskserver-configuration}
 
@@ -23,7 +31,7 @@ entity.
 
 With {command}`nixos-taskserver` the client certificate is created
 along with the UUID of the user, so it handles all of the credentials needed
-in order to setup the Taskwarrior client to work with a Taskserver.
+in order to setup the Taskwarrior 2 client to work with a Taskserver.
 
 ## The nixos-taskserver tool {#module-services-taskserver-nixos-taskserver-tool}
 
@@ -49,7 +57,7 @@ command, documentation for each subcommand can be shown by using the
 ## Declarative/automatic CA management {#module-services-taskserver-declarative-ca-management}
 
 Everything is done according to what you specify in the module options,
-however in order to set up a Taskwarrior client for synchronisation with a
+however in order to set up a Taskwarrior 2 client for synchronisation with a
 Taskserver instance, you have to transfer the keys and certificates to the
 client machine.
 

nixos/modules/services/misc/taskserver/default.nix

@@ -143,7 +143,7 @@ in {
         description = let
           url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver";
         in ''
-          Whether to enable the Taskwarrior server.
+          Whether to enable the Taskwarrior 2 server.
 
           More instructions about NixOS in conjunction with Taskserver can be
           found [in the NixOS manual](${url}).
@@ -327,7 +327,7 @@ in {
           Configuration options to pass to Taskserver.
 
           The options here are the same as described in
-          {manpage}`taskdrc(5)`, but with one difference:
+          {manpage}`taskdrc(5)` from the `taskwarrior2` package, but with one difference:
 
           The `server` option is
           `server.listen` here, because the
@@ -449,7 +449,7 @@ in {
       };
 
       systemd.services.taskserver = {
-        description = "Taskwarrior Server";
+        description = "Taskwarrior 2 Server";
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];

nixos/modules/services/networking/unbound.nix

@@ -33,7 +33,7 @@ let
   confFile = if cfg.checkconf then pkgs.runCommandLocal "unbound-checkconf" { } ''
     cp ${confFileUnchecked} unbound.conf
 
-    # fake stateDir which is not accesible in the sandbox
+    # fake stateDir which is not accessible in the sandbox
     mkdir -p $PWD/state
     sed -i unbound.conf \
       -e '/auto-trust-anchor-file/d' \
@@ -79,7 +79,7 @@ in {
         default = !cfg.settings ? include && !cfg.settings ? remote-control;
         defaultText = "!services.unbound.settings ? include && !services.unbound.settings ? remote-control";
         description = ''
-          Wether to check the resulting config file with unbound checkconf for syntax errors.
+          Whether to check the resulting config file with unbound checkconf for syntax errors.
 
           If settings.include is used, this options is disabled, as the import can likely not be accessed at build time.
           If settings.remote-control is used, this option is disabled, too as the control-key-file, server-cert-file and server-key-file cannot be accessed at build time.

nixos/modules/services/x11/display-managers/sx.nix

@@ -1,13 +1,18 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-with lib;
+let
+  cfg = config.services.xserver.displayManager.sx;
 
-let cfg = config.services.xserver.displayManager.sx;
-
-in {
+in
+{
   options = {
     services.xserver.displayManager.sx = {
-      enable = mkEnableOption "sx pseudo-display manager" // {
+      enable = lib.mkEnableOption "" // {
         description = ''
           Whether to enable the "sx" pseudo-display manager, which allows users
           to start manually via the "sx" command from a vt shell. The X server
@@ -19,16 +24,34 @@ in {
           dependency.
         '';
       };
+
+      addAsSession = lib.mkEnableOption "" // {
+        description = ''
+          Whether to add sx as a display manager session. Keep in mind that sx
+          expects to be run from a TTY, so it may not work in your display
+          manager.
+        '';
+      };
+
+      package = lib.mkPackageOption pkgs "sx" { };
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.sx ];
-    services.xserver = {
-      exportConfiguration = true;
-      logFile = mkDefault null;
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    services = {
+      displayManager.sessionPackages = lib.optionals cfg.addAsSession [ cfg.package ];
+
+      xserver = {
+        exportConfiguration = true;
+        logFile = lib.mkDefault null;
+      };
     };
   };
 
-  meta.maintainers = with maintainers; [ figsoda ];
+  meta.maintainers = with lib.maintainers; [
+    figsoda
+    thiagokokada
+  ];
 }

nixos/tests/all-tests.nix

@@ -928,6 +928,7 @@ in {
   swayfx = handleTest ./swayfx.nix {};
   switchTest = handleTest ./switch-test.nix { ng = false; };
   switchTestNg = handleTest ./switch-test.nix { ng = true; };
+  sx = handleTest ./sx.nix {};
   sympa = handleTest ./sympa.nix {};
   syncthing = handleTest ./syncthing.nix {};
   syncthing-no-settings = handleTest ./syncthing-no-settings.nix {};
@@ -996,6 +997,7 @@ in {
   tandoor-recipes-script-name = handleTest ./tandoor-recipes-script-name.nix {};
   tang = handleTest ./tang.nix {};
   taskserver = handleTest ./taskserver.nix {};
+  taskchampion-sync-server = handleTest ./taskchampion-sync-server.nix {};
   tayga = handleTest ./tayga.nix {};
   technitium-dns-server = handleTest ./technitium-dns-server.nix {};
   teeworlds = handleTest ./teeworlds.nix {};

nixos/tests/k3s/airgap-images.nix

@@ -31,7 +31,7 @@ import ../make-test-python.nix (
 
       start_all()
       machine.wait_for_unit("k3s")
-      machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"", timeout=60)
+      machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"", timeout=120)
       images = json.loads(machine.succeed("crictl img -o json"))
       image_names = [i["repoTags"][0] for i in images["images"]]
       with open("${k3s.imagesList}") as expected_images:

nixos/tests/sx.nix

@@ -0,0 +1,63 @@
+import ./make-test-python.nix (
+  { pkgs, lib, ... }:
+  {
+    name = "sx";
+    meta.maintainers = with lib.maintainers; [
+      figsoda
+      thiagokokada
+    ];
+
+    nodes.machine =
+      { ... }:
+      {
+        imports = [ ./common/user-account.nix ];
+
+        environment.systemPackages = with pkgs; [ icewm ];
+
+        services.getty.autologinUser = "alice";
+
+        services.xserver = {
+          enable = true;
+          displayManager.sx.enable = true;
+        };
+
+        # Create sxrc file on login and start sx
+        programs.bash.loginShellInit =
+          # bash
+          ''
+            mkdir -p "$HOME/.config/sx"
+            echo 'exec icewm' > "$HOME/.config/sx/sxrc"
+            chmod +x "$HOME/.config/sx/sxrc"
+
+            sx
+          '';
+      };
+
+    testScript =
+      { nodes, ... }:
+      let
+        user = nodes.machine.users.users.alice;
+      in
+      # python
+      ''
+        start_all()
+
+        machine.wait_for_unit("multi-user.target")
+
+        xauthority = "${user.home}/.local/share/sx/xauthority"
+        machine.wait_for_file(xauthority)
+        machine.succeed(f"xauth merge {xauthority}")
+
+        def icewm_is_visible(_last_try: bool) -> bool:
+            # sx will set DISPLAY as the TTY number we started, in this case
+            # TTY1:
+            # https://github.com/Earnestly/sx/blob/master/sx#L41.
+            # We can't use `machine.wait_for_window` here since we are running
+            # X as alice and not root.
+            return "IceWM" in machine.succeed("DISPLAY=:1 xwininfo -root -tree")
+
+        # Adding a retry logic to increase reliability
+        retry(icewm_is_visible)
+      '';
+  }
+)

nixos/tests/taskchampion-sync-server.nix

@@ -0,0 +1,48 @@
+import ./make-test-python.nix (
+  { ... }:
+  {
+    name = "taskchampion-sync-server";
+
+    nodes = {
+      server = {
+        services.taskchampion-sync-server.enable = true;
+        services.taskchampion-sync-server.openFirewall = true;
+      };
+      client =
+        { pkgs, ... }:
+        {
+          environment.systemPackages = [ pkgs.taskwarrior3 ];
+        };
+    };
+    testScript =
+      { nodes, ... }:
+      let
+        cfg = nodes.server.services.taskchampion-sync-server;
+        port = builtins.toString cfg.port;
+        # Generated with uuidgen
+        uuid = "bf01376e-04a4-435a-9263-608567531af3";
+        password = "nixos-test";
+      in
+      ''
+        # Explicitly start the VMs so that we don't accidentally start newServer
+        server.start()
+        client.start()
+
+        server.wait_for_unit("taskchampion-sync-server.service")
+        server.wait_for_open_port(${port})
+
+        # See man task-sync(5)
+        client.succeed("mkdir ~/.task")
+        client.succeed("touch ~/.taskrc")
+        client.succeed("echo sync.server.origin=http://server:${port} >> ~/.taskrc")
+        client.succeed("echo sync.server.client_id=${uuid} >> ~/.taskrc")
+        client.succeed("echo sync.encryption_secret=${password} >> ~/.taskrc")
+        client.succeed("task add hello world")
+        client.succeed("task sync")
+
+        # Useful for debugging
+        client.copy_from_vm("/root/.task", "client")
+        server.copy_from_vm("${cfg.dataDir}", "server")
+      '';
+  }
+)

nixos/tests/taskserver.nix

@@ -81,7 +81,7 @@ in {
     };
 
     client1 = { pkgs, ... }: {
-      environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ];
+      environment.systemPackages = [ pkgs.taskwarrior2 pkgs.gnutls ];
       users.users.alice.isNormalUser = true;
       users.users.bob.isNormalUser = true;
       users.users.foo.isNormalUser = true;

pkgs/applications/editors/vim/plugins/deprecated.json

@@ -7,6 +7,10 @@
         "date": "2021-12-21",
         "new": "cmp-tmux"
     },
+    "taskwarrior": {
+        "date": "2024-08-13",
+        "new": "taskwarrior3 or taskwarrior2"
+    },
     "fern-vim": {
         "date": "2024-05-28",
         "new": "vim-fern"

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -46,7 +46,8 @@
 , statix
 , stylish-haskell
 , tabnine
-, taskwarrior
+, taskwarrior2
+, taskwarrior3
 , tmux
 , tup
 , vim
@@ -1581,9 +1582,14 @@
       };
     };
 
-  taskwarrior = buildVimPlugin {
-    inherit (taskwarrior) version pname;
-    src = "${taskwarrior.src}/scripts/vim";
+  taskwarrior3 = buildVimPlugin {
+    inherit (taskwarrior3) version pname;
+    src = "${taskwarrior3.src}/scripts/vim";
+  };
+
+  taskwarrior2 = buildVimPlugin {
+    inherit (taskwarrior2) version pname;
+    src = "${taskwarrior2.src}/scripts/vim";
   };
 
   telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs {

pkgs/applications/misc/camunda-modeler/default.nix

@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "camunda-modeler";
-  version = "5.25.0";
+  version = "5.26.0";
 
   src = fetchurl {
     url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
-    hash = "sha256-4YeeeIC37s/cXZ4TjIxn/yvDVKP92f9uSBajLCj7NZw=";
+    hash = "sha256-jtTlqVsd+EGBkh05O+fRn6e6Q+Gw68uGruQqaTfsolM=";
   };
   sourceRoot = "camunda-modeler-${version}-linux-x64";
 

pkgs/applications/misc/mbutil/default.nix

@@ -1,25 +1,36 @@
-{ lib, buildPythonApplication, fetchFromGitHub, nose }:
+{
+  lib,
+  buildPythonApplication,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
 
 buildPythonApplication rec {
   pname = "mbutil";
   version = "0.3.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mapbox";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z";
+    repo = "mbutil";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-vxAF49NluEI/cZMUv1dlQBpUh1jfZ6KUVkYAmFAWphk=";
   };
 
-  nativeCheckInputs = [ nose ];
-  checkPhase = "nosetests";
+  patches = [ ./migrate_to_pytest.patch ];
 
-  meta = with lib; {
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "test/test.py" ];
+
+  meta = {
     description = "Importer and exporter for MBTiles";
     mainProgram = "mb-util";
     homepage = "https://github.com/mapbox/mbutil";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ sikmir ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }

pkgs/applications/misc/mbutil/migrate_to_pytest.patch

@@ -0,0 +1,30 @@
+diff --git a/test/test.py b/test/test.py
+index e02e259..1452fda 100644
+--- a/test/test.py
++++ b/test/test.py
+@@ -1,13 +1,24 @@
+ import os, shutil
+ import sys
+ import json
+-from nose import with_setup
+ from mbutil import mbtiles_to_disk, disk_to_mbtiles
+ 
+ def clear_data():
+     try: shutil.rmtree('test/output')
+     except Exception: pass
+ 
++
++def with_setup(setup_func, teardown_func):
++    def wrapper(func):
++        def wrapped(*args, **kwargs):
++            setup_func()
++            func(*args, **kwargs)
++            teardown_func()
++
++        return wrapped
++    return wrapper
++
++
+ @with_setup(clear_data, clear_data)
+ def test_mbtiles_to_disk():
+     mbtiles_to_disk('test/data/one_tile.mbtiles', 'test/output')

pkgs/applications/misc/ptask/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }:
+{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior2 }:
 
 stdenv.mkDerivation rec {
   pname = "ptask";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/ptask" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-      --prefix PATH : "${taskwarrior}/bin"
+      --prefix PATH : "${taskwarrior2}/bin"
   '';
 
   meta = with lib; {

pkgs/applications/misc/tasknc/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior2 }:
 
 stdenv.mkDerivation rec {
   version = "2020-12-17";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
     DESTDIR=$out PREFIX= MANPREFIX=/share/man make install
 
-    wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin
+    wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior2}/bin
   '';
 
 

pkgs/applications/misc/tuckr/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tuckr";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
     rev = version;
-    hash = "sha256-cIyqka/+CrO9RuKr7tI79QvpPA0mDL/YzWWWrcwin8E=";
+    hash = "sha256-5KDBtbovs3tPuLNJqHyMM9mGV8cNgJFv3QqAtLVOhns=";
   };
 
-  cargoHash = "sha256-5Z7UpkLlNMW8prtdJO+Xr45fpacjhDBoD/RFv/H44t0=";
+  cargoHash = "sha256-LvvC60CNl/y1rx4UTKVLFeiaJBNpou5JrCdsmZvTccU=";
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 

pkgs/applications/misc/vit/default.nix

@@ -1,7 +1,7 @@
 { lib
 , python3Packages
 , fetchPypi
-, taskwarrior
+, taskwarrior2
 , glibcLocales
 }:
 
@@ -24,7 +24,7 @@ buildPythonApplication rec {
 
   nativeCheckInputs = [ glibcLocales ];
 
-  makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ];
+  makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior2}/bin" ];
 
   preCheck = ''
     export TERM=''${TERM-linux}

pkgs/applications/networking/cluster/argo-rollouts/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "argo-rollouts";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-rollouts";
     rev = "v${version}";
-    sha256 = "sha256-5ly5VJSXIo9s2ilWYhf5FJij+tcITd+rmYEKFdFrq44=";
+    sha256 = "sha256-KljhBI7vNqQVV0UeFRXfdan1gEiwS1CwokgWnJ1RR5Q=";
   };
 
   vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM=";

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

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "4.5.0";
+  version = "4.5.1";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-DX7q8TgCJuM4G/gYnh+ZhbaGFO4BezRShZyNqZ2VRMg=";
+    sha256 = "sha256-EYhp07G4a3dhnNrWzz6BtFpcgoYHosGdY2sDUYcS9QA=";
   };
 
-  vendorHash = "sha256-K1jtwrfzRpzMApDW0WPmIZaJ5hADlMjEkFDWFmzmDc0=";
+  vendorHash = "sha256-Z7EkKVrwTzoD1BwaPhLr6XVtq/dctPJwH+KgyN3ZbUU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

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

@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , fetchurl
 , gettext
 , itstool
@@ -15,6 +16,7 @@
 , gnome
 , adwaita-icon-theme
 , gsettings-desktop-schemas
+, desktopToDarwinBundle
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -39,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
     gobject-introspection
     wrapGAppsHook3
     gtk3 # for gtk-update-icon-cache
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
   buildInputs = [
     gtk3

pkgs/by-name/ab/ablog/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ablog";
-  version = "0.11.10";
+  version = "0.11.11";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "sunpy";
     repo = "ablog";
     rev = "v${version}";
-    hash = "sha256-8NyFLGtMJLUkojEhWpWNZz3zlfgGVgSvgk4dDEz1jzs=";
+    hash = "sha256-Hx4iLO+Of2o4tmIDS17SxyswbW2+KMoD4BjB4q1KU9M=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

pkgs/by-name/ai/aider-chat/package.nix

@@ -0,0 +1,114 @@
+{
+  lib,
+  stdenv,
+  python311,
+  fetchFromGitHub,
+  gitMinimal,
+  portaudio,
+}:
+
+let
+  python3 = python311.override {
+    self = python3;
+    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
+  };
+  version = "0.50.0";
+in
+python3.pkgs.buildPythonApplication {
+  pname = "aider-chat";
+  inherit version;
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "paul-gauthier";
+    repo = "aider";
+    rev = "v${version}";
+    hash = "sha256-hRUxzljtgLGEDwHf6UtQzGQM8CgiRtgNLlVoKa2jU3o=";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies =
+    with python3.pkgs;
+    [
+      aiohappyeyeballs
+      backoff
+      beautifulsoup4
+      configargparse
+      diff-match-patch
+      diskcache
+      flake8
+      gitpython
+      grep-ast
+      importlib-resources
+      jsonschema
+      jiter
+      litellm
+      networkx
+      numpy
+      packaging
+      pathspec
+      pillow
+      playwright
+      prompt-toolkit
+      pypager
+      pypandoc
+      pyperclip
+      pyyaml
+      rich
+      scipy
+      sounddevice
+      soundfile
+      streamlit
+      tokenizers
+      watchdog
+    ]
+    ++ lib.optionals (!tensorflow.meta.broken) [
+      llama-index-core
+      llama-index-embeddings-huggingface
+    ];
+
+  buildInputs = [ portaudio ];
+
+  pythonRelaxDeps = true;
+
+  nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ];
+
+  disabledTestPaths = [
+    # requires network
+    "tests/scrape/test_scrape.py"
+
+    # Expected 'mock' to have been called once
+    "tests/help/test_help.py"
+  ];
+
+  disabledTests =
+    [
+      # requires network
+      "test_urls"
+      "test_get_commit_message_with_custom_prompt"
+
+      # FileNotFoundError
+      "test_get_commit_message"
+
+      # Expected 'launch_gui' to have been called once
+      "test_browser_flag_imports_streamlit"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # fails on darwin
+      "test_dark_mode_sets_code_theme"
+      "test_default_env_file_sets_automatic_variable"
+    ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  meta = {
+    description = "AI pair programming in your terminal";
+    homepage = "https://github.com/paul-gauthier/aider";
+    license = lib.licenses.asl20;
+    mainProgram = "aider";
+    maintainers = with lib.maintainers; [ taha-yassine ];
+  };
+}

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

@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "1.0.6";
+  version = "1.1.1";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     rev = version;
-    hash = "sha256-3xsntOPkcCV8ZizRS6du8cG1ZZEekehjf+4m3pofZBs=";
+    hash = "sha256-FFMclm+IUEU4cQZ0+uJHDCHytgW8+fygooWw3Nc1jxM=";
   };
 
   nativeBuildInputs = [

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

@@ -11,13 +11,13 @@
 }:
 
 let
-  version = "1.15.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     rev = "refs/tags/v${version}";
-    hash = "sha256-N51wZjhdoNbhHpMrgcEEzd9FIVwKwYs9sU7jyFV2b8g=";
+    hash = "sha256-sNSMVPPHSqy4sOpM3H07R3WL8OUrQ4//baxiWSOBXP8=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -47,10 +47,10 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-RkMgCa7oAPFbTHC5WAcz6b8cUOEORR0sZr2VxhQki1k=";
+    npmDepsHash = "sha256-jNvV1+2qKGNr0LjSCORi3A2IxJspc7/PTazcCCjeMe4=";
     dontNpmBuild = true;
-    # FIXME: Remove this flag when TypeScript 5.5 is released
-    npmFlags = [ "--legacy-peer-deps" ];
+    # Uncomment this flag when using unreleased peer dependencies
+    # npmFlags = [ "--legacy-peer-deps" ];
     installPhase = ''
       runHook preInstall
       cp -r . "$out"
@@ -94,7 +94,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-6Zhd5IothE7RoetaITL5MmLIF6YDNk6IiHcfTzbbjLY=";
+  npmDepsHash = "sha256-n2UU1wNN+wbHsAv7pJHNJTDjEE5ZpjRxBGSVPF4ADm8=";
 
   postPatch = ''
     chmod +w ../../

pkgs/by-name/cl/cloak-pt/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+let
+  version = "2.9.0";
+in
+buildGoModule {
+  pname = "Cloak";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "cbeuw";
+    repo = "Cloak";
+    rev = "v${version}";
+    hash = "sha256-IclSnSJAUSWWAk8UZbUJLMVcnoZk5Yvsd1n3u67cM2g=";
+  };
+
+  vendorHash = "sha256-kkb/gPnDbJvfc5Qqc5HuM1c9OwOu1ijfO7nNNnY3mOo=";
+
+  doCheck = false;
+
+  ldflags = [ "-X main.version=${version}" ];
+  meta = {
+    homepage = "https://github.com/cbeuw/Cloak/";
+    description = "Pluggable transport that enhances traditional proxy tools like OpenVPN to evade sophisticated censorship and data discrimination";
+    longDescription = ''
+      Cloak is not a standalone proxy program. Rather, it works by masquerading proxied traffic as normal web browsing activities.
+
+      To any third party observer, a host running Cloak server is indistinguishable from an innocent web server.
+    '';
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ bananad3v ];
+  };
+}

pkgs/by-name/fl/flarectl/package.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "flarectl";
-  version = "0.101.0";
+  version = "0.102.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflare-go";
     rev = "v${version}";
-    hash = "sha256-twQ+my2CZmQDGMZg7bNZwNqSME+HZrWDZkzxKKEKd/0=";
+    hash = "sha256-i/JWbi8itjcFklknFGB23DtYh4+jd+2YMQysHtS3qf8=";
   };
 
-  vendorHash = "sha256-gnl5zNNIH1LSAyzrhKIRXvwpUhXEydyDFzNCYtpZEIE=";
+  vendorHash = "sha256-4tJATAvWpWq1aTtV4ERTHF6S2D0azC3HlrwxkLIGT7s=";
 
   subPackages = [ "cmd/flarectl" ];
 

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

@@ -2,15 +2,16 @@
 , stdenv
 , fetchurl
 , removeReferencesTo
+, gitUpdater
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pkgconf";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz";
-    hash = "sha256-sG/2OoNTaqjC9kIvqArUXkgz9ZAmb+sU6t3+HUyFPGk=";
+    hash = "sha256-OpCArFHQNhXnwZEKCiqN8IQkiStfE7BiiiBNP8zg6os=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "doc" ];
@@ -40,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
     mv ${placeholder "dev"}/share ${placeholder "out"}
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/pkgconf/pkgconf.git";
+    rev-prefix = "pkgconf-";
+  };
+
   meta = {
     homepage = "https://github.com/pkgconf/pkgconf";
     description = "Package compiler and linker metadata toolkit";

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

@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "litmusctl";
-  version = "1.7.0";
+  version = "1.8.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -21,7 +21,7 @@ buildGoModule rec {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${version}";
-    hash = "sha256-g3g0wVjtVIF56N1gTillHMkNDHt58tpRQa2ds+3rHAE=";
+    hash = "sha256-gLXRIfdNDauAn+cRsRDTZB0Doq8U0SCC2xz7bf6nOUk=";
   };
 
   vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";

pkgs/by-name/mc/mcfly/package.nix

@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mcfly";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "cantino";
     repo = "mcfly";
     rev = "v${version}";
-    hash = "sha256-XlAzQNZ4XREp+mmvASGWUnoX2na//lQCgve7OtNcHeE=";
+    hash = "sha256-KQgoyxzTWoQok/sUFcvUazxrBMxVXvxqjJudyKYeZCo=";
   };
 
   postPatch = ''
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace mcfly.fish --replace '(command which mcfly)'  '${placeholder "out"}/bin/mcfly'
   '';
 
-  cargoHash = "sha256-k+CNsDz3qbCFD0jiiB++1uZJlSfThuCiQkaD6QYyfsY=";
+  cargoHash = "sha256-c+LOmUUt8t1x5Pp8yGHSeLcJNs/lJzq29KMX/i7Cscs=";
 
   meta = with lib; {
     homepage = "https://github.com/cantino/mcfly";

pkgs/by-name/md/mdt/package.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdt";
-  version = "0.8.1";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "henriklovhaug";
     repo = "md-tui";
     rev = "v${version}";
-    hash = "sha256-AwJvB1xLsJCr+r0RJi8jH50QlPq7mbUibvmvYZJi9XE=";
+    hash = "sha256-J1UtyxDT8+UmBwayUMtcPOtnVVkRZLg6ECXnqDSJ2Ew=";
   };
 
-  cargoHash = "sha256-VNuC0tSlFKlQV1KJKxKUiBHEpdVAyQpAJKbYZ8ntVaQ=";
+  cargoHash = "sha256-X6Pl3oMsFHaKMdXLfPxQ9xSRfRMo4eueLkmDoDBqjaM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
 

pkgs/by-name/ni/niri/package.nix

@@ -20,19 +20,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "niri";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "niri";
     rev = "v${version}";
-    hash = "sha256-EdlOGL9RdO77HnZxv2UpPwrJdFH8qPrPSRtkBBV167s=";
+    hash = "sha256-13xynDWoOqogUKZTf6lz267hEQGdCE+BE6acs2G3j8k=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "smithay-0.3.0" = "sha256-K1lguY6f1mbrfxkDNeLlNAXSM9JC8Jm61MyBIsIYiNs=";
+      "smithay-0.3.0" = "sha256-4lmCbdW+fOnPWEDAbKk4LFcr9KK+akjUJqiwm0pK8Uw=";
+      "libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
     };
   };
 
@@ -62,7 +63,7 @@ rustPlatform.buildRustPackage rec {
     libglvnd # For libEGL
   ];
 
-  passthru.providedSessions = ["niri"];
+  passthru.providedSessions = [ "niri" ];
 
   postPatch = ''
     patchShebangs ./resources/niri-session

pkgs/by-name/ni/nix-ld/package.nix

@@ -1,35 +1,36 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, nixosTests
+{
+  stdenv,
+  fetchFromGitHub,
+  nixosTests,
+  rustPlatform,
+  lib,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "nix-ld";
-  version = "1.2.3";
+rustPlatform.buildRustPackage {
+  name = "nix-ld";
 
   src = fetchFromGitHub {
     owner = "mic92";
     repo = "nix-ld";
-    rev = version;
-    hash = "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=";
+    rev = "2.0.0";
+    sha256 = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg=";
   };
 
-  doCheck = true;
+  cargoHash = "sha256-w6CQx9kOyBtM2nMwdFb+LtU4oHVEYrTNVmH1A6R5DHM=";
 
-  nativeBuildInputs = [ meson ninja ];
+  hardeningDisable = [ "stackprotector" ];
 
-  mesonFlags = [
-    "-Dnix-system=${stdenv.system}"
-  ];
+  NIX_SYSTEM = stdenv.system;
+  RUSTC_BOOTSTRAP = "1";
 
-  hardeningDisable = [
-    "stackprotector"
-  ];
+  preCheck = ''
+    export NIX_LD=${stdenv.cc.bintools.dynamicLinker}
+  '';
 
   postInstall = ''
+    mkdir -p $out/libexec
+    ln -s $out/bin/nix-ld $out/libexec/nix-ld
+
     mkdir -p $out/nix-support
 
     ldpath=/${stdenv.hostPlatform.libDir}/$(basename ${stdenv.cc.bintools.dynamicLinker})

pkgs/by-name/oe/oelint-adv/package.nix

@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "oelint-adv";
-  version = "5.7.1";
+  version = "5.7.2";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "oelint_adv";
-    hash = "sha256-8F3fXNdb8YtYRQ6CHz+qX6IsqvIxnGrETWrBPrb5v+Q=";
+    hash = "sha256-nHtOSOAKbmbmihaL8qvXBOB76LaC9E95UFQ479X/Rgo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

pkgs/by-name/ph/phpunit/package.nix

@@ -6,16 +6,16 @@
 
 php.buildComposerProject (finalAttrs: {
   pname = "phpunit";
-  version = "11.3.0";
+  version = "11.3.1";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     rev = finalAttrs.version;
-    hash = "sha256-c8jooavjabT2RUXHYdRXwQzSD0slHG6ws/83FFL8W5k=";
+    hash = "sha256-uTH5LlXabhsu86Te/oNnIrvq88MhAqYbVTyKEaPtTuU=";
   };
 
-  vendorHash = "sha256-MjWfMfu3ptJhJubUrP7pC5/o2mVHepRCguPgPzJnGOY=";
+  vendorHash = "sha256-hAIuAX3cBxs+mubgS/RlJ+QELvFoV35nAVDmkcaOddY=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/qr/qrtool/package.nix

@@ -1,36 +1,42 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, asciidoctor
-, installShellFiles
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  rustPlatform,
+  asciidoctor,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "qrtool";
   version = "0.11.4";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "sorairolake";
     repo = "qrtool";
     rev = "v${version}";
-    sha256 = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA=";
+    hash = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA=";
   };
 
   cargoHash = "sha256-lR/LusIgdA+G7YeSLHjxdcC96tOSqSyalVamS42ORs0=";
 
-  nativeBuildInputs = [ asciidoctor installShellFiles ];
+  nativeBuildInputs = [
+    asciidoctor
+    installShellFiles
+  ];
 
-  postInstall = ''
-    # Built by ./build.rs using `asciidoctor`
-    installManPage ./target/*/release/build/qrtool*/out/*.?
+  postInstall =
+    ''
+      # Built by ./build.rs using `asciidoctor`
+      installManPage ./target/*/release/build/qrtool*/out/*.?
 
-  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd qrtool \
-      --bash <($out/bin/qrtool --generate-completion bash) \
-      --fish <($out/bin/qrtool --generate-completion fish) \
-      --zsh <($out/bin/qrtool --generate-completion zsh)
-  '';
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd qrtool \
+        --bash <($out/bin/qrtool --generate-completion bash) \
+        --fish <($out/bin/qrtool --generate-completion fish) \
+        --zsh <($out/bin/qrtool --generate-completion zsh)
+    '';
 
   meta = with lib; {
     maintainers = with maintainers; [ philiptaron ];

pkgs/by-name/sk/skia/package.nix

@@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'deps = [ "//third_party/zlib" ]' 'deps = []'
   '';
 
+  strictDeps = true;
   nativeBuildInputs = [
     gn
     ninja
@@ -69,7 +70,14 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-memory-allocator
   ];
 
-  configurePhase = ''
+  configurePhase = let
+    cpu = {
+      "x86_64" = "x64";
+      "i686" = "x86";
+      "arm" = "arm";
+      "aarch64" = "arm64";
+    }.${stdenv.hostPlatform.parsed.cpu.name};
+  in ''
     runHook preConfigure
     gn gen build --args='${toString ([
       # Build in release mode
@@ -80,6 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
       "skia_use_wuffs=false"
       # Use system dependencies
       "extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]"
+      "cc=\"${stdenv.cc.targetPrefix}cc\""
+      "cxx=\"${stdenv.cc.targetPrefix}c++\""
+      "ar=\"${stdenv.cc.targetPrefix}ar\""
+      "target_cpu=\"${cpu}\""
     ] ++ map (lib: "skia_use_system_${lib}=true") [
       "zlib"
       "harfbuzz"
@@ -142,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://skia.org/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fgaz ];
-    platforms = lib.platforms.all;
+    platforms = with lib.platforms; arm ++ aarch64 ++ x86 ++ x86_64;
     pkgConfigModules = [ "skia" ];
     # https://github.com/NixOS/nixpkgs/pull/325871#issuecomment-2220610016
     broken = stdenv.isDarwin;

pkgs/by-name/sp/spicetify-cli/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "spicetify-cli";
-  version = "2.37.0";
+  version = "2.37.1";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-72HxZnx5TcupTU6bCzuVRXUzR82dA+93WDatbJCsVYM=";
+    hash = "sha256-YX3Fbeup2xYcaKEm/tQudE7tYsqO2n4BScSIZ8CqVQ4=";
   };
 
-  vendorHash = "sha256-i3xnf440lslzeDJ4pLLONqw8ACbdkKgPIhlPSuC1Vng=";
+  vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8=";
 
   ldflags = [
     "-s -w"

pkgs/by-name/sx/sx/package.nix

@@ -1,18 +1,21 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, patsh
-, xorg
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  makeDesktopItem,
+  patsh,
+  xorg,
+  nixosTests,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sx";
   version = "3.0";
 
   src = fetchFromGitHub {
     owner = "earnestly";
-    repo = pname;
-    rev = version;
+    repo = "sx";
+    rev = finalAttrs.version;
     hash = "sha256-hKoz7Kuus8Yp7D0F05wCOQs6BvV0NkRM9uUXTntLJxQ=";
   };
 
@@ -27,14 +30,33 @@ stdenvNoCC.mkDerivation rec {
 
   postInstall = ''
     patsh -f $out/bin/sx -s ${builtins.storeDir}
+
+    install -Dm755 -t $out/share/xsessions ${
+      makeDesktopItem {
+        name = "sx";
+        desktopName = "sx";
+        comment = "Start a xorg server";
+        exec = "sx";
+      }
+    }/share/applications/sx.desktop
   '';
 
-  meta = with lib; {
+  passthru = {
+    providedSessions = [ "sx" ];
+    tests = {
+      inherit (nixosTests) sx;
+    };
+  };
+
+  meta = {
     description = "Simple alternative to both xinit and startx for starting a Xorg server";
     homepage = "https://github.com/earnestly/sx";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "sx";
-    maintainers = with maintainers; [ figsoda thiagokokada ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      figsoda
+      thiagokokada
+    ];
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/ta/taskwarrior2/package.nix

@@ -1,4 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  libuuid,
+  gnutls,
+  python3,
+  xdg-utils,
+  installShellFiles,
+}:
 
 stdenv.mkDerivation rec {
   pname = "taskwarrior";
@@ -17,7 +27,13 @@ stdenv.mkDerivation rec {
       --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"
   '';
 
-  nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ];
+  nativeBuildInputs = [
+    cmake
+    libuuid
+    gnutls
+    python3
+    installShellFiles
+  ];
 
   doCheck = true;
   preCheck = ''
@@ -44,7 +60,10 @@ stdenv.mkDerivation rec {
     description = "Highly flexible command-line tool to manage TODO lists";
     homepage = "https://taskwarrior.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ marcweber oxalica ];
+    maintainers = with maintainers; [
+      marcweber
+      oxalica
+    ];
     mainProgram = "task";
     platforms = platforms.unix;
   };

pkgs/by-name/ta/taskwarrior3/package.nix

@@ -8,6 +8,7 @@
   fetchFromGitHub,
   cmake,
   libuuid,
+  nixosTests,
   python3,
   xdg-utils,
   installShellFiles,
@@ -29,20 +30,22 @@ stdenv.mkDerivation rec {
       --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"
   '';
 
-  nativeBuildInputs = [
-    cmake
-    libuuid
-    python3
-    installShellFiles
-    corrosion
-    cargo
-    rustc
-    rustPlatform.cargoSetupHook
-  ] ++ lib.optionals stdenv.isDarwin [
-    # darwin dependencies
-    darwin.apple_sdk.frameworks.Security
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      libuuid
+      python3
+      installShellFiles
+      corrosion
+      cargo
+      rustc
+      rustPlatform.cargoSetupHook
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # darwin dependencies
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];
 
   doCheck = true;
   checkTarget = "build_tests";
@@ -73,13 +76,20 @@ stdenv.mkDerivation rec {
     ln -s $out/share/vim-plugins/task $out/share/nvim/site
   '';
 
-  meta = with lib; {
+  passthru.tests.nixos = nixosTests.taskchampion-sync-server;
+
+  meta = {
     changelog = "https://github.com/GothenburgBitFactory/taskwarrior/blob/${src.rev}/ChangeLog";
     description = "Highly flexible command-line tool to manage TODO lists";
     homepage = "https://taskwarrior.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [marcweber oxalica mlaradji];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      marcweber
+      oxalica
+      mlaradji
+      doronbehar
+    ];
     mainProgram = "task";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/ze/zed-editor/package.nix

@@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
 
 rustPlatform.buildRustPackage rec {
   pname = "zed";
-  version = "0.147.2";
+  version = "0.148.0";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Qjorf5cqfEnvlKX0WaE0VNJr99AGJsAJ/BEf8yfPv7E=";
+    hash = "sha256-fwxKzd2YKGAMbDDJPj4A0MHBRLg8oBc6JZzrbr7BaHM=";
     fetchSubmodules = true;
   };
 
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     outputHashes = {
       "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
       "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
-      "blade-graphics-0.4.0" = "sha256-o3iYBrHcLXSrdvd0J/LXJb7VkTcFyB/S2Nk9WrmZupI=";
+      "blade-graphics-0.4.0" = "sha256-sGXhXmgtd7Wx/Gf7HCWro4RsQOGS4pQt8+S3T+2wMfY=";
       "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM=";
       "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
       "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";

pkgs/desktops/gnome/extensions/taskwhisperer/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
+{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior2, gettext, runtimeShell }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-taskwhisperer";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    taskwarrior
+    taskwarrior2
   ];
 
   passthru = {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      task = "${taskwarrior}/bin/task";
+      task = "${taskwarrior2}/bin/task";
       shell = runtimeShell;
     })
   ];

pkgs/desktops/lomiri/services/telephony-service/default.nix

@@ -67,8 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
+    # Patch out failure if QMake is not found, since we don't use it
     substituteInPlace CMakeLists.txt \
-      --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
+      --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" \
+      --replace-fail 'QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND"' 'FALSE'
 
   '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
     substituteInPlace tests/common/dbus-services/CMakeLists.txt \

pkgs/development/libraries/httplib/default.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "httplib";
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
     rev = "v${version}";
-    hash = "sha256-8/m3i1ciSq+jybz0yxS3Lr9oeHpvOf6qKOwmzNloi+Y=";
+    hash = "sha256-BR6Iy3RkSuOZHAs7edd7JFBHxFlN+R/ZC1Xt8p6xe2A=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix

@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "suitesparse-graphblas";
-  version = "9.3.0";
+  version = "9.3.1";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "DrTimothyAldenDavis";
     repo = "GraphBLAS";
     rev = "v${version}";
-    hash = "sha256-/ubvds/mg5SW8kEfnEuPyHCM/P8+ETT1Uus2ESj50Og=";
+    hash = "sha256-lNjxNW0XrHtdULDI35qp2BRCOrdKMnWu7Rje0+uBv0g=";
   };
 
   nativeBuildInputs = [

pkgs/development/lua-modules/generated-packages.nix

@@ -2089,14 +2089,14 @@ buildLuarocksPackage {
 luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }:
 buildLuarocksPackage {
   pname = "luarocks-build-treesitter-parser-cpp";
-  version = "1.0.0-1";
+  version = "2.0.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-1.0.0-1.rockspec";
-    sha256 = "0vvw3ai42jif2z2ir6l14jkjq138djbn04wnjblm3vilaz5k0sfv";
+    url    = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-2.0.0-1.rockspec";
+    sha256 = "13jwyg9y5n3zh55pisyms6kh8n59gwh9q9nslxkbdrb149y5wlr4";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v1.0.0.zip";
-    sha256 = "0j1f3wq19zng8ay6pniphb7m0xp131i9alqpdf0szpyq8y00w2s1";
+    url    = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v2.0.0.zip";
+    sha256 = "1rldmmimz3bhhh5yrx15wsdiymfmjyl3j8y71xz4mi4m16in470d";
   };
 
   disabled = luaOlder "5.1";

pkgs/development/python-modules/cyclonedx-python-lib/default.nix

@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "7.5.1";
+  version = "7.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zYiSJJ49lgRMuJX0fqL8dedcFQzsh6JiMuoqV0VhF2I=";
+    hash = "sha256-4778eTsgHxVnbJiFvZdOIXtRUeZ0S3nANEGC3eNlEpU=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];

pkgs/development/python-modules/django-markup/default.nix

@@ -3,6 +3,11 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+
+  # build-system
+  poetry-core,
+
+  # dependencies
   django,
 
   # optionals
@@ -21,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "django-markup";
-  version = "1.8.1";
+  version = "1.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,14 +35,16 @@ buildPythonPackage rec {
     owner = "bartTC";
     repo = "django-markup";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Hhcp4wVJEcYV1lEZ2jWf7nOlt5m4lVAfC6VmKIdxf4c=";
+    hash = "sha256-HSszXZ86hLxRgBZHIs1TA7F7MHLlS58oAhG50yrTquE=";
   };
 
   postPatch = ''
     sed -i "/--cov/d" pyproject.toml
   '';
 
-  buildInputs = [ django ];
+  build-system = [ poetry-core ];
+
+  dependencies = [ django ];
 
   passthru.optional-dependencies = {
     all_filter_dependencies = [
@@ -58,7 +65,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ] ++ passthru.optional-dependencies.all_filter_dependencies;
 
-  env.DJANGO_SETTINGS_MODULE = "django_markup.tests";
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=django_markup.tests
+  '';
 
   meta = with lib; {
     description = "Generic Django application to convert text with specific markup to html";

pkgs/development/python-modules/knx-frontend/default.nix

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2024.8.6.211307";
+  version = "2024.8.9.225351";
   format = "pyproject";
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-WHZW3EXsLrbQZgmDRJK0yFUPgY2B9UgNfvenXHh2z9g=";
+    hash = "sha256-ZxEcGXSsdBZQAcwsXI7K/bmxw8+DFQc+aBbgaIfTQgU=";
   };
 
   nativeBuildInputs = [ setuptools ];

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

@@ -1,48 +1,54 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  hist,
-  matplotlib,
-  mplhep-data,
-  pytestCheckHook,
-  pytest-mock,
-  pytest-mpl,
-  scipy,
+  fetchFromGitHub,
   setuptools,
   setuptools-scm,
+  matplotlib,
+  mplhep-data,
+  numpy,
+  packaging,
   uhi,
+  pytestCheckHook,
+  scipy,
+  pytest-mpl,
+  pytest-mock,
   uproot,
+  hist,
 }:
 
 buildPythonPackage rec {
   pname = "mplhep";
-  version = "0.3.50";
-  format = "pyproject";
+  version = "0.3.51";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-xHdZdfTiKbDGu6oYIiTd8P/npH2kUjz7s8A9+CBJN0A=";
+  src = fetchFromGitHub {
+    owner = "scikit-hep";
+    repo = "mplhep";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-5uXqBifJNWznXX4l5G79DLvD6VdD8xRBwZJbzp1+HP8=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     matplotlib
-    uhi
     mplhep-data
+    numpy
+    packaging
+    uhi
   ];
 
   nativeCheckInputs = [
-    hist
     pytestCheckHook
-    pytest-mock
-    pytest-mpl
     scipy
+    pytest-mpl
+    pytest-mock
     uproot
+    hist
   ];
 
   disabledTests = [
@@ -53,10 +59,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mplhep" ];
 
-  meta = with lib; {
+  meta = {
     description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
     homepage = "https://github.com/scikit-hep/mplhep";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ veprbl ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }

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

@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "osxphotos";
-  version = "0.68.3";
+  version = "0.68.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "osxphotos";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KgdKqmrWPr0kBtIB80BMmLUAmf7CpA7JJeE4DjLal78=";
+    hash = "sha256-bafEZ+6ck+LOm6eS+IjI6GFYh3OHpLUWrg0zJ4eb9Mg=";
   };
 
   build-system = [ setuptools ];

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

@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  prompt-toolkit,
+  pygments,
+}:
+
+buildPythonPackage {
+  pname = "pypager";
+  version = "3.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "prompt-toolkit";
+    repo = "pypager";
+    rev = "0255d59a14ffba81c3842ef570c96c8dfee91e8e";
+    hash = "sha256-uPpVAI12INKFZDiTQdzQ0dhWCBAGeu0488zZDEV22mU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    prompt-toolkit
+    pygments
+  ];
+
+  pythonImportsCheck = [ "pypager" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = ''Pure Python pager (like "more" and "less")'';
+    homepage = "https://github.com/prompt-toolkit/pypager";
+    license = lib.licenses.bsd3;
+    mainProgram = "pypager";
+    maintainers = with lib.maintainers; [ taha-yassine ];
+  };
+}

pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-storage-plugins";
-  version = "3.2.3";
+  version = "3.2.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-xfqxUla3qFnGZSFpWVCmtSJLqCK6XJF1OtDF1EDXbZU=";
+    hash = "sha256-im+Pb8SZAq2B3hrPzs4w+flb0q+oet6kZZSQ7/7VdaU=";
   };
 
   nativeBuildInputs = [ poetry-core ];

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

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "10.6.0";
+  version = "10.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QcywraWSjYlTDtBtF6cb+/X06k8jJOMNjWNqKrcYCnQ=";
+    hash = "sha256-ntrb2osKtZRajWo7WNTw0UyPTneE9b1+c6uF/jYBRe8=";
   };
 
   build-system = [ setuptools ];

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

@@ -1,17 +1,14 @@
 {
   lib,
-  pythonPackages,
+  buildPythonPackage,
+  six,
+  pytz,
+  tzlocal,
   fetchPypi,
-  taskwarrior,
+  taskwarrior2,
   writeShellScriptBin,
 }:
 
-with pythonPackages;
-
-let
-
-  wsl_stub = writeShellScriptBin "wsl" "true";
-in
 buildPythonPackage rec {
   pname = "tasklib";
   version = "2.5.1";
@@ -29,16 +26,17 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    taskwarrior
-    wsl_stub
+    taskwarrior2
+    # stub
+    (writeShellScriptBin "wsl" "true")
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/robgolding/tasklib";
     description = "Library for interacting with taskwarrior databases";
     changelog = "https://github.com/GothenburgBitFactory/tasklib/releases/tag/${version}";
-    maintainers = with maintainers; [ arcnmx ];
-    platforms = platforms.all;
-    license = licenses.bsd3;
+    maintainers = with lib.maintainers; [ arcnmx ];
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
   };
 }

pkgs/development/python-modules/taskw-ng/default.nix

@@ -9,7 +9,7 @@
   python-dateutil,
   pythonOlder,
   pytz,
-  taskwarrior,
+  taskwarrior2,
 }:
 
 buildPythonPackage rec {
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     pytz
   ];
 
-  checkInputs = [ taskwarrior ];
+  checkInputs = [ taskwarrior2 ];
 
   # TODO: doesn't pass because `can_use` fails and `task --version` seems not to be answering.
   # pythonImportsCheck = [ "taskw_ng" ];

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

@@ -8,7 +8,7 @@
   setuptools,
 
   # native dependencies
-  pkgs,
+  taskwarrior2,
 
   # dependencies
   kitchen,
@@ -39,12 +39,12 @@ buildPythonPackage rec {
   ];
   postPatch = ''
     substituteInPlace taskw/warrior.py \
-      --replace '@@taskwarrior@@' '${pkgs.taskwarrior}'
+      --replace '@@taskwarrior@@' '${taskwarrior2}'
   '';
 
   build-system = [ setuptools ];
 
-  buildInputs = [ pkgs.taskwarrior ];
+  buildInputs = [ taskwarrior2 ];
 
   dependencies = [
     kitchen

pkgs/development/tools/analysis/codeql/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.18.1";
+  version = "2.18.2";
 
   dontConfigure = true;
   dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-X/Sg5+UGl0DJ5LL42tlQt3NIfTJc4nH1AySeLJQsZkk=";
+    hash = "sha256-WyfBiYvPi+iQkrsYMdTUFP5yStzyRQMqNbgD9IKFEMs=";
   };
 
   nativeBuildInputs = [

pkgs/development/tools/buildah/default.nix

@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.37.0";
+  version = "1.37.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    hash = "sha256-WT1ij2jDEKavYREYYYKl6H27QOuGDAxnWSz+mbvJ5UA=";
+    hash = "sha256-43p2sD6mpcoMukr7mY2GTsti4FVC7Blq0ZozuIJlC30=";
   };
 
   outputs = [ "out" "man" ];

pkgs/development/tools/continuous-integration/cirrus-cli/default.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.121.0";
+  version = "0.122.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ec7HUYeBgoAtTxHIlW3dgC38z15pplWL/RhcZyxmIsE=";
+    hash = "sha256-7T1do0PWgBBKZUqGZXpzmtBMsRnumRwyTDhhaE9pJ/0=";
   };
 
-  vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o=";
+  vendorHash = "sha256-yUnoJoKb6BkZyVlbzIhTeqmdEuumpkbRvIX1+v9WMgs=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

pkgs/development/tools/faas-cli/default.nix

@@ -18,13 +18,13 @@ let
 in
 buildGoModule rec {
   pname = "faas-cli";
-  version = "0.16.32";
+  version = "0.16.34";
 
   src = fetchFromGitHub {
     owner = "openfaas";
     repo = "faas-cli";
     rev = version;
-    sha256 = "sha256-EqP1YStp8sUJq0zel9mTmi8SWHvObciUetRzAbo3rK8=";
+    sha256 = "sha256-vz/RMwmZYCG76lZyloRz1CyLJuj+fK8oAaK1GqW6bvE=";
   };
 
   vendorHash = null;

pkgs/development/tools/firebase-tools/default.nix

@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "13.14.2";
+  version = "13.15.1";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     rev = "v${version}";
-    hash = "sha256-Y5PoiBX/ql7gbNpCklZieFsoIzxhyau40MTGXDYyxYs=";
+    hash = "sha256-DnrKIOKwIZ4MmqYm2RqtMs4N1y4+zdw+Qm8RyDXyzRg=";
   };
 
-  npmDepsHash = "sha256-Z83Llre5ajVuGNt7LBr0tjWxRXTajne2U3fZuBwPjIg=";
+  npmDepsHash = "sha256-+cJai7Q/xleGiO251eoU3kKvfASQgTfsyHGiABiCaPs=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

pkgs/development/tools/rust/cargo-leptos/default.nix

@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "cargo-leptos";
-  version = "0.2.17";
+  version = "0.2.18";
 
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-W08R1ny4LyzWehnsWSMCRjCxmvV0k7ARVbmZ740hg8w=";
+    hash = "sha256-53T69yX+yllfZgHyKL6aydCtc2xIKG2f/Xgcb2yopxg=";
   };
 
-  cargoHash = "sha256-kuKsBnmH3bPgwuJ1q49iHMNT47Djx9BKxcMBbJ3zqis=";
+  cargoHash = "sha256-35QUaETifNitnIjaHRyZFdzsLRfQsoonHS5/TOkYIgU=";
 
   buildInputs = optionals isDarwin [
     SystemConfiguration

pkgs/misc/screensavers/betterlockscreen/default.nix

@@ -26,13 +26,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "betterlockscreen";
-  version = "4.2.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
-    owner = "pavanjadhaw";
+    owner = "betterlockscreen";
     repo = "betterlockscreen";
     rev = "v${version}";
-    sha256 = "sha256-e/NyUxrN18+x2zt+JzqVA00P8VdHo8oj9Bx09XKI+Eg=";
+    sha256 = "sha256-59Ct7XIfZqU3yaW9FO7UV8SSMLdcZMPRc7WJangxFPo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Fast and sweet looking lockscreen for linux systems with effects!";
-    homepage = "https://github.com/pavanjadhaw/betterlockscreen";
+    homepage = "https://github.com/betterlockscreen/betterlockscreen";
     mainProgram = "betterlockscreen";
     license = licenses.mit;
     platforms = platforms.linux;

pkgs/os-specific/darwin/raycast/default.nix

@@ -11,12 +11,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
-  version = "1.80.0";
+  version = "1.81.0";
 
   src = fetchurl {
     name = "Raycast.dmg";
     url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-ZNvgMlKowSMz5nLNRyIZa5xLYe2oH6ANoXL0jUM1HwY=";
+    hash = "sha256-tyBlis+KfayGINWoxtISkG2A40lpYhAQbsEmLL0LmzI=";
   };
 
   dontPatch = true;

pkgs/servers/dex/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "dex";
-  version = "2.41.0";
+  version = "2.41.1";
 
   src = fetchFromGitHub {
     owner = "dexidp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-sJYsImodetwBbyj2C5Skas6IuDDfuildbUb2QLL5Hek=";
+    sha256 = "sha256-sYTAW1S2fAAIZSFfsgYQ46TlkZHXUtbylSImBQz68DE=";
   };
 
   vendorHash = "sha256-LPPYJRmei/K2zW7Mi6Y/AOvNoYQSIfXKF+qxjYTCDAc=";

pkgs/servers/http/angie/console-light.nix

@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.4.0";
   pname = "angie-console-light";
 
   src = fetchurl {
     url = "https://download.angie.software/files/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-bwnVwhcPyEXGzvpXj2bC1WUGtNbBlHpqZibApKtESq8=";
+    hash = "sha256-Oz+FdMrIGNmJKHl/wOVZCP1b0AJODcURvDUKz4gCqYU=";
   };
 
   outputs = [ "out" "doc" ];

pkgs/servers/http/angie/default.nix

@@ -8,12 +8,12 @@
 }@args:
 
 callPackage ../nginx/generic.nix args rec {
-  version = "1.6.0";
+  version = "1.6.1";
   pname = if withQuic then "angieQuic" else "angie";
 
   src = fetchurl {
     url = "https://download.angie.software/files/angie-${version}.tar.gz";
-    hash = "sha256-yzEbYOxvt2SPTYD/Dw4SJDg94muKGan+QX51sf6xuU4=";
+    hash = "sha256-VQreIqK6cIa2ffRx5mUtPbEuTnXrCmm2KLQH5US92Rs=";
   };
 
   configureFlags = lib.optionals withAcme [

pkgs/servers/mail/mailpit/source.nix

@@ -1,6 +1,6 @@
 {
-  version = "1.19.3";
-  hash = "sha256-LgKQOkkstmvbzkWtr53pNebZx2TSxJBArcchDCT7rMI=";
-  npmDepsHash = "sha256-cNLejqYjeR4GL9xXnCHe5HdONg8tYlpgJPAg3K9U+Xw=";
-  vendorHash = "sha256-kDNbYB1KzCUUn3EXt3CkfUXTIsg7VOLVtF7anzZOvYs=";
+  version = "1.20.1";
+  hash = "sha256-/33zDWmKrC/wSCn67xDqo39DcVNiKhxE+i352ptrCxk=";
+  npmDepsHash = "sha256-dmU1IWSZBkoSixSuT5JSVVvKBCe/0L0UsmjSWKJB6jc=";
+  vendorHash = "sha256-vbDiWWUn67Hw8t6PBVR8u9SiyDOAMX5GBZ7ujTo3nqA=";
 }

pkgs/servers/nosql/aerospike/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "7.1.0.4";
+  version = "7.1.0.5";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-8fDwN2O2iz3AuMNuf3J9K2z69sE3JRYw19nWEKvqjTs=";
+    hash = "sha256-eUB9A9dv71hlrnOQsKcZTfqxXVhz5ErhIOIks2wJois=";
     fetchSubmodules = true;
   };
 

pkgs/servers/nosql/apache-jena/fuseki-binary.nix

@@ -11,10 +11,10 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-jena-fuseki";
-  version = "4.9.0";
+  version = "5.1.0";
   src = fetchurl {
     url = "mirror://apache/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    hash = "sha256-t25Q0lb+ecR12cDD1p6eZnzLxW0kZpPOFGvo5YK7AlI=";
+    hash = "sha256-GcwXcLVM2txPC+kkHjEIpqK9dTkQEN9Jkka0EaJRO7Q=";
   };
   nativeBuildInputs = [
     makeWrapper

pkgs/servers/sip/freeswitch/default.nix

@@ -103,12 +103,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "freeswitch";
-  version = "1.10.11";
+  version = "1.10.12";
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-LzGqrXzPED3PoCDnrwUmmSQsvlAucYo2gTkwFausM7A=";
+    hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8=";
   };
 
   postPatch = ''

pkgs/tools/misc/cf-terraforming/default.nix

@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib, cf-terraforming, testers }:
+{ buildGoModule, fetchFromGitHub, lib, cf-terraforming, testers, installShellFiles, stdenv }:
 
 buildGoModule rec {
   pname = "cf-terraforming";
@@ -23,6 +23,15 @@ buildGoModule rec {
     command = "cf-terraforming version";
   };
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)''
+    installShellCompletion --cmd cf-terraforming \
+      --bash <($out/bin/cf-terraforming completion bash) \
+      --fish <($out/bin/cf-terraforming completion fish) \
+      --zsh <($out/bin/cf-terraforming completion zsh)
+  '';
+
   meta = with lib; {
     description = "Command line utility to facilitate terraforming your existing Cloudflare resources";
     homepage = "https://github.com/cloudflare/cf-terraforming/";

pkgs/tools/misc/getoptions/default.nix

@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "getoptions";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "ko1nksm";
     repo = "getoptions";
     rev = "v${version}";
-    hash = "sha256-kUQ0dPjPr/A/btgFQu13ZLklnI284Ij74hCYbGgzF3A=";
+    hash = "sha256-HHxImHMT5862ysI+1QGkzaA21YsrUUUOH2LwAkVBPf0=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
     sed -i "/shellspec -s 'busybox ash'/d" Makefile
   '';
 
-  checkTarget = "testall";
+  checkTarget = "test_in_various_shells";
 
   meta = with lib; {
     description = "Elegant option/argument parser for shell scripts (full support for bash and all POSIX shells)";

pkgs/tools/misc/pb/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pb";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "parseablehq";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ub4/ou0FprDPTdGarehUPVPov2kLl6SbIlhpPiEarE8=";
+    hash = "sha256-KedO/ngAlabuf3/NPKhutnzLphz6/VxJ+XJvADIP3PQ=";
   };
 
-  vendorHash = "sha256-38lXffh3ZkMtvHi9roLHW0A6bzb+LRC91I3DdYyq1h0=";
+  vendorHash = "sha256-RAb2OvN3DF54fsVI5tRtNp1BYwB2qfYome7tj8zxxCY=";
 
   ldflags = [
     "-s"

pkgs/tools/security/cnquery/default.nix

@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "11.15.1";
+  version = "11.16.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     rev = "refs/tags/v${version}";
-    hash = "sha256-K9yNh4UEImBWeucl8O1yUUSAfvKwXtrmW8SCrP/pk3o=";
+    hash = "sha256-MtO1R4uBmFpNgvG0jFU1Q/1J1sBk0JG9SvzTw8mgi1w=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-muG1TFpEbZOjsmsgtpCPcZCD5geC9t/zyRwU9P2uCCY=";
+  vendorHash = "sha256-kUYGXZZktfFSvOblxNefwcYVNE4uDZM52YaTQMZxOmU=";
 
   ldflags = [
     "-w"

pkgs/tools/security/ghidra/build.nix

@@ -160,6 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     mkdir -p "$out/bin"
     ln -s "${pkg_path}/ghidraRun" "$out/bin/ghidra"
+    ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless"
     wrapProgram "${pkg_path}/support/launch.sh" \
       --set-default NIX_GHIDRAHOME "${pkg_path}/Ghidra" \
       --prefix PATH : ${lib.makeBinPath [ openjdk21 ]}

pkgs/tools/security/ghidra/default.nix

@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     mkdir -p "$out/bin"
     ln -s "${pkg_path}/ghidraRun" "$out/bin/ghidra"
+    ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless"
 
     wrapProgram "${pkg_path}/support/launch.sh" \
       --prefix PATH : ${lib.makeBinPath [ openjdk17 ]}

pkgs/tools/security/ghidra/with-extensions.nix

@@ -32,6 +32,8 @@ let
         ''
           makeWrapper '${ghidra}/bin/ghidra' "$out/bin/ghidra" \
             --set NIX_GHIDRAHOME "$out/lib/ghidra/Ghidra"
+          makeWrapper '${ghidra}/bin/ghidra-analyzeHeadless' "$out/bin/ghidra-analyzeHeadless" \
+            --set NIX_GHIDRAHOME "$out/lib/ghidra/Ghidra"
           ln -s ${ghidra}/share $out/share
         ''
         + lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/tools/security/pcsc-tools/default.nix

@@ -25,13 +25,13 @@ assert systemdSupport -> dbusSupport;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pcsc-tools";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pcsc-tools";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-+cvgSNlSYSJ2Zr2iWk96AacyQ38ru9/RK8yeK3ceqCo=";
+    hash = "sha256-5a3sVcFEFzBkbRKUqlCPV7sL3O17G7hDVpxLpAWofdE=";
   };
 
   configureFlags = [

pkgs/tools/system/automatic-timezoned/default.nix

@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "2.0.27";
+  version = "2.0.29";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Qp5f8c7ET74djXzZr2sZZy+4GUQwUPxSTtgQhoRJURg=";
+    sha256 = "sha256-21BOTGPDJAf9L9ZFL8PhI3OPazOROr1Qcti6kWpWfrg=";
   };
 
-  cargoHash = "sha256-ZvFKOlNagjH//WTPV/QeCOPvjLcimJ0v6YS0nXujhQA=";
+  cargoHash = "sha256-YpdmR5hrBhOeK7YWSNA5f35jDJAUkEfdv+cP3+uf0lo=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";

pkgs/top-level/aliases.nix

@@ -1432,6 +1432,7 @@ mapAliases ({
 
   tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   tangogps = foxtrotgps; # Added 2020-01-26
+  taskwarrior = lib.warn "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstram's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2;
   taplo-cli = taplo; # Added 2022-07-30
   taplo-lsp = taplo; # Added 2022-07-30
   taro = taproot-assets; # Added 2023-07-04

pkgs/top-level/all-packages.nix

@@ -33836,8 +33836,6 @@ with pkgs;
 
   tasktimer = callPackage ../applications/misc/tasktimer { };
 
-  taskwarrior = callPackage ../applications/misc/taskwarrior { };
-
   taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
 
   dstask = callPackage ../applications/misc/dstask { };

pkgs/top-level/python-packages.nix

@@ -11980,6 +11980,8 @@ self: super: with self; {
 
   pyowm = callPackage ../development/python-modules/pyowm { };
 
+  pypager = callPackage ../development/python-modules/pypager { };
+
   pypamtest = toPythonModule (pkgs.libpam-wrapper.override {
     enablePython = true;
     inherit python;