From 827afeba4bf346494ee3349f7131f82d78d0ae20 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 24 Apr 2025 18:29:59 +0200 Subject: [PATCH 1/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'devshell': 'github:numtide/devshell/f7795ede5b02664b57035b3b757876703e2c3eac?narHash=sha256-tO3HrHriyLvipc4xr%2BEwtdlo7wM1OjXNjlWRgmM7peY%3D' (2024-12-31) → 'github:numtide/devshell/7c9e793ebe66bcba8292989a68c0419b737a22a0?narHash=sha256-kWNaq6wQUbUMlPgw8Y%2B9/9wP0F8SHkjy24/mN3UAppg%3D' (2025-03-08) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd?narHash=sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm%2BzmZ7vxbJdo%3D' (2025-02-01) → 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5?narHash=sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY%3D' (2025-04-01) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/cae08186393d9736f2b3a5d30b2c7efe5569e337?narHash=sha256-cGd3JaoHeN7g%2BqLrvvwR%2B1RbJ0oTJp3LiHDL3OlJJUg%3D' (2025-01-15) → 'github:hercules-ci/hercules-ci-agent/575d191bc795161460963449b5c7f530f3a2015d?narHash=sha256-KXjse9a2V80go6eOEHkc8VyqEovdW85q2U3a67HVs7Q%3D' (2025-04-24) • Updated input 'hercules-ci-agent/nixpkgs': 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3?narHash=sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ%3D' (2025-01-13) → 'github:NixOS/nixpkgs/c8cd81426f45942bb2906d5ed2fe21d2f19d95b7?narHash=sha256-tzCdyIJj9AjysC3OuKA%2BtMD/kDEDAF9mICPDU7ix0JA%3D' (2025-04-08) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/6d1b6d5d59758b4f5f05745f774fc13cdc59da43?narHash=sha256-oJN/yvRL7G0WlR/hTkQIjFbPkzCV%2BsFnNB/38Tb9RL4%3D' (2025-01-30) → 'github:hercules-ci/hercules-ci-effects/5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e?narHash=sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY%3D' (2025-04-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ceaea203f3ae1787b1bd13f021f686391696fc5b?narHash=sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU%3D' (2025-02-05) → 'github:NixOS/nixpkgs/4975ac49a527b505803958595fcb191c9e889f60?narHash=sha256-%2BkHgeD%2B3%2BWZZcOaIsS6XwQWb%2BqbYYWYXzoEjdmdW6OY%3D' (2025-04-24) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 65312ac0..20af87ad 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -304,11 +304,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1736919270, - "narHash": "sha256-cGd3JaoHeN7g+qLrvvwR+1RbJ0oTJp3LiHDL3OlJJUg=", + "lastModified": 1745468238, + "narHash": "sha256-KXjse9a2V80go6eOEHkc8VyqEovdW85q2U3a67HVs7Q=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "cae08186393d9736f2b3a5d30b2c7efe5569e337", + "rev": "575d191bc795161460963449b5c7f530f3a2015d", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1738237977, - "narHash": "sha256-oJN/yvRL7G0WlR/hTkQIjFbPkzCV+sFnNB/38Tb9RL4=", + "lastModified": 1744693102, + "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "6d1b6d5d59758b4f5f05745f774fc13cdc59da43", + "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -561,11 +561,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1738758495, - "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=", + "lastModified": 1745469902, + "narHash": "sha256-+kHgeD+3+WZZcOaIsS6XwQWb+qbYYWYXzoEjdmdW6OY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b", + "rev": "4975ac49a527b505803958595fcb191c9e889f60", "type": "github" }, "original": { From f23ed6811ea75fe2a62213faf9e2bb59202e64b4 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 24 Apr 2025 18:35:55 +0200 Subject: [PATCH 2/9] cluster/services/ipfs: use upstream ipfs-cluster module --- cluster/services/ipfs/cluster.nix | 4 - modules/ipfs-cluster/default.nix | 169 ------------------------------ modules/part.nix | 1 - 3 files changed, 174 deletions(-) delete mode 100644 modules/ipfs-cluster/default.nix diff --git a/cluster/services/ipfs/cluster.nix b/cluster/services/ipfs/cluster.nix index f8d06a7b..ed349e91 100644 --- a/cluster/services/ipfs/cluster.nix +++ b/cluster/services/ipfs/cluster.nix @@ -11,10 +11,6 @@ let pinSvcSocket = "/run/ipfs-cluster/ipfs-pinning-service-api.sock"; proxySocket = "/run/ipfs-cluster/ipfs-api-proxy.sock"; in { - imports = [ - depot.nixosModules.ipfs-cluster - ]; - system.ascensions.ipfs-cluster = { requiredBy = [ "ipfs-cluster.service" ]; incantations = i: [ ]; diff --git a/modules/ipfs-cluster/default.nix b/modules/ipfs-cluster/default.nix deleted file mode 100644 index 790354a4..00000000 --- a/modules/ipfs-cluster/default.nix +++ /dev/null @@ -1,169 +0,0 @@ -{ config, lib, pkgs, options, ... }: -with lib; -let - cfg = config.services.ipfs-cluster; - opt = options.services.ipfs-cluster; - - # secret is by envvar, not flag - initFlags = toString [ - (optionalString (cfg.initPeers != [ ]) "--peers") - (lib.strings.concatStringsSep "," cfg.initPeers) - ]; - - serviceJson = builtins.toFile "ipfs-cluster-service.json" (builtins.toJSON cfg.settings); - - pinSvcBasicAuthFile = if cfg.pinSvcBasicAuthFile != null then - cfg.pinSvcBasicAuthFile - else - "/dev/null"; -in { - - ###### interface - - options = { - - services.ipfs-cluster = { - - enable = mkEnableOption - "Pinset orchestration for IPFS - requires ipfs daemon to be useful"; - - package = mkOption { - type = types.package; - default = pkgs.ipfs-cluster; - description = "ipfs-cluster package"; - }; - - user = mkOption { - type = types.str; - default = "ipfs"; - description = "User under which the ipfs-cluster daemon runs."; - }; - - group = mkOption { - type = types.str; - default = "ipfs"; - description = "Group under which the ipfs-cluster daemon runs."; - }; - - consensus = mkOption { - type = types.enum [ "raft" "crdt" ]; - description = "Consensus protocol - 'raft' or 'crdt'. https://cluster.ipfs.io/documentation/guides/consensus/"; - }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/ipfs-cluster"; - description = "The data dir for ipfs-cluster."; - }; - - initPeers = mkOption { - type = types.listOf types.str; - default = [ ]; - description = "Peer addresses to initialize with on first run."; - }; - - openSwarmPort = mkOption { - type = types.bool; - description = "Open swarm port, secured by the cluster secret. This does not expose the API or proxy. https://cluster.ipfs.io/documentation/guides/security/"; - }; - - secretFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - File containing the cluster secret in the format of EnvironmentFile as described by - systemd.exec - 5. For example: - - CLUSTER_SECRET=... - - - if null, a new secret will be generated on first run. - A secret in the correct format can also be generated by: openssl rand -hex 32 - ''; - }; - - settings = mkOption { - type = types.attrs; - default = {}; - description = "Configuration to be merged into service.json"; - }; - - pinSvcBasicAuthFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - JSON file containing basic auth credentials for the pinning service API. - - Use the following format: - - { - "username1": "password1", - "username2": "password2" - } - - ''; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - - - systemd.tmpfiles.rules = - [ "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -" ]; - - systemd.services.ipfs-cluster-init = { - path = [ "/run/wrappers" cfg.package ]; - environment.IPFS_CLUSTER_PATH = cfg.dataDir; - wantedBy = [ "default.target" ]; - - strictMounts = [ cfg.dataDir ]; - - serviceConfig = { - # "" clears exec list (man systemd.service -> execStart) - ExecStart = [ - "" - "${cfg.package}/bin/ipfs-cluster-service init --consensus ${cfg.consensus} ${initFlags}" - ]; - Type = "oneshot"; - RemainAfterExit = true; - User = cfg.user; - Group = cfg.group; - } // optionalAttrs (cfg.secretFile != null) { - EnvironmentFile = cfg.secretFile; - }; - unitConfig.ConditionDirectoryNotEmpty = "!${cfg.dataDir}"; - }; - - systemd.services.ipfs-cluster = { - environment.IPFS_CLUSTER_PATH = cfg.dataDir; - wantedBy = [ "multi-user.target" ]; - - strictMounts = [ cfg.dataDir ]; - - wants = [ "ipfs-cluster-init.service" ]; - after = [ "ipfs-cluster-init.service" ]; - - preStart = '' - ${pkgs.jq}/bin/jq --slurp '.[0] * .[1] * { api: { pinsvcapi: { basic_auth_credentials: .[2] } } }' \ - '${cfg.dataDir}/service.json' ${serviceJson} '${pinSvcBasicAuthFile}' \ - | install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin '${cfg.dataDir}/.service.json.new' - mv '${cfg.dataDir}/.service.json.new' '${cfg.dataDir}/service.json' - ''; - - serviceConfig = { - Type = "notify"; - RuntimeDirectory = "ipfs-cluster"; - ExecStart = - [ "" "${cfg.package}/bin/ipfs-cluster-service daemon" ]; - User = cfg.user; - Group = cfg.group; - }; - }; - networking.firewall.allowedTCPPorts = mkIf cfg.openSwarmPort [ 9096 ]; - }; -} diff --git a/modules/part.nix b/modules/part.nix index 1ce9db62..3a6bd6a6 100644 --- a/modules/part.nix +++ b/modules/part.nix @@ -15,7 +15,6 @@ in fail2ban = ./fail2ban; hyprspace = ./hyprspace; ipfs = ./ipfs; - ipfs-cluster = ./ipfs-cluster; maintenance = ./maintenance; minimal = ./minimal; motd = ./motd; From a1238957d915a8354f75102185812468c678cd33 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 24 Apr 2025 18:41:48 +0200 Subject: [PATCH 3/9] packages/npins: use upstream version --- packages/build-support/default.nix | 2 + .../make-npins-source/default.nix} | 0 packages/projects.nix | 2 +- packages/tools/npins/default.nix | 44 ------------------- packages/tools/npins/sources.json | 19 -------- 5 files changed, 3 insertions(+), 64 deletions(-) rename packages/{tools/npins/source.nix => build-support/make-npins-source/default.nix} (100%) delete mode 100644 packages/tools/npins/default.nix delete mode 100644 packages/tools/npins/sources.json diff --git a/packages/build-support/default.nix b/packages/build-support/default.nix index b6e1e4c6..c70a70cc 100644 --- a/packages/build-support/default.nix +++ b/packages/build-support/default.nix @@ -13,6 +13,8 @@ hydrateAssetDirectory = pkgs.callPackage ./hydrate-asset-directory { inherit fetchAsset; }; + + mkNpinsSource = pkgs.callPackage ./make-npins-source { }; }; }; } diff --git a/packages/tools/npins/source.nix b/packages/build-support/make-npins-source/default.nix similarity index 100% rename from packages/tools/npins/source.nix rename to packages/build-support/make-npins-source/default.nix diff --git a/packages/projects.nix b/packages/projects.nix index 580cb174..95378ac9 100644 --- a/packages/projects.nix +++ b/packages/projects.nix @@ -29,7 +29,7 @@ ipfs = pkgs.callPackage ./networking/ipfs { }; - npins = pkgs.callPackage ./tools/npins { + npins = pkgs.npins.override { nix = nix-super; nix-prefetch-git = pkgs.nix-prefetch-git.override { nix = nix-super; diff --git a/packages/tools/npins/default.nix b/packages/tools/npins/default.nix deleted file mode 100644 index 7eaf1039..00000000 --- a/packages/tools/npins/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-gitignore -, makeWrapper -, stdenv -, darwin -, callPackage - - # runtime dependencies -, nix # for nix-prefetch-url -, nix-prefetch-git -, git # for git ls-remote -}: - -let - runtimePath = lib.makeBinPath [ nix nix-prefetch-git git ]; - sources = (builtins.fromJSON (builtins.readFile ./sources.json)).pins; -in rustPlatform.buildRustPackage rec { - pname = "npins"; - inherit (src) version; - src = passthru.mkSource sources.npins; - - cargoHash = "sha256-aIpGTTLQ+HfLf5i4VON7Rq1xNl4rA+7TZ5yF1Ov8lmc="; - - buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); - nativeBuildInputs = [ makeWrapper ]; - - # (Almost) all tests require internet - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/npins --prefix PATH : "${runtimePath}" - ''; - - meta = with lib; { - description = "Simple and convenient dependency pinning for Nix"; - homepage = "https://github.com/andir/npins"; - license = licenses.eupl12; - maintainers = with maintainers; [ piegames ]; - }; - - passthru.mkSource = callPackage ./source.nix {}; -} diff --git a/packages/tools/npins/sources.json b/packages/tools/npins/sources.json deleted file mode 100644 index 0481abe3..00000000 --- a/packages/tools/npins/sources.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pins": { - "npins": { - "type": "GitRelease", - "repository": { - "type": "GitHub", - "owner": "andir", - "repo": "npins" - }, - "pre_releases": false, - "version_upper_bound": null, - "version": "0.1.0", - "revision": "5c9253ff6010f435ab73fbe1e50ae0fdca0ec07b", - "url": "https://api.github.com/repos/andir/npins/tarball/0.1.0", - "hash": "019fr9xsirld8kap75k18in3krkikqhjn4mglpy3lyhbhc5n1kh6" - } - }, - "version": 2 -} From 6c463783ece03ba9c536dea3eec6febc0352f58a Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 24 Apr 2025 18:46:28 +0200 Subject: [PATCH 4/9] packages: replace npins.mkSource with mkNpinsSource --- packages/data/stevenblack/default.nix | 4 ++-- packages/projects.nix | 17 +++++++++++++---- packages/web-apps/excalidraw/default.nix | 4 ++-- packages/web-apps/searxng/default.nix | 4 ++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/packages/data/stevenblack/default.nix b/packages/data/stevenblack/default.nix index 84f38582..57e793e1 100644 --- a/packages/data/stevenblack/default.nix +++ b/packages/data/stevenblack/default.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, npins, pins }: +{ stdenvNoCC, mkNpinsSource, pins }: let - src = npins.mkSource pins.stevenblack-hosts; + src = mkNpinsSource pins.stevenblack-hosts; in stdenvNoCC.mkDerivation { diff --git a/packages/projects.nix b/packages/projects.nix index 95378ac9..f4cf4a7f 100644 --- a/packages/projects.nix +++ b/packages/projects.nix @@ -10,7 +10,7 @@ ./websites/landing/project.nix ./websites/stop-using-nix-env/project.nix ]; - perSystem = { config, filters, pkgs, self', ... }: + perSystem = { builders, config, filters, pkgs, self', ... }: let inherit (self'.packages) nix-super; @@ -23,7 +23,10 @@ consul = pkgs.callPackage ./servers/consul { }; - excalidraw = pkgs.callPackage ./web-apps/excalidraw { inherit pins; }; + excalidraw = pkgs.callPackage ./web-apps/excalidraw { + inherit pins; + inherit (builders) mkNpinsSource; + }; graf = pkgs.callPackage ./tools/graf { }; @@ -47,9 +50,15 @@ nix = nix-super; }; - searxng = pkgs.callPackage ./web-apps/searxng { inherit pins; }; + searxng = pkgs.callPackage ./web-apps/searxng { + inherit pins; + inherit (builders) mkNpinsSource; + }; - stevenblack-hosts = pkgs.callPackage ./data/stevenblack { inherit pins; }; + stevenblack-hosts = pkgs.callPackage ./data/stevenblack { + inherit pins; + inherit (builders) mkNpinsSource; + }; void = pkgs.callPackage ./tools/void { }; }; diff --git a/packages/web-apps/excalidraw/default.nix b/packages/web-apps/excalidraw/default.nix index 4611ec94..6735be0e 100644 --- a/packages/web-apps/excalidraw/default.nix +++ b/packages/web-apps/excalidraw/default.nix @@ -3,7 +3,7 @@ , mkYarnPackage , fetchYarnDeps , fixup_yarn_lock -, npins +, mkNpinsSource , pins }: @@ -18,7 +18,7 @@ let REACT_APP_FIREBASE_CONFIG = ""; REACT_APP_GOOGLE_ANALYTICS_ID = ""; - src = npins.mkSource excalidraw; + src = mkNpinsSource excalidraw; packageJSON = "${excalidraw}/package.json"; diff --git a/packages/web-apps/searxng/default.nix b/packages/web-apps/searxng/default.nix index d9845b80..1ee93593 100644 --- a/packages/web-apps/searxng/default.nix +++ b/packages/web-apps/searxng/default.nix @@ -1,4 +1,4 @@ -{ lib, nixosTests, python3, python3Packages, npins, pins }: +{ python3, python3Packages, mkNpinsSource, pins }: let pin = pins.searxng; @@ -9,7 +9,7 @@ toPythonModule (buildPythonApplication rec { pname = "searxng"; version = "1.0.0pre_${builtins.substring 0 7 pin.revision}"; - src = npins.mkSource pins.searxng; + src = mkNpinsSource pins.searxng; postPatch = '' sed -i \ From 5c185fb362e71f113418f5109f1438fca2ca1384 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 24 Apr 2025 18:51:25 +0200 Subject: [PATCH 5/9] packages/keycloak: jre -> jre_headless --- packages/patched-derivations.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/patched-derivations.nix b/packages/patched-derivations.nix index 0d602e8b..66c1cd9a 100644 --- a/packages/patched-derivations.nix +++ b/packages/patched-derivations.nix @@ -50,7 +50,7 @@ super: rec { kanidm = patch super.kanidm "patches/base/kanidm"; keycloak = super.keycloak.override { - jre = jre17_standard; + jre_headless = jre17_standard; }; postgresql = super.postgresql_14; From 60ccae1bc1f6d73dc978eaa6cf2900581d0c48cf Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 24 Apr 2025 18:55:01 +0200 Subject: [PATCH 6/9] packages/npins: don't override nix-prefetch-git --- packages/projects.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/projects.nix b/packages/projects.nix index f4cf4a7f..e1fc4d57 100644 --- a/packages/projects.nix +++ b/packages/projects.nix @@ -34,9 +34,6 @@ npins = pkgs.npins.override { nix = nix-super; - nix-prefetch-git = pkgs.nix-prefetch-git.override { - nix = nix-super; - }; }; openbao = pkgs.callPackage ./projects/openbao { }; From abfe6dfd0fa4baa900d04b4a4232516a2dcb6712 Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Fri, 25 Apr 2025 02:19:31 +0000 Subject: [PATCH 7/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4975ac49a527b505803958595fcb191c9e889f60?narHash=sha256-%2BkHgeD%2B3%2BWZZcOaIsS6XwQWb%2BqbYYWYXzoEjdmdW6OY%3D' (2025-04-24) → 'github:NixOS/nixpkgs/e6d927fcfdc83d09abf2a73afefa36728f7eb579?narHash=sha256-AXJKfzKwIQBnAApTaI%2BkzOZpJ/QOBJhR0ofYeR3F8sE%3D' (2025-04-24) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 20af87ad..a0aaae57 100644 --- a/flake.lock +++ b/flake.lock @@ -561,11 +561,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745469902, - "narHash": "sha256-+kHgeD+3+WZZcOaIsS6XwQWb+qbYYWYXzoEjdmdW6OY=", + "lastModified": 1745514233, + "narHash": "sha256-AXJKfzKwIQBnAApTaI+kzOZpJ/QOBJhR0ofYeR3F8sE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4975ac49a527b505803958595fcb191c9e889f60", + "rev": "e6d927fcfdc83d09abf2a73afefa36728f7eb579", "type": "github" }, "original": { From ec2e33c9749fd849fde10b6d25139e12a6af31a1 Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Fri, 2 May 2025 02:19:22 +0000 Subject: [PATCH 8/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/e600439ec4c273cf11e06fe4d9d906fb98fa097c?narHash=sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA%3D' (2025-01-15) → 'github:ryantm/agenix/96e078c646b711aee04b82ba01aefbff87004ded?narHash=sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus%3D' (2025-04-26) • Updated input 'agenix/darwin': 'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d?narHash=sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0%3D' (2023-11-24) → 'github:lnl7/nix-darwin/43975d782b418ebf4969e9ccba82466728c2851b?narHash=sha256-dyN%2BteG9G82G%2Bm%2BPX/aSAagkC%2BvUv0SgUw3XkPhQodQ%3D' (2025-04-12) • Updated input 'agenix/home-manager': 'github:nix-community/home-manager/3bfaacf46133c037bb356193bd2f1765d9dc82c1?narHash=sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE%3D' (2023-12-20) → 'github:nix-community/home-manager/abfad3d2958c9e6300a883bd443512c55dfeb1be?narHash=sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs%3D' (2025-04-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e6d927fcfdc83d09abf2a73afefa36728f7eb579?narHash=sha256-AXJKfzKwIQBnAApTaI%2BkzOZpJ/QOBJhR0ofYeR3F8sE%3D' (2025-04-24) → 'github:NixOS/nixpkgs/a85a037d481695e6f16053c5b9079a8cb0d50d77?narHash=sha256-C%2BrTQHGJ0cqQ8kv02rKWuu4EhJHugSYnN61zMRfMKuw%3D' (2025-05-01) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a0aaae57..3353e983 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -561,11 +561,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745514233, - "narHash": "sha256-AXJKfzKwIQBnAApTaI+kzOZpJ/QOBJhR0ofYeR3F8sE=", + "lastModified": 1746122609, + "narHash": "sha256-C+rTQHGJ0cqQ8kv02rKWuu4EhJHugSYnN61zMRfMKuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6d927fcfdc83d09abf2a73afefa36728f7eb579", + "rev": "a85a037d481695e6f16053c5b9079a8cb0d50d77", "type": "github" }, "original": { From 646ff8260256d0d0f088019777a2639dd8d04d61 Mon Sep 17 00:00:00 2001 From: Hercules CI Effects Date: Fri, 9 May 2025 02:19:45 +0000 Subject: [PATCH 9/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/575d191bc795161460963449b5c7f530f3a2015d?narHash=sha256-KXjse9a2V80go6eOEHkc8VyqEovdW85q2U3a67HVs7Q%3D' (2025-04-24) → 'github:hercules-ci/hercules-ci-agent/bf467c0fd13ceb3118bab8f41424c3ceff6e6fcb?narHash=sha256-gQLQNUfXX4WYmeHSzdqgOVVw8RUyGuDsfnrV2gOPk28%3D' (2025-05-07) • Updated input 'hercules-ci-agent/haskell-flake': 'github:srid/haskell-flake/74210fa80a49f1b6f67223debdbf1494596ff9f2?narHash=sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08%3D' (2023-05-22) → 'github:srid/haskell-flake/c1d83e45832262d0d6fd8b295a0af885c256269b?narHash=sha256-YwPXipPfEwo0moneb%2Bu2M6gB0SgkdvcLUrN2iTLGJXE%3D' (2025-05-06) • Updated input 'hercules-ci-agent/nixpkgs': 'github:NixOS/nixpkgs/c8cd81426f45942bb2906d5ed2fe21d2f19d95b7?narHash=sha256-tzCdyIJj9AjysC3OuKA%2BtMD/kDEDAF9mICPDU7ix0JA%3D' (2025-04-08) → 'github:NixOS/nixpkgs/3730d8a308f94996a9ba7c7138ede69c1b9ac4ae?narHash=sha256-7%2BpG1I9jvxNlmln4YgnlW4o%2Bw0TZX24k688mibiFDUE%3D' (2025-05-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a85a037d481695e6f16053c5b9079a8cb0d50d77?narHash=sha256-C%2BrTQHGJ0cqQ8kv02rKWuu4EhJHugSYnN61zMRfMKuw%3D' (2025-05-01) → 'github:NixOS/nixpkgs/2cd2decd3aebe7bff63c51b978c27a8e91bbab3d?narHash=sha256-gSNBS1kgNrovmVq%2B1U3mkTtue5TsFM3q7BoYPos1DLw%3D' (2025-05-08) --- flake.lock | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 3353e983..a37fae0f 100644 --- a/flake.lock +++ b/flake.lock @@ -281,16 +281,15 @@ }, "haskell-flake": { "locked": { - "lastModified": 1684780604, - "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=", + "lastModified": 1746524662, + "narHash": "sha256-YwPXipPfEwo0moneb+u2M6gB0SgkdvcLUrN2iTLGJXE=", "owner": "srid", "repo": "haskell-flake", - "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2", + "rev": "c1d83e45832262d0d6fd8b295a0af885c256269b", "type": "github" }, "original": { "owner": "srid", - "ref": "0.3.0", "repo": "haskell-flake", "type": "github" } @@ -304,11 +303,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745468238, - "narHash": "sha256-KXjse9a2V80go6eOEHkc8VyqEovdW85q2U3a67HVs7Q=", + "lastModified": 1746629742, + "narHash": "sha256-gQLQNUfXX4WYmeHSzdqgOVVw8RUyGuDsfnrV2gOPk28=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "575d191bc795161460963449b5c7f530f3a2015d", + "rev": "bf467c0fd13ceb3118bab8f41424c3ceff6e6fcb", "type": "github" }, "original": { @@ -513,11 +512,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -561,11 +560,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746122609, - "narHash": "sha256-C+rTQHGJ0cqQ8kv02rKWuu4EhJHugSYnN61zMRfMKuw=", + "lastModified": 1746726650, + "narHash": "sha256-gSNBS1kgNrovmVq+1U3mkTtue5TsFM3q7BoYPos1DLw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a85a037d481695e6f16053c5b9079a8cb0d50d77", + "rev": "2cd2decd3aebe7bff63c51b978c27a8e91bbab3d", "type": "github" }, "original": {