Merge 7bff569ce4 into haskell-updates

2025-03-18 00:18:52 +00:00
parent 1f00f46d8b 7bff569ce4
commit dfd95563ce
202 changed files with 3380 additions and 1439 deletions
@@ -47,7 +47,7 @@ jobs:
    steps:
      - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

-      - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
        with:
          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
          name: nixpkgs-ci
@@ -26,7 +26,7 @@ jobs:
        with:
          extra_nix_config: sandbox = true

-      - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
        if: github.repository_owner == 'NixOS'
        with:
          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
@@ -24,7 +24,7 @@ jobs:
        with:
          extra_nix_config: sandbox = true

-      - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
+      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
        if: github.repository_owner == 'NixOS'
        with:
          # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
@@ -3016,6 +3016,14 @@
    githubId = 727571;
    keys = [ { fingerprint = "AAD4 3B70 A504 9675 CFC8  B101 BAFD 205D 5FA2 B329"; } ];
  };
+  berrij = {
+    email = "jonathan@berrisch.biz";
+    matrix = "@berrij:fairydust.space";
+    name = "Jonathan Berrisch";
+    github = "BerriJ";
+    githubId = 37799358;
+    keys = [ { fingerprint = "42 B6 CC90 6 A91 EA4F 8 A7E 315 B 30 DC 5398 152 C 5310"; } ];
+  };
  berryp = {
    email = "berryphillips@gmail.com";
    github = "berryp";
@@ -9359,6 +9367,12 @@
    githubId = 1379411;
    name = "Georg Haas";
  };
+  haylin = {
+    email = "me@haylinmoore.com";
+    github = "haylinmoore";
+    githubId = 8162992;
+    name = "Haylin Moore";
+  };
  hbjydev = {
    email = "hayden@kuraudo.io";
    github = "hbjydev";
@@ -145,6 +145,8 @@

 - [victorialogs][https://docs.victoriametrics.com/victorialogs/], log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable)

+- [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable)
+
 - [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable).

 - [Prometheus Node Cert Exporter](https://github.com/amimof/node-cert-exporter), a prometheus exporter to check for SSL cert expiry. Available under [services.prometheus.exporters.node-cert](#opt-services.prometheus.exporters.node-cert.enable).
@@ -1118,6 +1118,7 @@
  ./services/networking/go-neb.nix
  ./services/networking/go-shadowsocks2.nix
  ./services/networking/gobgpd.nix
+  ./services/networking/gokapi.nix
  ./services/networking/gvpe.nix
  ./services/networking/hans.nix
  ./services/networking/harmonia.nix
@@ -8,7 +8,7 @@
  services.userborn.enable = lib.mkDefault true;

  # Random perl remnants
-  system.disableInstallerTools = lib.mkDefault true;
+  system.tools.nixos-generate-config.enable = lib.mkDefault false;
  programs.less.lessopen = lib.mkDefault null;
  programs.command-not-found.enable = lib.mkDefault false;
  boot.enableContainers = lib.mkDefault false;
@@ -20,9 +20,4 @@
  # Check that the system does not contain a Nix store path that contains the
  # string "perl".
  system.forbiddenDependenciesRegexes = [ "perl" ];
-
-  # Re-add nixos-rebuild to the systemPackages that was removed by the
-  # `system.disableInstallerTools` option.
-  environment.systemPackages = [ pkgs.nixos-rebuild ];
-
 }
@@ -520,7 +520,7 @@ in
            elif [[ $compression == zstd ]]; then
              compressionCmd=(zstd --rm)
            fi
-            find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "''${compressionCmd[@]}" --force --quiet
+            find ${baseDir}/build-logs -ignore_readdir_race -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "''${compressionCmd[@]}" --force --quiet
          '';
        startAt = "Sun 01:45";
        serviceConfig.Slice = "system-hydra.slice";
@@ -86,7 +86,7 @@ in
        ProtectProc = "invisible";
        ProtectSystem = "strict";
        ReadWritePaths = [
-          "${config.users.users.${cfg.user}.home}"
+          cfg.dataDir
        ];
        RemoveIPC = true;
        RestrictAddressFamilies = [
@@ -59,7 +59,7 @@ in
          [bird]
          listen = "0.0.0.0:29184"
          config = "/etc/bird/bird.conf"
-          birdc  = "''${pkgs.bird}/bin/birdc"
+          birdc  = "''${pkgs.bird2}/bin/birdc"
          ttl = 5 # time to live (in minutes) for caching of cli output

          [parser]
@@ -0,0 +1,143 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.gokapi;
+  settingsFormat = pkgs.formats.json { };
+  userSettingsFile = settingsFormat.generate "generated-config.json" cfg.settings;
+in
+{
+  options.services.gokapi = {
+    enable = lib.mkEnableOption "Lightweight selfhosted Firefox Send alternative without public upload";
+
+    mutableSettings = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = ''
+        Allow changes to the program config made by the program to persist between restarts.
+        If disabled all required values must be set using nix, and all changes to config format over application updates must be resolved by user.
+      '';
+    };
+
+    package = lib.mkPackageOption pkgs "gokapi" { };
+
+    environment = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = lib.types.attrsOf (lib.types.either lib.types.str lib.types.int);
+        options = {
+          GOKAPI_CONFIG_DIR = lib.mkOption {
+            type = lib.types.str;
+            default = "%S/gokapi/config";
+            description = "Sets the directory for the config file.";
+          };
+          GOKAPI_CONFIG_FILE = lib.mkOption {
+            type = lib.types.str;
+            default = "config.json";
+            description = "Sets the filename for the config file.";
+          };
+          GOKAPI_DATA_DIR = lib.mkOption {
+            type = lib.types.str;
+            default = "%S/gokapi/data";
+            description = "Sets the directory for the data.";
+          };
+          GOKAPI_PORT = lib.mkOption {
+            type = lib.types.port;
+            default = 53842;
+            description = "Sets the port of the service.";
+          };
+        };
+      };
+      default = { };
+      description = ''
+        Environment variables to be set for the gokapi service. Can use systemd specifiers.
+        For full list see <https://gokapi.readthedocs.io/en/latest/advanced.html#environment-variables>.
+      '';
+    };
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = settingsFormat.type;
+        options = { };
+      };
+      default = { };
+      description = ''
+        Configuration settings for the generated config json file.
+        See <https://gokapi.readthedocs.io/en/latest/advanced.html#config-json> for more information
+      '';
+    };
+    settingsFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+      description = ''
+        Path to config file to parse and append to settings.
+        Largely useful for loading secrets from a file not in the nix store. Can use systemd specifiers.
+        See <https://gokapi.readthedocs.io/en/latest/advanced.html#config-json> for more information
+      '';
+    };
+
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.gokapi = {
+      wantedBy = [ "default.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      environment = lib.mapAttrs (_: value: toString value) cfg.environment;
+      unitConfig = {
+        Description = "gokapi service";
+      };
+      serviceConfig = {
+        ExecStartPre =
+          let
+            updateScript = lib.getExe (
+              pkgs.writeShellApplication {
+                name = "merge-config";
+                runtimeInputs = with pkgs; [ jq ];
+                text = ''
+                  echo "Running merge-config"
+                  mutableSettings="$1"
+                  statefulSettingsFile="$2"
+                  settingsFile="$3"
+                  if [[ "$mutableSettings" == true ]]; then
+                    if [[ -f "$statefulSettingsFile" ]]; then
+                      echo "Updating stateful config file"
+                      merged="$(jq -s '.[0] * .[1]' "$statefulSettingsFile" ${userSettingsFile})"
+                      echo "$merged" > "$statefulSettingsFile"
+                    fi
+                  else
+                    echo "Overwriting stateful config file"
+                    mkdir -p "$(dirname "$statefulSettingsFile")"
+                    cat ${userSettingsFile} > "$statefulSettingsFile"
+                  fi
+                  if [ "$settingsFile" != "null" ]; then
+                    echo "Merging settings file into current stateful settings file"
+                    merged="$(jq -s '.[0] * .[1]' "$statefulSettingsFile" "$settingsFile")"
+                    echo "$merged" > "$statefulSettingsFile"
+                  fi
+                '';
+              }
+            );
+          in
+          lib.strings.concatStringsSep " " [
+            updateScript
+            (lib.boolToString cfg.mutableSettings)
+            "${cfg.environment.GOKAPI_CONFIG_DIR}/${cfg.environment.GOKAPI_CONFIG_FILE}"
+            (if (cfg.settingsFile == null) then "null" else cfg.settingsFile)
+          ];
+        ExecStart = lib.getExe cfg.package;
+        RestartSec = 30;
+        DynamicUser = true;
+        PrivateTmp = true;
+        StateDirectory = "gokapi";
+        CacheDirectory = "gokapi";
+        Restart = "on-failure";
+      };
+    };
+  };
+  meta.maintainers = with lib.maintainers; [
+    delliott
+  ];
+}
@@ -189,7 +189,7 @@ def find_mounted_device(path: str) -> str:
    while not os.path.ismount(path):
        path = os.path.dirname(path)

-    devices = [x for x in psutil.disk_partitions(all=True) if x.mountpoint == path]
+    devices = [x for x in psutil.disk_partitions() if x.mountpoint == path]

    assert len(devices) == 1
    return devices[0].device
@@ -395,15 +395,16 @@ def main():
            limine_deploy_args = [limine_binary, 'bios-install', device]

        if config('partitionIndex'):
-            limine_deploy_args.append(config('partitionIndex'))
+            limine_deploy_args.append(str(config('partitionIndex')))

        if config('forceMbr'):
            limine_deploy_args += '--force-mbr'
-            try:
-                subprocess.run(limine_deploy_args)
-            except:
-                raise Exception(
-                    'Failed to deploy BIOS stage 1 Limine bootloader!\n' +
-                    'You might want to try enabling the `boot.loader.limine.forceMbr` option.')
+
+        try:
+            subprocess.run(limine_deploy_args)
+        except:
+            raise Exception(
+                'Failed to deploy BIOS stage 1 Limine bootloader!\n' +
+                'You might want to try enabling the `boot.loader.limine.forceMbr` option.')

 main()
