Add fudo-clojure flake input and use preppedSrc for dependency injection

Update deps-lock.json to include fudo-clojure transitive dependencies.
This commit is contained in:
2026-02-02 11:13:20 -08:00
parent 0ae640487c
commit 6dde040de7
3 changed files with 400 additions and 13 deletions

View File

@@ -7,13 +7,6 @@
"rev": "dfb30dd6605cb6c0efc275e1df1736f6e90d4d73",
"git-dir": "https/github.com/cognitect-labs/test-runner",
"hash": "sha256-PUNd+dHJNPTKno59YI27wpehyULYPvSyCQDjVIadKJ4="
},
{
"lib": "org.fudo/fudo-clojure",
"url": "https://git.fudo.org/fudo-public/fudo-clojure.git",
"rev": "5fd28094e18281ff409050fb1b0dda94b76671ed",
"git-dir": "https/git.fudo.org/fudo-public/fudo-clojure",
"hash": "sha256-zwX2KckXGRDOW1eww8Kr/iE/M2JeXISKU44R66I0vlY="
}
],
"mvn-deps": [
@@ -322,6 +315,16 @@
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
},
{
"mvn-path": "commons-net/commons-net/3.10.0/commons-net-3.10.0.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-IjDuxE70uBEuoJy+tt6CaXer55LmJ87idw41yow53OE="
},
{
"mvn-path": "commons-net/commons-net/3.10.0/commons-net-3.10.0.pom",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-CF86fYS5o1C1toQGhjkL5ELy6Qct6NHpzMj/08mx6qo="
},
{
"mvn-path": "io/github/clojure/tools.build/0.10.6/tools.build-0.10.6.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
@@ -397,6 +400,16 @@
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
},
{
"mvn-path": "less-awful-ssl/less-awful-ssl/1.0.6/less-awful-ssl-1.0.6.jar",
"mvn-repo": "https://repo.clojars.org/",
"hash": "sha256-La08mFg/k/YWbpQ6BoMI0kwnQoMC3Ug9p1LibdvPkz0="
},
{
"mvn-path": "less-awful-ssl/less-awful-ssl/1.0.6/less-awful-ssl-1.0.6.pom",
"mvn-repo": "https://repo.clojars.org/",
"hash": "sha256-/WwwI8r1uJlRAO0Mv41UU9K66+fsjSLUHpoYbs+18sM="
},
{
"mvn-path": "net/bis5/mattermost4j/mattermost-models/0.25.0/mattermost-models-0.25.0.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
@@ -467,6 +480,11 @@
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-dluccYMtL6rZYRhpwfByY+Pf0ADr79zUNNHxTLK+PqE="
},
{
"mvn-path": "org/apache/apache/30/apache-30.pom",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
},
{
"mvn-path": "org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
@@ -492,6 +510,11 @@
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
},
{
"mvn-path": "org/apache/commons/commons-parent/62/commons-parent-62.pom",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-dM1i1osJqtf7lCTqiCaat2q6DWUIjZVp/yc70gdCdDk="
},
{
"mvn-path": "org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
@@ -822,6 +845,16 @@
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-v4NILZb3bWNpnWPhJeZPSsc8gXiYVzNmLb1pr5xgM54="
},
{
"mvn-path": "org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-u5qbs6RJeoivHPyldOKLenY7X0+dubVH8r5Lm3Y8pgA="
},
{
"mvn-path": "org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.pom",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-Vgvgc0jVM4GI9RnOGhs7sckq2Y63V4HAUj7Y4bsU/iE="
},
{
"mvn-path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
"mvn-repo": "https://repo1.maven.org/maven2/",
@@ -1522,6 +1555,11 @@
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4="
},
{
"mvn-path": "org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom",
"mvn-repo": "https://repo1.maven.org/maven2/",
"hash": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
},
{
"mvn-path": "org/junit/junit-bom/5.7.1/junit-bom-5.7.1.pom",
"mvn-repo": "https://repo1.maven.org/maven2/",

345
flake.lock generated
View File

@@ -4,6 +4,31 @@
"inputs": {
"devshell": "devshell",
"nix-fetcher-data": "nix-fetcher-data",
"nixpkgs": [
"fudo-clojure",
"helpers",
"nixpkgs"
]
},
"locked": {
"lastModified": 1732066389,
"narHash": "sha256-6z9KTXwDQN14vljs5USgb4Pr8BYk46Q2yhkcdNx9QEE=",
"owner": "jlesquembre",
"repo": "clj-nix",
"rev": "95f26552686259f64685569e6966cdefebb0a6a9",
"type": "github"
},
"original": {
"owner": "jlesquembre",
"ref": "0.4.0",
"repo": "clj-nix",
"type": "github"
}
},
"clj-nix_2": {
"inputs": {
"devshell": "devshell_2",
"nix-fetcher-data": "nix-fetcher-data_2",
"nixpkgs": [
"helpers",
"nixpkgs"
@@ -45,7 +70,51 @@
"type": "github"
}
},
"clj2nix_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_3",
"utils": "utils_4"
},
"locked": {
"lastModified": 1727456190,
"narHash": "sha256-aZvIrzSQQ6ATmAHeitqchAD2DTLcWV+PU8qs80fq3lA=",
"owner": "hlolli",
"repo": "clj2nix",
"rev": "4a968eca5d368b5c818081333a64a3eb93e50d24",
"type": "github"
},
"original": {
"owner": "hlolli",
"repo": "clj2nix",
"type": "github"
}
},
"devshell": {
"inputs": {
"nixpkgs": [
"fudo-clojure",
"helpers",
"clj-nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide",
"repo": "devshell",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"devshell_2": {
"inputs": {
"nixpkgs": [
"helpers",
@@ -83,6 +152,22 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@@ -101,7 +186,70 @@
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1719745305,
"narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fudo-clojure": {
"inputs": {
"helpers": "helpers",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_3"
},
"locked": {
"lastModified": 1770058369,
"narHash": "sha256-KGVIBpZuA/epaJSFwaGRx8GaZFEzRNjMRSc7o4TQ8XA=",
"owner": "fudoniten",
"repo": "fudo-clojure",
"rev": "65bf45b72f783fe5c962c9d413685fbc0cd69779",
"type": "github"
},
"original": {
"owner": "fudoniten",
"repo": "fudo-clojure",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"fudo-clojure",
"helpers",
"clj2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_2": {
"inputs": {
"nixpkgs": [
"helpers",
@@ -129,6 +277,7 @@
"clj2nix": "clj2nix",
"nix2container": "nix2container",
"nixpkgs": [
"fudo-clojure",
"nixpkgs"
],
"utils": "utils_2"
@@ -147,9 +296,57 @@
"type": "github"
}
},
"helpers_2": {
"inputs": {
"clj-nix": "clj-nix_2",
"clj2nix": "clj2nix_2",
"nix2container": "nix2container_2",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_5"
},
"locked": {
"lastModified": 1770058348,
"narHash": "sha256-jqtOJhEOUCjJ8RoLkfejOlUyzSAHr6YHYwGXoUSnW5c=",
"owner": "fudoniten",
"repo": "fudo-nix-helpers",
"rev": "89ad3f7ca2cff121475794bde7c6e29e0e5169d1",
"type": "github"
},
"original": {
"owner": "fudoniten",
"repo": "fudo-nix-helpers",
"type": "github"
}
},
"nix-fetcher-data": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"fudo-clojure",
"helpers",
"clj-nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728229178,
"narHash": "sha256-p5Fx880uBYstIsbaDYN7sECJT11oHxZQKtHgMAVblWA=",
"owner": "jlesquembre",
"repo": "nix-fetcher-data",
"rev": "f3a73c34d28db49ef90fd7872a142bfe93120e55",
"type": "github"
},
"original": {
"owner": "jlesquembre",
"repo": "nix-fetcher-data",
"type": "github"
}
},
"nix-fetcher-data_2": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"helpers",
"clj-nix",
@@ -188,6 +385,24 @@
"type": "github"
}
},
"nix2container_2": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1767430085,
"narHash": "sha256-SiXJ6xv4pS2MDUqfj0/mmG746cGeJrMQGmoFgHLS25Y=",
"owner": "nlewo",
"repo": "nix2container",
"rev": "66f4b8a47e92aa744ec43acbb5e9185078983909",
"type": "github"
},
"original": {
"owner": "nlewo",
"repo": "nix2container",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1673785507,
@@ -215,6 +430,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1717284937,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1767028467,
@@ -231,6 +458,36 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1673785507,
"narHash": "sha256-EPUT8yVdvJhhjhbgnFWXXd4IUPKSOmww2+z4AmOdyPI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d06d765eeac716d8f1ca80f0935fd6fc951816ad",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1767028467,
"narHash": "sha256-7G+2aXClSMaTY1ogpX14CAxjRsvyVzpE0GRwL71WO7g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1cabc318c11299f07ca53e3cb719854682fe6eb3",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1769089682,
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
@@ -247,9 +504,10 @@
},
"root": {
"inputs": {
"helpers": "helpers",
"nixpkgs": "nixpkgs_3",
"utils": "utils_3"
"fudo-clojure": "fudo-clojure",
"helpers": "helpers_2",
"nixpkgs": "nixpkgs_5",
"utils": "utils_6"
}
},
"systems": {
@@ -282,6 +540,36 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_4": {
"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,
@@ -332,6 +620,57 @@
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_5": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_6": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

View File

@@ -8,11 +8,20 @@
url = "github:fudoniten/fudo-nix-helpers";
inputs.nixpkgs.follows = "nixpkgs";
};
fudo-clojure = {
url = "github:fudoniten/fudo-clojure";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, utils, helpers, ... }:
outputs = { self, nixpkgs, utils, helpers, fudo-clojure, ... }:
utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages."${system}";
let
pkgs = nixpkgs.legacyPackages."${system}";
cljLibs = {
"org.fudo/fudo-clojure" =
fudo-clojure.packages."${system}".fudo-clojure.preppedSrc;
};
in {
packages = rec {
default = bebot;
@@ -20,6 +29,7 @@
name = "org.fudo/bebot";
primaryNamespace = "bebot.core";
src = ./.;
inherit cljLibs;
};
};
@@ -27,7 +37,7 @@
default = updateDeps;
updateDeps = pkgs.mkShell {
buildInputs = with helpers.legacyPackages."${system}";
[ (updateClojureDeps { }) ];
[ (updateClojureDeps { deps = cljLibs; }) ];
};
};
});