Merge 429c338e15 into haskell-updates

2025-05-03 00:20:09 +00:00
parent dffbe7ad87 429c338e15
commit 92148d54fe
194 changed files with 2490 additions and 1222 deletions
@@ -61,12 +61,14 @@ body:
          You can still open a build failure report, but please say '**No, Hydra cannot reproduce this build failure.**' below.
        - If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-question-2754.svg" width="20px" align="top" alt="Gray Question Mark"> icon near the package entry, say '**Hydra is currently rebuilding this package.**'
        - If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-stopsign-1f6d1.svg" width="20px" align="top" alt="Red Stop Sign"> icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**'
+        - If Hydra isn't supposed to build the package at all, say '**Hydra doesn’t try to build the package.**'
      options:
        - "Please select the Hydra Status."
        - "Yes, Hydra can reproduce this build failure."
        - "No, Hydra cannot reproduce this build failure."
        - "Hydra is currently rebuilding this package."
        - "The last build job was manually cancelled."
+        - "Hydra doesn’t try to build the package."
      default: 0
    validations:
      required: true
@@ -7,6 +7,39 @@
      - any-glob-to-any-file:
        - .github/workflows/*
        - ci/**/*.*
+  - all:
+    - head-branch:
+      # r-ryantm's branches have this prefix.
+      - ^auto-update/
+    - changed-files:
+      - any-glob-to-any-file:
+        # Browser updates should always be backported.
+        - pkgs/applications/kde/angelfish.nix
+        - pkgs/applications/kde/falkon.nix
+        - pkgs/applications/kde/konqueror.nix
+        - pkgs/applications/networking/browsers/**/*
+        - pkgs/by-name/br/brave/**/*
+        # Added in December 2024, uncomment for 25.05
+        # - pkgs/by-name/ca/catalyst-browser/**/*
+        - pkgs/by-name/ch/chawan/**/*
+        - pkgs/by-name/di/dillo-plus/**/*
+        - pkgs/by-name/di/dillo/**/*
+        - pkgs/by-name/ed/edbrowse/**/*
+        - pkgs/by-name/ep/epiphany/**/*
+        - pkgs/by-name/go/google-chrome/**/*
+        - pkgs/by-name/ly/lynx/**/*
+        - pkgs/by-name/mi/microsoft-edge/**/*
+        - pkgs/by-name/mi/midori-unwrapped/**/*
+        - pkgs/by-name/mu/mullvad-browser/**/*
+        - pkgs/by-name/op/opera/**/*
+        - pkgs/by-name/to/tor-browser/**/*
+        - pkgs/by-name/vi/vimb-unwrapped/**/*
+        - pkgs/by-name/w3/w3m/**/*
+        - pkgs/desktops/lomiri/applications/morph-browser/**/*
+        - pkgs/development/libraries/webkitgtk/**/*
+        - pkgs/kde/gear/angelfish/**/*
+        - pkgs/kde/gear/falkon/**/*
+        - pkgs/kde/gear/konqueror/**/*

 "6.topic: policy discussion":
  - any:
@@ -40,6 +40,16 @@
        - pkgs/development/coq-modules/**/*
        - pkgs/top-level/coq-packages.nix

+"6.topic: COSMIC":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/services/desktop-managers/cosmic.nix
+        - nixos/modules/services/display-managers/cosmic-greeter.nix
+        - nixos/tests/cosmic.nix
+        - pkgs/by-name/co/cosmic-*/**/*
+        - pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
+
 "6.topic: crystal":
  - any:
    - changed-files:
@@ -20,7 +20,7 @@ jobs:
            lib
            maintainers

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -23,7 +23,7 @@ jobs:
        with:
          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -34,7 +34,7 @@ jobs:
          rev=$(jq -r .rev ci/pinned-nixpkgs.json)
          echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true
          nix_path: nixpkgs=${{ env.url }}
@@ -27,7 +27,7 @@ jobs:
        with:
          ref: refs/pull/${{ github.event.pull_request.number }}/merge

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31

      - name: Build shell
        run: nix-build shell.nix
@@ -45,7 +45,7 @@ jobs:
    needs: get-merge-commit
    if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha
    steps:
-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31

      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
        with:
@@ -92,7 +92,7 @@ jobs:
    runs-on: ubuntu-24.04
    if: github.repository_owner == 'NixOS'
    steps:
-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31

      # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
      # This is intentional, because we need to request the review of owners as declared in the base branch.
@@ -32,7 +32,7 @@ jobs:
        with:
          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          # nixpkgs commit is pinned so that it doesn't break
          # editorconfig-checker 2.4.0
@@ -22,7 +22,7 @@ jobs:
        with:
          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -43,7 +43,7 @@ jobs:
          echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT"

      - name: Install Nix
-        uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -71,7 +71,7 @@ jobs:
          path: nixpkgs

      - name: Install Nix
-        uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -111,7 +111,7 @@ jobs:
          path: nixpkgs

      - name: Install Nix
-        uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -152,7 +152,7 @@ jobs:
          path: nixpkgs

      - name: Install Nix
-        uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -260,7 +260,7 @@ jobs:
          path: comparison

      - name: Install Nix
-        uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+        uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31

      # Important: This workflow job runs with extra permissions,
      # so we need to make sure to not run untrusted code from PRs
@@ -27,7 +27,7 @@ jobs:
          rev=$(jq -r .rev ci/pinned-nixpkgs.json)
          echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true
          nix_path: nixpkgs=${{ env.url }}
@@ -33,7 +33,7 @@ jobs:
        with:
          ref: refs/pull/${{ github.event.pull_request.number }}/merge

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -20,7 +20,7 @@ jobs:
        with:
          ref: refs/pull/${{ github.event.pull_request.number }}/merge

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true

@@ -32,7 +32,7 @@ jobs:
          ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
        if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31
        with:
          extra_nix_config: sandbox = true
          nix_path: nixpkgs=channel:nixpkgs-unstable
@@ -43,7 +43,7 @@ jobs:
          git worktree add "$target" "$(git rev-parse HEAD^1)"
          echo "target=$target" >> "$GITHUB_ENV"

-      - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31
+      - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31

      - name: Fetching the pinned tool
        # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh
@@ -469,3 +469,6 @@ pkgs/development/interpreters/lfe/      @NixOS/beam

 # OctoDNS
 pkgs/tools/networking/octodns/ @anthonyroussel
+
+# Teleport
+pkgs/servers/teleport   @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
@@ -382,6 +382,15 @@ pkgs.mkShell {
 ```
 will create a development shell where a `node_modules` directory is created & packages symlinked to the Nix store when activated.

+:::{.note}
+Commands like `npm install` & `npm add` that writes packages & executables needs to be used with `--package-lock-only`.
+
+This means `npm` installs dependencies by writing into `package-lock.json` without modifying the `node_modules` folder. Installation happens through reloading the devShell.
+This might be best practice since it gives the `nix shell` virtually exclusive ownership over your `node_modules` folder.
+
+It's recommended to set `package-lock-only = true` in your project-local [`.npmrc`](https://docs.npmjs.com/cli/v11/configuring-npm/npmrc).
+:::
+
 ### corepack {#javascript-corepack}

 This package puts the corepack wrappers for pnpm and yarn in your PATH, and they will honor the `packageManager` setting in the `package.json`.
@@ -346,7 +346,7 @@
  [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6)
  for more information.

- `depdendency-track` no longer bundes the UI inside the jar. This bundling
+- `dependency-track` no longer bundes the UI inside the jar. This bundling
  functionality is deprecated by upstream and causes UI assets not being served
  after weeks of runtime.

@@ -289,7 +289,8 @@ rec {
  */
  availableOn =
    platform: pkg:
-    ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms)
+    pkg != null
+    && ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms)
    && all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or [ ]);

  /**
@@ -1789,6 +1789,12 @@
    githubId = 19378309;
    name = "Simon Struck";
  };
+  aoli-al = {
+    email = "aoli.al@hotmail.com";
+    github = "aoli-al";
+    githubId = 5557706;
+    name = "Ao Li";
+  };
  aorith = {
    email = "aomanu+nixpkgs@gmail.com";
    github = "aorith";
@@ -3354,6 +3360,12 @@
    github = "bmilanov";
    githubId = 30090366;
  };
+  bmrips = {
+    name = "Benedikt M. Rips";
+    email = "benedikt.rips@gmail.com";
+    github = "bmrips";
+    githubId = 20407973;
+  };
  bmwalters = {
    name = "Bradley Walters";
    email = "oss@walters.app";
@@ -16756,6 +16768,13 @@
    githubId = 6295090;
    name = "Mats";
  };
+  mymindstorm = {
+    name = "Brendan Early";
+    email = "mymindstorm@evermiss.net";
+    github = "mymindstorm";
+    githubId = 27789806;
+    keys = [ { fingerprint = "52B9 A09F 788F 4D1F 0C94  9EBE EE39 A9F3 0C9D 72B5"; } ];
+  };
  mynacol = {
    github = "Mynacol";
    githubId = 26695166;
@@ -117,7 +117,7 @@ added to the LUKS volume.
 ```

 Existing key slots are left intact, unless `--wipe-slot=` is specified. It is
-recommened to add a recovery key that should be stored in a secure physical
+recommended to add a recovery key that should be stored in a secure physical
 location and can be entered wherever a password would be entered.

 ```ShellSession
@@ -412,7 +412,7 @@ have a predefined type and string generator already declared under

    `multiline` (default `true`)

-    :   Whether to procude a multiline output. The output may still wrap across
+    :   Whether to produce a multiline output. The output may still wrap across
        multiple lines if it would otherwise exceed `columnWidth`.

    `columnWidth` (default `100`)
@@ -112,7 +112,7 @@

 - [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](options.html#opt-services.postgrest.enable).

- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilites on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable).
+- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilities on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable).

 - [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer).

@@ -182,7 +182,7 @@

 - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).

- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Availble as [services.lavalink](#opt-services.lavalink.enable).
+- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Available as [services.lavalink](#opt-services.lavalink.enable).

 - [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable).

@@ -397,7 +397,7 @@
  +extraCreateArgs+=("--exclude" "/some/path")
  ```

- `programs.xonsh.package` now gets overrided internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details.
+- `programs.xonsh.package` now gets overridden internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details.

 - `services.nitter.guestAccounts` has been renamed to `services.nitter.sessionsFile`, for consistency with upstream. The file format is unchanged.

@@ -1515,6 +1515,7 @@
  ./services/web-apps/collabora-online.nix
  ./services/web-apps/commafeed.nix
  ./services/web-apps/convos.nix
+  ./services/web-apps/cook-cli.nix
  ./services/web-apps/crabfit.nix
  ./services/web-apps/davis.nix
  ./services/web-apps/cryptpad.nix
@@ -105,7 +105,7 @@ The following few commands (run as root) let you test your backup.
 > systemctl restart borgbackup-job-backupToLocalServer
 > sleep 10
 > systemctl restart borgbackup-job-backupToLocalServer
-> export BORG_PASSPHRASE=topSecrect
+> export BORG_PASSPHRASE=topSecret
 > borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:.
 nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac]
 nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68]