@@ -479,6 +479,7 @@ in {
  gobgpd = handleTest ./gobgpd.nix {};
  gocd-agent = handleTest ./gocd-agent.nix {};
  gocd-server = handleTest ./gocd-server.nix {};
+  gokapi = runTest ./gokapi.nix;
  gollum = handleTest ./gollum.nix {};
  gonic = handleTest ./gonic.nix {};
  google-oslogin = handleTest ./google-oslogin {};
@@ -1005,7 +1006,7 @@ in {
  radicle = runTest ./radicle.nix;
  ragnarwm = handleTest ./ragnarwm.nix {};
  rasdaemon = handleTest ./rasdaemon.nix {};
-  rathole = handleTest ./rathole.nix {};
+  rathole = runTest ./rathole.nix;
  readarr = handleTest ./readarr.nix {};
  realm = handleTest ./realm.nix {};
  readeck = runTest ./readeck.nix;
@@ -72,7 +72,7 @@ makeTest {
          [bird]
          listen = "0.0.0.0:29184"
          config = "/etc/bird/bird.conf"
-          birdc  = "${pkgs.bird}/bin/birdc"
+          birdc  = "${pkgs.bird2}/bin/birdc"
          ttl = 5 # time to live (in minutes) for caching of cli output
          [parser]
          filter_fields = []
@@ -0,0 +1,22 @@
+{ lib, ... }:
+let
+  port = 6000;
+in
+{
+  name = "gokapi";
+
+  meta.maintainers = with lib.maintainers; [ delliott ];
+
+  nodes.machine = {
+    services.gokapi = {
+      enable = true;
+      environment.GOKAPI_PORT = port;
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("gokapi.service")
+    machine.wait_for_open_port(${toString port})
+    machine.succeed("curl --fail http://localhost:${toString port}/")
+  '';
+}
@@ -1,43 +1,44 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{ lib, ... }:

-  let
-    successMessage = "Success 3333115147933743662";
-  in
-  {
-    name = "rathole";
-    meta.maintainers = with lib.maintainers; [ xokdvium ];
-    nodes = {
-      server = {
-        networking = {
-          useNetworkd = true;
-          useDHCP = false;
-          firewall.enable = false;
-        };
+let
+  successMessage = "Success 3333115147933743662";
+in
+{
+  name = "rathole";
+  meta.maintainers = with lib.maintainers; [ xokdvium ];
+  nodes = {
+    server = {
+      networking = {
+        useNetworkd = true;
+        useDHCP = false;
+        firewall.enable = false;
+      };

-        systemd.network.networks."01-eth1" = {
-          name = "eth1";
-          networkConfig.Address = "10.0.0.1/24";
-        };
+      systemd.network.networks."01-eth1" = {
+        name = "eth1";
+        networkConfig.Address = "10.0.0.1/24";
+      };

-        services.rathole = {
-          enable = true;
-          role = "server";
-          settings = {
-            server = {
-              bind_addr = "0.0.0.0:2333";
-              services = {
-                success-message = {
-                  bind_addr = "0.0.0.0:80";
-                  token = "hunter2";
-                };
+      services.rathole = {
+        enable = true;
+        role = "server";
+        settings = {
+          server = {
+            bind_addr = "0.0.0.0:2333";
+            services = {
+              success-message = {
+                bind_addr = "0.0.0.0:80";
+                token = "hunter2";
              };
            };
          };
        };
      };
+    };

-      client = {
+    client =
+      { pkgs, ... }:
+      {
        networking = {
          useNetworkd = true;
          useDHCP = false;
@@ -72,18 +73,17 @@ import ./make-test-python.nix (
          };
        };
      };
-    };
+  };

-    testScript = ''
-      start_all()
-      server.wait_for_unit("rathole.service")
-      server.wait_for_open_port(2333)
-      client.wait_for_unit("rathole.service")
-      server.wait_for_open_port(80)
-      response = server.succeed("curl http://127.0.0.1/success-message.txt")
-      assert "${successMessage}" in response, "Got invalid response"
-      response = client.succeed("curl http://10.0.0.1/success-message.txt")
-      assert "${successMessage}" in response, "Got invalid response"
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    server.wait_for_unit("rathole.service")
+    server.wait_for_open_port(2333)
+    client.wait_for_unit("rathole.service")
+    server.wait_for_open_port(80)
+    response = server.succeed("curl http://127.0.0.1/success-message.txt")
+    assert "${successMessage}" in response, "Got invalid response"
+    response = client.succeed("curl http://10.0.0.1/success-message.txt")
+    assert "${successMessage}" in response, "Got invalid response"
+  '';
+}
@@ -24,6 +24,11 @@ let
    inherit (neovimUtils) buildNeovimPlugin;
  };

+  extras = callPackage ./extras.nix {
+    inherit buildVimPlugin;
+    inherit (neovimUtils) buildNeovimPlugin;
+  };
+
  # TL;DR
  # * Add your plugin to ./vim-plugin-names
  # * run ./update.py
@@ -36,9 +41,11 @@ let
  };

  aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: { };
-
-  extensible-self = lib.makeExtensible (
-    extends aliases (extends overrides (extends plugins initialPackages))
-  );
 in
-extensible-self
+lib.pipe initialPackages [
+  (extends plugins)
+  (extends extras)
+  (extends overrides)
+  (extends aliases)
+  lib.makeExtensible
+]
@@ -0,0 +1,104 @@
+{
+  lib,
+  buildVimPlugin,
+  buildNeovimPlugin,
+  nodePackages,
+  neovim-unwrapped,
+}:
+let
+  luaPackages = neovim-unwrapped.lua.pkgs;
+in
+self: super:
+(
+  let
+    nodePackageNames = [
+      "coc-cmake"
+      "coc-docker"
+      "coc-emmet"
+      "coc-eslint"
+      "coc-explorer"
+      "coc-flutter"
+      "coc-git"
+      "coc-go"
+      "coc-haxe"
+      "coc-highlight"
+      "coc-html"
+      "coc-java"
+      "coc-jest"
+      "coc-json"
+      "coc-lists"
+      "coc-ltex"
+      "coc-markdownlint"
+      "coc-pairs"
+      "coc-prettier"
+      "coc-r-lsp"
+      "coc-rls"
+      "coc-rust-analyzer"
+      "coc-sh"
+      "coc-smartf"
+      "coc-snippets"
+      "coc-solargraph"
+      "coc-spell-checker"
+      "coc-sqlfluff"
+      "coc-stylelint"
+      "coc-sumneko-lua"
+      "coc-tabnine"
+      "coc-texlab"
+      "coc-tsserver"
+      "coc-ultisnips"
+      "coc-vetur"
+      "coc-vimlsp"
+      "coc-vimtex"
+      "coc-wxml"
+      "coc-yaml"
+      "coc-yank"
+    ];
+    nodePackage2VimPackage =
+      name:
+      buildVimPlugin {
+        pname = name;
+        inherit (nodePackages.${name}) version meta;
+        src = "${nodePackages.${name}}/lib/node_modules/${name}";
+      };
+  in
+  lib.genAttrs nodePackageNames nodePackage2VimPackage
+)
+// (
+  let
+    luarocksPackageNames = [
+      "fidget-nvim"
+      "gitsigns-nvim"
+      "image-nvim"
+      "lsp-progress-nvim"
+      "lualine-nvim"
+      "luasnip"
+      "lush-nvim"
+      "lz-n"
+      "lze"
+      "lzextras"
+      "lzn-auto-require"
+      "middleclass"
+      "mini-test"
+      "neorg"
+      "neotest"
+      "nui-nvim"
+      "nvim-cmp"
+      "nvim-nio"
+      "nvim-web-devicons"
+      "oil-nvim"
+      "orgmode"
+      "papis-nvim"
+      "rest-nvim"
+      "rocks-config-nvim"
+      "rtp-nvim"
+      "telescope-manix"
+      "telescope-nvim"
+    ];
+    toVimPackage =
+      name:
+      buildNeovimPlugin {
+        luaAttr = luaPackages.${name};
+      };
+  in
+  lib.genAttrs luarocksPackageNames toVimPackage
+)
@@ -1188,6 +1188,19 @@ final: prev:
    meta.hydraPlatforms = [ ];
  };

+  aw-watcher-nvim = buildVimPlugin {
+    pname = "aw-watcher.nvim";
+    version = "2025-03-06";
+    src = fetchFromGitHub {
+      owner = "lowitea";
+      repo = "aw-watcher.nvim";
+      rev = "9030f9b851578fce7cec5fa3d7b54556eb7e270f";
+      sha256 = "0nsmfb508x03n0hvlnhcjzgqwwg8rp8wa2a5r7wz4z1hrs03hscx";
+    };
+    meta.homepage = "https://github.com/lowitea/aw-watcher.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  aw-watcher-vim = buildVimPlugin {
    pname = "aw-watcher-vim";
    version = "2023-10-09";
@@ -1281,6 +1281,7 @@ in
    dependencies = [ self.plenary-nvim ];
  };

+  # NOTE: this overrides a luaPackages-based plugin
  gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
  };
@@ -1421,6 +1422,7 @@ in
    doInstallCheck = true;
  };

+  # NOTE: this overrides a luaPackages-based plugin
  image-nvim = super.image-nvim.overrideAttrs {
    dependencies = with self; [
      nvim-treesitter
@@ -1683,6 +1685,7 @@ in
    dependencies = [ self.lualine-nvim ];
  };

+  # NOTE: this overrides a luaPackages-based plugin
  luasnip = super.luasnip.overrideAttrs {
    dependencies = [ luaPackages.jsregexp ];
  };
@@ -1949,6 +1952,7 @@ in
    ];
  };

+  # NOTE: this overrides a luaPackages-based plugin
  neotest = super.neotest.overrideAttrs {
    dependencies = with self; [
      nvim-nio
@@ -2838,6 +2842,7 @@ in
  };

  # needs  "http" and "json" treesitter grammars too
+  # NOTE: this overrides a luaPackages-based plugin
  rest-nvim = super.rest-nvim.overrideAttrs {
    dependencies = with self; [
      plenary-nvim
@@ -3225,6 +3230,7 @@ in
    dependencies = [ self.plenary-nvim ];
  };

+  # NOTE: this overrides a luaPackages-based plugin
  telescope-nvim = super.telescope-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
  };
@@ -3988,101 +3994,6 @@ in
    '';

  };
-}
-// (
-  let
-    nodePackageNames = [
-      "coc-cmake"
-      "coc-docker"
-      "coc-emmet"
-      "coc-eslint"
-      "coc-explorer"
-      "coc-flutter"
-      "coc-git"
-      "coc-go"
-      "coc-haxe"
-      "coc-highlight"
-      "coc-html"
-      "coc-java"
-      "coc-jest"
-      "coc-json"
-      "coc-lists"
-      "coc-ltex"
-      "coc-markdownlint"
-      "coc-pairs"
-      "coc-prettier"
-      "coc-r-lsp"
-      "coc-rls"
-      "coc-rust-analyzer"
-      "coc-sh"
-      "coc-smartf"
-      "coc-snippets"
-      "coc-solargraph"
-      "coc-spell-checker"
-      "coc-sqlfluff"
-      "coc-stylelint"
-      "coc-sumneko-lua"
-      "coc-tabnine"
-      "coc-texlab"
-      "coc-tsserver"
-      "coc-ultisnips"
-      "coc-vetur"
-      "coc-vimlsp"
-      "coc-vimtex"
-      "coc-wxml"
-      "coc-yaml"
-      "coc-yank"
-    ];
-    nodePackage2VimPackage =
-      name:
-      buildVimPlugin {
-        pname = name;
-        inherit (nodePackages.${name}) version meta;
-        src = "${nodePackages.${name}}/lib/node_modules/${name}";
-      };
-  in
-  lib.genAttrs nodePackageNames nodePackage2VimPackage
-)
-// (
-  let
-    luarocksPackageNames = [
-      "fidget-nvim"
-      "gitsigns-nvim"
-      "image-nvim"
-      "lsp-progress-nvim"
-      "lualine-nvim"
-      "luasnip"
-      "lush-nvim"
-      "lz-n"
-      "lze"
-      "lzextras"
-      "lzn-auto-require"
-      "middleclass"
-      "mini-test"
-      "neorg"
-      "neotest"
-      "nui-nvim"
-      "nvim-cmp"
-      "nvim-nio"
-      "nvim-web-devicons"
-      "oil-nvim"
-      "orgmode"
-      "papis-nvim"
-      "rest-nvim"
-      "rocks-config-nvim"
-      "rtp-nvim"
-      "telescope-manix"
-      "telescope-nvim"
-    ];
-    toVimPackage =
-      name:
-      neovimUtils.buildNeovimPlugin {
-        luaAttr = luaPackages.${name};
-      };
-  in
-  lib.genAttrs luarocksPackageNames toVimPackage
-)
-// {

  rocks-nvim =
    (neovimUtils.buildNeovimPlugin {
@@ -91,6 +91,7 @@ https://github.com/gaoDean/autolist.nvim/,,
 https://github.com/vim-scripts/autoload_cscope.vim/,,
 https://github.com/nullishamy/autosave.nvim/,HEAD,
 https://github.com/ActivityWatch/aw-watcher-vim/,HEAD,
+https://github.com/lowitea/aw-watcher.nvim/,HEAD,
 https://github.com/rafi/awesome-vim-colorschemes/,,
 https://github.com/AhmedAbdulrahman/aylin.vim/,,
 https://github.com/ayu-theme/ayu-vim/,,
@@ -4407,8 +4407,8 @@ let
        mktplcRef = {
          publisher = "shd101wyy";
          name = "markdown-preview-enhanced";
-          version = "0.8.15";
-          hash = "sha256-aW2Ri73xIl/1q/Yoi5qg25fjx7l55QfXAn+M+JuoN+A=";
+          version = "0.8.18";
+          hash = "sha256-BHLFlhcIXm3mvmjDPu3fuzpJIGHQvT/RDBEE/QFoRvU=";
        };
        meta = {
          description = "Provides a live preview of markdown using either markdown-it or pandoc";
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "debugpy";
    publisher = "ms-python";
-    version = "2025.4.0";
-    hash = "sha256-WbnR949zHuoW+jR6vugvHussScBvgRIi8PYi9HbJxjc=";
+    version = "2025.4.1";
+    hash = "sha256-PzO5CA/JaLlyMMQ0wOIIvoL116boSOpqtX9plw9IUgQ=";
  };

  meta = {
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-pce-fast";
-  version = "0-unstable-2024-12-27";
+  version = "0-unstable-2025-03-07";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-pce-fast-libretro";
-    rev = "cfbb0946f79de33bc615d0a079e1a92f1454c3e3";
-    hash = "sha256-47Fap6QjwFwodLaHBa78kKUap2DB8FdaEe6AEv0qyCA=";
+    rev = "9f2b7943db1fb784daf0948b0b493bc7f76919f8";
+    hash = "sha256-fwrfZ0Z/DAtDRuBqxCS11/qNoomAtUgEOf4eOLk9vO0=";
  };

  makefile = "Makefile";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-saturn";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2025-03-16";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-saturn-libretro";
-    rev = "0a78a9a5ab0088ba19f21e028dda9f4b4d7c9e48";
-    hash = "sha256-WNQhtaYBg7JqPdxcD0cLRjr2pSda6Xmx/WWYzyu5u9c=";
+    rev = "06c9daa7ff6de42955437d29a80d8fc4ececc8d3";
+    hash = "sha256-HTOT4/NmfcVjte61FjkqL9neKVQrH7P4dZjmIC9fy0k=";
  };

  makefile = "Makefile";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "bsnes";
-  version = "0-unstable-2025-02-28";
+  version = "0-unstable-2025-03-07";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "bsnes-libretro";
-    rev = "cb4a0695ec4eea7298ddc5dd013bb1bb23d5a496";
-    hash = "sha256-13d2quwMBK7ocNWWmbQNJXYj2MxvfGwvpXy2bcCGfMQ=";
+    rev = "ec353ea2502be9b71f3d9830b7a7b66ee69e254c";
+    hash = "sha256-9QRKEIi1JHd503KN9+DKxLMJMJWyNu9vomPAmlbb/zw=";
  };

  makefile = "Makefile";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "freeintv";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2025-03-05";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "freeintv";
-    rev = "beab9af119fc117833d2d866d8d4ea0857ec0236";
-    hash = "sha256-+3hF7OZ2OD8K3OsvzJ3+Nn3DwC7PfD+Mr3Ku2/W/fDQ=";
+    rev = "6efc4b8fd4c7423ec1f5ff1913b854529135b565";
+    hash = "sha256-B5GEzI/U/F0IsppdOx5znu+4LdZOxQLcGAez+oR2PCI=";
  };

  makefile = "Makefile";
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "gambatte";
-  version = "0-unstable-2025-02-28";
+  version = "0-unstable-2025-03-07";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "gambatte-libretro";
-    rev = "041833eb4b28e349f7690e18d04a5d7f28639bd1";
-    hash = "sha256-wC5wMCd5LDrNZgGTtAvg5asyPK7wlK/+DhUOgqvZvXs=";
+    rev = "4b3edb41d33e52b6d70c4e18bf0819a070991b66";
+    hash = "sha256-8RmNDvUd64FqEgduNMHgbunu92SqMi+Pn//Ou2EQUFs=";
  };

  meta = {
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "genesis-plus-gx";
-  version = "0-unstable-2025-01-17";
+  version = "0-unstable-2025-03-08";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "Genesis-Plus-GX";
-    rev = "8ea39eefc76bd97331c0da9efbac6ff343704a95";
-    hash = "sha256-BZHZ5aixtivkxI+1Fpo/ziykIQFM27UtF4hLGOrQ4cQ=";
+    rev = "1024afbcd77a7bf7c87972c7c86d3a7759877fc7";
+    hash = "sha256-9Y3uzWpiYIRGTFApVGdLIONpBpPaO1sRgaGj1EVI3M4=";
  };

  meta = {
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mame2003";
-  version = "0-unstable-2025-01-26";
+  version = "0-unstable-2025-03-14";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "mame2003-libretro";
-    rev = "290027956a5bfc9e22e3e96fb4b5958968da6b70";
-    hash = "sha256-FlroIr4T5Z4tBPJ32AxDjXdSnQpU9ergDCznP5qvh3Y=";
+    rev = "9c05757528afb96278ececf71454072cd4e57946";
+    hash = "sha256-v4LG52JbekLFPotMpoZyvYYj27I1SL1DEe01GaeMRjk=";
  };

  # Fix build with GCC 14
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
  ];

  meta = with lib; {
-    description = "Desktop application for creating diagrams";
+    description = "Desktop version of draw.io for creating diagrams";
    homepage = "https://about.draw.io/";
    license = with lib.licenses; [
      # The LICENSE file of https://github.com/jgraph/drawio claims Apache License Version 2.0 again since https://github.com/jgraph/drawio/commit/5b2e73471e4fea83d681f0cec5d1aaf7c3884996
@@ -33,7 +33,7 @@ writeTextFile {
  meta = with lib; {
    description = "xvfb wrapper around drawio";
    longDescription = ''
-      A wrapper around drawio for running in headless environments.
+      A wrapper around drawio (draw.io) for running in headless environments.
      Runs drawio under xvfb-run, with configuration going to a temporary
      directory.
    '';
@@ -10,46 +10,11 @@

 let
  pname = "1password";
-  version = if channel == "stable" then "8.10.60" else "8.10.68-12.BETA";

-  sources = {
-    stable = {
-      x86_64-linux = {
-        url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-QCoV66LvGo6vA5fjuE3fG+LwehKVMPmgaDghh9YEvmA=";
-      };
-      aarch64-linux = {
-        url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-E5TniXur9ATJ3ER/zTFc6EiBrH/kbNvIao0ADLyBZZE=";
-      };
-      x86_64-darwin = {
-        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-2Nv4CHKLgCFbU1TeJQhIq8YdkJSQJXtUw2S17B8cS4s=";
-      };
-      aarch64-darwin = {
-        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-drJiM8EiUM3M54+KPQdLvAmSfBH5YPqQk14yjHzoBtM=";
-      };
-    };
-    beta = {
-      x86_64-linux = {
-        url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-/0Y1qnCI/gXGKTHk9EIaUVbHTwRkOvwOOiMif6sRkqw=";
-      };
-      aarch64-linux = {
-        url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-4J6a10r5n8ffqC5Y2pjO/GJLXY5AQDkQWmFNLYeK/Xw=";
-      };
-      x86_64-darwin = {
-        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-XvflRqqUI59ekuSiQXyACzS94VIrl8wJjemi0xAznZU=";
-      };
-      aarch64-darwin = {
-        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-UErp3pcSXz/C5s3JraLoBN89tL8ghgJ3XLpg7KtU8Sc=";
-      };
-    };
-  };
+  versions = builtins.fromJSON (builtins.readFile ./versions.json);
+  inherit (versions.${channel} or (throw "unknown channel ${channel}")) version;
+
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);

  src = fetchurl {
    inherit
@@ -0,0 +1,38 @@
+{
+  "stable": {
+    "x86_64-linux": {
+      "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.60.x64.tar.gz",
+      "hash": "sha256-QCoV66LvGo6vA5fjuE3fG+LwehKVMPmgaDghh9YEvmA="
+    },
+    "aarch64-linux": {
+      "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.60.arm64.tar.gz",
+      "hash": "sha256-E5TniXur9ATJ3ER/zTFc6EiBrH/kbNvIao0ADLyBZZE="
+    },
+    "x86_64-darwin": {
+      "url": "https://downloads.1password.com/mac/1Password-8.10.60-x86_64.zip",
+      "hash": "sha256-2Nv4CHKLgCFbU1TeJQhIq8YdkJSQJXtUw2S17B8cS4s="
+    },
+    "aarch64-darwin": {
+      "url": "https://downloads.1password.com/mac/1Password-8.10.60-aarch64.zip",
+      "hash": "sha256-drJiM8EiUM3M54+KPQdLvAmSfBH5YPqQk14yjHzoBtM="
+    }
+  },
+  "beta": {
+    "x86_64-linux": {
+      "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.68-12.BETA.x64.tar.gz",
+      "hash": "sha256-/0Y1qnCI/gXGKTHk9EIaUVbHTwRkOvwOOiMif6sRkqw="
+    },
+    "aarch64-linux": {
+      "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.68-12.BETA.arm64.tar.gz",
+      "hash": "sha256-4J6a10r5n8ffqC5Y2pjO/GJLXY5AQDkQWmFNLYeK/Xw="
+    },
+    "x86_64-darwin": {
+      "url": "https://downloads.1password.com/mac/1Password-8.10.68-12.BETA-x86_64.zip",
+      "hash": "sha256-XvflRqqUI59ekuSiQXyACzS94VIrl8wJjemi0xAznZU="
+    },
+    "aarch64-darwin": {
+      "url": "https://downloads.1password.com/mac/1Password-8.10.68-12.BETA-aarch64.zip",
+      "hash": "sha256-UErp3pcSXz/C5s3JraLoBN89tL8ghgJ3XLpg7KtU8Sc="
+    }
+  }
+}
@@ -1,58 +1,83 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq
+#!nix-shell -i bash -p jq gnupg
 #shellcheck shell=bash

-CURRENT_HASH=""
+set -euo pipefail

-print_hash() {
-    OS="$1"
-    CHANNEL="$2"
-    ARCH="$3"
-    VERSION="$4"
+cd -- "$(dirname "${BASH_SOURCE[0]}")"

-    if [[ "$OS" == "linux" ]]; then
-        if [[ "$ARCH" == "x86_64" ]]; then
-            EXT="x64.tar.gz"
-        else
-            EXT="arm64.tar.gz"
-        fi
-        URL="https://downloads.1password.com/${OS}/tar/${CHANNEL}/${ARCH}/1password-${VERSION}.${EXT}"
+mk_url() {
+  local \
+    base_url="https://downloads.1password.com" \
+    os="$1" \
+    channel="$2" \
+    arch="$3" \
+    version="$4"
+
+  if [[ ${os} == "linux" ]]; then
+    if [[ ${arch} == "x86_64" ]]; then
+      ext="x64.tar.gz"
    else
-        EXT="$ARCH.zip"
-        URL="https://downloads.1password.com/${OS}/1Password-${VERSION}-${EXT}"
+      ext="arm64.tar.gz"
    fi
+    url="${base_url}/${os}/tar/${channel}/${arch}/1password-${version}.${ext}"
+  else
+    ext="${arch}.zip"
+    url="${base_url}/mac/1Password-${version}-${ext}"
+  fi

-    CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash')
-
-    echo "$CHANNEL ${ARCH}-${OS}: $CURRENT_HASH"
+  echo "${url}"
 }

-if [[ -z "$STABLE_VER" && -n "$1" ]]; then
-    STABLE_VER="$1"
-fi
+cleanup() {
+  if [[ -f ${GPG_KEYRING-} ]]; then
+    rm "${GPG_KEYRING}"
+  fi

-if [[ -z "$BETA_VER" && -n "$2" ]]; then
-    BETA_VER="$2"
-fi
+  if [[ -f ${JSON_HEAP-} ]]; then
+    rm "${JSON_HEAP}"
+  fi
+}

-if [[ "${BETA_VER: -4}" != "BETA" ]]; then
-    BETA_VER="$BETA_VER.BETA"
-fi
+trap cleanup EXIT

-if [[ -z "$STABLE_VER" ]]; then
-    echo "No 'STABLE_VER' environment variable provided, skipping"
-else
-    print_hash "linux" "stable" "x86_64" "$STABLE_VER"
-    print_hash "linux" "stable" "aarch64" "$STABLE_VER"
-    print_hash "mac" "stable" "x86_64" "$STABLE_VER"
-    print_hash "mac" "stable" "aarch64" "$STABLE_VER"
-fi
+# Get channel versions from versions.json
+declare -A version=(
+  ["stable"]=$(jq -r '.stable.version' versions.json)
+  ["beta"]=$(jq -r '.beta.version' versions.json)
+)

-if [[ -z "$BETA_VER" ]]; then
-    echo "No 'BETA_VER' environment variable provided, skipping"
-else
-    print_hash "linux" "beta" "x86_64" "$BETA_VER"
-    print_hash "linux" "beta" "aarch64" "$BETA_VER"
-    print_hash "mac" "beta" "x86_64" "$BETA_VER"
-    print_hash "mac" "beta" "aarch64" "$BETA_VER"
-fi
+#
+GPG_KEYRING=$(mktemp -t 1password.kbx.XXXXXX)
+gpg --no-default-keyring --keyring "${GPG_KEYRING}" \
+  --keyserver keyserver.ubuntu.com \
+  --receive-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+
+JSON_HEAP=$(mktemp -t 1password-gui.jsonheap.XXXXXX)
+for channel in stable beta; do
+  for os in linux darwin; do
+    for arch in x86_64 aarch64; do
+      url=$(mk_url ${os} ${channel} ${arch} "${version[${channel}]}")
+      nix store prefetch-file --json "${url}" | jq "
+        {
+          \"${channel}\": {
+             \"${arch}-${os}\": {
+               \"url\": \"${url}\",
+               \"hash\": .hash,
+               \"storePath\": .storePath
+             }
+           }
+        }" >> "${JSON_HEAP}"
+
+      # For some reason 1Password PGP signs only Linux binaries.
+      if [[ ${os} == "linux" ]]; then
+         gpgv --keyring "${GPG_KEYRING}" \
+           $(nix store prefetch-file --json "${url}.sig" | jq -r .storePath) \
+           $(jq -r --slurp ".[-1].[].[].storePath" "${JSON_HEAP}")
+      fi
+    done
+  done
+done
+
+# Combine heap of hash+url objects into a single JSON object.
+jq --slurp 'reduce .[] as $x ({}; . * $x) | del (.[].[].storePath)' "${JSON_HEAP}" > sources.json
@@ -0,0 +1,9 @@
+{
+  "stable": {
+    "version": "8.10.60"
+  },
+
+  "beta": {
+    "version": "8.10.68-12.BETA"
+  }
+}
@@ -38,7 +38,7 @@ GEM
    google-cloud-env (2.2.1)
      faraday (>= 1.0, < 3.a)
    google-logging-utils (0.1.0)
-    googleauth (1.12.2)
+    googleauth (1.13.1)
      faraday (>= 1.0, < 3.a)
      google-cloud-env (~> 2.2)
      google-logging-utils (~> 0.1)
@@ -56,14 +56,14 @@ GEM
    http-cookie (1.0.8)
      domain_name (~> 0.5)
    http-form_data (2.3.0)
-    i18n (1.14.6)
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
-    json (2.9.1)
+    json (2.10.1)
    jsonpath (1.1.5)
      multi_json
    jwt (2.10.1)
      base64
-    krane (3.7.0)
+    krane (3.7.1)
      activesupport (>= 5.0)
      colorize (~> 0.8)
      concurrent-ruby (~> 1.1)
@@ -82,11 +82,11 @@ GEM
    llhttp-ffi (0.5.0)
      ffi-compiler (~> 1.0)
      rake (~> 13.0)
-    logger (1.6.5)
+    logger (1.6.6)
    mime-types (3.6.0)
      logger
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0107)
+    mime-types-data (3.2025.0304)
    minitest (5.25.4)
    multi_json (1.15.0)
    net-http (0.6.0)
@@ -113,7 +113,7 @@ GEM
    thor (1.3.2)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    uri (1.0.2)
+    uri (1.0.3)

 PLATFORMS
  ruby
@@ -209,10 +209,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0zynv2s6s6i5d8x84p1axin21bfgmgy92ai2jb7a7aaknaqpfc9x";
+      sha256 = "187c8y2arv0akkpmff0zf2qnf93ixvsbjpnvwsrzw2p4cbk8qi1k";
      type = "gem";
    };
-    version = "1.12.2";
+    version = "1.13.1";
  };
  http = {
    dependencies = [
@@ -268,20 +268,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
      type = "gem";
    };
-    version = "1.14.6";
+    version = "1.14.7";
  };
  json = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj";
