From 7800d6f4e9780ec41ca82f9bbbd578e3284c8892 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 22 Nov 2023 23:54:54 +0100 Subject: [PATCH 1/6] packages/searxng: 1.0.0pre_018b0a9 -> 1.0.0pre_e99ebb3 --- packages/sources/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 0fa0a55..f661cb8 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -34,9 +34,9 @@ "repo": "searxng" }, "branch": "master", - "revision": "018b0a93224218e16622e1f2463d6b1b2f6b4d16", - "url": "https://github.com/searxng/searxng/archive/018b0a93224218e16622e1f2463d6b1b2f6b4d16.tar.gz", - "hash": "1ya3hcir2y7z4jlx3aw83yfdz0i409r4x19siibq1nr4w45y6gfl" + "revision": "e99ebb3decd31019f52fdc79c1342e38a0c05358", + "url": "https://github.com/searxng/searxng/archive/e99ebb3decd31019f52fdc79c1342e38a0c05358.tar.gz", + "hash": "18yxl9f8z8q4bh2kb5za860dq0ik4pcgx3iim1sg0i888pbfxdpl" }, "stevenblack-hosts": { "type": "GitRelease", From c0ba4276d918d4cc87d721116fa8205e22363d50 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 22 Nov 2023 23:55:07 +0100 Subject: [PATCH 2/6] packages/stevenblack-hosts: 3.13.22 -> 3.14.28 --- packages/sources/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index f661cb8..27e40fd 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -47,10 +47,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "3.13.22", - "revision": "cb390ce10e72efd44a2f3ad1f994fce58ee0e74a", - "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.13.22", - "hash": "1knbhd5vg5lq96rz8q9rmdw43fkzgkrfxjy1kanj90azi5j4qp81" + "version": "3.14.28", + "revision": "2aa9e8334e47366e2083cc11ed0d92d7cdbe6a31", + "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.14.28", + "hash": "0fnp62rwrah2c11fzf0mlhwddbq89085x1nyavi0z8mbd62qh4wg" }, "tempo": { "type": "GitRelease", From 6d432278ce4372d777fbdd509d15dc602b274b13 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 22 Nov 2023 23:55:31 +0100 Subject: [PATCH 3/6] packages/excalidraw: 0.0.0+1184a8c -> 0.0.0+d1e4421 --- packages/sources/sources.json | 6 +++--- packages/web-apps/excalidraw/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 27e40fd..18ae980 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -22,9 +22,9 @@ "repo": "excalidraw" }, "branch": "master", - "revision": "1184a8c0e953312ff4a2b5beae467a1e11897477", - "url": "https://github.com/excalidraw/excalidraw/archive/1184a8c0e953312ff4a2b5beae467a1e11897477.tar.gz", - "hash": "1a8yf8iclmr36npc31z5sj3jlmxvcnzg80z7axpg387wig8zjrnc" + "revision": "d1e4421823913aacb353a5b52dcd158370bfa96a", + "url": "https://github.com/excalidraw/excalidraw/archive/d1e4421823913aacb353a5b52dcd158370bfa96a.tar.gz", + "hash": "1mrqpifskf5209y23h6kmvkzi6x0aizpm5jpdbcmqq2i6xmnp36h" }, "searxng": { "type": "Git", diff --git a/packages/web-apps/excalidraw/default.nix b/packages/web-apps/excalidraw/default.nix index e853d4c..98b93c3 100644 --- a/packages/web-apps/excalidraw/default.nix +++ b/packages/web-apps/excalidraw/default.nix @@ -27,7 +27,7 @@ let offlineCache = fetchYarnDeps { name = "excalidraw-yarn-cache-${builtins.hashString "sha256" (builtins.readFile "${excalidraw}/yarn.lock")}"; yarnLock = src + "/yarn.lock"; - hash = "sha256-PuMqjAFhl+IPnpZyOlRPFazQbU5yKHe2iQJNgq4Cvh0="; + hash = "sha256-ZUHhvVWj6wC91ebdX5k568Wg7rGlb9ixqJb2MUY1hkM="; }; configurePhase = '' From d8f58c6eff8fdea4de027cf02d13fcaf61a739b7 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 22 Nov 2023 23:55:39 +0100 Subject: [PATCH 4/6] packages/cinny: 2.2.6 -> 3.2.0 --- packages/sources/sources.json | 8 ++++---- packages/web-apps/cinny/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 18ae980..6056121 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -9,10 +9,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "v2.2.6", - "revision": "f6694031a1581af171ffe1658138dfcf344d6c6c", - "url": "https://api.github.com/repos/cinnyapp/cinny/tarball/v2.2.6", - "hash": "0zq26wpdh96clabw3nzmbv2fl6kiky39m6n843jap239mxpf1bqd" + "version": "v3.2.0", + "revision": "9ecb233763048c730d24ddacecc8c002d3c8fc89", + "url": "https://api.github.com/repos/cinnyapp/cinny/tarball/v3.2.0", + "hash": "17ndz0x5zws2y533c3wa80mhk0k5n1d4il9agv04aglpd75vn1n0" }, "excalidraw": { "type": "Git", diff --git a/packages/web-apps/cinny/default.nix b/packages/web-apps/cinny/default.nix index 39351e8..f5153a0 100644 --- a/packages/web-apps/cinny/default.nix +++ b/packages/web-apps/cinny/default.nix @@ -11,7 +11,7 @@ let src = fetchzip { name = "cinny-tarball-${version}"; url = "https://github.com/${repo.owner}/${repo.repo}/releases/download/${cinny.version}/cinny-${cinny.version}.tar.gz"; - sha256 = "sha256-5g8Xva0lIE2Ng/guPlcrEsddfliltBJqouPEIUMdIKE="; + sha256 = "sha256-4mOMVwwoR8NJVD7kikXAEN3kUAoH5hYHz0md0LYX7bo="; }; buildCommand = '' From 5efcf070a63eaa07cf8e16a5ea12ad77d7329d33 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 1 Dec 2023 02:19:56 +0100 Subject: [PATCH 5/6] checks/garage: sync on all jobs instead of just ascend-garage-layout --- packages/checks/garage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/checks/garage.nix b/packages/checks/garage.nix index 6b9e34c..8d4aefa 100644 --- a/packages/checks/garage.nix +++ b/packages/checks/garage.nix @@ -94,7 +94,7 @@ testers.runNixOSTest { with subtest("should apply new layout with ascension"): for node in nodes: - node.wait_until_succeeds('test "$(systemctl is-active ascend-garage-layout)" != activating') + node.wait_until_succeeds('test "$(systemctl list-jobs | wc -l)" -eq 1') for node in nodes: node.succeed("/run/current-system/specialisation/modifiedLayout/bin/switch-to-configuration test") From 21eafc3428b445ec3d5cbd42c0bc682f87265a79 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 1 Dec 2023 16:04:46 +0100 Subject: [PATCH 6/6] 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/daf42cb35b2dc614d1551e37f96406e4c4a2d3e4' (2023-10-08) → 'github:ryantm/agenix/13ac9ac6d68b9a0896e3d43a082947233189e247' (2023-11-29) • Updated input 'devshell': 'github:numtide/devshell/1aed986e3c81a4f6698e85a7452cbfcc4b31a36e' (2023-10-27) → 'github:numtide/devshell/7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51' (2023-11-24) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f76e870d64779109e41370848074ac4eaa1606ec' (2023-10-29) → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/e44538cf90ecd8173a6edf75f9a14364d3b9962f' (2023-10-29) → 'github:hercules-ci/hercules-ci-agent/6750a787c56e1a75b271d2113adb14d37f762d88' (2023-11-08) • Updated input 'hercules-ci-agent/nixpkgs': 'github:NixOS/nixpkgs/0fbe93c5a7cac99f90b60bdf5f149383daaa615f' (2023-07-02) → 'github:NixOS/nixpkgs/85f1ba3e51676fa8cc604a3d863d729026a6b8eb' (2023-11-04) • Updated input 'hercules-ci-effects': 'github:hercules-ci/hercules-ci-effects/300e0af24a1bbe32d115beb182efb01785582c45' (2023-10-24) → 'github:hercules-ci/hercules-ci-effects/31b6cd7569191bfcd0a548575b0e2ef953ed7d09' (2023-11-26) • Updated input 'nix-super': 'gitlab:max/nix-super/ba035e1ea339a97e6ba6a1dd79e0c0e334240234' (2023-10-15) → 'gitlab:max/nix-super/c076362db8b438c921d9bbe196ede50205f788c6' (2023-11-25) • Added input 'nix-super/libgit2': 'github:libgit2/libgit2/45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5' (2023-10-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/187ac4d3f3a63ac088a02a2b156e41f7bbe28480' (2023-10-27) → 'github:NixOS/nixpkgs/d2332963662edffacfddfad59ff4f709dde80ffe' (2023-11-30) --- flake.lock | 65 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 0fc53f8..e62fb5c 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1698410321, - "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", + "lastModified": 1700815693, + "narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=", "owner": "numtide", "repo": "devshell", - "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", + "rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1698579227, - "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f76e870d64779109e41370848074ac4eaa1606ec", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1698580029, - "narHash": "sha256-tIrIpD+su09pMg+0++6GxmWQtBr9N2JTUhAHRgW4Ezk=", + "lastModified": 1699447920, + "narHash": "sha256-HVcHwTCLqMW7cWKw0yyUGz2wU5Dz0v8dgclMVnTLA3U=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "e44538cf90ecd8173a6edf75f9a14364d3b9962f", + "rev": "6750a787c56e1a75b271d2113adb14d37f762d88", "type": "github" }, "original": { @@ -294,11 +294,11 @@ ] }, "locked": { - "lastModified": 1698165573, - "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=", + "lastModified": 1701009247, + "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "300e0af24a1bbe32d115beb182efb01785582c45", + "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", "type": "github" }, "original": { @@ -328,6 +328,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -415,6 +431,7 @@ "nix-super": { "inputs": { "flake-compat": "flake-compat_2", + "libgit2": "libgit2", "lowdown-src": "lowdown-src", "nixpkgs": [ "nixpkgs" @@ -425,11 +442,11 @@ }, "locked": { "host": "git.privatevoid.net", - "lastModified": 1697392285, - "narHash": "sha256-1IBnF9IuStUWoAKJ74HNhV46+9Cbf/yZP6h6hJOJ1Cg=", + "lastModified": 1700941252, + "narHash": "sha256-2c8miJcsG24YEtXOSjvgW0ES1ND5DpY+ymGPq3S56YE=", "owner": "max", "repo": "nix-super", - "rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234", + "rev": "c076362db8b438c921d9bbe196ede50205f788c6", "type": "gitlab" }, "original": { @@ -441,11 +458,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -457,11 +474,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1698445381, - "narHash": "sha256-0mNhGNWFEmaC6vy1KWhjiqyBSVpmYxCvuTZFQ7+R+50=", + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "187ac4d3f3a63ac088a02a2b156e41f7bbe28480", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", "type": "github" }, "original": {