Merge staging-next into staging

2024-12-30 12:06:26 +00:00
parent 374ad3bc18 20d1b508c1
commit e7344062a5
72 changed files with 3911 additions and 28107 deletions
@@ -45,6 +45,8 @@

 - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable).

+- [Zenoh](https://zenoh.io/), a pub/sub/query protocol with low overhead. The Zenoh router daemon is available as [services.zenohd](options.html#opt-services.zenohd.enable)
+
 - [MaryTTS](https://github.com/marytts/marytts), an open-source, multilingual text-to-speech synthesis system written in pure Java. Available as [services.marytts](options.html#opt-services.marytts).

 - [networking.modemmanager](options.html#opt-networking.modemmanager) has been split out of [networking.networkmanager](options.html#opt-networking.networkmanager). NetworkManager still enables ModemManager by default, but options exist now to run NetworkManager without ModemManager.
@@ -1316,6 +1316,7 @@
  ./services/networking/yggdrasil.nix
  ./services/networking/zapret.nix
  ./services/networking/zerobin.nix
+  ./services/networking/zenohd.nix
  ./services/networking/zeronet.nix
  ./services/networking/zerotierone.nix
  ./services/networking/zeronsd.nix
@@ -0,0 +1,136 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    types
+    mkDefault
+    mkOption
+    ;
+
+  json = pkgs.formats.json { };
+
+  cfg = config.services.zenohd;
+
+in
+{
+  options = {
+    services.zenohd = {
+      enable = lib.mkEnableOption "Zenoh daemon.";
+
+      package = mkOption {
+        description = "The zenoh package to use.";
+        type = types.package;
+        default = pkgs.zenoh;
+        defaultText = "pkgs.zenoh";
+      };
+
+      settings = mkOption {
+        description = ''
+          Config options for `zenoh.json5` configuration file.
+
+          See <https://github.com/eclipse-zenoh/zenoh/blob/main/DEFAULT_CONFIG.json5>
+          for more information.
+        '';
+        default = { };
+        type = types.submodule {
+          freeformType = json.type;
+        };
+      };
+
+      plugins = mkOption {
+        description = "Plugin packages to add to zenohd search paths.";
+        type = with types; listOf package;
+        default = [ ];
+        example = lib.literalExpression ''
+          [ pkgs.zenoh-plugin-mqtt ]
+        '';
+      };
+
+      backends = mkOption {
+        description = "Storage backend packages to add to zenohd search paths.";
+        type = with types; listOf package;
+        default = [ ];
+        example = lib.literalExpression ''
+          [ pkgs.zenoh-backend-rocksdb ]
+        '';
+      };
+
+      home = mkOption {
+        description = "Base directory for zenohd related files defined via ZENOH_HOME.";
+        type = types.str;
+        default = "/var/lib/zenoh";
+      };
+
+      env = mkOption {
+        description = ''
+          Set environment variables consumed by zenohd and its plugins.
+        '';
+        type = with types; attrsOf str;
+        default = { };
+      };
+
+      extraOptions = mkOption {
+        description = "Extra command line options for zenohd.";
+        type = with types; listOf str;
+        default = [ ];
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.zenohd =
+      let
+        cfgFile = json.generate "zenohd.json" cfg.settings;
+
+      in
+      {
+        wantedBy = [ "multi-user.target" ];
+        wants = [ "network-online.target" ];
+        after = [ "network-online.target" ];
+
+        environment = cfg.env;
+
+        serviceConfig = {
+          Type = "simple";
+          User = "zenohd";
+          Group = "zenohd";
+          ExecStart =
+            "${lib.getExe cfg.package} -c ${cfgFile} " + (lib.concatStringsSep " " cfg.extraOptions);
+        };
+      };
+
+    users = {
+      users.zenohd = {
+        description = "Zenoh daemon user";
+        group = "zenohd";
+        isSystemUser = true;
+      };
+
+      groups.zenohd = { };
+    };
+
+    services.zenohd = {
+      env.ZENOH_HOME = cfg.home;
+
+      settings = {
+        plugins_loading = {
+          enabled = mkDefault true;
+          search_dirs = mkDefault (
+            (map (x: "${lib.getLib x}/lib") cfg.plugins) ++ [ "${lib.getLib cfg.package}/lib" ]
+          ); # needed for internal plugins
+        };
+
+        plugins.storage_manager.backend_search_dirs = mkDefault (
+          map (x: "${lib.getLib x}/lib") cfg.backends
+        );
+      };
+    };
+
+    systemd.tmpfiles.rules = [ "d ${cfg.home} 750 zenohd zenohd -" ];
+  };
+}
@@ -154,9 +154,10 @@ in
      description = ''
        If enabled, copies the NixOS configuration file
        (usually {file}`/etc/nixos/configuration.nix`)
-        and links it from the resulting system
+        and symlinks it from the resulting system
        (getting to {file}`/run/current-system/configuration.nix`).
        Note that only this single file is copied, even if it imports others.
+        Warning: This feature cannot be used when the system is configured by a flake
      '';
    };

@@ -1186,6 +1186,7 @@ in {
  yggdrasil = handleTest ./yggdrasil.nix {};
  your_spotify = handleTest ./your_spotify.nix {};
  zammad = handleTest ./zammad.nix {};
+  zenohd = handleTest ./zenohd.nix {};
  zeronet-conservancy = handleTest ./zeronet-conservancy.nix {};
  zfs = handleTest ./zfs.nix {};
  zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
@@ -0,0 +1,94 @@
+import ./make-test-python.nix (
+  { pkgs, lib, ... }:
+
+  {
+    name = "zenohd";
+    meta.maintainers = [ lib.maintainers.markuskowa ];
+
+    nodes = {
+      router =
+        {
+          pkgs,
+          lib,
+          config,
+          ...
+        }:
+        {
+          networking.firewall.allowedTCPPorts = [
+            7447 # zenohd default port
+            config.services.zenohd.settings.plugins.mqtt.port
+            config.services.zenohd.settings.plugins.webserver.http_port
+          ];
+
+          services.zenohd = {
+            enable = true;
+
+            plugins = with pkgs; [
+              zenoh-plugin-mqtt
+              zenoh-plugin-webserver
+            ];
+
+            backends = with pkgs; [
+              zenoh-backend-filesystem
+              zenoh-backend-rocksdb
+            ];
+
+            settings = {
+              plugins = {
+                mqtt = {
+                  port = 1883;
+                  allow = ".*";
+                };
+                webserver.http_port = 8000;
+                storage_manager = {
+                  volumes = {
+                    fs = { };
+                    rocksdb = { };
+                  };
+                  storages = {
+                    mem = {
+                      key_expr = "mem/**";
+                      volume = "memory";
+                    };
+                    fs = {
+                      key_expr = "fs/**";
+                      volume = {
+                        id = "fs";
+                        dir = "zenoh-fs";
+                        strip_prefix = "fs";
+                      };
+                    };
+                    rocksdb = {
+                      key_expr = "rocksdb/**";
+                      volume = {
+                        id = "rocksdb";
+                        dir = "zenoh-rocksdb";
+                        strip_prefix = "rocksdb";
+                        create_db = true;
+                      };
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+
+      client = {
+        environment.systemPackages = [
+          pkgs.mosquitto
+        ];
+      };
+    };
+
+    testScript = ''
+      start_all()
+      router.wait_for_unit("zenohd.service")
+      client.wait_for_unit("multi-user.target")
+
+      for be in ["fs", "rocksdb", "mem" ]:
+        client.succeed(f"mosquitto_pub -h router -t {be}/test -m hello")
+        client.succeed(f"curl router:8000/{be}/test | grep hello")
+    '';
+  }
+)
@@ -45,19 +45,8 @@ rustPlatform.buildRustPackage rec {
    rm .git_commit
  '';

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ark-secret-scalar-0.0.2" = "sha256-yvgTxccxeUrnBhElI7AY3ad0PqmGCDlsoi8jH2Cceks=";
-      "common-0.1.0" = "sha256-Jbl5b0zIDFBcu2lYi5LYRdABq3vxgPlE4EsFucTWQd8=";
-      "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
-      "ipfs-hasher-0.21.3" = "sha256-AH3NMil07F+kkWjqAbMaMbjnTisSQiCd3tJz934ZICw=";
-      "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w=";
-      "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
-      "sp-crypto-ec-utils-0.4.1" = "sha256-KXyG43YIzMG2r6kCTyQyCIHSAkXSlZv8pbFEXXvC4JU=";
-      "sp-debug-derive-8.0.0" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-ueTEx6oqfMzM1ytXavRxLrWf4+8jYqVY9JJJbl8j2YY=";

  buildType = "production";
  buildAndTestSubdir = "polkadot";
@@ -83,9 +72,11 @@ rustPlatform.buildRustPackage rec {
      SystemConfiguration
    ];

-  # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't
-  # available for `rustc-wasm32`
-  WASM_BUILD_STD = 0;
+  # NOTE: currently we can't build the runtimes since it requires rebuilding rust std
+  # (-Zbuild-std), for which rust-src is required to be available in the sysroot of rustc.
+  # this should no longer be needed after: https://github.com/paritytech/polkadot-sdk/pull/7008
+  # since the new wasmv1-none target won't require rebuilding std.
+  SKIP_WASM_BUILD = 1;

  OPENSSL_NO_VENDOR = 1;
  PROTOC = "${protobuf}/bin/protoc";
@@ -7,14 +7,14 @@
 }:
 buildLua (finalAttrs: {
  pname = "modernx-zydezu";
-  version = "0.3.8";
+  version = "0.3.9";

  scriptPath = "modernx.lua";
  src = fetchFromGitHub {
    owner = "zydezu";
    repo = "ModernX";
    rev = finalAttrs.version;
-    hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA=";
+    hash = "sha256-wjBFI69lcsVY3HDXyz1VV5IkQvkJQQfMbGwUYmwlJ9w=";
  };

  postInstall = ''
@@ -10,7 +10,7 @@
 }:

 let
-  version = "1.7.4";
+  version = "1.7.5";
 in
 buildGoModule {
  pname = "actionlint";
@@ -22,10 +22,10 @@ buildGoModule {
    owner = "rhysd";
    repo = "actionlint";
    rev = "v${version}";
-    hash = "sha256-NPlDD74vrVXsVgdoMHD0F3SYebH1p/RH9h1qVgLQMRw=";
+    hash = "sha256-CJ3T47zPO1p29Nxpxtgf7oTe3TT240RXJG14DW1uANY=";
  };

-  vendorHash = "sha256-pKmN5duaSp5EuQ8L2SWduh3g1gbQq2jrUaKsQuEuy98=";
+  vendorHash = "sha256-3c+0Hxn7JcJzrg9Ep/BKKb0mu0nbb5qX2snljCeu1N0=";

  nativeBuildInputs = [
    makeWrapper
@@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "bee";
-  version = "2.3.1";
+  version = "2.3.2";

  src = fetchFromGitHub {
    owner = "ethersphere";
    repo = "bee";
    rev = "v${version}";
-    hash = "sha256-pl0zx1Vmu1pC1JSGrz1M72ObzckUT1HbtgKb8hV1RG8=";
+    hash = "sha256-/fyonUp8LxZrnvIk06DnacHlKgSLjIjirGr7MEVU9nc=";
  };

  vendorHash = "sha256-kxfdreEGRY9NHxpGwgvdeYBg0m+itEhy7ih1JSD2E44=";
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "corrosion";
-  version = "0.5";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "corrosion-rs";
    repo = "corrosion";
    rev = "v${version}";
-    hash = "sha256-vaNXXXaGqYNmhonU+ANN857LAUgwv+PMcON+nBuUoeo=";
+    hash = "sha256-/Xq0SKaKuOgrMXbgw+Aa59NEnU1mPQhARoh7EqV01K8=";
  };

  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
@@ -1,11 +0,0 @@
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON)
- IF (ENABLE_BASHCOMP)
-     pkg_check_modules(BASHCOMP bash-completion)
-     IF (BASHCOMP_FOUND)
-        execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-+        SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
-         message("Bash completion directory: ${BASHCOMP_DIR}")
-         INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
-         INSTALL(CODE "
@@ -1,11 +0,0 @@
--- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -14,7 +14,7 @@ if (NOT SKBUILD)
-     FIND_PACKAGE(PythonLibs 3 REQUIRED)
- endif (NOT SKBUILD)
-
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
-+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
- INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
-
- MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
@@ -5,7 +5,6 @@
  cmake,
  pkg-config,
  bzip2,
-  expat,
  glib,
  curl,
  libxml2,
@@ -15,7 +14,6 @@
  sqlite,
  file,
  xz,
-  pcre,
  bash-completion,
  zstd,
  zchunk,
@@ -24,38 +22,31 @@

 stdenv.mkDerivation rec {
  pname = "createrepo_c";
-  version = "0.17.2";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "rpm-software-management";
    repo = "createrepo_c";
-    rev = version;
-    sha256 = "sha256-rcrJjcWj+cTAE3k11Ynr7CQCOWD+rb60lcar0G2w06A=";
+    tag = version;
+    hash = "sha256-IWn1in1AMN4brekerj+zu1OjTl+PE7fthU5+gcBzVU0=";
  };

-  patches = [
-    # Use the output directory to install the bash completions.
-    ./fix-bash-completion-path.patch
-    # Use the output directory to install the python modules.
-    ./fix-python-install-path.patch
-  ];
-
  postPatch = ''
    substituteInPlace CMakeLists.txt \
-      --replace '@BASHCOMP_DIR@' "$out/share/bash-completion/completions"
+      --replace-fail 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' "SET(BASHCOMP_DIR \"$out/share/bash-completion/completions\")"
    substituteInPlace src/python/CMakeLists.txt \
-      --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}"
+      --replace-fail "EXECUTE_PROCESS(COMMAND \''${PYTHON_EXECUTABLE} -c \"from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))\" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)" "SET(PYTHON_INSTALL_DIR \"$out/${python3.sitePackages}\")"
  '';

  nativeBuildInputs = [
    cmake
    pkg-config
    rpm
+    bash-completion
  ];

  buildInputs = [
    bzip2
-    expat
    glib
    curl
    libxml2
@@ -64,8 +55,6 @@ stdenv.mkDerivation rec {
    sqlite
    file
    xz
-    pcre
-    bash-completion
    zstd
    zchunk
    libmodulemd
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "decker";
-  version = "1.52";
+  version = "1.53";

  src = fetchFromGitHub {
    owner = "JohnEarnest";
    repo = "Decker";
    rev = "v${version}";
-    hash = "sha256-D9GaOi6jqTJ0c/hn4Qfdx96vf1RqCIzzKJ/MfhgYVE4=";
+    hash = "sha256-TsEGErzekSmAEJLKao74FxdfMq3yTuFrru6HncEvQ38=";
  };

  buildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
    done
  '' + lib.optionalString withGui ''
    substituteInPlace src/firewall-applet.in \
-      --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"
+      --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
  '';

  nativeBuildInputs = [
@@ -1,61 +1,6 @@
 {
 "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
 "!version": 1,
- "https://jcenter.bintray.com": {
-  "io/pebbletemplates#pebble-project/3.1.5": {
-   "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM="
-  },
-  "io/pebbletemplates#pebble/3.1.5": {
-   "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=",
-   "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc="
-  },
-  "junit#junit/4.12": {
-   "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
-   "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
-  },
-  "net/java/dev/jna#jna-platform/4.5.2": {
-   "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=",
-   "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU="
-  },
-  "net/java/dev/jna#jna/4.5.2": {
-   "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=",
-   "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8="
-  },
-  "org/bouncycastle#bcprov-jdk15on/1.59": {
-   "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=",
-   "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU="
-  },
-  "org/hamcrest#hamcrest-core/1.3": {
-   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
-   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
-  },
-  "org/hamcrest#hamcrest-library/1.3": {
-   "jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=",
-   "pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc="
-  },
-  "org/hamcrest#hamcrest-parent/1.3": {
-   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
-  },
-  "org/mockito#mockito-core/1.9.5": {
-   "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=",
-   "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw="
-  },
-  "org/objenesis#objenesis/1.0": {
-   "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=",
-   "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs="
-  },
-  "org/slf4j#slf4j-api/1.7.25": {
-   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
-   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
-  },
-  "org/slf4j#slf4j-parent/1.7.25": {
-   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
-  },
-  "org/unbescape#unbescape/1.1.6.RELEASE": {
-   "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=",
-   "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E="
-  }
- },
 "https://mvn.freenetproject.org": {
  "org/freenetproject#freenet-ext/29": {
   "jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="
@@ -98,6 +43,30 @@
   "jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=",
   "pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0="
  },
+  "com/android/tools/build/builder-model/0.9.2/builder-model-0.9.2.jar": {
+   "asc": "sha256-mvzW7dRcRrToD9jWhsDp1nwq2XVTZeOUx5/CYFLukfQ="
+  },
+  "com/android/tools/build/builder-model/0.9.2/builder-model-0.9.2.pom": {
+   "asc": "sha256-n958l8bKaQ1Qx2r+bcAlndat8CwvZbZiNe+cxPi2MMQ="
+  },
+  "com/android/tools/build/builder-test-api/0.9.2/builder-test-api-0.9.2.jar": {
+   "asc": "sha256-6v/kcHV6Usj90eieQgOgMl2b3q1LS1i6KJQItY/o2cg="
+  },
+  "com/android/tools/build/builder-test-api/0.9.2/builder-test-api-0.9.2.pom": {
+   "asc": "sha256-Crh44ObdpB0SJ+h9M7pWIE/bYK4l5rrx0fak28HgSNI="
+  },
+  "com/android/tools/build/builder/0.9.2/builder-0.9.2.jar": {
+   "asc": "sha256-ztAiK1VbDcSvFZ0j9rXrFVNf33Rhzrm8wzn5gPGvfzk="
+  },
+  "com/android/tools/build/builder/0.9.2/builder-0.9.2.pom": {
+   "asc": "sha256-syEEuQm2v5Z8NNGANlh/myoZfi4OaIjjk4Al3x5ljYw="
+  },
+  "com/android/tools/build/gradle/0.9.2/gradle-0.9.2.jar": {
+   "asc": "sha256-qyO5UMul04CKVrdOCBB+ouP1H03GgG9GFYI0dksRNHo="
+  },
+  "com/android/tools/build/gradle/0.9.2/gradle-0.9.2.pom": {
+   "asc": "sha256-IgxhubDsggD6cinAXDC2WgyKq0rQpE7mQHSnTdkhKNE="
+  },
  "com/android/tools/build/gradle/maven-metadata": {
   "xml": {
    "groupId": "com.android.tools.build",
@@ -105,18 +74,54 @@
    "release": "2.3.0"
   }
  },
+  "com/android/tools/build/manifest-merger/22.7.2/manifest-merger-22.7.2.jar": {
+   "asc": "sha256-l7sOFoQMAzDBHZmJAI4oAcEMEj8IZDkULMZpj4+RkEE="
+  },
+  "com/android/tools/build/manifest-merger/22.7.2/manifest-merger-22.7.2.pom": {
+   "asc": "sha256-jHFCoJT3Vklk1CHcU5htftAxjHayTF3PQp0/BAhI2BA="
+  },
+  "com/android/tools/common/22.7.2/common-22.7.2.jar": {
+   "asc": "sha256-n/wISK1w475HWWyAVpyFf0vfrZk+SuDoJPnab+1N2kE="
+  },
+  "com/android/tools/common/22.7.2/common-22.7.2.pom": {
+   "asc": "sha256-TFNSXpxIshBScNQNWSba6QOuxtEQai2OdOBohuCgKzI="
+  },
  "com/android/tools/ddms#ddmlib/22.7.2": {
   "jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=",
   "pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY="
  },
+  "com/android/tools/ddms/ddmlib/22.7.2/ddmlib-22.7.2.jar": {
+   "asc": "sha256-vSgCnTMlLGziMsAKCJKTne+asEEe8K8R+poeHCmL+hI="
+  },
+  "com/android/tools/ddms/ddmlib/22.7.2/ddmlib-22.7.2.pom": {
+   "asc": "sha256-FnOAxy4OttUH0A1K72JWeH+siIglSW68ArW9oQhdJIc="
+  },
+  "com/android/tools/dvlib/22.7.2/dvlib-22.7.2.jar": {
+   "asc": "sha256-WgfgmfP4gV9Y3me/FSkYjHmm5QXHO2P1GqFTNsVXGJM="
+  },
+  "com/android/tools/dvlib/22.7.2/dvlib-22.7.2.pom": {
+   "asc": "sha256-PIx3iCiWEA/GYUfT0L+Y+lhfa98ssDWLSjWl1qF5okA="
+  },
  "com/android/tools/external/lombok#lombok-ast/0.2.2": {
   "jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=",
   "pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074="
  },
+  "com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar": {
+   "asc": "sha256-ubvH9/JIm1E4JxKsA2I8gmKSgedhyQrehjbtKvkvXuk="
+  },
+  "com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.pom": {
+   "asc": "sha256-h86LTl/gH52T3cqAVBNuNX6F4EgX2y2aXWGQ3ie0R1o="
+  },
  "com/android/tools/layoutlib#layoutlib-api/22.7.2": {
   "jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=",
   "pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM="
  },
+  "com/android/tools/layoutlib/layoutlib-api/22.7.2/layoutlib-api-22.7.2.jar": {
+   "asc": "sha256-3tXQc62IfKonpENS1sEbBJap0hhdcUSqWbkpvu/vyFs="
+  },
+  "com/android/tools/layoutlib/layoutlib-api/22.7.2/layoutlib-api-22.7.2.pom": {
+   "asc": "sha256-C09wcRuPuH4qsmXkncBSeO0Z2GZxKPOQQvJDQwfMBZ4="
+  },
  "com/android/tools/lint#lint-api/22.7.2": {
   "jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=",
   "pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM="
@@ -129,6 +134,36 @@
   "jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=",
   "pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc="
  },
+  "com/android/tools/lint/lint-api/22.7.2/lint-api-22.7.2.jar": {
+   "asc": "sha256-YH4XVrtDVk9Gey/I60RSUWWu0QtFFSCZpg6O5h87CIw="
+  },
+  "com/android/tools/lint/lint-api/22.7.2/lint-api-22.7.2.pom": {
+   "asc": "sha256-5UjETgtrLCNiMvg+uWqet4FnrvoLiQq3wITS6oGX13o="
+  },
+  "com/android/tools/lint/lint-checks/22.7.2/lint-checks-22.7.2.jar": {
+   "asc": "sha256-P0Kq4YSaRD91xQCOWv7WO6Ae7Kv0DQpf0icYXPEkssU="
+  },
+  "com/android/tools/lint/lint-checks/22.7.2/lint-checks-22.7.2.pom": {
+   "asc": "sha256-uR2CLmzh+m7mAA5SDvS5eeGlIveZmzpLpfDsW1CHIps="
+  },
+  "com/android/tools/lint/lint/22.7.2/lint-22.7.2.jar": {
+   "asc": "sha256-k1lNA9bAtAVz6GA00rkJusVIoUiNn+J+hXvUch7SYyQ="
+  },
+  "com/android/tools/lint/lint/22.7.2/lint-22.7.2.pom": {
+   "asc": "sha256-Q16Lx4njfrT0vUR4/oCA6AZ9XjBOV2F7YW0HxTEBu/s="
+  },
+  "com/android/tools/sdk-common/22.7.2/sdk-common-22.7.2.jar": {
+   "asc": "sha256-F7wcwNMx92sutxXHVpsI8vkvHiXngBvbpwbF5teMCr4="
+  },
+  "com/android/tools/sdk-common/22.7.2/sdk-common-22.7.2.pom": {
+   "asc": "sha256-HAG4PLQozpyFKT1Z4RWJbkqCcLdqKIX1jMzq7xEdVYs="
+  },
+  "com/android/tools/sdklib/22.7.2/sdklib-22.7.2.jar": {
+   "asc": "sha256-y7XVQ5ikgdTJx/9DxBCcFFBLefGH8eUEXM8i6xNj6Dc="
+  },
+  "com/android/tools/sdklib/22.7.2/sdklib-22.7.2.pom": {
+   "asc": "sha256-LdpmibFMCP7bk1qQd7r7pdSfSEVX1fItSq/A3XYohvs="
+  },
  "com/google/guava#guava-parent/15.0": {
   "pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js="
  },
@@ -136,21 +171,94 @@
   "jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=",
   "pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs="
  },
+  "com/google/guava/guava-parent/15.0/guava-parent-15.0.pom": {
+   "asc": "sha256-GTlOaEPTfDFHy1xkMncIK2RKh3V0ltThkNvZ/iTKQPw="
+  },
+  "com/google/guava/guava/15.0/guava-15.0.jar": {
+   "asc": "sha256-O+b5j21kF4SwFWVKdhyosCbDa8YDmyir0I3dFePvdoU="
+  },
+  "com/google/guava/guava/15.0/guava-15.0.pom": {
+   "asc": "sha256-6UQa9fz5vuf/GA+ByIcpViliI9pUc8+rjRzHVJL/iCw="
+  },
  "com/squareup#javawriter/2.2.1": {
   "jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=",
   "pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA="
  },
+  "com/squareup/javawriter/2.2.1/javawriter-2.2.1.jar": {
+   "asc": "sha256-3Yy6yNGFQ/RrvC9/hh9/Sng320M+zSdgydw2D0IICO0="
+  },
+  "com/squareup/javawriter/2.2.1/javawriter-2.2.1.pom": {
+   "asc": "sha256-NPDWZzyuLZPDZkxtM3X4fNkrcOgBlA25Ur4bQLv7QAg="
+  },
  "commons-codec#commons-codec/1.4": {
   "jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=",
   "pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8="
  },
+  "commons-codec/commons-codec/1.4/commons-codec-1.4.jar": {
+   "asc": "sha256-nnSvNrWBCQnQHrEmCToDzejnbXJImQrPe+ffRPCgipw="
+  },
+  "commons-codec/commons-codec/1.4/commons-codec-1.4.pom": {
+   "asc": "sha256-4YgQcyQZ5ziWdGwzeWxMn/oOM2UdYLrhq5wUtjjKJPc="
+  },
  "commons-logging#commons-logging/1.1.1": {
   "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=",
   "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug="
  },
+  "commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar": {
+   "asc": "sha256-wY7phz0hNTOPi8YInSBZ+DH75wcqsAYvq6svJABO8BY="
+  },
+  "commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom": {
+   "asc": "sha256-5O+8adBtGElIn97Mi2kMVHXSJlNDj0C1uc2txt/HcJs="
+  },
+  "io/pebbletemplates#pebble-project/3.1.5": {
+   "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM="
+  },
+  "io/pebbletemplates#pebble/3.1.5": {
+   "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=",
+   "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc="
+  },
+  "io/pebbletemplates/pebble-project/3.1.5/pebble-project-3.1.5.pom": {
+   "asc": "sha256-xVWh8tfwv8bCI1PiVOOgDx3O/fpvFTTdScy5Zw2Q/To="
+  },
+  "io/pebbletemplates/pebble/3.1.5/pebble-3.1.5.jar": {
+   "asc": "sha256-cFF8mZganRCeN3NneTDN1q23v7gpiaQmqF1xB+gDf1Y="
+  },
+  "io/pebbletemplates/pebble/3.1.5/pebble-3.1.5.pom": {
+   "asc": "sha256-qzOpaSYC/oOoJLkeqRdWDoFp1tMNERW/eZM7y2yJ90M="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "junit/junit/4.13.2/junit-4.13.2.jar": {
+   "asc": "sha256-qFOPh/WLb1S3ps7/0BJisILDiWIrCIbFIIeN4e+56rk="
+  },
+  "junit/junit/4.13.2/junit-4.13.2.pom": {
+   "asc": "sha256-gIzTYDjanf/1IzpX45EvG3BKlDTnp02va57XpLBi9d0="
+  },
  "kxml2#kxml2/2.3.0": {
   "pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU="
  },
+  "net/java/dev/jna#jna-platform/4.5.2": {
+   "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=",
+   "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU="
+  },
+  "net/java/dev/jna#jna/4.5.2": {
+   "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=",
+   "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8="
+  },
+  "net/java/dev/jna/jna-platform/4.5.2/jna-platform-4.5.2.jar": {
+   "asc": "sha256-mCY0PWlQJMB6IzgJ1xaO/nJZJZC0PDYDYwIjLKzaTcg="
+  },
+  "net/java/dev/jna/jna-platform/4.5.2/jna-platform-4.5.2.pom": {
+   "asc": "sha256-Jpde2ET9nK96bRMGPKRXJD8naBJCRtNLZS5/J1f8AVc="
+  },
+  "net/java/dev/jna/jna/4.5.2/jna-4.5.2.jar": {
+   "asc": "sha256-9KXn9EXk1JJdLNAxXt23tC4ZvAc8YyQcPUtAhmPRy30="
+  },
+  "net/java/dev/jna/jna/4.5.2/jna-4.5.2.pom": {
+   "asc": "sha256-EgEfn4uqaMa1yS1oAC6BYwnERayRmBUfNiN0vAMGAqI="
+  },
  "net/sf/kxml#kxml2/2.3.0": {
   "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=",
   "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU="
@@ -166,9 +274,27 @@
  "net/sf/proguard#proguard-parent/4.10": {
   "pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM="
  },
+  "net/sf/proguard/proguard-base/4.10/proguard-base-4.10.jar": {
+   "asc": "sha256-TL4/Aaaoj77RknIIiDFg34ZvkkmI92HUjA38kfABdc0="
+  },
+  "net/sf/proguard/proguard-base/4.10/proguard-base-4.10.pom": {
+   "asc": "sha256-KzDBhyCZaQn/l1lk5J1qSUDpC2l96x3lUkv6HiiPu0k="
+  },
+  "net/sf/proguard/proguard-gradle/4.10/proguard-gradle-4.10.jar": {
+   "asc": "sha256-nsPmzDnUqRzyKzVolwnP+R8YgVDziMqZaR82RolwmK0="
+  },
+  "net/sf/proguard/proguard-gradle/4.10/proguard-gradle-4.10.pom": {
+   "asc": "sha256-xLysB82xpC/dbOBFGqBK0sa6vitiUpSKmGAN7wbidX8="
+  },
+  "net/sf/proguard/proguard-parent/4.10/proguard-parent-4.10.pom": {
+   "asc": "sha256-QyzAPExvQl0zxiS6j2eZJxPoiAA3RAl4X8FM3OD4+GI="
+  },
  "org/apache#apache/4": {
   "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ="
  },
+  "org/apache/apache/4/apache-4.pom": {
+   "asc": "sha256-aAalIBTrcoWtABbZ1280b5N7+qINywPWWTtR2Gw9pak="
+  },
  "org/apache/commons#commons-compress/1.0": {
   "jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=",
   "pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E="
@@ -179,6 +305,18 @@
  "org/apache/commons#commons-parent/5": {
   "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo="
  },
+  "org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar": {
+   "asc": "sha256-IEO1Qm7Y1AdNkfT99t+8mqQ7KwPoLSEBlc8Ups3nUyY="
+  },
+  "org/apache/commons/commons-compress/1.0/commons-compress-1.0.pom": {
+   "asc": "sha256-tuFXfC5uycG29GlxwmhjY65JuNabajDXHLJbGdAQjlE="
+  },
+  "org/apache/commons/commons-parent/11/commons-parent-11.pom": {
+   "asc": "sha256-hgEzyW2ItIA1+P6i6cHRWr3bILkS2ynh/pyNFS4/OLM="
+  },
+  "org/apache/commons/commons-parent/5/commons-parent-5.pom": {
+   "asc": "sha256-6ZA2PdnME62+KkCoEMHjJMBZRWLlGefwiMyaMJLIiLQ="
+  },
  "org/apache/httpcomponents#httpclient/4.1.1": {
   "jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=",
   "pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc="
@@ -203,6 +341,36 @@
  "org/apache/httpcomponents#project/4.1.1": {
   "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow="
  },
+  "org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar": {
+   "asc": "sha256-IBjcWIUV/O4A7rHpXO+Jd64Lm+d4W7xYU+Nv00kCXeg="
+  },
+  "org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom": {
+   "asc": "sha256-YezBIVduwFwXabNCrrZn7oEFO1tLJ5ztz+RJHqGWjLE="
+  },
+  "org/apache/httpcomponents/httpcomponents-client/4.1.1/httpcomponents-client-4.1.1.pom": {
+   "asc": "sha256-bKJv92oBSHgdXHI884xvZ22L38qboC1BKWO08HUrz0Y="
+  },
+  "org/apache/httpcomponents/httpcomponents-client/4.1/httpcomponents-client-4.1.pom": {
+   "asc": "sha256-EutH7JPGE7OMO4mOsWpAIw9j9shsWd+obgCKe+Vx2KU="
+  },
+  "org/apache/httpcomponents/httpcomponents-core/4.1/httpcomponents-core-4.1.pom": {
+   "asc": "sha256-dXFGZMsRHYLkjBv4QBH8mr1U5xm1fytTKAb2KFE2FEY="
+  },
+  "org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar": {
+   "asc": "sha256-xqZuKzF6klaO0bD8bXE5tyiWkO1Hpe9387qt/AJcs54="
+  },
+  "org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.pom": {
+   "asc": "sha256-ovZWk6l1FQsg0C65j4H3srHRuqGYZ1QWLE72AsmnPPk="
+  },
+  "org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar": {
+   "asc": "sha256-QJ5DghXtPl2nissIn4G6sZHdPngQHL7iCn7H7BxM5Yw="
+  },
+  "org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.pom": {
+   "asc": "sha256-tWXRxOIKfwDlekZQPv6Dsyo82VgiFRwpoPA9c7xxqFA="
+  },
+  "org/apache/httpcomponents/project/4.1.1/project-4.1.1.pom": {
+   "asc": "sha256-RC9FuVR7UWWSIVwOci4aF3BPeHZAaAP4hSyXhU1ahFY="
+  },
  "org/bouncycastle#bcpkix-jdk15on/1.48": {
   "jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=",
   "pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0="
@@ -211,10 +379,85 @@
   "jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=",
   "pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI="
  },
+  "org/bouncycastle#bcprov-jdk15on/1.59": {
+   "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=",
+   "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU="
+  },
+  "org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar": {
+   "asc": "sha256-6tXbsLOuaFcz7tQZL5gydPf5nC4ghFFt49OXSkQEZEA="
+  },
+  "org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.pom": {
+   "asc": "sha256-bx8bIFid6sxY9CdeW+Hs97+FLy1DscS6wC9u+P63LT0="
+  },
+  "org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar": {
+   "asc": "sha256-f9qKQ9gEnRNI3dvoQpvrTFO6QEZM8hTDXNg3G5/N104="
+  },
+  "org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.pom": {
+   "asc": "sha256-fzInz+bfjfvS6HWuYgtz9P6KEXK0tRt+r+weNqVS/Yw="
+  },
+  "org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.jar": {
+   "asc": "sha256-ICEPWOGva/aukTU8MqzkEKgtMKCLlHROqYt5HOYJ5mk="
+  },
+  "org/bouncycastle/bcprov-jdk15on/1.59/bcprov-jdk15on-1.59.pom": {
+   "asc": "sha256-F6lDq/sfWn2DvCZzOpgvKvxByFso/1OSOHPNtCKIF78="
+  },
  "org/eclipse/jdt/core/compiler#ecj/4.2.2": {
   "jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=",
   "pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0="
  },
+  "org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.jar": {
+   "asc": "sha256-4EsxB+k8PkrYaQC659GD+f17mBEi6FQqihlswUFZGjg="
+  },
+  "org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.pom": {
+   "asc": "sha256-tnaW/JMy9jqxXze2MoL0xsIQL/K6fiiyBA6EfrsCUfc="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/hamcrest#hamcrest/3.0": {
+   "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
+   "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
+   "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
+  },
+  "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar": {
+   "asc": "sha256-YNmOD50t5Jur372FbCQ67ZeNG0jNA/+j3Y+8SGmGGXc="
+  },
+  "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom": {
+   "asc": "sha256-l6OtfH63FxpqJBn5YBbgEATt+c7SkwBtlz8QhThi7kM="
+  },
+  "org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom": {
+   "asc": "sha256-0Iq1QfQtuRW9U8CAaXL08S6msdH/wJeUYMQ6H5ql0aY="
+  },
+  "org/hamcrest/hamcrest/3.0/hamcrest-3.0.jar": {
+   "asc": "sha256-RneFTdkbhb4gYFeggKnn7GGxx9bwh1oPKhaV+rOSPiw="
+  },
+  "org/hamcrest/hamcrest/3.0/hamcrest-3.0.module": {
+   "asc": "sha256-/J6pffAL2DCSbrZPuO6qDMktPg9RjMZutKGFyEU7aTI="
+  },
+  "org/mockito#mockito-core/1.9.5": {
+   "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=",
+   "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw="
+  },
+  "org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar": {
+   "asc": "sha256-eIfgc49Zw5Oqx+vVeB66zTNKoBvixcE6KDkf7Aav6Lo="
+  },
+  "org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom": {
+   "asc": "sha256-rfCK39qLfToRTlvgFQpZnFMEYMCZqDtcFd1KvNjpwbo="
+  },
+  "org/objenesis#objenesis/1.0": {
+   "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=",
+   "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs="
+  },
+  "org/objenesis/objenesis/1.0/objenesis-1.0.jar": {
+   "asc": "sha256-3mmf2B0Qzgs7ymDdqIa2Viw3V+DZa/nhNlnbG5+Jctw="
+  },
+  "org/objenesis/objenesis/1.0/objenesis-1.0.pom": {
+   "asc": "sha256-qcTqne8ZjjbFkMP5t/2gwG0i/dVrTD+SjTHY0Wn7IqA="
+  },
  "org/ow2#ow2/1.3": {
   "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs="
  },
@@ -233,8 +476,58 @@
   "jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=",
   "pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc="
  },
+  "org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar": {
+   "asc": "sha256-3a/+snWLUZFPxcIcazh0kRrFMkBveZi4KH96bF7wzfI="
+  },
+  "org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.pom": {
+   "asc": "sha256-qq5cOCS/6PDbcjQEO/oiw/vBd9uOr+KUYikDHuHyzCk="
+  },
+  "org/ow2/asm/asm-parent/4.0/asm-parent-4.0.pom": {
+   "asc": "sha256-eonTcSxLVAyUxUyG6KXF04wV9IO1MoHzL7hpcKE9i6E="
+  },
+  "org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar": {
+   "asc": "sha256-LZuPDX8KrSvgD7DfnRyoENbfW8oGMqiazi3MtugqBTA="
+  },
+  "org/ow2/asm/asm-tree/4.0/asm-tree-4.0.pom": {
+   "asc": "sha256-pZUFC8L/8axy7jgRmvHo0E5/X9wWWLpjh43D6X3p4Sg="
+  },
+  "org/ow2/asm/asm/4.0/asm-4.0.jar": {
+   "asc": "sha256-6k6hHuOMwtShQlN69KEfZe6t1U84URL8qA9zpF2EQC4="
+  },
+  "org/ow2/asm/asm/4.0/asm-4.0.pom": {
+   "asc": "sha256-Chrj2eVc9d/X29xW6MDTXx9jyiT/FA8BnHMOONKFGFw="
+  },
+  "org/ow2/ow2/1.3/ow2-1.3.pom": {
+   "asc": "sha256-EKqTTnapQPgeFNBNoK+2aBGNwuHZZMHbwpEutEQO7ZE="
+  },
+  "org/slf4j#slf4j-api/1.7.25": {
+   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
+   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
+  },
+  "org/slf4j#slf4j-parent/1.7.25": {
+   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
+  },
+  "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar": {
+   "asc": "sha256-BKW7pnBF865e25U5DhApCyET6bbeguvQzwxwcHbPCeI="
+  },
+  "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom": {
+   "asc": "sha256-aZiuTbgrIvslBuWIqOBhSJKQhuk2sGcbXeKuR04sqws="
+  },
+  "org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25.pom": {
+   "asc": "sha256-BwwQsg8JhBbRGGrCjXUJdZtHcIjBm332csOEmX92IeU="
+  },
  "org/sonatype/oss#oss-parent/7": {
   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/unbescape#unbescape/1.1.6.RELEASE": {
+   "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=",
+   "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E="
+  },
+  "org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar": {
+   "asc": "sha256-qz5rvOGRW+6t/VyP982ODE4t6IBemafD8LBYvd7tVRU="
+  },
+  "org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.pom": {
+   "asc": "sha256-WnZ7/qjsZQszhpIN2ZZ0ceoGqs1M7P78Y+aKREUuE5k="
  }
 }
 }
@@ -3,34 +3,19 @@
  stdenv,
  fetchurl,
  fetchFromGitHub,
-  jdk17_headless,
-  jre17_minimal,
-  gradle_7,
+  jdk_headless,
+  jre,
+  gradle_8,
  bash,
  coreutils,
  substituteAll,
  nixosTests,
-  fetchpatch,
  writeText,
 }:

 let
-  gradle = gradle_7;
-  jdk = jdk17_headless;
-  # Reduce closure size
-  jre = jre17_minimal.override {
-    modules = [
-      "java.base"
-      "java.logging"
-      "java.naming"
-      "java.sql"
-      "java.desktop"
-      "java.management"
-    ];
-    jdk = jdk17_headless;
-  };
-
-  version = "01497";
+  gradle = gradle_8;
+  jdk = jdk_headless;

  freenet_ext = fetchurl {
    url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar";
@@ -48,31 +33,18 @@ let
    '';
  };

-  patches = [
-    # gradle 7 support
-    # https://github.com/freenet/fred/pull/827
-    (fetchpatch {
-      url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch";
-      hash = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY=";
-    })
-  ];
-
 in
 stdenv.mkDerivation rec {
  pname = "freenet";
-  inherit version patches;
+  version = "01499";

  src = fetchFromGitHub {
    owner = "freenet";
    repo = "fred";
    rev = "refs/tags/build${version}";
-    hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ=";
+    hash = "sha256-L9vae7wB6Ow2O4JA7CG/XV/zI8OS9/Rg7in/TSatXxY=";
  };

-  postPatch = ''
-    rm gradle/verification-{keyring.keys,metadata.xml}
-  '';
-
  nativeBuildInputs = [
    gradle
    jdk
@@ -126,5 +98,6 @@ stdenv.mkDerivation rec {
    maintainers = with lib.maintainers; [ nagy ];
    platforms = with lib.platforms; linux;
    changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md";
+    mainProgram = "freenet";
  };
 }
@@ -10,16 +10,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "fzf-make";
-  version = "0.47.0";
+  version = "0.52.0";

  src = fetchFromGitHub {
    owner = "kyu08";
    repo = "fzf-make";
    rev = "v${version}";
-    hash = "sha256-EqxMsxQpcoPPvWzzl/1JcekLJljmxJcoubXgAMqMhXY=";
+    hash = "sha256-KJdGUo7qSMIDJ8jvcBX/cla8pQkB/EGytIP0YzV/3fY=";
  };

-  cargoHash = "sha256-GjOeiusc0zVEBOuEfsuy/MABDO1c5x+mA/twwm3yZF8=";
+  cargoHash = "sha256-nrttuY9x61aE3RJOtbUWZbqOX6ZRyghQSruu5EdX470=";
+
+  useFetchCargoVendor = true;

  nativeBuildInputs = [ makeBinaryWrapper ];

@@ -31,7 +33,7 @@ rustPlatform.buildRustPackage rec {

  meta = {
    description = "Fuzzy finder for Makefile";
-    homepage = "https://github.com/kyu08/fzf-make";
+    inherit (src.meta) homepage;
    changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ figsoda sigmanificient ];
@@ -0,0 +1,39 @@
+--- a/bridge/bridge.go	2024-12-25 20:53:45.504021585 +0000
+++ b/bridge/bridge.go	2024-12-25 21:02:20.318422528 +0000
+@@ -38,11 +38,6 @@
+ 
+ func InitBridge(fs embed.FS) {
+ 	// step1: Set Env
+-	exePath, err := os.Executable()
+-	if err != nil {
+-		panic(err)
+-	}
+-
+ 	for _, v := range os.Args {
+ 		if v == "tasksch" {
+ 			Env.FromTaskSch = true
+@@ -50,8 +45,13 @@
+ 		}
+ 	}
+ 
+-	Env.BasePath = filepath.Dir(exePath)
+-	Env.AppName = filepath.Base(exePath)
+	Env.AppName = "GUI.for.Clash"
+	xdgDataHome := os.Getenv("XDG_DATA_HOME")
+	if xdgDataHome == "" {
+		homeDir, _ := os.UserHomeDir()
+		xdgDataHome = filepath.Join(homeDir, ".local", "share")
+	}
+	Env.BasePath = filepath.Join(xdgDataHome, Env.AppName)
+ 
+ 	// step2: Create a persistent data symlink
+ 	if Env.OS == "darwin" {
+@@ -128,7 +128,7 @@
+ }
+ 
+ func (a *App) RestartApp() FlagResult {
+-	exePath := Env.BasePath + "/" + Env.AppName
+	exePath := "@basepath@/bin" + "/" + Env.AppName
+ 
+ 	cmd := exec.Command(exePath)
+ 	HideExecWindow(cmd)
@@ -9,20 +9,22 @@
  webkitgtk_4_0,
  pkg-config,
  libsoup_3,
-  wrapGAppsHook3,
  autoPatchelfHook,
  makeDesktopItem,
  copyDesktopItems,
+  replaceVars,
 }:
 let
  pname = "gui-for-clash";
-  version = "1.8.9";
+  version = "1.9.0";
+
  src = fetchFromGitHub {
    owner = "GUI-for-Cores";
    repo = "GUI.for.Clash";
-    rev = "v${version}";
-    hash = "sha256-jNYMv3gPbZV2JlTV0v0NQ06HkXDzgHXuEdJrBgQ+p2g=";
+    tag = "v${version}";
+    hash = "sha256-0PNFiOZ+POp1P/HDJmAIMKNGIjft6bfwPiRDLswY2ns=";
  };
+
  frontend = stdenv.mkDerivation (finalAttrs: {
    inherit pname version src;

@@ -34,7 +36,7 @@ let
    pnpmDeps = pnpm.fetchDeps {
      inherit (finalAttrs) pname version src;
      sourceRoot = "${finalAttrs.src.name}/frontend";
-      hash = "sha256-RQtU61H1YklCgJrlyHALxUZp8OvVs2MgFThWBsYk2cs=";
+      hash = "sha256-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ=";
    };

    sourceRoot = "${finalAttrs.src.name}/frontend";
@@ -42,7 +44,7 @@ let
    buildPhase = ''
      runHook preBuild

-      pnpm run build
+      pnpm run build-only

      runHook postBuild
    '';
@@ -50,8 +52,7 @@ let
    installPhase = ''
      runHook preInstall

-      mkdir $out/
-      cp -r ./dist/* $out/
+      cp -r ./dist $out

      runHook postInstall
    '';
@@ -67,12 +68,17 @@ in
 buildGoModule {
  inherit pname version src;

-  vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg=";
+  patches = [
+    (replaceVars ./bridge.patch {
+      basepath = placeholder "out";
+    })
+  ];
+
+  vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs=";

  nativeBuildInputs = [
    wails
    pkg-config
-    wrapGAppsHook3
    autoPatchelfHook
    copyDesktopItems
  ];
@@ -84,9 +90,9 @@ buildGoModule {

  desktopItems = [
    (makeDesktopItem {
-      name = "GUI.for.Clash";
+      name = "gui-for-clash";
      exec = "GUI.for.Clash";
-      icon = "GUI.for.Clash";
+      icon = "gui-for-clash";
      genericName = "GUI.for.Clash";
      desktopName = "GUI.for.Clash";
      categories = [
@@ -98,17 +104,8 @@ buildGoModule {
    })
  ];

-  postUnpack = ''
-    cp -r ${frontend} $sourceRoot/frontend/dist
-  '';
-
-  postPatch = ''
-    sed -i '/exePath, err := os.Executable()/,+3d' bridge/bridge.go
-    substituteInPlace bridge/bridge.go \
-      --replace-fail "Env.BasePath = filepath.Dir(exePath)" "" \
-      --replace-fail "Env.AppName = filepath.Base(exePath)" "Env.AppName = \"GUI.for.Clash\"
-        Env.BasePath = filepath.Join(os.Getenv(\"HOME\"), \".config\", Env.AppName)" \
-      --replace-fail 'exePath := Env.BasePath' 'exePath := "${placeholder "out"}/bin"'
+  preBuild = ''
+    cp -r ${frontend} ./frontend/dist
  '';

  buildPhase = ''
@@ -122,9 +119,8 @@ buildGoModule {
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/share/pixmaps
-    cp -r ./build/bin $out/bin
-    cp build/appicon.png $out/share/pixmaps/GUI.for.Clash.png
+    install -Dm 0755 ./build/bin/GUI.for.Clash $out/bin/GUI.for.Clash
+    install -Dm 0644 build/appicon.png $out/share/pixmaps/gui-for-clash.png

    runHook postInstall
  '';
@@ -1,5 +1,5 @@
--- old/bridge/bridge.go	2024-11-03 02:07:33.553972040 +0800
-+++ new/bridge/bridge.go	2024-11-03 02:10:09.239584378 +0800
+--- a/bridge/bridge.go	2024-12-25 20:53:45.504021585 +0000
+++ b/bridge/bridge.go	2024-12-25 21:02:20.318422528 +0000
@@ -38,11 +38,6 @@
 
 func InitBridge(fs embed.FS) {
@@ -12,23 +12,28 @@
 	for _, v := range os.Args {
 		if v == "tasksch" {
 			Env.FromTaskSch = true
-@@ -50,8 +45,8 @@
+@@ -50,8 +45,13 @@
 		}
 	}
 
 -	Env.BasePath = filepath.Dir(exePath)
 -	Env.AppName = filepath.Base(exePath)
 +	Env.AppName = "GUI.for.SingBox"
-+	Env.BasePath = filepath.Join(os.Getenv("HOME"), ".config", Env.AppName)
+	xdgDataHome := os.Getenv("XDG_DATA_HOME")
+	if xdgDataHome == "" {
+		homeDir, _ := os.UserHomeDir()
+		xdgDataHome = filepath.Join(homeDir, ".local", "share")
+	}
+	Env.BasePath = filepath.Join(xdgDataHome, Env.AppName)
 
 	// step2: Create a persistent data symlink
 	if Env.OS == "darwin" {
-@@ -128,7 +123,7 @@
+@@ -128,7 +128,7 @@
 }
 
 func (a *App) RestartApp() FlagResult {
 -	exePath := Env.BasePath + "/" + Env.AppName
-+	exePath := Env.AppName
+	exePath := "@basepath@/bin" + "/" + Env.AppName
 
 	cmd := exec.Command(exePath)
 	HideExecWindow(cmd)
@@ -9,20 +9,22 @@
  webkitgtk_4_0,
  pkg-config,
  libsoup_3,
-  wrapGAppsHook3,
  autoPatchelfHook,
  makeDesktopItem,
  copyDesktopItems,
+  replaceVars,
 }:
 let
  pname = "gui-for-singbox";
-  version = "1.8.9";
+  version = "1.9.0";
+
  src = fetchFromGitHub {
    owner = "GUI-for-Cores";
    repo = "GUI.for.SingBox";
-    rev = "v${version}";
-    hash = "sha256-mN+j2O/pM+kblmxZjVWvHXLHJSxydxLRh/Fol2+WALE=";
+    tag = "v${version}";
+    hash = "sha256-5zd4CVWVR+E3E097Xjd/V6QFRV9Ye2UQvBalAQ9zqXc=";
  };
+
  frontend = stdenv.mkDerivation (finalAttrs: {
    inherit pname version src;

@@ -34,7 +36,7 @@ let
    pnpmDeps = pnpm.fetchDeps {
      inherit (finalAttrs) pname version src;
      sourceRoot = "${finalAttrs.src.name}/frontend";
-      hash = "sha256-bAgyGZLmEr8tMunoeQHl+B2IDGr4Gw3by1lC811lqio=";
+      hash = "sha256-dLI1YMzs9lLk9lJBkBgc6cpirM79khy0g5VaOVEzUAc=";
    };

    sourceRoot = "${finalAttrs.src.name}/frontend";
@@ -42,7 +44,7 @@ let
    buildPhase = ''
      runHook preBuild

-      pnpm run build
+      pnpm run build-only

      runHook postBuild
    '';
@@ -50,8 +52,7 @@ let
    installPhase = ''
      runHook preInstall

-      mkdir $out/
-      cp -r ./dist/* $out/
+      cp -r ./dist $out

      runHook postInstall
    '';
@@ -67,12 +68,17 @@ in
 buildGoModule {
  inherit pname version src;

-  vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg=";
+  patches = [
+    (replaceVars ./bridge.patch {
+      basepath = placeholder "out";
+    })
+  ];
+
+  vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs=";

  nativeBuildInputs = [
    wails
    pkg-config
-    wrapGAppsHook3
    autoPatchelfHook
    copyDesktopItems
  ];
@@ -84,9 +90,9 @@ buildGoModule {

  desktopItems = [
    (makeDesktopItem {
-      name = "GUI.for.SingBox";
+      name = "gui-for-singbox";
      exec = "GUI.for.SingBox";
-      icon = "GUI.for.SingBox";
+      icon = "gui-for-singbox";
      genericName = "GUI.for.SingBox";
      desktopName = "GUI.for.SingBox";
      categories = [
@@ -98,12 +104,10 @@ buildGoModule {
    })
  ];

-  postUnpack = ''
-    cp -r ${frontend} $sourceRoot/frontend/dist
+  preBuild = ''
+    cp -r ${frontend} ./frontend/dist
  '';

-  patches = [ ./bridge.patch ];
-
  buildPhase = ''
    runHook preBuild

@@ -115,9 +119,8 @@ buildGoModule {
  installPhase = ''
    runHook preInstall

-    mkdir -p $out/share/pixmaps
-    cp -r ./build/bin $out/bin
-    cp build/appicon.png $out/share/pixmaps/GUI.for.SingBox.png
+    install -Dm 0755 ./build/bin/GUI.for.SingBox $out/bin/GUI.for.SingBox
+    install -Dm 0644 build/appicon.png $out/share/pixmaps/gui-for-singbox.png

    runHook postInstall
  '';
@@ -2,35 +2,48 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  pkg-config,
  SDL,
  SDL_ttf,
  SDL_gfx,
  SDL_mixer,
  libpng,
  glew,
-  dejavu_fonts,
-  makeDesktopItem,
+  fontconfig,
+  versionCheckHook,
+  nix-update-script,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "hyperrogue";
-  version = "13.0v";
+  version = "13.0w";

  src = fetchFromGitHub {
    owner = "zenorogue";
    repo = "hyperrogue";
-    rev = "v${version}";
-    sha256 = "sha256-bH5dnXLWU2D6Y70u7Cy2vqsli1GhID9af4J+21NSPHk=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-/ERMR4JtlIsZ5mvPKTjcjiUfX5/7DTqT0Zc/LEFdZ+M=";
+  };
+
+  env = {
+    FONTCONFIG = 1;
+    HYPERROGUE_USE_GLEW = 1;
+    HYPERROGUE_USE_PNG = 1;
+    HYPERROGUE_USE_ROGUEVIZ = 1;
  };

  CXXFLAGS = [
    "-I${lib.getDev SDL}/include/SDL"
    "-DHYPERPATH='\"${placeholder "out"}/share/hyperrogue/\"'"
    "-DRESOURCEDESTDIR=HYPERPATH"
-    "-DHYPERFONTPATH='\"${dejavu_fonts}/share/fonts/truetype/\"'"
  ];
-  HYPERROGUE_USE_GLEW = 1;
-  HYPERROGUE_USE_PNG = 1;
+
+  nativeBuildInputs = [
+    pkg-config
+    copyDesktopItems
+  ];

  buildInputs = [
    SDL
@@ -39,22 +52,27 @@ stdenv.mkDerivation rec {
    SDL_mixer
    libpng
    glew
+    fontconfig
  ];

-  desktopItem = makeDesktopItem {
-    name = "hyperrogue";
-    desktopName = "HyperRogue";
-    genericName = "HyperRogue";
-    comment = meta.description;
-    icon = "hyperrogue";
-    exec = "hyperrogue";
-    categories = [
-      "Game"
-      "AdventureGame"
-    ];
-  };
+  desktopItems = [
+    (makeDesktopItem {
+      name = "hyperrogue";
+      desktopName = "HyperRogue";
+      genericName = "HyperRogue";
+      comment = finalAttrs.meta.description;
+      icon = "hyperrogue";
+      exec = "hyperrogue";
+      categories = [
+        "Game"
+        "AdventureGame"
+      ];
+    })
+  ];

  installPhase = ''
+    runHook preInstall
+
    install -d $out/share/hyperrogue/{sounds,music}

    install -m 555 -D hyperrogue $out/bin/hyperrogue
@@ -62,8 +80,6 @@ stdenv.mkDerivation rec {
    install -m 444 -D music/* $out/share/hyperrogue/music
    install -m 444 -D sounds/* $out/share/hyperrogue/sounds

-    install -m 444 -D ${desktopItem}/share/applications/hyperrogue.desktop \
-      $out/share/applications/hyperrogue.desktop
    install -m 444 -D hyperroid/app/src/main/res/drawable-ldpi/icon.png \
      $out/share/icons/hicolor/36x36/apps/hyperrogue.png
    install -m 444 -D hyperroid/app/src/main/res/drawable-mdpi/icon.png \
@@ -76,16 +92,31 @@ stdenv.mkDerivation rec {
      $out/share/icons/hicolor/144x144/apps/hyperrogue.png
    install -m 444 -D hyperroid/app/src/main/res/drawable-xxxhdpi/icon.png \
      $out/share/icons/hicolor/192x192/apps/hyperrogue.png
+
+    runHook postInstall
  '';

  enableParallelBuilding = true;

-  meta = with lib; {
-    homepage = "https://www.roguetemple.com/z/hyper/";
-    description = "A roguelike game set in hyperbolic geometry";
-    mainProgram = "hyperrogue";
-    maintainers = with maintainers; [ rardiol ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.all;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+
+  doInstallCheck = !stdenv.hostPlatform.isDarwin;
+
+  passthru = {
+    updateScript = nix-update-script { };
  };
-}
+
+  meta = {
+    description = "Roguelike game set in hyperbolic geometry";
+    homepage = "https://www.roguetemple.com/z/hyper/";
+    changelog = "https://github.com/zenorogue/hyperrogue/releases/tag/v${finalAttrs.version}";
+    mainProgram = "hyperrogue";
+    maintainers = with lib.maintainers; [ rardiol ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
+  };
+})
@@ -1,32 +1,91 @@
-{ lib, stdenv, fetchurl, unzip, nixosTests }:
+{
+  lib,
+  fetchFromGitHub,
+  nixosTests,
+  fetchYarnDeps,
+  nodejs,
+  php,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodePackages,
+  python3,
+  pkg-config,
+  libsass,
+  stdenv,
+}:

-stdenv.mkDerivation rec {
+php.buildComposerProject (finalAttrs: {
  pname = "invoiceplane";
  version = "1.6.1";

-  src = fetchurl {
-    url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip";
-    hash = "sha256-66vXxE4pTUMkmPalLgJrCt2pl2BSWOJ3tiJ5K5wspYY=";
+  src = fetchFromGitHub {
+    owner = "InvoicePlane";
+    repo = "InvoicePlane";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-rVt3HkAh3zBVwt1a4ZGiuC/Khvb3Ugk42hT5mul4qRA=";
  };

-  nativeBuildInputs = [ unzip ];
+  vendorHash = "sha256-qYjNn7VQGkUfJ74coUpUOfAOkgi3eLoo/ITpcOcTenk=";

-  sourceRoot = ".";
+  buildInputs = [ libsass ];

-  installPhase = ''
-    mkdir -p $out/
-    cp -r ip/. $out/
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    # Needed for executing package.json scripts
+    nodePackages.grunt-cli
+    pkg-config
+    (python3.withPackages (ps: with ps; [ distutils ]))
+    stdenv.cc
+  ];
+
+  offlineCache = fetchYarnDeps {
+    yarnLock = ./yarn.lock;
+    hash = "sha256-t9GYFqKY3YZ/l5LZXIHIgehgvxIbMMuYLwXvvdQaryM=";
+  };
+
+  # Upstream yarn.lock and package.json out of sync
+  # https://github.com/InvoicePlane/InvoicePlane/issues/1109
+  preConfigure = ''
+    cp ${./yarn.lock} ./yarn.lock
+  '';
+
+  # Upstream composer.json file is missing the name, description and license fields
+  composerStrictValidation = false;
+
+  postBuild = ''
+    # Building node-sass dependency
+    mkdir -p "$HOME/.node-gyp/${nodejs.version}"
+    echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion"
+    ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}"
+    export npm_config_nodedir=${nodejs}
+
+    pushd node_modules/node-sass
+    LIBSASS_EXT=auto yarn run build --offline
+    popd
+
+    # Running package.json scripts
+    grunt build
+  '';
+
+  # Cleanup
+  postInstall = ''
+    mv $out/share/php/invoiceplane/* $out/
+    rm -r $out/{composer.json,composer.lock,CONTRIBUTING.md,docker-compose.yml,Gruntfile.js,package.json,node_modules,yarn.lock,share}
  '';

  passthru.tests = {
    inherit (nixosTests) invoiceplane;
  };

-  meta = with lib; {
+  meta = {
    description = "Self-hosted open source application for managing your invoices, clients and payments";
-    license = licenses.mit;
+    changelog = "https://github.com/InvoicePlane/InvoicePlane/releases/tag/v${finalAttrs.version}";
    homepage = "https://www.invoiceplane.com";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ onny ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ onny ];
  };
-}
+})
@@ -33,23 +33,23 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "justbuild";
-  version = "1.3.2";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "just-buildsystem";
    repo = "justbuild";
    rev = "refs/tags/v${version}";
-    hash = "sha256-N9K1n2ttxhD0q2BXprt/nQdQseUtpaFmEZUcxRJV5C8=";
+    hash = "sha256-asbJdm50srMinr8sguGR3rWT7YXm75Zjm2Dvj53PpMc=";
  };

  bazelapi = fetchurl {
    url = "https://github.com/bazelbuild/remote-apis/archive/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz";
-    hash = "sha256-dCGr1TUsz5J8IFBFOk2/ofexxxcOw+hwK2/i05uIBf4=";
+    hash = "sha256:1zh5i2dx7qkg5dqfihqf2z3v3xx1px6kliah41y95krc6pasn8bl";
  };

  googleapi = fetchurl {
-    url = "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz";
-    hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A=";
+    url = "https://github.com/googleapis/googleapis/archive/fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz";
+    hash = "sha256:1r33jj8yipxjgiarddcxr1yc5kmn98rwrjl9qxfx0fzn1bsg04q5";
  };

  nativeBuildInputs = [
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {

    mkdir .distfiles
    ln -s ${bazelapi} .distfiles/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz
-    ln -s ${googleapi} .distfiles/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz
+    ln -s ${googleapi} .distfiles/fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz

    mkdir .pkgconfig
    cat << __EOF__ > .pkgconfig/gsl.pc
@@ -29,7 +29,7 @@

 let
  pname = "legends-of-equestria";
-  version = "2024.05.01";
+  version = "2024.06.02";
  description = "Free-to-play MMORPG";
  runtimeDeps =
    [
@@ -73,9 +73,9 @@ stdenv.mkDerivation {
          megacmd
          unzip
        ];
-        url = "https://mega.nz/file/NjIwwJoK#MVi3C3FAcSQPd7FRpQc0CoStBG8jSFuPn0jD-pG3zY0";
+        url = "https://mega.nz/file/Z3oAGYDa#01EfQICR4k5BK56hWFckYKsfgdV36KoU91TvSBwKgxY";
        outputHashAlgo = "sha256";
-        outputHash = "VXBtEB3G5MTrWn9OOvmCG3sDoasjbKkLJruhdQZa4SQ=";
+        outputHash = "vpVIaRPrZih+ydWszsBF/JgO0AXh2rF/yOpBuI+V0m4=";
        outputHashMode = "recursive";
      }
      ''
@@ -102,7 +102,7 @@ stdenv.mkDerivation {

    loeHome=$out/lib/${pname}
    mkdir -p $loeHome
-    cp -r LoE/* $loeHome
+    cp -r Linux/* $loeHome

    makeWrapper $loeHome/LoE.x86_64 $out/bin/LoE \
      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"
@@ -18,7 +18,7 @@ let
  llvmPackages = llvmPackages_18;
  stdenv = llvmPackages.stdenv;

-  version = "8.6.0";
+  version = "8.6.1";

  hasI686 =
    (if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
  # 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-4bFZ6nxNcrJTQhkJ5S1KU0PJN4yu9Li+QznF5IxpGCE=";
+    hash = "sha256-T64ydpYz299SHDEY0L0gOb4xwRpOQkGv8RIjl9j/5Ew=";
  };

  hardeningDisable = [
@@ -10,7 +10,7 @@ let
 in
 {
  options.services.local-ai = {
-    enable = lib.mkEnableOption "local-ai";
+    enable = lib.mkEnableOption "Enable service";

    package = lib.mkPackageOption pkgs "local-ai" { };

@@ -147,8 +147,8 @@ let
        src = fetchFromGitHub {
          owner = "ggerganov";
          repo = "llama.cpp";
-          rev = "6423c65aa8be1b98f990cf207422505ac5a441a1";
-          hash = "sha256-DI3VhXEeok/wIFuM/l1hJJZlpxvyKY6Kmi97o3g0Ppk=";
+          rev = "26a8406ba9198eb6fdd8329fa717555b4f77f05f";
+          hash = "sha256-WFkg4ZhL5x55JdeFmAGBFKjWd31XyfGPtQkn+9b7GF4=";
          fetchSubmodules = true;
        };
        postPatch =
@@ -275,32 +275,14 @@ let
    '';
  };

-  go-rwkv = stdenv.mkDerivation {
-    name = "go-rwkv";
-    src = fetchFromGitHub {
-      owner = "donomii";
-      repo = "go-rwkv.cpp";
-      rev = "661e7ae26d442f5cfebd2a0881b44e8c55949ec6";
-      hash = "sha256-byTNZQSnt7qpBMng3ANJmpISh3GJiz+F15UqfXaz6nQ=";
-      fetchSubmodules = true;
-    };
-    buildFlags = [ "librwkv.a" ];
-    dontUseCmakeConfigure = true;
-    nativeBuildInputs = [ cmake ];
-    installPhase = ''
-      cp -r --no-preserve=mode $src $out
-      cp *.a $out
-    '';
-  };
-
  # try to merge with openai-whisper-cpp in future
  whisper-cpp = effectiveStdenv.mkDerivation {
    name = "whisper-cpp";
    src = fetchFromGitHub {
      owner = "ggerganov";
      repo = "whisper.cpp";
-      rev = "31aea563a83803c710691fed3e8d700e06ae6788";
-      hash = "sha256-YCYRx+DHhxazJ3ZAdmuqeYHOX5v6JEZhU9eo487yEtk=";
+      rev = "6266a9f9e56a5b925e9892acf650f3eb1245814d";
+      hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk=";
    };

    nativeBuildInputs = [
@@ -338,25 +320,6 @@ let
    '';
  };

-  go-bert = stdenv.mkDerivation {
-    name = "go-bert";
-    src = fetchFromGitHub {
-      owner = "go-skynet";
-      repo = "go-bert.cpp";
-      rev = "710044b124545415f555e4260d16b146c725a6e4";
-      hash = "sha256-UNrs3unYjvSzCVaVISFFBDD+s37lmN6/7ajmGNcYgrU=";
-      fetchSubmodules = true;
-    };
-    buildFlags = [ "libgobert.a" ];
-    dontUseCmakeConfigure = true;
-    nativeBuildInputs = [ cmake ];
-    env.NIX_CFLAGS_COMPILE = "-Wformat";
-    installPhase = ''
-      cp -r --no-preserve=mode $src $out
-      cp *.a $out
-    '';
-  };
-
  go-stable-diffusion = stdenv.mkDerivation {
    name = "go-stable-diffusion";
    src = fetchFromGitHub {
@@ -417,6 +380,45 @@ let
    meta.broken = lib.versionOlder go-tiny-dream.stdenv.cc.version "13";
  };

+  bark = stdenv.mkDerivation {
+    name = "bark";
+    src = fetchFromGitHub {
+      owner = "PABannier";
+      repo = "bark.cpp";
+      rev = "v1.0.0";
+      hash = "sha256-wOcggRWe8lsUzEj/wqOAUlJVypgNFmit5ISs9fbwoCE=";
+      fetchSubmodules = true;
+    };
+    installPhase = ''
+      mkdir -p $out/build
+      cp -ra $src/* $out
+      find . \( -name '*.a' -or -name '*.c.o' \) -print0 \
+        | tar cf - --null --files-from - \
+        | tar xf - -C $out/build
+    '';
+    nativeBuildInputs = [ cmake ];
+  };
+
+  stable-diffusion = stdenv.mkDerivation {
+    name = "stable-diffusion";
+    src = fetchFromGitHub {
+      owner = "leejet";
+      repo = "stable-diffusion.cpp";
+      rev = "4570715727f35e5a07a76796d823824c8f42206c";
+      hash = "sha256-1w7OokrQflasvauDEADLDJf2530m5a7WP+X1KgwxCks=";
+      fetchSubmodules = true;
+    };
+    installPhase = ''
+      mkdir -p $out/build
+      cp -ra $src/* $out
+      find . \( -name '*.a' -or -name '*.c.o' \) -print0 \
+        | tar cf - --null --files-from - \
+        | tar xf - -C $out/build
+    '';
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ opencv ];
+  };
+
  GO_TAGS =
    lib.optional with_tinydream "tinydream"
    ++ lib.optional with_tts "tts"
@@ -431,12 +433,12 @@ let
      stdenv;

  pname = "local-ai";
-  version = "2.23.0";
+  version = "2.24.2";
  src = fetchFromGitHub {
    owner = "go-skynet";
    repo = "LocalAI";
    rev = "v${version}";
-    hash = "sha256-7i2qW9yh++YQrEnjjxkHB7GJZSIIJQFJ9GyU2Rp9+kk=";
+    hash = "sha256-nJYeNwx6G3WhrTZYi1yoPzYtofx1H7bTkK0T9ld5wcE=";
  };

  prepare-sources =
@@ -447,30 +449,32 @@ let
      mkdir sources
      ${cp} ${go-llama} sources/go-llama.cpp
      ${cp} ${if with_tts then go-piper else go-piper.src} sources/go-piper
-      ${cp} ${go-rwkv} sources/go-rwkv.cpp
      ${cp} ${whisper-cpp.src} sources/whisper.cpp
      cp ${whisper-cpp}/lib/lib*.a sources/whisper.cpp
-      ${cp} ${go-bert} sources/go-bert.cpp
      ${cp} ${
        if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src
      } sources/go-stable-diffusion
      ${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream
+      ${cp} ${bark} sources/bark.cpp
+      ${cp} ${stable-diffusion} sources/stablediffusion-ggml.cpp
    '';

  self = buildGo123Module.override { stdenv = effectiveStdenv; } {
    inherit pname version src;

-    vendorHash = "sha256-bLeKh0aKSQrD5jTydG0ZLW5RCNb3oKvjCSeA9juI3B8=";
+    vendorHash = "sha256-QmOoICJ11SY8xXE0g1+1mWRUZ3kQPtCcpM6aZiBkHQ0=";

    env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4";

    postPatch =
      ''
+        # TODO: add silero-vad
        sed -i Makefile \
          -e '/mod download/ d' \
          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \
          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \
          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \
+          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/silero-vad/ d' \

      ''
      + lib.optionalString with_cublas ''
@@ -492,7 +496,8 @@ let
        cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server

        # avoid rebuild of prebuilt make targets
-        touch backend-assets/grpc/* backend-assets/util/* sources/**/lib*.a
+        touch backend-assets/grpc/* backend-assets/util/*
+        find sources -name "lib*.a" -exec touch {} +
      '';

    buildInputs =
@@ -511,14 +516,17 @@ let
      ++ lib.optionals with_stablediffusion go-stable-diffusion.buildInputs
      ++ lib.optionals with_tts go-piper.buildInputs;

-    nativeBuildInputs = [
-      protobuf
-      protoc-gen-go
-      protoc-gen-go-grpc
-      makeWrapper
-      ncurses # tput
-      which
-    ] ++ lib.optional enable_upx upx ++ lib.optionals with_cublas [ cuda_nvcc ];
+    nativeBuildInputs =
+      [
+        protobuf
+        protoc-gen-go
+        protoc-gen-go-grpc
+        makeWrapper
+        ncurses # tput
+        which
+      ]
+      ++ lib.optional enable_upx upx
+      ++ lib.optionals with_cublas [ cuda_nvcc ];

    enableParallelBuilding = false;

@@ -599,8 +607,6 @@ let
    passthru.local-packages = {
      inherit
        go-tiny-dream
-        go-rwkv
-        go-bert
        go-llama
        go-piper
        llama-cpp-grpc
@@ -610,6 +616,9 @@ let
        piper-phonemize
        piper-tts'
        llama-cpp-rpc
+        go-stable-diffusion
+        bark
+        stable-diffusion
        ;
    };

@@ -51,18 +51,17 @@ in
  };

 }
-// lib.optionalAttrs (!self.features.with_cublas) {
-  # https://localai.io/features/embeddings/#bert-embeddings
-  bert =
+// lib.optionalAttrs (!self.features.with_cublas && !self.features.with_clblas) {
+  # https://localai.io/features/embeddings/#llamacpp-embeddings
+  llamacpp-embeddings =
    let
      model = "embedding";
      model-configs.${model} = {
-        # Note: q4_0 and q4_1 models can not be loaded
        parameters.model = fetchurl {
-          url = "https://huggingface.co/skeskinen/ggml/resolve/main/all-MiniLM-L6-v2/ggml-model-f16.bin";
-          hash = "sha256-nBlbJFOk/vYKT2vjqIo5IRNmIU32SYpP5IhcniIxT1A=";
+          url = "https://huggingface.co/hugging-quants/Llama-3.2-1B-Instruct-Q4_K_M-GGUF/resolve/main/llama-3.2-1b-instruct-q4_k_m.gguf";
+          sha256 = "1d0e9419ec4e12aef73ccf4ffd122703e94c48344a96bc7c5f0f2772c2152ce3";
        };
-        backend = "bert-embeddings";
+        backend = "llama-cpp";
        embeddings = true;
      };

@@ -74,7 +73,7 @@ in
      };
    in
    testers.runNixOSTest {
-      name = self.name + "-bert";
+      name = self.name + "-llamacpp-embeddings";
      nodes.machine = {
        imports = [ common-config ];
        virtualisation.cores = 2;
@@ -103,8 +102,6 @@ in
        '';
    };

-}
-// lib.optionalAttrs (!self.features.with_cublas && !self.features.with_clblas) {
  # https://localai.io/docs/getting-started/manual/
  llama =
    let
@@ -118,7 +115,7 @@ in
          # https://ai.meta.com/blog/meta-llama-3-1/
          model = fetchurl {
            url = "https://huggingface.co/lmstudio-community/Meta-Llama-3.1-8B-Instruct-GGUF/resolve/main/Meta-Llama-3.1-8B-Instruct-Q4_K_M.gguf";
-            hash = "sha256-8r4+GiOcEsnz8BqWKxH7KAf4Ay/bY7ClUC6kLd71XkQ=";
+            sha256 = "f2be3e1a239c12c9f3f01a962b11fb2807f8032fdb63b0a5502ea42ddef55e44";
          };
          # defaults from:
          # https://deepinfra.com/meta-llama/Meta-Llama-3.1-8B-Instruct
@@ -6,18 +6,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "mitra";
-  version = "3.11.0";
+  version = "3.13.0";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "silverpill";
    repo = "mitra";
    rev = "v${version}";
-    hash = "sha256-sxHp7br0fYIif17TZFDZpogiiI3WavFgqF+++QNpIfE=";
+    hash = "sha256-OxOIsoS3f0zFbEpXKvnIpISq4Bzkjj50LuLFkfwLlzM=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-LEqrR5+20up23/lqSj5Ruqch5tnKEhAeMBQZ+nSDeZM=";
+  cargoHash = "sha256-J6EeJOx+1E7MjwDZK2mgMY5vrbpuNGWkbRxwjxnaKxk=";

  # require running database
  doCheck = false;
@@ -19,18 +19,20 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: bookmark.o: (.bss+0x20): multiple definition of `gBm';
-  #     gpshare.o:(.bss+0x0): first defined here
-  env.NIX_CFLAGS_COMPILE = toString (
-    [ "-fcommon" ]
-    # these are required for the configure script to work with clang
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      # Workaround build failure on -fno-common toolchains like upstream
+      # gcc-10. Otherwise build fails as:
+      #   ld: bookmark.o: (.bss+0x20): multiple definition of `gBm';
+      #     gpshare.o:(.bss+0x0): first defined here
+      "-fcommon"
+      # configure fails due to ancient sample C program:
+      # error: installation or configuration problem: C compiler cannot create executables.
      "-Wno-implicit-int"
+      # error: two or more data types in declaration specifiers
      "-Wno-implicit-function-declaration"
-    ]
-  );
+    ];
+  };

  preConfigure = ''
    find -name Makefile.in | xargs sed -i '/^TMPDIR=/d'
@@ -0,0 +1,38 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nvidia_oc";
+  version = "0.1.16";
+
+  src = fetchFromGitHub {
+    owner = "Dreaming-Codes";
+    repo = "nvidia_oc";
+    tag = version;
+    hash = "sha256-9FNulyXLHDQ/FQBAGaINRW0F3KZdRcgmDHn7vQX2L2U=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-DuuHqBhL25ghgcYxcOtWRArUqL9+c3d5mBrAcWTAFW8=";
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "Simple command line tool to overclock Nvidia GPUs using the NVML library on Linux";
+    homepage = "https://github.com/Dreaming-Codes/nvidia_oc";
+    changelog = "https://github.com/Dreaming-Codes/nvidia_oc/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genga898 ];
+    mainProgram = "nvidia_oc";
+  };
+}
@@ -3,6 +3,7 @@
  buildGoModule,
  fetchFromGitHub,
  installShellFiles,
+  gitUpdater,
 }:

 buildGoModule rec {
@@ -12,13 +13,13 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = pname;
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
    hash = "sha256-hb5XgwBg9llX/PDX8A8hL5fJbG03nTjrvEd252k2Il0=";
  };

  vendorHash = "sha256-bOjIwBPxu/BfRaAcZTXf4xCGvVXnumb2++JZTx7ZG1s=";

-  sourceRoot = "${src.name}/src";
+  sourceRoot = "source/src";

  nativeBuildInputs = [
    installShellFiles
@@ -45,20 +46,22 @@ buildGoModule rec {
  postInstall = ''
    mv $out/bin/{src,oh-my-posh}
    mkdir -p $out/share/oh-my-posh
-    cp -r ${src}/themes $out/share/oh-my-posh/
+    cp -r $src/themes $out/share/oh-my-posh/
    installShellCompletion --cmd oh-my-posh \
      --bash <($out/bin/oh-my-posh completion bash) \
      --fish <($out/bin/oh-my-posh completion fish) \
      --zsh <($out/bin/oh-my-posh completion zsh)
  '';

-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
    description = "Prompt theme engine for any shell";
    mainProgram = "oh-my-posh";
    homepage = "https://ohmyposh.dev";
    changelog = "https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
      lucperkins
      urandom
    ];
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "opera";
-  version = "115.0.5322.77";
+  version = "115.0.5322.119";

  src = fetchurl {
    url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-mMXwshT15+5R2/jCSAutO4UVFGAV2Enc4IjvUeqyCCU=";
+    hash = "sha256-VUy3InKC3jn4FXZfptWqboFuislvFenVm8DeI0mn35Y=";
  };

  nativeBuildInputs = [
@@ -1,31 +1,32 @@
 {
  lib,
-  stdenv,
  fetchFromGitHub,
  rustPlatform,
-  testers,
+  versionCheckHook,
  nix-update-script,
-  ox,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "ox";
-  version = "0.7.2";
+  version = "0.7.6";

  src = fetchFromGitHub {
    owner = "curlpipe";
    repo = pname;
-    rev = version;
-    hash = "sha256-yAToibHhvHAry7WVZ5uD84CbUTp06RyZ9J12/2deM1I=";
+    tag = version;
+    hash = "sha256-kTCdq3C0OUQS3tQRwEJ0+MTHZ8j2nnUARjdbmfH6ed4=";
  };

-  cargoHash = "sha256-YAy5vCxcHUL0wM9+Y3GDqV/V1utL3V05heT92/zQ/X8=";
+  cargoHash = "sha256-GiKSkpXEngQtnGW8zjy2RWQOG1b/xQrYRSLHsndkooo=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgramArg = [ "--version" ];

  passthru = {
-    tests.version = testers.testVersion {
-      package = ox;
-    };
-
    updateScript = nix-update-script { };
  };

@@ -34,7 +35,10 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/curlpipe/ox";
    changelog = "https://github.com/curlpipe/ox/releases/tag/${version}";
    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ moni ];
+    maintainers = with maintainers; [
+      moni
+      kachick
+    ];
    mainProgram = "ox";
  };
 }
@@ -29,13 +29,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pdal";
-  version = "2.8.2";
+  version = "2.8.3";

  src = fetchFromGitHub {
    owner = "PDAL";
    repo = "PDAL";
    rev = finalAttrs.version;
-    hash = "sha256-zHy/fZ6vlgbBvYZ1olmkO4qsqW5Y2UU5fT1XQPvNmas=";
+    hash = "sha256-i4Kk9T9MwMGshyGtHrSDhnzqeeThRCKXsjpW3rIDVVc=";
  };

  nativeBuildInputs = [
@@ -34,11 +34,11 @@

 stdenv.mkDerivation rec {
  pname = "saga";
-  version = "9.6.2";
+  version = "9.7.0";

  src = fetchurl {
    url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-TXnBSIleUdoTek8GpJqR/10OuVvV7UxHxho5fXr8jgk=";
+    hash = "sha256-wUj0TvZoL/9miCwVk3eYilYXqczkbgsStCrbKAoeuxw=";
  };

  sourceRoot = "saga-${version}/saga-gis";
@@ -23,11 +23,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "SDL2_image";
-  version = "2.8.3";
+  version = "2.8.4";

  src = fetchurl {
    url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz";
-    hash = "sha256-SwAPLCOM44CAfuDLaKDvAFhxaR7Ohkbb9PQlpYKxuyI=";
+    hash = "sha256-WomgFCChkridvMX1JnRIGB1dzIHS9aFojLHqxvVX2mc=";
  };

  nativeBuildInputs = [
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3babfae..11ea637c 100644
+index 07a6c2e5..37c33d92 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -209,7 +209,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+@@ -221,7 +221,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
   set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
 endif()
 
@@ -11,6 +11,17 @@ index a3babfae..11ea637c 100644
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 #SET(CMAKE_MACOSX_RPATH ON)
 
+@@ -260,6 +260,10 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
+ else()
+   set( SFCGAL_LIB_NAME "SFCGAL" )
+ endif()
+
+if ( UNIX )
+  include(GNUInstallDirs)
+endif()
+ #set( SFCGAL_LIB_NAME ${${CMAKE_BUILD_TYPE}
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sfcgal-config.in ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config @ONLY)
+ install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config DESTINATION bin )
 diff --git a/sfcgal-config.in b/sfcgal-config.in
 index a0e992c5..49615c13 100755
 --- a/sfcgal-config.in
@@ -29,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [ cmake ];

-  patches = [ ./cmake-fix.patch ];
+  patches = [
+    # https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/384
+    ./cmake-fix.patch
+  ];

  meta = {
    description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations";
@@ -37,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}";
    license = lib.licenses.lgpl2;
    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.fqidz ];
+    maintainers = with lib; teams.geospatial.members ++ [ maintainers.fqidz ];
  };
 })
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "simplotask";
-  version = "1.16.2";
+  version = "1.16.3";

  src = fetchFromGitHub {
    owner = "umputun";
    repo = "spot";
    rev = "v${version}";
-    hash = "sha256-D5XQeY8y9Bof5AWAR5Wt6anOT6RFG887H5lwxvx02E8=";
+    hash = "sha256-Se2Gq3GnQsAKIzRslt2zEkqeE8lwda96EcglhqfC5NA=";
  };

  vendorHash = null;
@@ -4,17 +4,18 @@
  nodejs,
  pnpm_9,
  stdenvNoCC,
+  nix-update-script,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "stylelint-lsp";
-  version = "2.0.0";
+  version = "2.0.1";

  src = fetchFromGitHub {
    owner = "bmatcuk";
    repo = "stylelint-lsp";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-mzhY6MKkXb1jFYZvs/VkGipBjBfUY3GukICb9qVQI80=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LUX/H7yY8Dl44vgpf7vOgtMdY7h//m5BAfrK5RRH9DM=";
  };

  buildInputs = [
@@ -38,6 +39,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    runHook postBuild
  '';

+  preInstall = ''
+    # remove unnecessary files
+    pnpm --ignore-scripts prune --prod
+    rm -rf node_modules/.pnpm/typescript*
+    find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
+  '';
+
  installPhase = ''
    runHook preInstall

@@ -49,12 +57,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "A stylelint Language Server";
    homepage = "https://github.com/bmatcuk/stylelint-lsp";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gepbird ];
+    license = lib.licenses.mit;
    mainProgram = "stylelint-lsp";
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [
+      gepbird
+    ];
+    platforms = lib.platforms.unix;
  };
 })
@@ -5,13 +5,13 @@
  fetchFromGitHub,
 }:
 let
-  version = "0.20.0";
+  version = "0.21.0";

  src = fetchFromGitHub {
    owner = "go-spatial";
    repo = "tegola";
-    rev = "v${version}";
-    hash = "sha256-Jlpw3JaU5+DO7Z5qruEMoLRf95cPGd9Z+MeDGSgbMjc=";
+    tag = "v${version}";
+    hash = "sha256-EXCh+5t2+7j/huIKUWOqG7u+Lo4eziyvPkDGpw3xaO8=";
  };

  frontend = buildNpmPackage {
@@ -47,11 +47,11 @@ buildGoModule {
    go generate ./server
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://www.tegola.io/";
    description = "Mapbox Vector Tile server";
    mainProgram = "tegola";
-    maintainers = with maintainers; teams.geospatial.members ++ [ ingenieroariel ];
-    license = licenses.mit;
+    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ ingenieroariel ]);
+    license = lib.licenses.mit;
  };
 }
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  unstableGitUpdater,
+  fetchFromGitHub,
+  lib,
+}:
+
+stdenv.mkDerivation {
+  pname = "unarc";
+  version = "0-unstable-2020-06-05";
+
+  src = fetchFromGitHub {
+    owner = "xredor";
+    repo = "unarc";
+    rev = "adc333d6cdd76d72da254cc80d766fbbcc683c95";
+    hash = "sha256-ysOei44P3K+aA+h73DuHlgwTKqQx/Xq8z+DefB6Qhcs=";
+  };
+
+  postPatch = ''
+    substituteInPlace 'CUI.h' \
+      --replace-fail 'fgets(answer, 256, stdin);' 'if (!fgets (answer, 256, stdin)) return FALSE;' \
+      --replace-fail 'printf (help)' 'printf ("%s", help)'
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -m755 unarc $out/bin
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Unpacker for ArC (FreeArc) archives ('ArC\\1' header)";
+    homepage = "https://github.com/xredor/unarc";
+    license = lib.licenses.unfree; # unknown
+    maintainers = [ lib.maintainers.lucasew ];
+    mainProgram = "unarc";
+  };
+}
@@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "utm";
-  version = "4.6.3";
+  version = "4.6.4";

  src = fetchurl {
    url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
-    hash = "sha256-LKSKbUx7rxNWBybEKA7ah/5esArs9TRFJexLlMlEqjs=";
+    hash = "sha256-qthnJhUrFaPpY893igsN/Y6Bhzazga7SaZ2XShiEVCc=";
  };

  nativeBuildInputs = [
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "GPUOpen-LibrariesAndSDKs";
    repo = "VulkanMemoryAllocator";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-j0Z9OEwQx3RB2cni9eK3gYfwkhOc2ST213b6VseaVzg=";
  };

@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  meta = {
    description = "Easy to integrate Vulkan memory allocation library";
    homepage = "https://gpuopen.com/vulkan-memory-allocator/";
-    changelog = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/blob/v${finalAttrs.version}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fgaz ];
    mainProgram = "vulkan-memory-allocator";
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  autoreconfHook,
 }:

 stdenv.mkDerivation rec {
@@ -13,6 +14,12 @@ stdenv.mkDerivation rec {
    sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6";
  };

+  nativeBuildInputs = [ autoreconfHook ];
+
+  # fdatasync is undocumented on darwin with no header file which breaks the build.
+  # use fsync instead.
+  configureFlags = lib.optional stdenv.hostPlatform.isDarwin "ac_cv_func_fdatasync=no";
+
  patches = [ ./fix-install.patch ];

  meta = with lib; {
@@ -6,12 +6,12 @@

 python3Packages.buildPythonApplication rec {
  pname = "zfs-autobackup";
-  version = "3.2";
+  version = "3.3";

  src = fetchPypi {
    inherit version;
    pname = "zfs_autobackup";
-    hash = "sha256-rvtY7fsn2K2hueAsQkaPXcwxUAgE8j+GsQFF3eJKG2o=";
+    hash = "sha256-nAc1mdrtIEmUS0uMqOdvV07xP02MFj6F5uCTiCXtnMs=";
  };

  propagatedBuildInputs = with python3Packages; [ colorama ];
@@ -0,0 +1,90 @@
+commit f063e9f74b45f34e4ac570a90901253bf8e64efd
+Author: Mary Guillemard <mary.guillemard@collabora.com>
+Date:   2024-12-02 09:11:35 +0100
+
+    meson: Add mesa-clc and install-mesa-clc options
+    
+    Due to the cross build issues in current meson, we adds new options to
+    allow mesa_clc and vtn_bindgen to be installed or searched on the
+    system.
+    
+    Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
+    Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
+    Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
+    Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32719>
+
+diff --git a/meson.build b/meson.build
+index de9c9af53a1..e37325ec176 100644
+--- a/meson.build
+++ b/meson.build
+@@ -808,7 +808,7 @@ if with_gallium_rusticl or with_nouveau_vk or with_tools.contains('etnaviv')
+ endif
+ 
+ with_clover_spirv = with_gallium_clover and get_option('opencl-spirv')
+-with_clc = with_microsoft_clc or with_intel_clc or with_gallium_asahi or with_asahi_vk or with_gallium_rusticl or with_clover_spirv
+with_clc = get_option('mesa-clc') != 'auto' or with_microsoft_clc or with_intel_clc or with_gallium_asahi or with_asahi_vk or with_gallium_rusticl
+ 
+ dep_clc = null_dep
+ if with_gallium_clover or with_clc
+diff --git a/meson_options.txt b/meson_options.txt
+index 79ee65e6094..8f22b36e5fb 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -744,3 +744,20 @@ option(
+     'none', 'dri2'
+   ],
+ )
+
+option(
+  'mesa-clc',
+  type : 'combo',
+  value : 'auto',
+  choices : [
+    'enabled', 'system', 'auto'
+  ],
+  description : 'Build the mesa-clc compiler or use a system version.'
+)
+
+option(
+  'install-mesa-clc',
+  type : 'boolean',
+  value : false,
+  description : 'Install the mesa-clc compiler (if needed for cross builds).'
+)
+diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build
+index 74767d08de2..4875d71ca21 100644
+--- a/src/compiler/clc/meson.build
+++ b/src/compiler/clc/meson.build
+@@ -117,15 +117,20 @@ idep_mesaclc = declare_dependency(
+   link_args : _idep_mesaclc_link_args,
+ )
+ 
+-prog_mesa_clc = executable(
+-  'mesa_clc',
+-  ['mesa_clc.c'],
+-  include_directories : [inc_include, inc_src],
+-  c_args : [pre_args, no_override_init_args],
+-  link_args : [ld_args_build_id],
+-  dependencies : [idep_mesaclc, dep_llvm, dep_spirv_tools, idep_getopt],
+-  # If we can run host binaries directly, just build mesa_clc for the host.
+-  # Most commonly this happens when doing a cross compile from an x86_64 build
+-  # machine to an x86 host
+-  native : not meson.can_run_host_binaries(),
+-)
+if get_option('mesa-clc') == 'system'
+  prog_mesa_clc = find_program('mesa_clc', native : true)
+else
+  prog_mesa_clc = executable(
+    'mesa_clc',
+    ['mesa_clc.c'],
+    include_directories : [inc_include, inc_src],
+    c_args : [pre_args, no_override_init_args],
+    link_args : [ld_args_build_id],
+    dependencies : [idep_mesaclc, dep_llvm, dep_spirv_tools, idep_getopt],
+    # If we can run host binaries directly, just build mesa_clc for the host.
+    # Most commonly this happens when doing a cross compile from an x86_64 build
+    # machine to an x86 host
+    native : not meson.can_run_host_binaries(),
+    install : get_option('install-mesa-clc'),
+  )
+endif
@@ -138,6 +138,9 @@ in stdenv.mkDerivation {

  patches = [
    ./opencl.patch
+    # cherry-picked from https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32719
+    # safe to remove for versions > 24.3.2
+    ./cross_clc.patch
  ];

  postPatch = ''
@@ -204,6 +207,7 @@ in stdenv.mkDerivation {

    # Enable Intel RT stuff when available
    (lib.mesonBool "install-intel-clc" true)
+    (lib.mesonBool "install-mesa-clc" true)
    (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64)
    (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib")

@@ -222,6 +226,7 @@ in stdenv.mkDerivation {
    (lib.mesonOption "video-codecs" "all")
  ] ++ lib.optionals needNativeCLC [
    (lib.mesonOption "intel-clc" "system")
+    (lib.mesonOption "mesa-clc" "system")
  ];

  strictDeps = true;
@@ -333,6 +338,7 @@ in stdenv.mkDerivation {
    echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd

    moveToOutput bin/intel_clc $driversdev
+    moveToOutput bin/mesa_clc $driversdev
    moveToOutput lib/gallium-pipe $opencl
    moveToOutput "lib/lib*OpenCL*" $opencl
    moveToOutput "lib/libOSMesa*" $osmesa
@@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "aiorussound";
-  version = "4.1.0";
+  version = "4.2.0";
  pyproject = true;

  # requires newer f-strings introduced in 3.12
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "noahhusby";
    repo = "aiorussound";
    rev = "refs/tags/${version}";
-    hash = "sha256-uMVmP4wXF6ln5A/iECf075B6gVnEzQxDTEPcyv5osyM=";
+    hash = "sha256-NO8FIUaMPZqB+zjMpaCvp/1LMyCH14AhdJMpbt6PwFY=";
  };

  build-system = [ poetry-core ];
@@ -359,7 +359,7 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.35.88";
+  version = "1.35.90";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-EWAlHIz8xYHO0/kNkAvmOVpZb5fG8UPGZepO33XNoYw=";
+    hash = "sha256-I6ODTVHGA7gIhH313Va2x12cOeiXhI5lVw2GtBXV9Gk=";
  };

  build-system = [ setuptools ];
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.35.88";
+  version = "1.35.90";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-0kYZ5reA087sjwKlxDb3SIar+d0pXWENhLOMUjQKp3o=";
+    hash = "sha256-xrKUyuQ26q+H3LcX5DSMJQ6h/BcDNledoRS2k2Y9jkI=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -1,40 +1,35 @@
 {
  lib,
+  bitvector-for-humans,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch2,
-  poetry-core,
-  pytestCheckHook,
-  pytest-mock,
-  bitvector-for-humans,
  hidapi,
  loguru,
+  poetry-core,
  pyserial,
+  pytest-mock,
+  pytestCheckHook,
+  pythonOlder,
  typer,
  webcolors,
 }:
+
 buildPythonPackage rec {
  pname = "busylight-for-humans";
-  version = "0.32.0";
+  version = "0.33.0";
  pyproject = true;

+  disabled = pythonOlder "3.8";
+
  src = fetchFromGitHub {
    owner = "JnyJny";
    repo = "busylight";
-    rev = version;
-    hash = "sha256-rdgkTk9x3bO5H01Bo2yOGIIxkoLv1k7kkJidJu/1HDQ=";
+    tag = version;
+    hash = "sha256-gwhN8aFwxRdA6fPuCDVdBJ8yl8Zq6DAfSRW88Yk7IUk=";
  };

-  patches = [
-    (fetchpatch2 {
-      # https://github.com/JnyJny/busylight/pull/369
-      name = "fix-poetry-core.patch";
-      url = "https://github.com/helsinki-systems/busylight/commit/74ca283e2250564f422d904ece1b9ab0dd9a8f6c.patch";
-      hash = "sha256-eif9ycSYL8ZpXsvNCOHDJlpj12oauyzlMKUScZMzllc=";
-    })
-  ];
-
  build-system = [ poetry-core ];
+
  dependencies = [
    bitvector-for-humans
    hidapi
@@ -43,6 +38,7 @@ buildPythonPackage rec {
    typer
    webcolors
  ];
+
  nativeCheckInputs = [
    pytestCheckHook
    pytest-mock
@@ -58,10 +54,11 @@ buildPythonPackage rec {
  '';

  meta = with lib; {
+    description = "Control USB connected presence lights from multiple vendors via the command-line or web API";
    homepage = "https://github.com/JnyJny/busylight";
-    description = "Control USB connected presence lights from multiple vendors via the command-line or web API.";
-    mainProgram = "busylight";
+    changelog = "https://github.com/JnyJny/busylight/releases/tag/${version}";
    license = licenses.asl20;
    maintainers = teams.helsinki-systems.members;
+    mainProgram = "busylight";
  };
 }
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "fastcore";
-  version = "1.7.27";
+  version = "1.7.28";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "homematicip";
-  version = "1.1.5";
+  version = "1.1.6";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -28,8 +28,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "hahn-th";
    repo = "homematicip-rest-api";
-    rev = "refs/tags/${version}";
-    hash = "sha256-rplzHb1F37Nii8C0zqeJCDgQQ8l/+ZmjQr2Lf6ssBLU=";
+    tag = version;
+    hash = "sha256-LECY5O9wY1qnSDVm7KWTkgxgSk1plpBD67vcAcXHoII=";
  };

  build-system = [
@@ -10,15 +10,15 @@

 buildPythonPackage rec {
  pname = "pygreat";
-  version = "2024.0.2";
+  version = "2024.0.3";
  pyproject = true;
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "greatscottgadgets";
    repo = "libgreat";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-yYp+2y4QIOykkrObWaXbZMMc2fsRn/+tGWqySA7V534=";
+    tag = "v${version}";
+    hash = "sha256-dJqL85mx1zGYUpMxDa83hNRr7eUn5NNfWXullGFQK70=";
  };

  sourceRoot = "${src.name}/host";
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pyipma";
-  version = "3.0.7";
+  version = "3.0.8";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "dgomes";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-a6UXc8XLZhSyUb8AxnXoPgiyP004GQfuapRmVeOaFQU=";
+    hash = "sha256-iz47BeBiSXIN/rZNOjuZYTFTIm0WAUg8cy0xV20gdwk=";
  };

  propagatedBuildInputs = [
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pylamarzocco";
-  version = "1.4.1";
+  version = "1.4.3";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "zweckj";
    repo = "pylamarzocco";
    rev = "refs/tags/v${version}";
-    hash = "sha256-fbXqAPyx6pGEKM+invdq88dDyiLJpyjL3idalnk0RUQ=";
+    hash = "sha256-bSwlAaaUVeORDJFWY8I2iIiQ9OvvDrpDBoQ3Ns5NrRM=";
  };

  build-system = [ setuptools ];
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "pysqueezebox";
-  version = "10.0.0";
+  version = "0.11.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "rajlaud";
    repo = "pysqueezebox";
    rev = "refs/tags/v${version}";
-    hash = "sha256-p9EwzkKkNi/jGMXx4sPTSpPk3Uq3Na8WElolNryu2N4=";
+    hash = "sha256-8eCf0y8xbnSP+c+QP8fRkamUj5kN4EUQVZpotdo7hbs=";
  };

  build-system = [ setuptools ];
@@ -16,13 +16,14 @@
  # tests
  pytestCheckHook,
  aioresponses,
+  pytest-cov-stub,
  pytest-asyncio,
  syrupy,
 }:

 buildPythonPackage rec {
  pname = "python-homeassistant-analytics";
-  version = "0.8.0";
+  version = "0.8.1";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -31,14 +32,9 @@ buildPythonPackage rec {
    owner = "joostlek";
    repo = "python-homeassistant-analytics";
    rev = "refs/tags/v${version}";
-    hash = "sha256-vyJseIYFmbxUYieZB0r3Z3j6/ZHmgs7ONa5YKQTwAXw=";
+    hash = "sha256-TfD1N4KoeIVoDp1YoOhBw8E7adow1nU1N6vj2j3W2No=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "--cov" ""
-  '';
-
  build-system = [ poetry-core ];

  dependencies = [
@@ -51,6 +47,7 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
    aioresponses
+    pytest-cov-stub
    pytest-asyncio
    syrupy
  ];
@@ -58,10 +55,9 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "python_homeassistant_analytics" ];

  meta = with lib; {
+    description = "Asynchronous Python client for Home Assistant Analytics";
    changelog = "https://github.com/joostlek/python-homeassistant-analytics/releases/tag/v${version}";
-    description = "Asynchronous Python client for Homeassistant Analytics";
-    homepage = "https://github.com/joostlek/python-homeassistant-analytics
-";
+    homepage = "https://github.com/joostlek/python-homeassistant-analytics";
    license = licenses.mit;
    maintainers = with maintainers; [ jamiemagee ];
  };
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "pytile";
-  version = "2023.12.0";
+  version = "2024.12.0";
  format = "pyproject";

  disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "bachya";
    repo = "pytile";
    rev = "refs/tags/${version}";
-    hash = "sha256-oHOeEaqkh+RjhpdQ5v1tFhaS6gUzl8UzDGnPLNRY90c=";
+    hash = "sha256-6vcFGMj7E1xw01yHOq/WDpqMxd7OIiRBCmw5LForAR0=";
  };

  nativeBuildInputs = [ poetry-core ];
@@ -33,7 +33,7 @@

 buildPythonPackage rec {
  pname = "rasterio";
-  version = "1.4.2";
+  version = "1.4.3";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@@ -41,8 +41,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "rasterio";
    repo = "rasterio";
-    rev = "refs/tags/${version}";
-    hash = "sha256-YGSd0IG6TWnHmDiVEE3F2KNQ4dXJhkPqAJsIrWyuHos=";
+    tag = version;
+    hash = "sha256-InejYBRa4i0E2GxEWbtBpaErtcoYrhtypAlRtMlUoDk=";
  };

  nativeBuildInputs = [
@@ -3,6 +3,8 @@
  buildPythonPackage,
  pythonOlder,
  fetchFromGitHub,
+  fetchpatch,
+
  # build-system
  setuptools,
  # dependencies
@@ -31,6 +33,14 @@ buildPythonPackage rec {
    hash = "sha256-0YsGu8JuYrb6lWuC3RQ4jCkulxxFpnd0eaRajCwtFHo=";
  };

+  patches = [
+    # https://github.com/corteva/rioxarray/issues/836
+    (fetchpatch {
+      url = "https://github.com/corteva/rioxarray/commit/6294b7468587b8c243ee4f561a90ca8de90ea0f1.patch";
+      hash = "sha256-0IvDAr17ymMN1J2vC1U3z/2N1Np1RaRjCAODZthQz8g=";
+    })
+  ];
+
  build-system = [ setuptools ];

  dependencies = [
@@ -2,32 +2,34 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  isPy3k,
  cython,
+  setuptools,
  numpy,
  srsly,
 }:

 buildPythonPackage rec {
  pname = "spacy-pkuseg";
-  version = "0.0.33";
-  format = "setuptools";
-
-  disabled = !isPy3k;
+  version = "1.0.0";
+  pyproject = true;

  src = fetchPypi {
    inherit version;
    pname = "spacy_pkuseg";
-    hash = "sha256-8TFWrE4ERg8aw17f0DbplwTbutGa0KObBsNA+AKinmI=";
+    hash = "sha256-M1MeqOE/wJ6+O0C9l+hNB8zVof5n+o6EFzdpolrAMVg=";
  };

  # Does not seem to have actual tests, but unittest discover
  # recognizes some non-tests as tests and fails.
  doCheck = false;

-  nativeBuildInputs = [ cython ];
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];

-  propagatedBuildInputs = [
+  dependencies = [
    numpy
    srsly
  ];
@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "stripe";
-  version = "11.3.0";
+  version = "11.4.1";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-mOYl2d26vOzwJmaGcWlpbhE9nquieXn7MQp6jf1ECXw=";
+    hash = "sha256-fd0lG2ItSQ/lfXhIeFXcn02VsbsRNgfoH9N3A3oTPVo=";
  };

  build-system = [ setuptools ];
@@ -14,12 +14,12 @@ let
  # kernel config in the xanmod version commit
  variants = {
    lts = {
-      version = "6.6.67";
-      hash = "sha256-ePZAs+TWroyDSKx+ubZeNRr/lA8zuqp3m0Cs5yE18JE=";
+      version = "6.6.68";
+      hash = "sha256-fuPJgbDJ2PLB74fy/WFnhGdTEKJMeNwsbWm6RVM4Jes=";
    };
    main = {
-      version = "6.12.6";
-      hash = "sha256-Pao4tS3SjllOkRrH+k/+9JqLIEOrNqJTFlHZ4cp2OF8=";
+      version = "6.12.7";
+      hash = "sha256-sM9XINKBGRcO29o3kEIKM03t/XojG9nYLirQSBii8Y4=";
    };
  };

@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bzip3";
-  version = "1.5.0";
+  version = "1.5.1";

  outputs = [
    "bin"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "kspalaiologos";
    repo = "bzip3";
    rev = finalAttrs.version;
-    hash = "sha256-KEx21v1cGANCbTjFmI62QAxFoEhzM3KkxBriVXnxvEk=";
+    hash = "sha256-QMvK0MP0Zx2mQfvYvrOjGV1Lo/ObO5diXcibmwtQATk=";
  };

  postPatch = ''