+      sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
      type = "gem";
    };
-    version = "2.9.1";
+    version = "2.10.1";
  };
  jsonpath = {
    dependencies = [ "multi_json" ];
@@ -322,10 +322,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "032b8fk23jpmmslnhn351as9irykpa40sjz6yxibjpglj4w7wnqz";
+      sha256 = "1gkbrk08l8zdcnp62yc0r89kq9sv79v6v0ni1d6ghm4mil8apbm9";
      type = "gem";
    };
-    version = "3.7.0";
+    version = "3.7.1";
  };
  kubeclient = {
    dependencies = [
@@ -362,10 +362,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3";
+      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
      type = "gem";
    };
-    version = "1.6.5";
+    version = "1.6.6";
  };
  mime-types = {
    dependencies = [
@@ -386,10 +386,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3";
+      sha256 = "15sh43bmq39sqa1q5l5wiazyim71m6jg572fgy5p0ba3h5c3inby";
      type = "gem";
    };
-    version = "3.2025.0107";
+    version = "3.2025.0304";
  };
  minitest = {
    groups = [ "default" ];
@@ -561,9 +561,9 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk";
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
      type = "gem";
    };
-    version = "1.0.2";
+    version = "1.0.3";
  };
 }
@@ -124,3 +124,13 @@
     loadFromURL(u"private:factory/swriter"_ustr);
 
     uno::Reference<rdf::XDocumentMetadataAccess> xDocumentMetadataAccess(mxComponent,
+--- a/sw/qa/extras/odfexport/odfexport2.cxx
+++ b/sw/qa/extras/odfexport/odfexport2.cxx
+@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
+     // - Error: "2001-01-01" does not satisfy the "dateTime" type
+     // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
+     loadAndReload("midnight_redline.fodt");
+    return; // fails on aarch64
+ 
+     xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
+     assertXPathContent(pXmlDoc,
@@ -121,13 +121,3 @@
     createSwDoc();
     SwDoc* pDoc = getSwDoc();
     CPPUNIT_ASSERT(pDoc);
--- a/sw/qa/extras/odfexport/odfexport2.cxx
-+++ b/sw/qa/extras/odfexport/odfexport2.cxx
-@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
-     // - Error: "2001-01-01" does not satisfy the "dateTime" type
-     // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip.
-     loadAndReload("midnight_redline.fodt");
-+    return; // fails on aarch64
- 
-     xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr);
-     assertXPathContent(pXmlDoc,
@@ -105,11 +105,11 @@
    md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
  }
  {
-    name = "curl-8.11.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/curl-8.11.1.tar.xz";
-    sha256 = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56";
+    name = "curl-8.12.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz";
+    sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202";
    md5 = "";
-    md5name = "c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56-curl-8.11.1.tar.xz";
+    md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz";
  }
  {
    name = "libe-book-0.1.3.tar.xz";
@@ -161,11 +161,11 @@
    md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
  }
  {
-    name = "fontconfig-2.15.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz";
-    sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e";
+    name = "fontconfig-2.16.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.0.tar.xz";
+    sha256 = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220";
    md5 = "";
-    md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz";
+    md5name = "6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220-fontconfig-2.16.0.tar.xz";
  }
  {
    name = "crosextrafonts-20130214.tar.gz";
@@ -434,11 +434,11 @@
    md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
  }
  {
-    name = "gpgme-1.24.1.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/gpgme-1.24.1.tar.bz2";
-    sha256 = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f";
+    name = "gpgme-1.24.2.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2";
+    sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581";
    md5 = "";
-    md5name = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f-gpgme-1.24.1.tar.bz2";
+    md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2";
  }
  {
    name = "graphite2-minimal-1.3.14.tgz";
@@ -588,11 +588,11 @@
    md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
  }
  {
-    name = "language-subtag-registry-2025-01-21.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-01-21.tar.bz2";
-    sha256 = "06b37484c2736816e84b8bdd2075011d5961c2316865bc2795831230b925608d";
+    name = "language-subtag-registry-2025-02-06.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-02-06.tar.bz2";
+    sha256 = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662";
    md5 = "";
-    md5name = "06b37484c2736816e84b8bdd2075011d5961c2316865bc2795831230b925608d-language-subtag-registry-2025-01-21.tar.bz2";
+    md5name = "e5fffcbd640e743fa9b699087d63ccf8ab5b52eed521da68f8c894f350856662-language-subtag-registry-2025-02-06.tar.bz2";
  }
  {
    name = "lcms2-2.16.tar.gz";
@@ -602,11 +602,11 @@
    md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz";
  }
  {
-    name = "libassuan-3.0.1.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/libassuan-3.0.1.tar.bz2";
-    sha256 = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1";
+    name = "libassuan-3.0.2.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/libassuan-3.0.2.tar.bz2";
+    sha256 = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6";
    md5 = "";
-    md5name = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1-libassuan-3.0.1.tar.bz2";
+    md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2";
  }
  {
    name = "libatomic_ops-7.8.2.tar.gz";
@@ -679,11 +679,11 @@
    md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz";
  }
  {
-    name = "libxml2-2.13.5.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.13.5.tar.xz";
-    sha256 = "74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6";
+    name = "libxml2-2.13.6.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.13.6.tar.xz";
+    sha256 = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96";
    md5 = "";
-    md5name = "74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6-libxml2-2.13.5.tar.xz";
+    md5name = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96-libxml2-2.13.6.tar.xz";
  }
  {
    name = "libxslt-1.1.42.tar.xz";
@@ -707,11 +707,11 @@
    md5name = "4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f-lxml-5.3.0.tar.gz";
  }
  {
-    name = "mariadb-connector-c-3.3.13-src.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.13-src.tar.gz";
-    sha256 = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef";
+    name = "mariadb-connector-c-3.3.14-src.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.14-src.tar.gz";
+    sha256 = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49";
    md5 = "";
-    md5name = "1c03c30b394871ab354dbdb47574beae19e2657da21a911ecc9e33e9388a3bef-mariadb-connector-c-3.3.13-src.tar.gz";
+    md5name = "497c324ed9ebce1dd8a940c1d308574f0d4db41c8209f19bfb3ded25e733ed49-mariadb-connector-c-3.3.14-src.tar.gz";
  }
  {
    name = "mdds-2.1.1.tar.xz";
@@ -791,11 +791,11 @@
    md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
  }
  {
-    name = "openssl-3.0.15.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/openssl-3.0.15.tar.gz";
-    sha256 = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533";
+    name = "openssl-3.0.16.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";
+    sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";
    md5 = "";
-    md5name = "23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533-openssl-3.0.15.tar.gz";
+    md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
  }
  {
    name = "liborcus-0.19.2.tar.xz";
@@ -826,11 +826,11 @@
    md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
  }
  {
-    name = "libpng-1.6.45.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libpng-1.6.45.tar.xz";
-    sha256 = "926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370";
+    name = "libpng-1.6.47.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz";
+    sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631";
    md5 = "";
-    md5name = "926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370-libpng-1.6.45.tar.xz";
+    md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz";
  }
  {
    name = "tiff-4.7.0.tar.xz";
@@ -854,11 +854,11 @@
    md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
  }
  {
-    name = "postgresql-14.15.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/postgresql-14.15.tar.bz2";
-    sha256 = "02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5";
+    name = "postgresql-14.17.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/postgresql-14.17.tar.bz2";
+    sha256 = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1";
    md5 = "";
-    md5name = "02e891e314b4e9ee24cbd78028dab7c73f9c1ba3e30835bcbef71fe220401fc5-postgresql-14.15.tar.bz2";
+    md5name = "6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1-postgresql-14.17.tar.bz2";
  }
  {
    name = "Python-3.10.16.tar.xz";
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "1pfkmv9ad9n4w0yic0l3kqx9qs7v6vjakslrqr7laa2pxyl04zsz";
-  url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-help-25.2.0.3.tar.xz";
+  sha256 = "0r6hbhi8zxnsjk2lmyqxdyfs7vdg30d40753qnwkwk3avq8hywdf";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-help-25.2.1.2.tar.xz";
 }
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "1d15sn9zq40qfjxwm9cqgj7big8mk4mviz6i825qbfzq6vblh94q";
-  url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-25.2.0.3.tar.xz";
+  sha256 = "0pdpslpzrwkxxv775v563xw78wgsk8air8sf35cca165fwjaw0c0";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-25.2.1.2.tar.xz";
 }
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "1sxcmkclwbzbq34mjxwkjj58qj8xf4vgnlzpyfxnmawwhnsq9x9f";
-  url = "https://download.documentfoundation.org/libreoffice/src/25.2.0/libreoffice-translations-25.2.0.3.tar.xz";
+  sha256 = "0jyc212vdjwixrm7fllnchai8jpxqk7kk4a4wsyfbx96ap5c1gc9";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.2.1/libreoffice-translations-25.2.1.2.tar.xz";
 }
