From 5f366ca174940410ca5f12663f09a94c8f7af072 Mon Sep 17 00:00:00 2001 From: niten Date: Mon, 2 Feb 2026 11:08:06 -0800 Subject: [PATCH] Update library deps to use preppedSrc and regenerate deps-lock.json --- flake.lock | 149 +++++++++++++++++++++++++++-------------------------- flake.nix | 2 +- 2 files changed, 76 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index f2c931f..7cd47b2 100644 --- a/flake.lock +++ b/flake.lock @@ -11,15 +11,16 @@ ] }, "locked": { - "lastModified": 1720000076, - "narHash": "sha256-RZDioKh4VEd6S+ToTcMBmIpI4pWUKREUOlaVrOpIQe4=", + "lastModified": 1732066389, + "narHash": "sha256-6z9KTXwDQN14vljs5USgb4Pr8BYk46Q2yhkcdNx9QEE=", "owner": "jlesquembre", "repo": "clj-nix", - "rev": "623084fc09e0ceab1ab40860ae6a3d27d50a624d", + "rev": "95f26552686259f64685569e6966cdefebb0a6a9", "type": "github" }, "original": { "owner": "jlesquembre", + "ref": "0.4.0", "repo": "clj-nix", "type": "github" } @@ -56,11 +57,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1685699489, - "narHash": "sha256-QPkF7QiE0dmiqUpHmX7mBIhMCgbnZDjJG5bQ6702AOs=", + "lastModified": 1727456190, + "narHash": "sha256-aZvIrzSQQ6ATmAHeitqchAD2DTLcWV+PU8qs80fq3lA=", "owner": "hlolli", "repo": "clj2nix", - "rev": "66ae6a15c3aab59cb31523e825e5270be082bfe4", + "rev": "4a968eca5d368b5c818081333a64a3eb93e50d24", "type": "github" }, "original": { @@ -73,7 +74,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "utils": "utils_4" }, "locked": { @@ -92,7 +93,6 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "fudo-clojure", "helpers", @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -204,36 +204,18 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fudo-clojure": { "inputs": { "helpers": "helpers", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils_3" }, "locked": { - "lastModified": 1720833084, - "narHash": "sha256-BP9fU2cv2E8iGJyJ42nXkhEjMzvpzsehMAf45E6fJFo=", + "lastModified": 1770058369, + "narHash": "sha256-KGVIBpZuA/epaJSFwaGRx8GaZFEzRNjMRSc7o4TQ8XA=", "owner": "fudoniten", "repo": "fudo-clojure", - "rev": "aa7da4169fbff2f11bac674b0c93ef0b0ef77b0f", + "rev": "65bf45b72f783fe5c962c9d413685fbc0cd69779", "type": "github" }, "original": { @@ -291,6 +273,7 @@ "inputs": { "clj-nix": "clj-nix", "clj2nix": "clj2nix", + "nix2container": "nix2container", "nixpkgs": [ "fudo-clojure", "nixpkgs" @@ -298,11 +281,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1720832856, - "narHash": "sha256-V3DbkCkofYElCjkJ7zl2Y4ZVxvnaLrApqlky1W5wi3k=", + "lastModified": 1770058348, + "narHash": "sha256-jqtOJhEOUCjJ8RoLkfejOlUyzSAHr6YHYwGXoUSnW5c=", "owner": "fudoniten", "repo": "fudo-nix-helpers", - "rev": "2d9209cd1e01bad4106600c86cdf58813f06d9aa", + "rev": "89ad3f7ca2cff121475794bde7c6e29e0e5169d1", "type": "github" }, "original": { @@ -315,7 +298,7 @@ "inputs": { "clj-nix": "clj-nix_2", "clj2nix": "clj2nix_2", - "nix2container": "nix2container", + "nix2container": "nix2container_2", "nixpkgs": [ "nixpkgs" ], @@ -346,11 +329,11 @@ ] }, "locked": { - "lastModified": 1719828256, - "narHash": "sha256-yzSm+tjU5wizDEn0KkRKMLmXJm2FmfDOPFZBrqb7Zkg=", + "lastModified": 1728229178, + "narHash": "sha256-p5Fx880uBYstIsbaDYN7sECJT11oHxZQKtHgMAVblWA=", "owner": "jlesquembre", "repo": "nix-fetcher-data", - "rev": "2be1f0bd141071f5315010d38a2e87b1e58e7e0c", + "rev": "f3a73c34d28db49ef90fd7872a142bfe93120e55", "type": "github" }, "original": { @@ -384,7 +367,25 @@ }, "nix2container": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1767430085, + "narHash": "sha256-SiXJ6xv4pS2MDUqfj0/mmG746cGeJrMQGmoFgHLS25Y=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "66f4b8a47e92aa744ec43acbb5e9185078983909", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_2": { + "inputs": { + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1767430085, @@ -441,20 +442,35 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720691131, - "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", + "lastModified": 1767028467, + "narHash": "sha256-7G+2aXClSMaTY1ogpX14CAxjRsvyVzpE0GRwL71WO7g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", + "rev": "1cabc318c11299f07ca53e3cb719854682fe6eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1769900590, + "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-25.11", "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1673785507, "narHash": "sha256-EPUT8yVdvJhhjhbgnFWXXd4IUPKSOmww2+z4AmOdyPI=", @@ -469,7 +485,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1767028467, "narHash": "sha256-7G+2aXClSMaTY1ogpX14CAxjRsvyVzpE0GRwL71WO7g=", @@ -484,7 +500,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1720691131, "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", @@ -503,7 +519,7 @@ "inputs": { "fudo-clojure": "fudo-clojure", "helpers": "helpers_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "utils": "utils_6" } }, @@ -567,21 +583,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1667395993, @@ -599,14 +600,14 @@ }, "utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -617,14 +618,14 @@ }, "utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -650,7 +651,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -668,7 +669,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 4cd4b6a..1f937c8 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ cljLibs = { "org.fudo/fudo-clojure" = - fudo-clojure.packages."${system}".fudo-clojure; + fudo-clojure.packages."${system}".fudo-clojure.preppedSrc; }; in { packages = {