@@ -434,6 +434,7 @@ let
      };

      effectiveUser = container.podman.user or "root";
+      inherit (config.users.users.${effectiveUser}) uid;
      dependOnLingerService =
        cfg.backend == "podman" && effectiveUser != "root" && config.users.users.${effectiveUser}.linger;
    in
@@ -441,7 +442,7 @@ let
      wantedBy = [ ] ++ optional (container.autoStart) "multi-user.target";
      wants =
        lib.optional (container.imageFile == null && container.imageStream == null) "network-online.target"
-        ++ lib.optional dependOnLingerService "linger-users.service";
+        ++ lib.optionals dependOnLingerService [ "linger-users.service" ];
      after =
        lib.optionals (cfg.backend == "docker") [
          "docker.service"
@@ -452,8 +453,15 @@ let
          "network-online.target"
        ]
        ++ dependsOn
-        ++ lib.optional dependOnLingerService "linger-users.service";
-      requires = dependsOn;
+        ++ lib.optionals dependOnLingerService [ "linger-users.service" ]
+        ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [
+          "user@${toString uid}.service"
+        ];
+      requires =
+        dependsOn
+        ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [
+          "user@${toString uid}.service"
+        ];
      environment = lib.mkMerge [
        proxy_env
        (mkIf (cfg.backend == "podman" && container.podman.user != "root") {
@@ -523,6 +531,10 @@ let
        else
          "${cfg.backend} rm -f ${name} || true";

+      unitConfig = mkIf (effectiveUser != "root") {
+        RequiresMountsFor = "/run/user/${toString uid}/containers";
+      };
+
      serviceConfig =
        {
          ### There is no generalized way of supporting `reload` for docker
@@ -616,6 +628,15 @@ in
                  assertion = cfg.backend == "docker" -> podman == null;
                  message = "virtualisation.oci-containers.containers.${name}: Cannot set `podman` option if backend is `docker`.";
                }
+                {
+                  assertion =
+                    cfg.backend == "podman" && podman.sdnotify == "healthy" && podman.user != "root"
+                    -> config.users.users.${podman.user}.uid != null;
+                  message = ''
+                    Rootless container ${name} (with podman and sdnotify=healthy)
+                    requires that its running user ${podman.user} has a statically specified uid.
+                  '';
+                }
              ];
          in
          concatMap (name: toAssertions name cfg.containers.${name}) (lib.attrNames cfg.containers);
@@ -638,7 +638,7 @@ let
      clevisTest ? false,
      clevisFallbackTest ? false,
      disableFileSystems ? false,
-      selectNixPackage ? pkgs: pkgs.nixStable,
+      selectNixPackage ? pkgs: pkgs.nixVersions.stable,
    }:
    let
      isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
@@ -80,6 +80,7 @@ let
              home = "/var/lib/redis";
              linger = type == "healthy";
              createHome = true;
+              uid = 2342;
              subUidRanges = [
                {
                  count = 65536;
@@ -1609,6 +1609,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  bloat-nvim = buildVimPlugin {
+    pname = "bloat.nvim";
+    version = "2025-04-30";
+    src = fetchFromGitHub {
+      owner = "dundalek";
+      repo = "bloat.nvim";
+      rev = "f90bef655ac40fecbaae53e10db1cf7894d090b1";
+      sha256 = "0ah5c84172wkc75zx5ll2dp9y3r867lik29aw5mm7i3lj530p0ri";
+    };
+    meta.homepage = "https://github.com/dundalek/bloat.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  block-nvim = buildVimPlugin {
    pname = "block.nvim";
    version = "2023-10-10";
@@ -6535,6 +6548,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  kanagawa-paper-nvim = buildVimPlugin {
+    pname = "kanagawa-paper.nvim";
+    version = "2025-04-27";
+    src = fetchFromGitHub {
+      owner = "thesimonho";
+      repo = "kanagawa-paper.nvim";
+      rev = "4f41353f6a2bf9f25b2466a0f1eb6883d8fd09c1";
+      sha256 = "0gan0jqn4azkqln5xsnffpyjqmzqv1wwv02xv2d0yykmlqk9yqc8";
+    };
+    meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  kdl-vim = buildVimPlugin {
    pname = "kdl.vim";
    version = "2023-02-20";
@@ -11440,6 +11466,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  oil-git-status-nvim = buildVimPlugin {
+    pname = "oil-git-status.nvim";
+    version = "2025-04-03";
+    src = fetchFromGitHub {
+      owner = "refractalize";
+      repo = "oil-git-status.nvim";
+      rev = "4b5cf53842c17a09420919e655a6a559da3112d7";
+      sha256 = "1jzw6lkvi9xxzqy8xz056xlb45byr1arklh87zmyf0nj9plm2nsp";
+    };
+    meta.homepage = "https://github.com/refractalize/oil-git-status.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  ollama-nvim = buildVimPlugin {
    pname = "ollama.nvim";
    version = "2024-06-09";
@@ -8,19 +8,19 @@
  gitMinimal,
 }:
 let
-  version = "1.1.1";
+  version = "1.2.0";
  src = fetchFromGitHub {
    owner = "Saghen";
    repo = "blink.cmp";
    tag = "v${version}";
-    hash = "sha256-Vs34vPQ6BhBcSSlgGpUMOXNzywrwg116xt3MLUwgVVA=";
+    hash = "sha256-bKe8SSg1HPWE7b4iRQJwiOVCrvvgttuHCOIa4U/38AY=";
  };
  blink-fuzzy-lib = rustPlatform.buildRustPackage {
    inherit version src;
    pname = "blink-fuzzy-lib";

    useFetchCargoVendor = true;
-    cargoHash = "sha256-MWElqh7ENJ6CbLOnvz0DsP5YYu+e+y12GSUOfW1IKGU=";
+    cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M=";

    nativeBuildInputs = [ gitMinimal ];

@@ -1457,6 +1457,14 @@ in
    passthru.python3Dependencies = ps: [ ps.jupytext ];
  };

+  kanagawa-paper-nvim = super.kanagawa-paper-nvim.overrideAttrs {
+    nvimSkipModules = [
+      # skipping wezterm theme switcher since it relies on a wezterm module
+      # that does not seem to be available, tried to build setting wezterm-nvim as a dep
+      "wezterm.theme_switcher"
+    ];
+  };
+
  kulala-nvim = super.kulala-nvim.overrideAttrs {
    dependencies = with self; [
      nvim-treesitter
@@ -2623,6 +2631,10 @@ in
    ];
  };

+  oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs {
+    dependencies = [ self.oil-nvim ];
+  };
+
  ollama-nvim = super.ollama-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
  };
@@ -2744,9 +2756,15 @@ in
    ];
  };

-  peek-nvim = super.peek-nvim.overrideAttrs {
-    runtimeDeps = [ deno ];
-  };
+  peek-nvim = super.peek-nvim.overrideAttrs (old: {
+    patches = [
+      # Patch peek-nvim to run using nixpkgs deno
+      # This means end-users have to build peek-nvim the first time they use it...
+      (replaceVars ./patches/peek-nvim/cmd.patch {
+        deno = lib.getExe deno;
+      })
+    ];
+  });

  persisted-nvim = super.persisted-nvim.overrideAttrs {
    nvimSkipModules = [
@@ -0,0 +1,37 @@
+diff --git a/app/src/main.ts b/app/src/main.ts
+index c82d914..e8542f3 100644
+--- a/app/src/main.ts
+++ b/app/src/main.ts
+@@ -73,7 +73,7 @@ async function init(socket: WebSocket) {
+     const onListen: Deno.ServeOptions['onListen'] = ({ hostname, port }) => {
+       const serverUrl = `${hostname.replace('0.0.0.0', 'localhost')}:${port}`;
+       logger.info(`listening on ${serverUrl}`);
+-      const webview = new Deno.Command('deno', {
+      const webview = new Deno.Command('@deno@', {
+         cwd: dirname(fromFileUrl(Deno.mainModule)),
+         args: [
+           'run',
+diff --git a/lua/peek/app.lua b/lua/peek/app.lua
+index af5148e..5e67563 100644
+--- a/lua/peek/app.lua
+++ b/lua/peek/app.lua
+@@ -38,10 +38,17 @@ function module.setup()
+   end
+
+   cmd = vim.list_extend({
+-    'deno',
+-    'task',
+-    '--quiet',
+    '@deno@',
+     'run',
+    '--allow-read',
+    '--allow-write',
+    '--allow-net',
+    '--allow-env',
+    '--allow-run',
+    '--no-check',
+    '--allow-import',
+    '--no-lock',
+    '../../app/src/main.ts',
+   }, args)
+ end
@@ -122,6 +122,7 @@ https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
 https://github.com/Saghen/blink.compat/,HEAD,
+https://github.com/dundalek/bloat.nvim/,HEAD,
 https://github.com/HampusHauffman/block.nvim/,HEAD,
 https://github.com/blueballs-theme/blueballs-neovim/,,
 https://github.com/uloco/bluloco.nvim/,,
@@ -500,6 +501,7 @@ https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/julelang/jule.nvim/,HEAD,
 https://github.com/JuliaEditorSupport/julia-vim/,,
 https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
+https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD,
 https://github.com/rebelot/kanagawa.nvim/,,
 https://github.com/imsnif/kdl.vim/,HEAD,
 https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
@@ -878,6 +880,7 @@ https://github.com/obsidian-nvim/obsidian.nvim/,HEAD,
 https://github.com/nvimdev/oceanic-material/,,
 https://github.com/mhartington/oceanic-next/,,
 https://github.com/pwntester/octo.nvim/,,
+https://github.com/refractalize/oil-git-status.nvim/,HEAD,
 https://github.com/nomnivore/ollama.nvim/,HEAD,
 https://github.com/yonlu/omni.vim/,,
 https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
@@ -1,7 +1,6 @@
 {
  stdenv,
  lib,
-  mkDerivation,
  fetchFromGitHub,
  cargo,
  extra-cmake-modules,
@@ -9,21 +8,16 @@
  rustPlatform,

  # common deps
-  karchive,
-  qtwebsockets,
+  libzip,
+  qt6Packages,

  # client deps
-  qtbase,
-  qtkeychain,
-  qtmultimedia,
-  qtsvg,
-  qttools,
+  ffmpeg,
  libsecret,
  libwebp,

  # optional client deps
  giflib,
-  kdnssd,
  libvpx,
  miniupnpc,

@@ -45,17 +39,17 @@ assert lib.assertMsg (
 ) "You must specify at least one of buildClient, buildServer, or buildExtraTools.";

 let
-  clientDeps = [
+  clientDeps = with qt6Packages; [
    qtbase
    qtkeychain
    qtmultimedia
    qtsvg
    qttools
+    ffmpeg
    libsecret
    libwebp
    # optional:
    giflib # gif animation export support
-    kdnssd # local server discovery with Zeroconf
    libvpx # WebM video export
    miniupnpc # automatic port forwarding
  ];
@@ -67,7 +61,7 @@ let
  ] ++ lib.optional withSystemd systemd;

 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "drawpile";
  version = "2.2.2";

@@ -88,12 +82,18 @@ mkDerivation rec {
    extra-cmake-modules
    rustc
    rustPlatform.cargoSetupHook
+    (
+      if buildClient || buildServerGui then
+        qt6Packages.wrapQtAppsHook
+      else
+        qt6Packages.wrapQtAppsNoGuiHook
+    )
  ];

  buildInputs =
    [
-      karchive
-      qtwebsockets
+      libzip
+      qt6Packages.qtwebsockets
    ]
    ++ lib.optionals buildClient clientDeps
    ++ lib.optionals buildServer serverDeps;
@@ -36,8 +36,6 @@
  lz4,
  libmpg123,
  makeWrapper,
-  pcre,
-  pcre2,
  pkg-config,
  portaudio,
  rapidjson,
@@ -107,8 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
      libxkbcommon
      lz4
      libmpg123
-      pcre
-      pcre2
      portaudio
      rapidjson
      sqlite
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "helm-secrets";
-  version = "4.6.3";
+  version = "4.6.4";

  src = fetchFromGitHub {
    owner = "jkroepke";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-5vsUyeQH/kCaHo7aze1xA1NVLXrxpFB19P708ikKTpg=";
+    hash = "sha256-PvWHxcxNSCI5RX830+b61fiyi0WX8ujEJzjyUOXp+iA=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -9,6 +9,7 @@
  runtimeShell,
  kubectl,
  nixosTests,
+  nix-update-script,

  components ? [
    "cmd/kubelet"
@@ -19,15 +20,15 @@
  ],
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "kubernetes";
-  version = "1.32.3";
+  version = "1.33.0";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = "kubernetes";
-    rev = "v${version}";
-    hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5MlMBsYf8V7BvV6xaeRMVSRaE+TpG8xJkMwVGm/fVdo=";
  };

  vendorHash = null;
@@ -95,15 +96,18 @@ buildGoModule rec {
    runHook postInstall
  '';

-  meta = with lib; {
-    description = "Production-Grade Container Scheduling and Management";
-    license = licenses.asl20;
-    homepage = "https://kubernetes.io";
-    teams = [ teams.kubernetes ];
-    platforms = platforms.linux;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = nixosTests.kubernetes // {
+      inherit kubectl;
+    };
  };

-  passthru.tests = nixosTests.kubernetes // {
-    inherit kubectl;
+  meta = {
+    description = "Production-Grade Container Scheduling and Management";
+    license = lib.licenses.asl20;
+    homepage = "https://kubernetes.io";
+    teams = [ lib.teams.kubernetes ];
+    platforms = lib.platforms.linux;
  };
-}
+})
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  buildGoModule,
+  buildGo123Module,
  fetchFromGitHub,
  fetchFromGitLab,
  callPackage,
@@ -96,6 +97,7 @@ let

  # These are the providers that don't fall in line with the default model
  special-providers = {
+    aws = automated-providers.aws.override { mkProviderGoModule = buildGo123Module; };
    # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely.
    checkly = automated-providers.checkly.override { spdx = "MIT"; };
    gitlab = automated-providers.gitlab.override {
@@ -0,0 +1,24 @@
+{
+  buildKodiAddon,
+  fetchFromGitHub,
+  lib,
+}:
+buildKodiAddon rec {
+  pname = "bluetooth-manager";
+  namespace = "script.bluetooth.man";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "wastis";
+    repo = "BluetoothManager";
+    tag = "v${version}";
+    hash = "sha256-KKaR7rIkflMYU6EDBEcorHQ3t7jsB4Qe6Ikg+eBblkA=";
+  };
+
+  meta = with lib; {
+    description = "Addon that allows to manage bluetooth devices from within a Linux based Kodi";
+    platforms = platforms.all;
+    maintainers = teams.kodi.members;
+    license = licenses.gpl3Plus;
+  };
+}
@@ -4,6 +4,7 @@
  cmake,
  libbfd,
  SDL2,
+  libGL,
  obs-studio,
  looking-glass-client,
 }:
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
    obs-studio
    libbfd
    SDL2
+    libGL
  ];

  env.NIX_CFLAGS_COMPILE = "-mavx";
@@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "ada";
-  version = "3.2.3";
+  version = "3.2.4";

  src = fetchFromGitHub {
    owner = "ada-url";
    repo = "ada";
    tag = "v${version}";
-    hash = "sha256-35vw/hGlOPhpjY43jWTrWxqazaYzhdviXxBe53cKEzg=";
+    hash = "sha256-tC7Hpf9xCysraTtVC+mYE/DVNrG02lwLAlDiTeaWpY4=";
  };

  nativeBuildInputs = [ cmake ];
@@ -14,7 +14,7 @@
  xmlto,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "adcli";
  version = "0.9.2";

@@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
    domain = "gitlab.freedesktop.org";
    owner = "realmd";
    repo = "adcli";
-    rev = version;
+    tag = finalAttrs.version;
    hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
  };

  nativeBuildInputs = [
    autoreconfHook
    docbook_xsl
+    libxslt # xsltproc
    pkg-config
    util-linux
    xmlto
@@ -37,11 +38,15 @@ stdenv.mkDerivation rec {
  buildInputs = [
    cyrus_sasl
    libkrb5
-    libxslt
    openldap
  ];

-  configureFlags = [ "--disable-debug" ];
+  strictDeps = true;
+
+  configureFlags = [
+    "--disable-debug"
+    "ac_cv_path_KRB5_CONFIG=${lib.getExe' (lib.getDev libkrb5) "krb5-config"}"
+  ];

  postPatch = ''
    substituteInPlace tools/Makefile.am \
@@ -61,15 +66,15 @@ stdenv.mkDerivation rec {
    patch_docbook doc/adcli-docs.xml
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html";
    description = "Helper library and tools for Active Directory client operations";
    mainProgram = "adcli";
-    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [
      SohamG
      anthonyroussel
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
-}
+})
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
    ]
    ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [
      # ignore one failing test for now
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout")
+      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'")
    ];

  # Fontconfig error: Cannot load default config file: No such file: (null)
@@ -7,16 +7,16 @@

 buildNpmPackage rec {
  pname = "all-the-package-names";
-  version = "2.0.2137";
+  version = "2.0.2146";

  src = fetchFromGitHub {
    owner = "nice-registry";
    repo = "all-the-package-names";
    tag = "v${version}";
-    hash = "sha256-1HabSjZUHjPWkKZc+Xeh11bzb6ycQ1V7GS/XGycFoKc=";
+    hash = "sha256-mPPlBXhnDYTQPATw1Ulb/bk44Q5Q+hUA9tGcxCj0i3w=";
  };

-  npmDepsHash = "sha256-zSGpKDcmBYod81wCeoSzOqse1zSao4aURngh55wq6CA=";
+  npmDepsHash = "sha256-yNG6rQRbXRDtmCm2KNZLZ1/ein+QA7/0CjAVIMVp2PI=";

  passthru.updateScript = nix-update-script { };

@@ -12,20 +12,20 @@
 }:
 let
  pname = "anubis";
-  version = "1.16.0";
+  version = "1.17.1";

  src = fetchFromGitHub {
    owner = "TecharoHQ";
    repo = "anubis";
    tag = "v${version}";
-    hash = "sha256-/7GMf0QGR0rtz05vHN/yYYuzxN25NhqidITdAf6jSXY=";
+    hash = "sha256-8b2rVVuxhsY0+5IZvzMm7ki3HGbJAnUUoAqpD1PuqZ4=";
  };

  anubisXess = buildNpmPackage {
    inherit version src;
    pname = "${pname}-xess";

-    npmDepsHash = "sha256-QrW0grgNRZRum2mCec86Za1UV4R5QSRlhjVYFsZDwY8=";
+    npmDepsHash = "sha256-jiLrqn0jenug2ff/mqhOIfc7f+CsQja5g2K9n+W1kVM=";

    buildPhase = ''
      runHook preBuild
@@ -44,7 +44,7 @@ in
 buildGoModule (finalAttrs: {
  inherit pname version src;

-  vendorHash = "sha256-D0+SDJIagAPqd71fIHCh29vPMVL0ZZAFg0rmgW2EaGw=";
+  vendorHash = "sha256-v9GsTUzBYfjh6/ETBbFpN5dqMzMaOz8w39Xz1omaPJE=";

  nativeBuildInputs = [
    esbuild
@@ -88,6 +88,7 @@ buildGoModule (finalAttrs: {
    maintainers = with lib.maintainers; [
      knightpp
      soopyc
+      ryand56
    ];
    mainProgram = "anubis";
  };
@@ -11,12 +11,12 @@

 let
  pname = "anytype-heart";
-  version = "0.39.11";
+  version = "0.40.19";
  src = fetchFromGitHub {
    owner = "anyproto";
    repo = "anytype-heart";
    tag = "v${version}";
-    hash = "sha256-+H63bc4aJPERfclzKh4E3uYEEwNycLfe0BCPSlilqCc=";
+    hash = "sha256-BUQZmZ7jKWdbBcWtx7rbbeEJbo5FncYHmp/5FVd0vdI=";
  };

  arch =
@@ -34,7 +34,7 @@ in
 buildGoModule {
  inherit pname version src;

-  vendorHash = "sha256-fbZ1DiRcD9dnS8e7BMrKPYApqZmQbaH6DsSSO1knDmo=";
+  vendorHash = "sha256-xsxgeoS1wIi0/LNGmZZyWKWzhkMJUnCEslXcIz+Dw8U=";

  subPackages = [ "cmd/grpcserver" ];
  tags = [
@@ -0,0 +1,37 @@
+From d236396b1da80a7233168e01e8164256e7f69cc1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
+Date: Fri, 25 Apr 2025 12:29:37 +0200
+Subject: [PATCH] feat(update): Disable auto checking for updates and updating
+ manually
+
+---
+ electron/js/update.js | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/electron/js/update.js b/electron/js/update.js
+index 0e34efa..9386c90 100644
+--- a/electron/js/update.js
+++ b/electron/js/update.js
+@@ -29,7 +29,8 @@ class UpdateManager {
+ 		autoUpdater.autoInstallOnAppQuit = false;
+ 		autoUpdater.channel = channel;
+ 
+-		this.setTimeout();
+		// PATCH(update): Never check for updates on a timer timeout.
+		// this.setTimeout();
+ 
+ 		autoUpdater.on('checking-for-update', () => {
+ 			Util.log('info', 'Checking for update');
+@@ -93,6 +94,9 @@ class UpdateManager {
+ 	};
+ 
+ 	isAllowed () {
+		// PATCH(update): Always disallow update check, even when requested by the user manually or when Anytype starts.
+		return false;
+
+ 		const { config } = ConfigManager;
+ 
+ 		if (config.updateDisabled) {
+-- 
+2.49.0
+
@@ -13,27 +13,27 @@

 let
  pname = "anytype";
-  version = "0.45.3";
+  version = "0.46.4";

  src = fetchFromGitHub {
    owner = "anyproto";
    repo = "anytype-ts";
    tag = "v${version}";
-    hash = "sha256-fwfxmNca75xAAHKeT2nddz+XZexDomzHbw188LXxZqA=";
+    hash = "sha256-JA8DHOPRLPoc8/GXkHfktVy3sZ5BpSFmgn71Xt15iLE=";
  };
  description = "P2P note-taking tool";

  locales = fetchFromGitHub {
    owner = "anyproto";
    repo = "l10n-anytype-ts";
-    rev = "687106c4e37297f86fab79f77ef83599b61ab65c";
-    hash = "sha256-Y0irD0jzqYobnjtD2M1+hTDRUUYnuygUx9+tE1gUoTw=";
+    rev = "07eed415b0eec409dcdfedf848936d41f190c7ec";
+    hash = "sha256-PgDZkL/tg7/uZhLLenRjkb5NB1hQjUJflaAce2TlDRE=";
  };
 in
 buildNpmPackage {
  inherit pname version src;

-  npmDepsHash = "sha256-9BI+rXzTYonlMhcH8uiWyyF18JGv8GL1U9hZ9Z6X3As=";
+  npmDepsHash = "sha256-4pMYKmQ7+f8BKztLF4Jfe89tuh+DiQNnS3ulL0i6Gw0=";

  env = {
    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -50,6 +50,10 @@ buildNpmPackage {
    "--nodedir=${electron.headers}"
  ];

+  patches = [
+    ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch
+  ];
+
  buildPhase = ''
    runHook preBuild

@@ -3,16 +3,15 @@
  stdenvNoCC,
  fetchFromGitHub,
 }:
-
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
  pname = "bemoji";
-  version = "0.4.0";
+  version = "0.4.0-unstable-2024-04-28";

  src = fetchFromGitHub {
    owner = "marty-oehme";
    repo = "bemoji";
-    tag = "v${version}";
-    hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww=";
+    rev = "1b5e9c1284ede59d771bfd43780cc8f6f7446f38";
+    hash = "sha256-WD4oFq0NRZ0Dt/YamutM7iWz3fMRxCqwgRn/rcUsTIw=";
  };

  strictDeps = true;
@@ -28,6 +27,9 @@ stdenvNoCC.mkDerivation rec {
    license = licenses.mit;
    mainProgram = "bemoji";
    platforms = platforms.all;
-    maintainers = with maintainers; [ laurent-f1z1 ];
+    maintainers = with maintainers; [
+      laurent-f1z1
+      MrSom3body
+    ];
  };
 }
@@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation {
  pname = "candy-icons";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-04-23";

  src = fetchFromGitHub {
    owner = "EliverLara";
    repo = "candy-icons";
-    rev = "2ba176007c40957b43d26b7a9be2c9f23a480e98";
-    hash = "sha256-6eWxf13ZBknN7IeLICpmDXu4GdxubkGJ9D4/ZEuOvfs=";
+    rev = "1763fc1f476e6c2ba7ca8df878645815b808ebca";
+    hash = "sha256-aXAtVtsJC9MdkhUJWZnOQteaR005+KnPxFrEepfomCk=";
  };

  nativeBuildInputs = [ gtk3 ];
@@ -8,15 +8,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-tally";
-  version = "1.0.62";
+  version = "1.0.63";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-EZvwjxIw6ixaSvHod7l9178D7MRTk4MrWHPxy+UCgf4=";
+    hash = "sha256-SNTqoxguv+HRdTLBL+cxUGNmprlC6VnpZ8xp6tKr+is=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-aSOEaHlUeP8D0GDdI6iLnuRHFasTt1nM6EGzYxhIPvo=";
+  cargoHash = "sha256-gpGBXh1qR5cFZXDSYKDYg8d4/A/K88dYSUb9mNrmGno=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
    with darwin.apple_sdk_11_0.frameworks;
@@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "clusterctl";
-  version = "1.10.0";
+  version = "1.10.1";

  src = fetchFromGitHub {
    owner = "kubernetes-sigs";
    repo = "cluster-api";
    rev = "v${version}";
-    hash = "sha256-04ytG4U8Luc5yh5VAbS1AQpjjapKsWWZSSB3IU5Rf6U=";
+    hash = "sha256-8clNhU9RxQ63zBaNnvftp4+wUG33bL8KCxbgzJwJdPo=";
  };

  vendorHash = "sha256-iProsOETP9ahyemF2tHUVmoiqjG+ghjZkHb6PAhygb4=";
@@ -0,0 +1,13 @@
+diff --git a/codec2.pc.in b/codec2.pc.in
+index ecca704..94fca12 100644
+--- a/codec2.pc.in
+++ b/codec2.pc.in
+@@ -1,6 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2
+libdir=@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_INCLUDEDIR@/codec2
+ 
+ Name: codec2
+ Description: A speech codec for 2400 bit/s and below
@@ -1,5 +1,6 @@
 {
  lib,
+  testers,
  stdenv,
  buildPackages,
  fetchFromGitHub,
@@ -8,17 +9,28 @@
  lpcnetfreedv,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "codec2";
  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "drowe67";
    repo = "codec2";
-    rev = "${version}";
+    rev = finalAttrs.version;
    hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM=";
  };

+  patches = [
+    # Fix nix-store path dupliucations
+    ./fix-pkg-config.patch
+  ];
+
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
+
  nativeBuildInputs = [
    cmake
    buildPackages.stdenv.cc # needs to build a C program to run at build time
@@ -40,10 +52,18 @@ stdenv.mkDerivation rec {
    install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/
  '';

-  # Swap keyword order to satisfy SWIG parser
-  postFixup = ''
-    sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h
-  '';
+  postFixup =
+    # Swap keyword order to satisfy SWIG parser
+    ''
+      sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h
+    ''
+    +
+      # generated cmake module is not compatible with multiple outputs
+      ''
+        substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \
+          '"''${_IMPORT_PREFIX}/include/codec2' \
+          "\"$dev/include/codec2"
+      '';

  cmakeFlags =
    [
@@ -56,6 +76,8 @@ stdenv.mkDerivation rec {
      "-DLPCNET=ON"
    ];

+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
  meta = with lib; {
    description = "Speech codec designed for communications quality speech at low data rates";
    homepage = "https://www.rowetel.com/codec2.html";
@@ -64,5 +86,6 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ markuskowa ];
    # generate_codebook only built for host platform
    broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    pkgConfigModules = [ "codec2" ];
  };
-}
+})
@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "comrak";
-  version = "0.38.0";
+  version = "0.39.0";

  src = fetchFromGitHub {
    owner = "kivikakk";
    repo = "comrak";
    rev = "v${version}";
-    sha256 = "sha256-chgg/6BJlCTOWPQ0jnE4l5O/lk0iA4xSwdWURKMF+f8=";
+    sha256 = "sha256-hy/kn8hShwzLHvzp3x1eSGipYRSXjOYCMPHEM1xQEr0=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-lP0eGjYZ3AOOH8O4N77QRCNt5Vd2FGfP95vdJN467rE=";
+  cargoHash = "sha256-MFSyxoNzPzIP2Yi3lCyEcsAx4DvNmk2Jr75oD/tX9iE=";

  meta = with lib; {
    description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";
@@ -8,17 +8,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-ext-ctl";
-  version = "1.4.0";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "cosmic-utils";
    repo = "cosmic-ctl";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-4UbmzBKxJwpyzucPRguQV1078961goiQlhtDjOGz1kA=";
+    hash = "sha256-URqNhkC1XrXYxr14K6sT3TLso38eWLMA+WplBdj52Vg=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-53lpHzHQ6SoZzd+h6O0NvSJHsPgbW0/kqnDrM5D6SWQ=";
+  cargoHash = "sha256-OL1LqOAyIFFCGIp3ySdvEXJ1ECp9DgC/8mfAPo/E7k4=";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbip-asn-lite";
-  version = "2025-04";
+  version = "2025-05";

  src = fetchurl {
    url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-gAMetVcoeTmXUYELzplAjz2Rk5p4tY4+NnCmmotUN0o=";
+    hash = "sha256-7o/mGSi66++h9mOPhsv/M/taDHJ7kPfKPh7jb+nC4IQ=";
  };

  dontUnpack = true;
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbip-city-lite";
-  version = "2025-04";
+  version = "2025-05";

  src = fetchurl {
    url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-KVp7dZJlEeLjN925bZq2+RnYgsdC724rkb/PxVxq9vE=";
+    hash = "sha256-Trqy6BlagHycC432BE1p/fF+hfcVpPhzVJTKIJQaWlY=";
  };

  dontUnpack = true;
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbip-country-lite";
-  version = "2025-04";
+  version = "2025-05";

  src = fetchurl {
    url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-Be9Q4VQUb5ql0BLreSu4YBGA+NHJkofjsp46aN7tI1E=";
+    hash = "sha256-7ZmodKYVMID/5yOMZuEpRkb41/DTrgprJPG7DYnYNak=";
  };

  dontUnpack = true;
@@ -68,10 +68,13 @@ python3.pkgs.buildPythonApplication rec {
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';

+  postFixup = ''
+    patchShebangs --update --host $out/share/dialect/search_provider
+  '';
+
  doCheck = false;

-  # handle setup hooks better
-  strictDeps = false;
+  strictDeps = true;

  passthru.updateScript = nix-update-script { };

@@ -30,7 +30,7 @@ let
 in
 stdenv.mkDerivation {
  pname = "domination";
-  version = "1.3.3";
+  version = "1.3.4";

  # The .zip releases do not contain the build.xml file
  src = fetchsvn {
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
    # https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt
    # Alternatively, look for revs like "changelog update",
    # "new version x.y.z info on website", or "website update for x.y.z".
-    rev = "2616";
-    hash = "sha256-/h9TstRxMpeoEsIeSN0MRmyRsiBHomguIPch1Zda8s8=";
+    rev = "2664";
+    hash = "sha256-bkaHpqJSc3UvwNT7LwuPUT8xN0g6QypfLSHlLmm8nX8=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,10 @@
+diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
+--- a/scripts/bash-based-configure
+++ b/scripts/bash-based-configure
+@@ -1364,6 +1364,7 @@ EOF
+ 
+    cat >conftest.c <<EOF
+ #include <glib.h>
+#include <stdio.h>
+ int main(int argc, char *argv[])
+ { g_malloc(1024); 
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
  patches = lib.optionals enableSoftening [
    ./encryption.patch
    ./dvdrom.patch
+    ./gcc14-fix.patch
  ];

  postPatch = ''
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "encrypted-dns-server";
-  version = "0.9.16";
+  version = "0.9.17";

  src = fetchFromGitHub {
    owner = "DNSCrypt";
    repo = "encrypted-dns-server";
    tag = version;
-    hash = "sha256-llBMOqmxEcysoBsRg5s1uqCyR6+ilTgBI7BaeSDVoEw=";
+    hash = "sha256-un7607HQ7s7G2GPTmYVT3wK/ePLNVyV+A2mtKt0YGsw=";
  };

-  cargoHash = "sha256-33XcfiktgDG34aamw8X3y0QkybVENUJxLhx47WZUpFc=";
+  cargoHash = "sha256-qhY1LgtV0Kmj/at9EG7Y+swN1Oy0/SzRCr7U8xVh8KA=";

  nativeBuildInputs = [ pkg-config ];

@@ -1,7 +1,7 @@
 {
  stdenv,
  lib,
-  fetchurl,
+  fetchFromGitLab,
  desktop-file-utils,
  docbook-xsl-nons,
  gettext,
@@ -21,16 +21,20 @@
  libgedit-gtksourceview,
  libgedit-tepl,
  libgee,
-  gnome,
+  gitUpdater,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "enter-tex";
-  version = "3.47.0";
+  version = "3.48.0";

-  src = fetchurl {
-    url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "gedit";
+    repo = "enter-tex";
+    tag = finalAttrs.version;
+    hash = "sha256-OnkP4E1kNWuE9k7SQ/ujnxnFgVyAqIhqHAw04ZA0Tno=";
  };

  nativeBuildInputs = [
@@ -60,18 +64,16 @@ stdenv.mkDerivation (finalAttrs: {

  preBuild = ''
    # Workaround the use case of C code mixed with Vala code.
-    # https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure
+    # https://gitlab.gnome.org/World/gedit/enter-tex/-/blob/3.48.0/docs/more-information.md#install-procedure
    ninja src/gtex/Gtex-1.gir
  '';

  doCheck = true;

-  passthru.updateScript = gnome.updateScript {
-    packageName = "enter-tex";
-  };
+  passthru.updateScript = gitUpdater { };

  meta = with lib; {
-    homepage = "https://gitlab.gnome.org/swilmet/enter-tex";
+    homepage = "https://gitlab.gnome.org/World/gedit/enter-tex";
    description = "LaTeX editor for the GNOME desktop";
    maintainers = with maintainers; [
      manveru
@@ -15,17 +15,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "eza";
-  version = "0.21.2";
+  version = "0.21.3";

  src = fetchFromGitHub {
    owner = "eza-community";
    repo = "eza";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-r8svNiz0hcK0QQ0LvkYKTc9gLOEDLylZss32g6sM/hY=";
+    hash = "sha256-6SGGeZVQe3uuyEt6TJn5cBqnI/BdDGRiPHugKrgQNhs=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-akoRFvlwHUg8KzmxMGkJ//fIrX/+/yu6fHbxBjgwUZc=";
+  cargoHash = "sha256-QCy9lLOSB+64DPTc/SVSCrD2nfJswGcR2P9AdN6CqZw=";

  nativeBuildInputs = [
    cmake
@@ -2,50 +2,57 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  autoreconfHook,
+  cmake,
  libzip,
  boost,
-  wt4,
+  wt,
  libconfig,
  pkg-config,
+  libarchive,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "fileshelter";
-  version = "4.0.1";
+  version = "6.2.0";

  src = fetchFromGitHub {
    owner = "epoupon";
    repo = "fileshelter";
-    rev = "v${version}";
-    sha256 = "07n70wwqj7lqdxs3wya1m8bwg8l6lgmmlfpwyv3r3s4dfzb1b3ka";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-21ANNJB7rbGAdlS7ELyGAEIjvK8biFlH27yVHrLKpwY=";
  };

+  postPatch = ''
+    sed -i '1i #include <algorithm>' src/fileshelter/ui/ShareCreateFormView.cpp
+  '';
+
  enableParallelBuilding = true;

  nativeBuildInputs = [
-    autoreconfHook
+    cmake
    pkg-config
  ];
+
  buildInputs = [
    libzip
    boost
-    wt4
+    wt
    libconfig
+    libarchive
  ];

  NIX_LDFLAGS = "-lpthread";

  postInstall = ''
-    ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources
+    ln -s ${wt}/share/Wt/resources $out/share/fileshelter/docroot/resources
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/epoupon/fileshelter";
    description = "FileShelter is a 'one-click' file sharing web application";
    mainProgram = "fileshelter";
-    maintainers = [ maintainers.willibutz ];
-    license = licenses.gpl3;
+    maintainers = [ lib.maintainers.willibutz ];
+    license = lib.licenses.gpl3;
    platforms = [ "x86_64-linux" ];
  };
-}
+})
@@ -9,17 +9,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "flitter";
-  version = "1.1.1";
+  version = "1.1.3";

  src = fetchFromGitHub {
    owner = "alexozer";
    repo = "flitter";
-    rev = "v${version}";
-    sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o=";
+    tag = version;
+    hash = "sha256-LG4gCpV4NUOuQMjGIjjX+pc9dL/IG6pzy3J5cDfUE5k=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-nhFTXjOXy9QxsASlZHC4jXAJ/Xw65g1l3JczOYvq3dc=";
+  cargoHash = "sha256-V+GsBEyGNI+13TsIci5GC0VW5BYPCGDAlpaj9DQWjCg=";

  nativeBuildInputs = [
    pkg-config
@@ -27,7 +27,7 @@
 }:

 let
-  version = "1.22.2";
+  version = "1.22.3";

  # build stimuli file for PGO build and the script to generate it
  # independently of the foot's build, so we can cache the result
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
    owner = "dnkl";
    repo = "foot";
    tag = version;
-    hash = "sha256-eX9nSAl2pHbJU8g80q3RifDlFh00LSi8GvYU4+rlIsA=";
+    hash = "sha256:1l5liw4dgv7hxdimyk5qycmkfjgimdrx51rjvdizpcfmdlkvg518";
  };

  separateDebugInfo = true;
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "frei";
-  version = "0.3.0";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "alexcoder04";
    repo = "frei";
    rev = "v${version}";
-    sha256 = "sha256-C70c/uADy/D2YARRYROkc6Bs/VtYH3SIXUjSF3+qVjY=";
+    sha256 = "sha256-QVoRiqQt4DJK07YcCPplxigpgIqjDeQVYyDK/KQ7gbo=";
  };

  vendorHash = null;
@@ -9,15 +9,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "functiontrace-server";
-  version = "0.8.3";
+  version = "0.8.4";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-xTNNAYhxyL5/Sip+nZJleWOjTYs2MH3QM7pzLYk/6Gs=";
+    hash = "sha256-i+lXjFXCPT6Skr+r/RKYQm+iJ+WETJ/tAQg5U6qFFi8=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-zwarLDKaI4TMCId8+3wVtioOMw2F8Z7Rnl0bKbQVndQ=";
+  cargoHash = "sha256-61+hEq0cdJZ+DTgN/ZtK6IKuwLCq3oxk0SrzqWewQXs=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.CoreFoundation
@@ -3,8 +3,7 @@
  lib,
  meson,
  mesonEmulatorHook,
-  fetchurl,
-  python3,
+  fetchFromGitLab,
  pkg-config,
  gtk3,
  gtk-mac-integration,
@@ -20,7 +19,7 @@
  gobject-introspection,
  docbook-xsl-nons,
  ninja,
-  gnome,
+  gitUpdater,
  gspell,
  itstool,
  desktop-file-utils,
@@ -29,16 +28,21 @@

 stdenv.mkDerivation rec {
  pname = "gedit";
-  version = "48.1";
+  version = "48.2";

  outputs = [
    "out"
    "devdoc"
  ];

-  src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
-    hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo=";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "gedit";
+    repo = "gedit";
+    tag = version;
+    fetchSubmodules = true;
+    hash = "sha256-M8ZyjY4wSogEjhEx9sOKfuGkbiypDmZoU0H4ja+TgaY=";
  };

  patches = [
@@ -55,7 +59,6 @@ stdenv.mkDerivation rec {
      meson
      ninja
      pkg-config
-      python3
      vala
      wrapGAppsHook3
      gtk-doc
@@ -81,19 +84,10 @@ stdenv.mkDerivation rec {
      gtk-mac-integration
    ];

-  postPatch = ''
-    chmod +x build-aux/meson/post_install.py
-    patchShebangs build-aux/meson/post_install.py
-  '';
-
  # Reliably fails to generate gedit-file-browser-enum-types.h in time
  enableParallelBuilding = false;

-  passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gedit";
-    };
-  };
+  passthru.updateScript = gitUpdater { };

  meta = with lib; {
    homepage = "https://gitlab.gnome.org/World/gedit/gedit";
@@ -4,6 +4,8 @@
  fetchFromGitHub,
  lib,
  nixosTests,
+  apple-sdk_12,
+  darwinMinVersionHook,
 }:

 buildGoModule rec {
@@ -17,16 +19,20 @@ buildGoModule rec {
    hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds=";
  };

-  vendorHash = null;
+  vendorHash = "sha256-vP8OtjpYNMm1KkNfD3pmNrHh3HRy1GkzUbfLKWKhHbo=";

  deleteVendor = true;

-  # The certstore directory isn't recognized as a subpackage, but is when moved
-  # into the vendor directory.
-  postUnpack = ''
-    mkdir -p $sourceRoot/vendor/ghostunnel
-    mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/
-  '';
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-sdk_12
+    (darwinMinVersionHook "12.0")
+  ];
+
+  # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain
+  # which doesn't work from a nix build. Presumably other platform implementations of the
+  # certstore would have similar issues, so it probably makes sense to skip them in
+  # general wherever they are available.
+  checkFlags = [ "-skip=^Test(ImportDelete|Signer|Certificate)(RSA|ECDSA|EC)$" ];

  passthru.tests = {
    nixos = nixosTests.ghostunnel;
@@ -34,12 +40,14 @@ buildGoModule rec {
  };

  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
    description = "TLS proxy with mutual authentication support for securing non-TLS backend applications";
    homepage = "https://github.com/ghostunnel/ghostunnel#readme";
    changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}";
    license = licenses.asl20;
-    maintainers = with maintainers; [ roberth ];
+    maintainers = with maintainers; [
+      roberth
+      mjm
+    ];
    mainProgram = "ghostunnel";
  };
 }
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "golden-cheetah";
-  version = "3.7-DEV2408";
+  version = "3.7";

  src = fetchFromGitHub {
    owner = "GoldenCheetah";
    repo = "GoldenCheetah";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
+    hash = "sha256-INlkFWugIoln7wrmgLZUC/Ye8eV+mlT6BZ0ZdP7CiqE=";
  };

  buildInputs =
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "gosmee";
-  version = "0.24.0";
+  version = "0.25.0";

  src = fetchFromGitHub {
    owner = "chmouel";
    repo = "gosmee";
    rev = "v${version}";
-    hash = "sha256-hE9iZkIkMzCICw9n1XhJ2PO5SvqE0EVhLJQO7tCUw3U=";
+    hash = "sha256-aQ25V6FKfvXWFjeWkTQLWQfeZGBMlBUe2L9IkDPN+88=";
  };
  vendorHash = null;

@@ -0,0 +1,62 @@
+{
+  fetchFromGitHub,
+  gawk,
+  lib,
+  nix-update-script,
+  runCommand,
+  stdenvNoCC,
+  writableTmpDirAsHomeHook,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "goto";
+  version = "2.1.0-unstable-2020-11-15";
+
+  src = fetchFromGitHub {
+    owner = "iridakos";
+    repo = "goto";
+    # no tags
+    rev = "b7fda54e0817b9cb47e22a78bd00b4571011cf58";
+    hash = "sha256-dUxim8LLb+J9cI7HySkmC2DIWbWAKSsH/cTVXmt8zRo=";
+  };
+
+  strictDeps = true;
+
+  buildInputs = [ gawk ];
+
+  postInstall = ''
+    install -Dm644 goto.sh -t $out/share/
+  '';
+
+  passthru.tests.basic-usage =
+    runCommand "goto-basic-usage"
+      {
+        nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+      }
+      ''
+        # Mock `complete` since the builder `pkgs.bash` is not interactive.
+        complete() { return; }
+
+        source ${finalAttrs.finalPackage}/share/goto.sh
+
+        goto --register pwd .
+        cd /
+        goto pwd
+        goto --unregister pwd
+        goto --list
+
+        touch $out
+      '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Alias and navigate to directories with tab completion";
+    homepage = "https://github.com/iridakos/goto";
+    changelog = "https://github.com/iridakos/goto/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.bmrips ];
+  };
+})
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "gtree";
-  version = "1.11.4";
+  version = "1.11.5";

  src = fetchFromGitHub {
    owner = "ddddddO";
    repo = "gtree";
    rev = "v${version}";
-    hash = "sha256-a2kQVn/3PyGZliPOB/2hFULK+YJBv7JVv0p7cbmfsN0=";
+    hash = "sha256-AEzquSbDFy5vXyIjRvVxMp6ArDiPqy0XfPiPVPisobw=";
  };

-  vendorHash = "sha256-ARmyA8qYKv8xTmpaN77D/NlBfFJFVTGudpBeQG5apso=";
+  vendorHash = "sha256-N+w8UreFq/SYjZgFh6QNcC/YsCDze/v2jvD0D19dDUs=";

  subPackages = [
    "cmd/gtree"
@@ -7,18 +7,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "harper";
-  version = "0.31.0";
+  version = "0.32.1";

  src = fetchFromGitHub {
    owner = "Automattic";
    repo = "harper";
    rev = "v${version}";
-    hash = "sha256-+XO81A7F3QOGcDm/keqUHbURCQfzAHRiAlQmNzGo1IU=";
+    hash = "sha256-6W1NFZ5wRL3RxNYbgRH4qCSDNwOc3uQFeFujffusjGo=";
  };

  buildAndTestSubdir = "harper-ls";
  useFetchCargoVendor = true;
-  cargoHash = "sha256-EwWBqVTkBH4p1ljBitXtGkjUlx96Uajxc0z7DDkGawo=";
+  cargoHash = "sha256-PKqLf7UrtQp8pLIJbFgZ53iW+So6Yq7cpETARsnMFvI=";

  passthru.updateScript = nix-update-script { };

@@ -1,31 +1,35 @@
 {
-  stdenv,
  lib,
+  stdenv,
  fetchFromGitHub,
  openssl,
+  libpcap,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "hcxdumptool";
-  version = "6.3.2";
+  version = "6.3.5";

  src = fetchFromGitHub {
    owner = "ZerBea";
    repo = "hcxdumptool";
-    rev = version;
-    sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg=";
+    tag = finalAttrs.version;
+    hash = "sha256-PA4nbjg4ybWvZZ7wbsh+OR/wEEVm5qu5OfM9EO3HBYs=";
  };

-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+    libpcap
+  ];

  installFlags = [ "PREFIX=$(out)" ];

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/ZerBea/hcxdumptool";
    description = "Small tool to capture packets from wlan devices";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ danielfullmer ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ danielfullmer ];
    mainProgram = "hcxdumptool";
  };
-}
+})
@@ -11,17 +11,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hddfancontrol";
-  version = "2.0.2";
+  version = "2.0.3";

  src = fetchFromGitHub {
    owner = "desbma";
    repo = "hddfancontrol";
    tag = finalAttrs.version;
-    hash = "sha256-/+bvTpfgAjyG8gkyhueLJCKJo3e2OvabfOYOM9vV+g8=";
+    hash = "sha256-GdvGFNmarLxtO6BoZ8PktVvAiKIxu4FdZWCJeVtW/fI=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-yupjse1snr467otqZgoSANpKoxq2F8NDfo8NvwGNJxk=";
+  cargoHash = "sha256-1GPct+CabVE8/tMpWsQ3/XRJQkcAmS6UDNuz5c/Oewo=";

  nativeBuildInputs = [
    makeWrapper
@@ -0,0 +1,70 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  wrapGAppsHook4,
+  meson,
+  ninja,
+  pkg-config,
+  blueprint-compiler,
+  desktop-file-utils,
+  libadwaita,
+  gst_all_1,
+  libsecret,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "high-tide";
+  version = "0-unstable-2025-05-01";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "Nokse22";
+    repo = "high-tide";
+    rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc";
+    hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ=";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    meson
+    ninja
+    pkg-config
+    blueprint-compiler
+    desktop-file-utils
+  ];
+
+  buildInputs =
+    [ libadwaita ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+      gst-plugins-bad
+      libsecret
+    ]);
+
+  dependencies = with python3Packages; [
+    pygobject3
+    tidalapi
+    requests
+    mpd2
+  ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  meta = {
+    description = "Libadwaita TIDAL client for Linux";
+    homepage = "https://github.com/Nokse22/high-tide";
+    license = with lib.licenses; [ gpl3Plus ];
+    mainProgram = "HighTide";
+    maintainers = with lib.maintainers; [
+      nyabinary
+      griffi-gh
+    ];
+    platforms = lib.platforms.linux;
+  };
+}
@@ -2,37 +2,24 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  fetchpatch,
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "httptap";
-  version = "0.0.8";
+  version = "0.1.1";

  src = fetchFromGitHub {
    owner = "monasticacademy";
    repo = "httptap";
-    tag = "v${version}";
-    hash = "sha256-1BtV5ao5dAKSINdUdJD/wxTMFXXiP8Vy1A7gQfVIsUQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Cn5u6q0r06SJp4uhF7j5K6yNZv8Q3WNxlDd5Vxmshhw=";
  };

-  patches = [
-    # this patch updates go.mod to include missing dependencies
-    # https://github.com/monasticacademy/httptap/pull/13
-    (fetchpatch {
-      name = "update-go-mod";
-      url = "https://github.com/monasticacademy/httptap/commit/3b520725c784d6435be6a51c58ae847bae729962.patch";
-      hash = "sha256-0dPq0Ldu1m8YZKctFtoUcbQdmx6sqjA8EVhTeMwNWx8=";
-    })
-  ];
-
-  vendorHash = "sha256-+TtHw2KdeNHCgnMnkxJJ9shqsrlbeTzYwbPH0dJmCjM=";
+  vendorHash = "sha256-yTtUt+kfDwN6W4caHCAYFjpYzhaqZUbLe+Nz7JKAXu8=";

  env.CGO_ENABLED = 0;

-  subPackages = [
-    "."
-  ];
+  subPackages = [ "." ];

  ldflags = [
    "-s"
@@ -46,4 +33,4 @@ buildGoModule rec {
    maintainers = with lib.maintainers; [ jpetrucciani ];
    mainProgram = "httptap";
  };
-}
+})
@@ -13,6 +13,11 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4=";
  };

+  # Insert empty line in expected output of rust panic in a test
+  postPatch = ''
+    sed -i '6G' tests/snapshots/run__file@empty.hvm.snap
+  '';
+
  useFetchCargoVendor = true;
  cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo=";

@@ -1,7 +1,7 @@
 {
  lib,
-  fetchFromGitHub,
  python3Packages,
+  fetchFromGitHub,
  bash,
  git,
  less,
@@ -9,33 +9,33 @@

 python3Packages.buildPythonApplication rec {
  pname = "icdiff";
-  version = "1.9.5";
+  version = "2.0.7";

  src = fetchFromGitHub {
    owner = "jeffkaufman";
    repo = "icdiff";
-    rev = "release-${version}";
-    sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd";
+    tag = "release-${version}";
+    hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
  };

+  # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
+  doCheck = false;
+
  nativeCheckInputs = [
    bash
    git
    less
  ];

-  # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory
-  doCheck = false;
-
  checkPhase = ''
    patchShebangs test.sh
    ./test.sh ${python3Packages.python.interpreter}
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://www.jefftk.com/icdiff";
    description = "Side-by-side highlighted command line diffs";
    maintainers = [ ];
-    license = licenses.psfl;
+    license = lib.licenses.psfl;
  };
 }
@@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "ignite-cli";
-  version = "28.9.0";
+  version = "28.10.0";

  src = fetchFromGitHub {
    repo = "cli";
    owner = "ignite";
    rev = "v${version}";
-    hash = "sha256-NLQ+Zd77JyHuih7hPeM067fcpny1V50GFDLGhtclGms=";
+    hash = "sha256-oGPiU6vC9T/fadyt97GkZBuPojINXnQPhtguwv7eyJU=";
  };

  vendorHash = "sha256-EaOs3m5AN0EYMO8j3mkKPOQwapi0WRaTIUJKTjDpmCo=";
@@ -17,7 +17,7 @@

 stdenv.mkDerivation rec {
  pname = "intel-media-driver";
-  version = "24.4.4";
+  version = "25.1.4";

  outputs = [
    "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    owner = "intel";
    repo = "media-driver";
    rev = "intel-media-${version}";
-    hash = "sha256-vZIWH/YBrUMmXu/JBBeGPOsn7pZUDaU8O6vgoekGhVU=";
+    hash = "sha256-kRMBOQpGWVrOvQ2RoYZzoYAfB2r7UqesiaTajjw+SLA=";
  };

  patches = [
@@ -6,6 +6,7 @@
  fetchurl,
  makeWrapper,
  icu,
+  libappindicator-gtk3,
  undmg,
 }:

@@ -65,6 +66,7 @@ let
      install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop
      install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
      wrapProgram $out/bin/jetbrains-toolbox \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator-gtk3 ]} \
        --append-flags "--update-failed"
    '';

@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "jql";
-  version = "8.0.5";
+  version = "8.0.6";

  src = fetchFromGitHub {
    owner = "yamafaktory";
    repo = "jql";
    rev = "jql-v${version}";
-    hash = "sha256-0sQEC2kUnuuKp73DJsNBFB0VL0rkBkudmr7ZQpS1v04=";
+    hash = "sha256-bb3QoODsVZaTw5mcagvcGLn8uwG48nmHPgtlIC2ZdVE=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-10eM7tczFoQVYagyP1btsCp4PHm+zRoh2oAEVVxsROA=";
+  cargoHash = "sha256-7+qlQf44DgjijKlM+HRjyubH3W/PJbortri3ur0ASnk=";

  meta = with lib; {
    description = "JSON Query Language CLI tool built with Rust";
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "kube-bench";
-  version = "0.10.5";
+  version = "0.10.6";

  src = fetchFromGitHub {
    owner = "aquasecurity";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-SI7rkJdl54e6b+zZEsj7CIU0wheDRcrAmCLoNWr7O8E=";
+    hash = "sha256-+4OSqFU9IoVN9lsw6CwVL60OU4e/yCBZfnD8qqNLTtk=";
  };

  vendorHash = "sha256-BB7DHACKELwvquOwmBSXl1kwKw43mNnpp5yY33wwdVo=";
@@ -11,11 +11,12 @@
  mesonEmulatorHook,
  gtk3,
  glib,
+  gitUpdater,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "libgedit-gfls";
-  version = "0.2.1";
+  version = "0.3.0";

  outputs = [
    "out"
@@ -28,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
    group = "World";
    owner = "gedit";
    repo = "libgedit-gfls";
-    rev = finalAttrs.version;
-    hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg=";
+    tag = finalAttrs.version;
+    hash = "sha256-X56QPcmNB0Ey+kzSqDnb6/j6/w7IU7MFSAxW8mX8I3w=";
  };

  nativeBuildInputs =
@@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
    glib
  ];

+  passthru.updateScript = gitUpdater { };
+
  meta = {
    homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls";
    description = "Module dedicated to file loading and saving";
@@ -15,11 +15,12 @@
  pkg-config,
  gtk-doc,
  docbook-xsl-nons,
+  gitUpdater,
 }:

 stdenv.mkDerivation rec {
  pname = "libgedit-tepl";
-  version = "6.12.0";
+  version = "6.13.0";

  outputs = [
    "out"
@@ -32,8 +33,8 @@ stdenv.mkDerivation rec {
    group = "World";
    owner = "gedit";
    repo = "libgedit-tepl";
-    rev = version;
-    hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE=";
+    tag = version;
+    hash = "sha256-YWONsw5+gq5Uew6xB76pKsGTJmI83zAssO5WX6aP7ZM=";
  };

  strictDeps = true;
@@ -62,6 +63,8 @@ stdenv.mkDerivation rec {
    libgedit-gtksourceview
  ];

+  passthru.updateScript = gitUpdater { };
+
  meta = with lib; {
    homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl";
    description = "Text editor product line";
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libmsquic";
-  version = "2.4.9";
+  version = "2.4.10";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "msquic";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-XcqSM4Kt6YuLsbqYcMd+g4pfBjoMMfX9xA85fWQhcck=";
+    hash = "sha256-lAiBS5DQISeu9ZbBOAxBSlAJ9Xn0kq7HI+eMw4nHt/E=";
    fetchSubmodules = true;
  };

@@ -0,0 +1,39 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gitUpdater,
+  cmake,
+  libsodium,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxeddsa";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Syndace";
+    repo = "libxeddsa";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kdy+S51nQstRFGw5mIW3TW+WBNynHLpmFC1t6Mc02K4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libsodium ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
+    description = "Toolkit around Curve25519 and Ed25519 key pairs";
+    homepage = "https://github.com/Syndace/libxeddsa";
+    changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
+  };
+})
@@ -15,12 +15,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  name = "lug-helper";
-  version = "3.7";
+  version = "3.8";
  src = fetchFromGitHub {
    owner = "starcitizen-lug";
    repo = "lug-helper";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-2z8Le65DQk121jTM3UP25V3Xzq+KUve5XJQmNaQ2IGg=";
+    hash = "sha256-e0pq3E9Jsx9pBRhN0gFJxZPDUbK/Xe84+5AO2/RlsLo=";
  };

  buildInputs = [
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl3Plus;
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
    maintainers = with lib.maintainers; [ ];
+    knownVulnerabilities = [ "https://github.com/mihomo-party-org/mihomo-party/issues/706" ];
  };
 }
@@ -97,7 +97,7 @@ let
    ++ lib.optionals mediaSupport [ ffmpeg ]
  );

-  version = "14.5";
+  version = "14.5.1";

  sources = {
    x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
        "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
        "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
      ];
-      hash = "sha256-uqwsDXbS8tfG/bgTQKvdiaPzchVhssoQccQStncNWOk=";
+      hash = "sha256-FQdPdCkdxh+wieC12lT90qaSvu56o4BDgUkaDOm5xSE=";
    };
  };

@@ -6,24 +6,24 @@

 rustPlatform.buildRustPackage {
  pname = "n2";
-  version = "unstable-2023-10-10";
+  version = "unstable-2025-03-14";

  src = fetchFromGitHub {
    owner = "evmar";
    repo = "n2";
-    rev = "90041c1f010d27464e3b18e38440ed9855ea62ef";
-    hash = "sha256-svJPcriSrqloJlr7pIp/k84O712l4ZEPlSr58GPANXY=";
+    rev = "d67d508c389ac2e6961c6f84cd668f05ec7dc7b7";
+    hash = "sha256-eWcN/iK/ToufABi4+hIyWetp2I94Vy4INHb4r6fw+TY=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-bVvtTsaLnsmfzv2wMFx81a2ef91pj8XGtXhj8X9WFlc=";
+  cargoHash = "sha256-LTgAaTQXW0XEbe+WS47pqSb+eU7FqjdTSO2++C3J5aM=";

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/evmar/n2";
    description = "Ninja compatible build system";
    mainProgram = "n2";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
  };
 }
@@ -79,7 +79,7 @@ let
            owner = "OctoPrint";
            repo = "OctoPrint";
            rev = version;
-            hash = "sha256-HvIMssPpRhzG//eyf0SfM5ddTUMr82F4ZS7c9tp88qw=";
+            hash = "sha256-Zc9t2mZQVvwJsyd0VaS8tMdGm9Ix3/QNl5ogeOTohVU=";
          };

          propagatedBuildInputs =
@@ -125,17 +125,17 @@ in
 goBuild (finalAttrs: {
  pname = "ollama";
  # don't forget to invalidate all hashes each update
-  version = "0.6.6";
+  version = "0.6.7";

  src = fetchFromGitHub {
    owner = "ollama";
    repo = "ollama";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9ZkO+LrS9rOTgOW8chLO3tnbne/+BSxQY+zOsSoE5Zc=";
+    hash = "sha256-GRqvaD/tAPI9cVlVu+HmRTv5zr7oCHdSlKoFfSLJ4r4=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-4wYgtdCHvz+ENNMiHptu6ulPJAznkWetQcdba3IEB6s=";
+  vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA=";

  env =
    lib.optionalAttrs enableRocm {
--- a/Show More
+++ b/Show More