@@ -1 +1 @@
-"25.2.0.3"
+"25.2.1.2"
@@ -100,10 +100,10 @@ case $variant in
        echo "  url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix
        echo "  rev = \"$rev\";" >> $t.nix
        echo "  hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix
-        echo "}"
+        echo "}" >> "$t.nix"
    done

-    local prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/core" --rev "$rev")
+    prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/core" --rev "$rev")
    echo "{ fetchgit, ... }:" > main.nix
    echo "fetchgit {" >> main.nix
    echo "  url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> main.nix
@@ -12,7 +12,7 @@
 }:

 let
-  version = "0.4.1";
+  version = "0.4.2";

 in
 stdenv.mkDerivation {
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
    owner = "pothosware";
    repo = "SoapyBladeRF";
    rev = "soapy-bladerf-${version}";
-    sha256 = "02wh09850vinqg248fw4lxmx7y857cqmnnb8jm9zhyrsggal0hki";
+    sha256 = "sha256-lhTiu+iCdlLTY5ceND+F8HzKf2K9afuTi3cme6nGEMo=";
  };

  nativeBuildInputs = [
@@ -61,7 +61,7 @@ let
   "8.19.2".sha256   = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0=";
   "8.20.0".sha256   = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
   "8.20.1".sha256   = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";
-   "9.0+rc1".sha256  = "sha256-TLq925HFdizxyHjKRMeHBH9rLRpLNUiVIfA1JSMgYXA=";
+   "9.0.0".sha256    = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
  };
  releaseRev = v: "V${v}";
  fetched = import ../../../../build-support/coq/meta-fetch/default.nix
@@ -15,7 +15,7 @@ let
  lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; };

  release = {
-   "9.0+rc1".sha256 = "sha256-TLq925HFdizxyHjKRMeHBH9rLRpLNUiVIfA1JSMgYXA=";
+   "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
  };
  releaseRev = v: "V${v}";
  fetched = import ../../../../build-support/coq/meta-fetch/default.nix
@@ -53,8 +53,8 @@ let
      }
    else
      {
-        version = "2025.0";
-        hash = "sha256-onrTWmRilbvsEpq+aE2dA9Hi4L12sNYl6QVXRqrvroI=";
+        version = "2025.1";
+        hash = "sha256-Ct9iGoD9gEP43v7ITOAoEcDN9CoFIjKJCTLYHyXE0oo=";
      };

 in
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "albedo";
-  version = "0.0.16";
+  version = "0.1.0";

  src = fetchFromGitHub {
    owner = "coreruleset";
    repo = "albedo";
    tag = "v${version}";
-    hash = "sha256-HMW0SIcPDCy2QNfxpMke+/d1XCNpyx6RL6RCZAmU+WE=";
+    hash = "sha256-Yx8C44/Dy4hlmCxpuTjhqwwvEZq6HOdvq1AeNRd17MM=";
  };

-  vendorHash = "sha256-3YBcu/GEonEoORbB7x6YGpIl7kEzUQ9PAZNFB8NKb+c=";
+  vendorHash = "sha256-qZga699UjBsPmOUSN66BFInl8Bmk42HiVn0MfPlxRE4=";

  ldflags = [
    "-s"
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchurl,
+  appimageTools,
+  makeWrapper,
+}:
+
+let
+  pname = "altus";
+  version = "5.6.0";
+
+  src = fetchurl {
+    name = "altus-${version}.AppImage";
+    url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
+    hash = "sha512-u4eBTboFJaU5qLFURXFchOmFV7GzlDbUokrBpxx8QeAJO6B0IwX1gJU0C69BKinIdO4Q93SAcjsvUkvSI+blrw==";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  extraInstallCommands = ''
+    install -m 444 -D ${appimageContents}/Altus.desktop $out/share/applications/altus.desktop
+    install -m 444 -D ${appimageContents}/Altus.png \
+      $out/share/icons/hicolor/scalable/apps/altus.png
+    substituteInPlace $out/share/applications/altus.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=altus'
+    wrapProgram "$out/bin/altus" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+  '';
+
+  meta = {
+    description = "Client for WhatsApp Web with themes, notifications and multiple accounts support";
+    homepage = "https://github.com/amanharwara/altus";
+    changelog = "https://github.com/amanharwara/altus/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ johnrtitor ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
@@ -56,13 +56,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "amnezia-vpn";
-  version = "4.8.4.1";
+  version = "4.8.4.4";

  src = fetchFromGitHub {
    owner = "amnezia-vpn";
    repo = "amnezia-client";
    tag = finalAttrs.version;
-    hash = "sha256-iZKmwbSvyLTW9xWi/6WIwB1BeZai326e0Ut7x1RmKFw=";
+    hash = "sha256-uWO38eK4pJ7pkViyBh3QSVWPIMXn1tcMSS4Bt1M1bpk=";
    fetchSubmodules = true;
  };

@@ -15,11 +15,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "angular-language-server";
-  version = "19.2.0";
+  version = "19.2.1";
  src = fetchurl {
    name = "angular-language-server-${finalAttrs.version}.zip";
    url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
-    hash = "sha256-Xf2ziPU3JWbmjoNy4ufaJHgnbxAw1fwuw+nH6r/8oTA=";
+    hash = "sha256-3piEpVwcRiL3lqu67y81var3N0sxKMCm1TQg77CUSmQ=";
  };

  nativeBuildInputs = [
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "autoprefixer";
-  version = "10.4.20";
+  version = "10.4.21";

  src = fetchFromGitHub {
    owner = "postcss";
    repo = "autoprefixer";
    rev = finalAttrs.version;
-    hash = "sha256-CGAUv6qzpcjDPcW7Vsak0iYC6GOJAkKLciVnxYcOeus=";
+    hash = "sha256-25FVNUXMEuzPJtpld/GHEppspa2ns7fAuniBCltSync=";
  };

  nativeBuildInputs = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = pnpm_9.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-Gu2DRDx0YRlSb+EInOfmAOYKvOba6Lq1wkOW9t9fnbA=";
+    hash = "sha256-zb/BwL//i0oly5HEXN20E3RzZXdaOn+G2yIWRas3PB4=";
  };

  installPhase = ''
@@ -1,23 +1,55 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, alsa-lib
-, speexdsp
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  alsa-lib,
+  libopus,
+  soxr,
+  cmake,
+  pkg-config,
+  versionCheckHook,
+  nix-update-script,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (final: {
  pname = "bark";
-  version = "unstable-2023-08-22";
+  version = "0.6.0";
  src = fetchFromGitHub {
    owner = "haileys";
    repo = "bark";
-    rev = "2586b9fb58b496f8ef06f516c9cd3aace77521f7";
-    hash = "sha256-sGroae6uJhB9UIpFmvt520Zs9k0ir7H8pGkhKJmVWek=";
+    tag = "v${final.version}";
+    hash = "sha256-JaUIWGCYhasM0DgqL+DiG2rE1OWVg/N66my/4RWDN1E=";
  };
+
  useFetchCargoVendor = true;
-  cargoHash = "sha256-WqJZoYpOQQGJGvND2R1o2nvK5P24z7YeJ9i26mai45M=";
-  buildInputs = [ alsa-lib speexdsp ];
-  nativeBuildInputs = [ pkg-config ];
+  cargoHash = "sha256-LcmX8LbK8UHDDeqwLTFEUuRBv9GgDiCpXP4bmIR3gME=";
+
+  # Broken rustdoc comment
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/haileys/bark/pull/13.patch";
+      hash = "sha256-cA1bqc7XhJ2cxOYvjIJ9oopzBZ9I4rGERkiwDAUh3V4";
+    })
+  ];
+
+  buildInputs = [
+    alsa-lib
+    libopus
+    soxr
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Live sync audio streaming for local networks";
@@ -27,5 +59,4 @@ rustPlatform.buildRustPackage {
    platforms = lib.platforms.linux;
    mainProgram = "bark";
  };
-}
-
+})
@@ -1,20 +1,20 @@
 {
-  buildGo124Module,
+  buildGoModule,
  lib,
  fetchFromGitHub,
  nix-update-script,
  buildNpmPackage,
 }:

-buildGo124Module rec {
+buildGoModule rec {
  pname = "beszel";
-  version = "0.10.1";
+  version = "0.10.2";

  src = fetchFromGitHub {
    owner = "henrygd";
    repo = "beszel";
    tag = "v${version}";
-    hash = "sha256-4RuYZcBR7X9Ug6l91N/FtyfT38HlW2guputzo4kF8YU=";
+    hash = "sha256-yYSX58qA4vE7Bp3ADc6rIMf9yaeU7Zw7D5rmES6x6oA=";
  };

  webui = buildNpmPackage {
@@ -48,7 +48,7 @@ buildGo124Module rec {

    sourceRoot = "${src.name}/beszel/site";

-    npmDepsHash = "sha256-UKOS7QyGsdKosjhxVhZErFkXhnfrFxdX0ozBUJGsNII=";
+    npmDepsHash = "sha256-27NUV23dNHFSwOHiB/wGSAWkp6eZMnw/6Pd3Fwn98+s=";
  };

  sourceRoot = "${src.name}/beszel";
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  pkg-config,
  systemd,
+  coreutils,
 }:

 stdenv.mkDerivation rec {
@@ -19,7 +20,10 @@ stdenv.mkDerivation rec {

  postPatch = ''
    substituteInPlace Makefile \
-      --replace "pkg-config" "$PKG_CONFIG"
+      --replace-fail "pkg-config" "$PKG_CONFIG"
+
+    substituteInPlace 90-brightnessctl.rules \
+      --replace-fail /bin/ ${coreutils}/bin/
  '';

  makeFlags = [
@@ -28,6 +32,11 @@ stdenv.mkDerivation rec {
    "ENABLE_SYSTEMD=1"
  ];

+  installTargets = [
+    "install"
+    "install_udev_rules"
+  ];
+
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ systemd ];

@@ -2,18 +2,18 @@

 buildGoModule rec {
  pname = "cadvisor";
-  version = "0.52.0";
+  version = "0.52.1";

  src = fetchFromGitHub {
    owner = "google";
    repo = "cadvisor";
    rev = "v${version}";
-    hash = "sha256-LNnL3vxt5ZEstyriRggVyLGOFim0eMT0XH4SgBaZLx0=";
+    hash = "sha256-EXhKX4Za+fdJcSrrbH1te533jyEVLmhgd3I9LcOCz2Q=";
  };

  modRoot = "./cmd";

-  vendorHash = "sha256-ttfLCPG5DFJbh0v5BUUDwdEaw7itu8qTIqxeYEowB44=";
+  vendorHash = "sha256-DkJLWFhYElN7BYb5Jn6PDYzgndJKbEI5U08WbRqSMdw=";

  ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ];

@@ -120,6 +120,16 @@ python.pkgs.buildPythonApplication rec {
    };
  };

+  disabledTests = [
+    # cause by authlib being too up-to-date for this version of canaille
+    # see: https://github.com/NixOS/nixpkgs/issues/389861#issuecomment-2726361949
+    # FIX: update and see if this is fixed
+    "test_invalid_client[ldap_backend]"
+    "test_invalid_client[memory_backend]"
+    "test_invalid_client[sql_backend]"
+    "test_password_reset[sql_backend]"
+  ];
+
  meta = with lib; {
    description = "Lightweight Identity and Authorization Management";
    homepage = "https://canaille.readthedocs.io/en/latest/index.html";
@@ -5,16 +5,18 @@
  cmake,
  lksctp-tools,
  sctpSupport ? true,
+  versionCheckHook,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "cannelloni";
-  version = "1.1.0";
+  version = "1.2.1";
  src = fetchFromGitHub {
    owner = "mguentner";
    repo = "cannelloni";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-pAXHo9NCXMFKYcIJogytBiPkQE0nK6chU5TKiDNCKA8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dhrB3qg/ljAP7nX+WpX+g7HaUEGj5pTPdDhY2Mi7pUo=";
  };

  nativeBuildInputs = [
@@ -27,12 +29,19 @@ stdenv.mkDerivation (finalAttrs: {
    "-DSCTP_SUPPORT=${lib.boolToString sctpSupport}"
  ];

-  meta = with lib; {
+  nativeInstallInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "SocketCAN over Ethernet tunnel";
    mainProgram = "cannelloni";
    homepage = "https://github.com/mguentner/cannelloni";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.samw ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.samw ];
  };
 })
@@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-bundle-licenses";
-  version = "3.1.0";
+  version = "4.0.0";

  src = fetchFromGitHub {
    owner = "sstadick";
    repo = "cargo-bundle-licenses";
    rev = "v${version}";
-    hash = "sha256-leSHjl/B76Z4JM1wO9IBKbdfMgHtY/pGut1hnDd8/L0=";
+    hash = "sha256-pTxZ9s8ZccylMfEiifYmJuBB+riZ37QJSAMpVuSgLzs=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-I5zIrMZ9GnlAUfWaaFP6yr+pv8wWtxguxSL0zho3BRs=";
+  cargoHash = "sha256-4zolwQzK6dnFIcS2NwuxYZRS2AGcUGHh+KQzDkI0J6c=";

  meta = with lib; {
    description = "Generate a THIRDPARTY file with all licenses in a cargo project";
@@ -14,17 +14,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-lambda";
-  version = "1.6.3";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "cargo-lambda";
    repo = "cargo-lambda";
    tag = "v${version}";
-    hash = "sha256-GiV5yjlzU4iU4BJ8Fq8I9uOchVCF2UGb+WLMMr7n8pc=";
+    hash = "sha256-mgGmqenCizrP3KHOE6t0Yk6ARuMH4tLo4FyyRzDe7dQ=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-JMYGcIli72pH5O8DXQb7++bvnIgBpyYykqRbddObaAI=";
+  cargoHash = "sha256-XfznyrSc1J31hZf0lUJCnqFlmiTl+lD2XCX/aabPhHc=";

  nativeCheckInputs = [ cacert ];

@@ -1,7 +1,7 @@
 {
-  version = "1.2025.057";
+  version = "1.2025.063";
  src = {
-    url = "https://persistent.oaistatic.com/sidekick/public/ChatGPT_Desktop_public_1.2025.057_1741115522.dmg";
-    hash = "sha256-aVPBYPr1tMRBEvKgooVIzgiqClCIN8tWERjIcgP0UUk=";
+    url = "https://persistent.oaistatic.com/sidekick/public/ChatGPT_Desktop_public_1.2025.063_1741403068.dmg";
+    hash = "sha256-ZqQZtrN+t6C5BRCHh8iqA/e11EA2GCvVTcxAAjK7Vq0=";
  };
 }
@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "circt";
-  version = "1.108.0";
+  version = "1.109.0";
  src = fetchFromGitHub {
    owner = "llvm";
    repo = "circt";
    rev = "firtool-${version}";
-    hash = "sha256-uffGyfSTAZUHBkg3Tr25S7SagYTqrcuiDzKqPwlYfkc=";
+    hash = "sha256-FFMmS5S382Dy8Ut01pY0eq1bI1uSn8I3evMS6hftSss=";
    fetchSubmodules = true;
  };

@@ -9,13 +9,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "cloudlog";
-  version = "2.6.16";
+  version = "2.6.17";

  src = fetchFromGitHub {
    owner = "magicbug";
    repo = "Cloudlog";
    rev = version;
-    hash = "sha256-1GdIC1vC/SG9duQkrOXIe24OyIwdLgeEiG7i+KYP8Cs=";
+    hash = "sha256-SW9ZW6IcxG+KonfgRHnCRo7P9KqfDCrS5MjnRKHvN1k=";
  };

  postPatch = ''
@@ -0,0 +1,38 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  nautilus-python,
+  python3,
+}:
+stdenv.mkDerivation rec {
+  pname = "code-nautilus";
+  version = "0-unstable-2024-09-11";
+
+  src = fetchFromGitHub {
+    owner = "harry-cpp";
+    repo = "code-nautilus";
+    rev = "8ea0ce78f3f1f7a6af5f9e9cf93fc3e70015f61e";
+    sha256 = "u10laS3BwUVCJYlQ6WivU7o/sFFv6cTeV+uxBEdD7oA=";
+  };
+
+  buildInputs = [
+    nautilus-python
+    python3.pkgs.pygobject3
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 ./code-nautilus.py -t $out/share/nautilus-python/extensions
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "VSCode extension for Nautilus: 'Open in Code'";
+    homepage = "https://github.com/harry-cpp/code-nautilus";
+    license = licenses.unlicense;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ berrij ];
+  };
+
+}
@@ -8,7 +8,7 @@

 buildGoModule rec {
  pname = "consul";
-  version = "1.20.4";
+  version = "1.20.5";

  # Note: Currently only release tags are supported, because they have the Consul UI
  # vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
    owner = "hashicorp";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-pvTHrFrnRSprsbIPenVPVnnmU59OQCZc9DF+8wcWJ3A=";
+    hash = "sha256-dBx/WHi+qFrOyA0lIjvARcAZ96WvHCjVs94XicSL5L0=";
  };

  # This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
    "connect/certgen"
  ];

-  vendorHash = "sha256-hAnIKuFtS6l4nhq8bTcHkvW43FT6K8+0FglRRNfDtPg=";
+  vendorHash = "sha256-rQDVXMLXI2/D4SNLfs3CT4chDnzhh1aU5xuMMBDMhLI=";

  doCheck = false;

@@ -0,0 +1,48 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  makeWrapper,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "countryguess";
+  version = "0-unstable-2025-03-04";
+  # upstream pyproject.toml is nonsense. Copied from another project
+  # without customizing it for this project.
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "swarbler";
+    repo = "countryguess";
+    rev = "28f45231bc3d8bedeb7d1b51d56ca1b56796ff8c";
+    hash = "sha256-S/fy94aRoVI2CvICrviQ2ZgVESWYLuREb5mwsfXL6Hc=";
+  };
+
+  dependencies = with python3Packages; [
+    art
+    colorama
+  ];
+
+  # upstream python file lacks shebang
+  postPatch = ''
+    echo '#!/usr/bin/env python3' | cat - countryguess.py > temp && mv temp countryguess.py
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm744 countryguess.py $out/bin/countryguess
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Guess the 193 U.N. recognised countries";
+    homepage = "https://github.com/swarbler/countryguess";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    mainProgram = "countryguess";
+  };
+}
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "credhub-cli";
-  version = "2.9.43";
+  version = "2.9.44";

  src = fetchFromGitHub {
    owner = "cloudfoundry-incubator";
    repo = "credhub-cli";
    rev = version;
-    sha256 = "sha256-w3TGXv5Lz5yQiyYQZHGEncljDd54f8GfkKQoC51hQVU=";
+    sha256 = "sha256-5963iZ7fDNs+J96+GSoGcjKLCqu8u3obAWE9+9oEBGU=";
  };

  # these tests require network access that we're not going to give them
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "dnscontrol";
-  version = "4.16.0";
+  version = "4.17.0";

  src = fetchFromGitHub {
    owner = "StackExchange";
    repo = "dnscontrol";
    tag = "v${version}";
-    hash = "sha256-yFBKDb4XdCw5en/VN5IP8iCTdSRMqATVR8vV3G1gHJQ=";
+    hash = "sha256-4h911E5iAfqfuF66PsW0+amKw9hneaV3LS5UFsPR690=";
  };

-  vendorHash = "sha256-4LDH1mJE0SJFvHYT14uCcgzy5CQ61V2gj1SfyHLEQXY=";
+  vendorHash = "sha256-158Rzie6fECkjDK18KE6WVSPlgTZAS++pSkv7KmdByk=";

  nativeBuildInputs = [ installShellFiles ];

@@ -0,0 +1,28 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "dpms-off";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "lilydjwg";
+    repo = "dpms-off";
+    rev = "17c5600fdfcf3f5aeb7c85b649dc53e18565b21f";
+    hash = "sha256-fADydBO4XISt2n7vrkCuca8db9jtMVsUUvqYAqeVy60=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-wpX14e+J+n1it+1D6OD/AyDn+bOuSoJCEEWlmuZ7c0Y=";
+
+  meta = {
+    description = "Turn off monitors to save power (for Wayland)";
+    homepage = "https://github.com/lilydjwg/dpms-off";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.philiptaron ];
+    mainProgram = "dpms-off";
+  };
+}
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "dune3d";
-  version = "1.2.0";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "dune3d";
    repo = "dune3d";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-oS10xek4IyRrjZTBvDsjqCA9NE93vzB0W9iQEm2IMf4=";
+    hash = "sha256-9lBaenBxMoJgG5tMM+EZ87xcJ4HhFTA9RUNZt2Jx34Q=";
  };

  nativeBuildInputs = [
@@ -7,7 +7,7 @@

 let
  pname = "erigon";
-  version = "2.61.2";
+  version = "2.61.3";
 in
 buildGoModule {
  inherit pname version;
@@ -16,7 +16,7 @@ buildGoModule {
    owner = "ledgerwatch";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-r9BAhoQn51IUPAWDxcc19LHWNyxf5aj/uoDzpdy2GUA=";
+    hash = "sha256-VGLuPaGYx/DQc3Oc9wAbELXAtkuxr8cbePVBExlZikk=";
    fetchSubmodules = true;
  };

@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "fcitx5-pinyin-minecraft";
-  version = "0.1.20240629";
+  version = "0.1.20250315";

  src = fetchurl {
    url = "https://github.com/oldherl/fcitx5-pinyin-minecraft/releases/download/${finalAttrs.version}/minecraft-cn.dict";
-    hash = "sha256-uD/ADL+JGdSYiNz6XIqJB0Y0IU6Jf56q5g7xG2o3a+E=";
+    hash = "sha256-7BKNsxlIxEch4cTEcp4jFnIdyv7ifbtJ8HCIMX5G2U8=";
  };

  dontUnpack = true;
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "fcitx5-pinyin-moegirl";
-  version = "20250209";
+  version = "20250309";

  src = fetchurl {
    url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
-    hash = "sha256-+EIXBIu3OE59VpnAWalmiNqD4FsvuSgRr79OQCqrgMA=";
+    hash = "sha256-0ZXlPpeaxXK3dI2uGBmISpCGM9isQdPxJRTcoIa75fg=";
  };

  dontUnpack = true;
@@ -0,0 +1,59 @@
+{
+  stdenv,
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "filen-cli";
+  version = "0.0.29";
+
+  src = fetchFromGitHub {
+    owner = "FilenCloudDienste";
+    repo = "filen-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ftbRv75x6o1HgElY4oLBBe5SRuLtxdrjpjZznSCyroI=";
+  };
+
+  npmDepsHash = "sha256-a+sq0vFsk4c7bl0Nn2KfBFxyq3ZF2HPvt8d1vxegnHg=";
+
+  postPatch = ''
+    # The filen-cli repository does not contain the correct version string;
+    # it is replaced during publishing in the same way:
+    # https://github.com/FilenCloudDienste/filen-cli/blob/c7d5eb2a2cd6d514321992815f16475f6909af36/.github/workflows/build-and-publish.yml#L24
+    substituteInPlace package.json \
+      --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"'
+  '';
+
+  # A special random 256-bit string called CRYPTO_BASE_KEY has to be injected
+  # during build. It can be randomly generated using the generateKey.mjs
+  # script, however, generating a key here will invalidate the session on every
+  # rebuild, and hence we need to provide a constant key. The key below is
+  # extracted from the official filen-cli releases. Example:
+  # $ strings filen-cli-v0.0.29-linux-x64 | grep checkInjectedBuildInfo -A 6
+  # That also makes the session data compatible with the official distribution.
+  env.FILEN_CLI_CRYPTO_BASE_KEY = "f47fb2011c90d8aad21f7415d19989cea2c1ac8bc674daf36af48de8697a83e0";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/filen";
+  versionCheckProgramArg = [ "--version" ];
+
+  # Writes $HOME/Library/Application Support on darwin
+  doInstallCheck = !stdenv.hostPlatform.isDarwin;
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^v([0-9.]+)$" ];
+  };
+
+  meta = {
+    description = "CLI tool for interacting with the Filen cloud";
+    homepage = "https://github.com/FilenCloudDienste/filen-cli";
+    changelog = "https://github.com/FilenCloudDienste/filen-cli/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ eilvelia ];
+    mainProgram = "filen";
+  };
+})
@@ -19,11 +19,18 @@ buildGoModule rec {

  vendorHash = "sha256-I/umXgVm9a+0Ay3ARuaa4Dua4Zhc5p2TONHvhCt3Qtk=";

-  checkFlags = [
-    # TestHTTPChecker requires internet
-    # TestS3DriverPathStyle requires s3 credentials/urls
-    "-skip TestHTTPChecker|TestS3DriverPathStyle"
-  ];
+  checkFlags =
+    let
+      skippedTests = [
+        # requires internet
+        "TestHTTPChecker"
+        # requires s3 credentials/urls
+        "TestS3DriverPathStyle"
+        # flaky
+        "TestPurgeAll"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

  meta = with lib; {
    description = "GitLab Docker toolset to pack, ship, store, and deliver content";
@@ -6,15 +6,15 @@
  nixosTests,
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "glance";
-  version = "0.7.6";
+  version = "0.7.7";

  src = fetchFromGitHub {
    owner = "glanceapp";
    repo = "glance";
-    tag = "v${version}";
-    hash = "sha256-1DIngje7UT86eI3ZJWd71BkbAvHJ2JC0LUHAQXz0rfc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HFF1qiruz1SM9+g3xOKawuGmLzdYUUt3DnMRwjobVN4=";
  };

  vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q=";
@@ -22,7 +22,7 @@ buildGoModule rec {
  ldflags = [
    "-s"
    "-w"
-    "-X github.com/glanceapp/glance/internal/glance.buildVersion=${version}"
+    "-X github.com/glanceapp/glance/internal/glance.buildVersion=${finalAttrs.version}"
  ];

  excludedPackages = [ "scripts/build-and-ship" ];
@@ -36,7 +36,7 @@ buildGoModule rec {

  meta = {
    homepage = "https://github.com/glanceapp/glance";
-    changelog = "https://github.com/glanceapp/glance/releases/tag/v${version}";
+    changelog = "https://github.com/glanceapp/glance/releases/tag/v${finalAttrs.version}";
    description = "Self-hosted dashboard that puts all your feeds in one place";
    mainProgram = "glance";
    license = lib.licenses.agpl3Only;
@@ -45,4 +45,4 @@ buildGoModule rec {
      defelo
    ];
  };
-}
+})
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "goda";
-  version = "0.5.11";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "loov";
    repo = "goda";
    rev = "v${version}";
-    hash = "sha256-UeXn+JAR4TExZahwFozjbwXHF3QEcJvh5SzU/8VAmLg=";
+    hash = "sha256-g/sScj5VDQjpWmZN+1YqKJHixGwSBJi6v6YiGklSsjw=";
  };

-  vendorHash = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs=";
+  vendorHash = "sha256-Tkt01WSKMyShcw+/2iCh1ziHHhj24LnmfKY8KTDa+L8=";

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

@@ -0,0 +1,66 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nixosTests,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "gokapi";
+  version = "1.9.6";
+
+  src = fetchFromGitHub {
+    owner = "Forceu";
+    repo = "Gokapi";
+    tag = "v${version}";
+    hash = "sha256-RDEvKh3tUun7wt1nhtCim95wEN9V9RlztZ9zcw9nS1o=";
+  };
+
+  vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ=";
+
+  # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work.
+  preBuild = ''
+    cd ./cmd/gokapi/
+    go run ../../build/go-generate/updateVersionNumbers.go
+    # Tries to download "golang.org/x/exp/slices"
+    # go run ../../build/go-generate/updateProtectedUrls.go
+    go run ../../build/go-generate/buildWasm.go
+    # Must be specify go root to import wasm_exec.js
+    GOROOT="$(go env GOROOT)" go run "../../build/go-generate/copyStaticFiles.go"
+    cd ../..
+  '';
+
+  subPackages = [
+    "cmd/gokapi"
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    tests = {
+      inherit (nixosTests) gokapi;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Lightweight selfhosted Firefox Send alternative without public upload";
+    homepage = "https://github.com/Forceu/Gokapi";
+    changelog = "https://github.com/Forceu/Gokapi/releases/tag/v${version}";
+    license = lib.licenses.agpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      delliott
+    ];
+    mainProgram = "gokapi";
+  };
+}
@@ -0,0 +1,76 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  makeWrapper,
+  nodejs,
+  stdenv,
+  yarnBuildHook,
+  yarnConfigHook,
+  versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "graphql-language-service-cli";
+  version = "3.5.0";
+
+  src = fetchFromGitHub {
+    owner = "graphql";
+    repo = "graphiql";
+    tag = "graphql-language-service-cli@${finalAttrs.version}";
+    hash = "sha256-NJTggaMNMjOP5oN+gHxFTwEdNipPNzTFfA6f975HDgM=";
+  };
+
+  patches = [
+    ./patches/0001-repurpose-vscode-graphql-build-script.patch
+  ];
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-ae6KP2sFgw8/8YaTJSPscBlVQ5/bzbvHRZygcMgFAlU=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+    makeWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib}
+
+    pushd packages/graphql-language-service-cli
+
+    node esbuild.js --minify
+
+    # copy package.json for --version command
+    mv {out/graphql.js,package.json} $out/lib
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/graphql-lsp \
+      --add-flags $out/lib/graphql.js \
+
+    popd
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+
+  passthru = {
+    updateScript = ./updater.sh;
+  };
+
+  meta = {
+    description = "Official, runtime independent Language Service for GraphQL";
+    homepage = "https://github.com/graphql/graphiql";
+    changelog = "https://github.com/graphql/graphiql/blob/${finalAttrs.src.tag}/packages/graphql-language-service-cli/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nathanregner ];
+    mainProgram = "graphql-lsp";
+  };
+})
@@ -0,0 +1,63 @@
+From ceeca9463380ab11483ec22f9e46fdc3f83162b0 Mon Sep 17 00:00:00 2001
+From: Nathan Regner <nathanregner@gmail.com>
+Date: Sat, 15 Mar 2025 15:50:13 -0600
+Subject: [PATCH] Repurpose vscode-graphql build script
+
+Bundling the output script means we don't have to ship 1GB of
+`node_modules` (there are lots of unrelated dependencies used by other
+packages in the monorepo).
+---
+ .../esbuild.js                                | 28 ++-----------------
+ 1 file changed, 2 insertions(+), 26 deletions(-)
+ rename packages/{vscode-graphql => graphql-language-service-cli}/esbuild.js (59%)
+
+diff --git a/packages/vscode-graphql/esbuild.js b/packages/graphql-language-service-cli/esbuild.js
+similarity index 59%
+rename from packages/vscode-graphql/esbuild.js
+rename to packages/graphql-language-service-cli/esbuild.js
+index 744f4e60..4b9147fa 100644
+--- a/packages/vscode-graphql/esbuild.js
+++ b/packages/graphql-language-service-cli/esbuild.js
+@@ -1,12 +1,8 @@
+ const { build } = require('esbuild');
+ const [, , arg] = process.argv;
+ 
+-const logger = console;
+-
+-const isWatchMode = arg === '--watch';
+-
+ build({
+-  entryPoints: ['src/extension.ts', 'src/server/index.ts'],
+  entryPoints: ['bin/graphql.js'],
+   bundle: true,
+   minify: arg === '--minify',
+   platform: 'node',
+@@ -50,24 +46,4 @@ build({
+     'liquor',
+     'twig',
+   ],
+-})
+-  .then(({ errors, warnings }) => {
+-    if (warnings.length) {
+-      logger.warn(...warnings);
+-    }
+-    if (errors.length) {
+-      logger.error(...errors);
+-    }
+-
+-    logger.log('successfully bundled vscode-graphql 🚀');
+-
+-    if (isWatchMode) {
+-      logger.log('watching... 🕰');
+-    } else {
+-      process.exit();
+-    }
+-  })
+-  .catch(err => {
+-    logger.error(err);
+-    process.exit(1);
+-  });
+});
+-- 
+2.48.1
+
@@ -0,0 +1,22 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p coreutils curl jq nix-update
+
+set -euo pipefail
+
+# this package is part of a monorepo with many tags; nix-update only seems to
+# fetch the 10 most recent
+# https://github.com/Mic92/nix-update/issues/231
+owner="graphql"
+repo="graphiql"
+version=$(
+    curl -s ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/graphql/graphiql/git/refs/tags/graphql-language-service-cli" |
+        jq 'map(.ref | capture("refs/tags/graphql-language-service-cli@(?<version>[0-9.]+)").version) | .[]' -r |
+        sort --reverse --version-sort | head -n1
+)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
+    echo "Already up to date!"
+    exit 0
+fi
+
+nix-update graphql-language-service-cli --version $version
@@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "httping";
-  version = "4.2.0";
+  version = "4.4.0";

  src = fetchFromGitHub {
    owner = "folkertvanheusden";
    repo = "HTTPing";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6PXus8lg+2L9RoRe4nPI1+2iYDKKEhVfJJZMoKWSCb0=";
+    hash = "sha256-qvi+8HwEipI8vkhPgFSN+q+3BsUCQTOqPVUUzzDn3Uo=";
  };

  nativeBuildInputs = [
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
    tests.version = testers.testVersion {
      command = "${lib.getExe finalAttrs.finalPackage} --version";
      package = finalAttrs.finalPackage;
+      version = "v${finalAttrs.version}";
    };
    updateScript = nix-update-script { };
  };
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hyprutils";
-  version = "0.5.1";
+  version = "0.5.2";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "hyprutils";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=";
+    hash = "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=";
  };

  nativeBuildInputs = [
@@ -9,14 +9,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "icloudpd";
-  version = "1.27.0";
+  version = "1.27.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "icloud-photos-downloader";
    repo = "icloud_photos_downloader";
    tag = "v${version}";
-    hash = "sha256-lYCUdDUGaUsRrL0Wpjv106XVlme+vGYdnf5mUqkjnNw=";
+    hash = "sha256-gJ1Vx0p8GiJ4esJuOanojlCHvqzOz8ttgAVn6idrLPM=";
  };

  pythonRelaxDeps = true;
@@ -7,17 +7,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "inori";
-  version = "0.2.3";
+  version = "0.2.4";

  src = fetchFromGitHub {
    owner = "eshrh";
    repo = "inori";
    tag = "v${version}";
-    hash = "sha256-g+OH8sjfByrVsI1KogkluvAqNyYz7Fba2aeJkFhCgPU=";
+    hash = "sha256-UKYRqiwqyYh1ZQH4yAm2ALJjxCkczHAURy/Pob4S29g=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-YiGAOX2zxfjpLBzS7vlUlMG6cUHEAkdbm6z6P7ar064=";
+  cargoHash = "sha256-0ITazN1eGAuuy0QR8GdnU0Z6Nz44R/8kByWyHIr0P60=";

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

@@ -5,17 +5,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "jinja-lsp";
-  version = "0.1.84";
+  version = "0.1.85";

  src = fetchFromGitHub {
    owner = "uros-5";
    repo = "jinja-lsp";
    tag = "v${version}";
-    hash = "sha256-VgdrPpYY2RC+6JKaPYcd0wI381TPaE/NBx7uDI8Ud5g=";
+    hash = "sha256-/4A9IiSeskRKblcZIpsMgZsqYE6eBSeyHPpO/owCGD8=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-7h2iY6tpUoOGnLmhI8SJUSLlM9CadgtiWEFHFr1gURs=";
+  cargoHash = "sha256-14zMp2Z2GG4IC2DWzbzv07GAph4q6pHFJTyy67jisXg=";

  cargoBuildFlags = [
    "-p"
@@ -19,7 +19,7 @@

 rustPlatform.buildRustPackage rec {
  pname = "just";
-  version = "1.39.0";
+  version = "1.40.0";
  outputs =
    [
      "out"
@@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec {
    owner = "casey";
    repo = "just";
    tag = version;
-    hash = "sha256-K2MUS6wo0qxJnnIWDdmxHRNwyzx1z7yscVwMzXKAwQA=";
+    hash = "sha256-pmuwZoBIgUsKWFTXo8HYHVxrDWPMO8cumD/UHajFS6A=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-nDwJgZPWw86qpaGaYWB/Qqbym0FR2EpEKAme5CKbMv0=";
+  cargoHash = "sha256-mQQGxtSgNuRbz/83eWru+dmtWiLSKdVH+3z88BNugQE=";

  nativeBuildInputs =
    lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "kube-bench";
-  version = "0.10.2";
+  version = "0.10.4";

  src = fetchFromGitHub {
    owner = "aquasecurity";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-5vgAK99a0gCYAVd0f/dd6Z1qsGzAeHL+eTTb/hcFlp4=";
+    hash = "sha256-BlznHX8iUFv9knFlv80Ac6SADfGtnB2F5atG8yfKQ0E=";
  };

-  vendorHash = "sha256-2HUvy9O7c1j4oXdIw7VZPtkEjQj2en8YPetiGwDaeYg=";
+  vendorHash = "sha256-dO4rJ7pNVtz8ZZlO1vEHQU3sIMEy/qM30rlDvsfuuso=";

  nativeBuildInputs = [ installShellFiles ];

@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ladybird";
-  version = "0-unstable-2025-03-04";
+  version = "0-unstable-2025-03-16";

  src = fetchFromGitHub {
    owner = "LadybirdWebBrowser";
    repo = "ladybird";
-    rev = "12f5e9c5f87072fb1c54739d8a185e43356b5bd5";
-    hash = "sha256-AvuMJ+udk+Tk5P77WxgX2T0BdbLF4mN/SJPJoEjiWZM=";
+    rev = "7a2cc28932a7b0f85e7bde6bae273fba8155f573";
+    hash = "sha256-yJ51v30Mh9S93ZInafm9kxr0c9hg7LoBufmwyevX/FY=";
  };

  postPatch = ''
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "last";
-  version = "1611";
+  version = "1615";

  src = fetchFromGitLab {
    owner = "mcfrith";
    repo = "last";
    rev = "refs/tags/${version}";
-    hash = "sha256-m7JmNAFKI1mVzNtDeXKnDBxdFlcNZKBvxsq+KBuQWs4=";
+    hash = "sha256-1opYdV4nszLSuHNCo0HuURuPYby8oVGXwQvDd68mDOM=";
  };

  nativeBuildInputs = [
@@ -13,7 +13,7 @@

 stdenv.mkDerivation rec {
  pname = "libfabric";
-  version = "2.0.0";
+  version = "2.1.0";

  enableParallelBuilding = true;

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    owner = "ofiwg";
    repo = "libfabric";
    rev = "v${version}";
-    sha256 = "sha256-W86hsxhbaUbB1sb0l1J0e/9IBnc5eZLQ1m4/SuyXZG0=";
+    sha256 = "sha256-TK45SCPyFIMhliBYBEMPSKX/UtHGPj075SlTNB92O0Y=";
  };

  outputs = [
@@ -18,7 +18,7 @@

 stdenv.mkDerivation rec {
  pname = "libgedit-amtk";
-  version = "5.9.0";
+  version = "5.9.1";

  outputs = [
    "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
    owner = "gedit";
    repo = "libgedit-amtk";
    rev = version;
-    hash = "sha256-D6jZmadUHDtxedw/tCsKHzcWXobs6Vb7dyhbVKqu2Zc=";
+    hash = "sha256-myKpZtqtf40UByBUKVF0jv521kGAUA6KDmbDJy/Q1q8=";
  };

  strictDeps = true;
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "libstrophe";
-  version = "0.13.1";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "strophe";
    repo = "libstrophe";
    rev = version;
-    hash = "sha256-JMuvWspgXs+1dVWoo6kJVaf6cVvYj8lhyyu4ZILKeOg=";
+    hash = "sha256-53O8hHyw9y0Bzs+BpGouAxuSGJxh6NSNNWZqi7RHAsY=";
  };

  nativeBuildInputs = [
@@ -5,27 +5,26 @@
  llvmPackages,
  mtools,
  nasm,
+  nixosTests,
  # The following options map to configure flags.
  enableAll ? false,
  buildCDs ? false,
  targets ? [ ],
  # x86 specific flags
-  biosSupport ? false,
+  biosSupport ? true,
  pxeSupport ? false,
 }:

 let
  stdenv = llvmPackages.stdenv;

-  version = "9.0.1";
-
-  hasI686 =
+  hasX86 =
    (if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
+    || (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets))
    || enableAll;

-  hasX86_64 =
-    (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets))
-    || enableAll;
+  biosSupport' = biosSupport && hasX86;
+  pxeSupport' = pxeSupport && hasX86;

  uefiFlags =
    target:
@@ -37,39 +36,20 @@ let
      x86_64 = [ "--enable-uefi-x86-64" ];
    }
    .${target} or (throw "Unsupported target ${target}");
-
-  configureFlags =
-    lib.optionals enableAll [ "--enable-all" ]
-    ++ lib.optionals biosSupport [ "--enable-bios" ]
-    ++ lib.optionals (buildCDs && biosSupport) [ "--enable-bios-cd" ]
-    ++ lib.optionals buildCDs [ "--enable-uefi-cd" ]
-    ++ lib.optionals pxeSupport [ "--enable-bios-pxe" ]
-    ++ lib.concatMap uefiFlags (
-      if targets == [ ] then [ stdenv.hostPlatform.parsed.cpu.name ] else targets
-    )
-    ++ [
-      "TOOLCHAIN_FOR_TARGET=llvm"
-      # `clang` on `PATH` has to be unwrapped, but *a* wrapped clang
-      # still needs to be available
-      "CC=${lib.getExe stdenv.cc}"
-    ];
 in

-assert lib.assertMsg (!biosSupport || hasI686) "BIOS builds are possible only for x86";
-
-assert lib.assertMsg (!pxeSupport || hasI686) "PXE builds are possible only for x86";
-
 # The output of the derivation is a tool to create bootable images using Limine
 # as bootloader for various platforms and corresponding binary and helper files.
-stdenv.mkDerivation {
-  inherit version configureFlags;
+stdenv.mkDerivation (finalAttrs: {
  pname = "limine";
+  version = "9.2.0";
+
  # We don't use the Git source but the release tarball, as the source has a
  # `./bootstrap` script performing network access to download resources.
  # Packaging that in Nix is very cumbersome.
  src = fetchurl {
-    url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
-    hash = "sha256-c27Hn9evHt7AqzUWPFYoIHD8UQR1ToJgX+1DcVbaMBU=";
+    url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
+    hash = "sha256-tR946s/b9RcGAFa+dJk/+Bfzf5FmE2UgdygjDVkrEgw=";
  };

  enableParallelBuilding = true;
@@ -83,7 +63,7 @@ stdenv.mkDerivation {
    ++ lib.optionals (enableAll || buildCDs) [
      mtools
    ]
-    ++ lib.optionals (hasI686 || hasX86_64) [ nasm ];
+    ++ lib.optionals hasX86 [ nasm ];

  outputs = [
    "out"
@@ -92,26 +72,48 @@ stdenv.mkDerivation {
    "man"
  ];

-  meta = with lib; {
+  configureFlags =
+    lib.optionals enableAll [ "--enable-all" ]
+    ++ lib.optionals biosSupport' [ "--enable-bios" ]
+    ++ lib.optionals (buildCDs && biosSupport') [ "--enable-bios-cd" ]
+    ++ lib.optionals buildCDs [ "--enable-uefi-cd" ]
+    ++ lib.optionals pxeSupport' [ "--enable-bios-pxe" ]
+    ++ lib.concatMap uefiFlags (
+      if targets == [ ] then [ stdenv.hostPlatform.parsed.cpu.name ] else targets
+    )
+    ++ [
+      "TOOLCHAIN_FOR_TARGET=llvm"
+      # `clang` on `PATH` has to be unwrapped, but *a* wrapped clang
+      # still needs to be available
+      "CC=${lib.getExe stdenv.cc}"
+    ];
+
+  passthru.tests = nixosTests.limine;
+
+  meta = {
    homepage = "https://limine-bootloader.org/";
+    changelog = "https://raw.githubusercontent.com/limine-bootloader/limine/refs/tags/v${finalAttrs.version}/ChangeLog";
    description = "Limine Bootloader";
    mainProgram = "limine";
    # The platforms on that the Limine binary and helper tools can run, not
    # necessarily the platforms for that bootable images can be created.
-    platforms = platforms.unix;
-    badPlatforms = platforms.darwin;
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.platforms.darwin;
    # Caution. Some submodules have different licenses.
-    license = [
-      licenses.asl20 # cc-runtime
-      licenses.bsd0 # freestanding-toolchain, freestanding-headers
-      licenses.bsd2 # limine, flanterm
-      licenses.mit # limine-efi, stb
-      licenses.zlib # tinf
+    license = with lib.licenses; [
+      asl20 # cc-runtime
+      bsd0 # freestanding-headers, freestanding-toolchain
+      bsd2 # limine, flanterm, libfdt, nyu-efi
+      bsd2Patent # nyu-efi
+      bsd3 # nyu-efi
+      bsdAxisNoDisclaimerUnmodified # nyu-efi
+      mit # nyu-efi, stb_image
+      zlib # tinf
    ];
-    maintainers = [
-      maintainers.lzcunt
-      maintainers.phip1611
-      maintainers.surfaceflinger
+    maintainers = with lib.maintainers; [
+      lzcunt
+      phip1611
+      surfaceflinger
    ];
  };
-}
+})
@@ -15,7 +15,7 @@

 buildGoModule rec {
  pname = "mautrix-meta";
-  version = "0.4.4";
+  version = "0.4.5";

  subPackages = [ "cmd/mautrix-meta" ];

@@ -23,13 +23,13 @@ buildGoModule rec {
    owner = "mautrix";
    repo = "meta";
    rev = "v${version}";
-    hash = "sha256-S8x3TGQEs+oh/3Q1Gz00M8dOcjjuHSgzVhqlbikZ8QE=";
+    hash = "sha256-UWW5h4e6usxVkMH1TDGt62/ThlAhbeqivnYFIKPOqXE=";
  };

  buildInputs = lib.optional (!withGoolm) olm;
  tags = lib.optional withGoolm "goolm";

-  vendorHash = "sha256-sUnvwPJQOoVzxbo2lS3CRcTrWsPjgYPsKClVw1wZJdM=";
+  vendorHash = "sha256-fJuCNhbm6930zPyfXA8mbjyJmRdv0Zn0ZZ+ULImXjKU=";

  passthru = {
    tests = {
@@ -14,19 +14,19 @@

 buildGoModule rec {
  pname = "mautrix-whatsapp";
-  version = "0.11.3";
+  version = "0.11.4";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "whatsapp";
    rev = "v${version}";
-    hash = "sha256-b56WCt71A1+TUN7ug3E/F8A99vqGJLJfHN49klZzx9I=";
+    hash = "sha256-6Fnkw/lf64T0EXpWvSSnIRBuHJVt01Ft8Ks43/jvtZ0=";
  };

  buildInputs = lib.optional (!withGoolm) olm;
  tags = lib.optional withGoolm "goolm";

-  vendorHash = "sha256-8Iu5rL42TFFqlClQf01kT86Hhb46qsPObjE1snuz1So=";
+  vendorHash = "sha256-zMS6zZvJQAcnoklCi5qoM+aMMCSaeTQmQBxawgC67P8=";

  doCheck = false;

@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
  pname = "mimir";
-  version = "2.15.0";
+  version = "2.15.1";

  src = fetchFromGitHub {
    rev = "${pname}-${version}";
    owner = "grafana";
    repo = pname;
-    hash = "sha256-mFCeetwMaqdxFt001QUEtoiPupRAtFBkTvIABszPQbc=";
+    hash = "sha256-dqWDp8vf4OkwSKSAoF92lFZhe5rT1lqQ2oMchUFrmdM=";
  };

  vendorHash = null;
--- a/Show More
+++ b/Show More