public/tattler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working with new nix-helpers

Browse Source
This commit is contained in:
niten 2024-04-04 13:15:34 -07:00
parent d0b8cbb5cb
commit c212a8e8f6
4 changed files with 982 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

876
deps-lock.json
View File

File diff suppressed because it is too large Load Diff

13
deps.edn
View File

@ -5,17 +5,16 @@
org.clojure/tools.cli {:mvn/version "1.0.214"}
metosin/malli { :mvn/version "0.11.0" }
org.fudo/notifier {
:local/root "/nix/store/qqfnbwp1vg3r0ni2sj096pas67drx45l-org.fudo-notifier-0.1.jar"
; :git/url "https://git.fudo.org/fudo-public/notifier.git"
; :git/sha "bda18253fc5f736a3bec36ac9f36ff49e03538e0"
:git/url "https://fudo.dev/public/notifier.git"
:git/sha "06c061a7ca3bf3a7e37b20eb95d42159575b0ae5"
}
org.fudo/fudo-clojure {
:git/url "https://git.fudo.org/fudo-public/fudo-clojure.git"
:git/sha "2352892ad7d7cf7c6bd294005a28d55ef224862a"
:git/url "https://fudo.dev/public/fudo-clojure.git"
:git/sha "12eff55c8b2a3b3a84c58b81315dbdf7284b991b"
}
org.fudo/milquetoast {
:git/url "https://git.fudo.org/fudo-public/milquetoast.git"
:git/sha "ae81b91f0c710632f55b43f0193e16ab0dd81dde"
:git/url "https://fudo.dev/public/milquetoast.git"
:git/sha "9960525a3ec0045190daa6a5db596e6826a32aed"
}
}
}

239
flake.lock generated
View File

@ -3,18 +3,18 @@
"clj-nix": {
"inputs": {
"devshell": "devshell",
"flake-utils": "flake-utils",
"nix-fetcher-data": "nix-fetcher-data",
"nixpkgs": [
"helpers",
"nixpkgs"
]
},
"locked": {
"lastModified": 1677342613,
"narHash": "sha256-BqhKj7jQahSVThEwLHt164kJHGx9LXzBARFZaFNLPW8=",
"lastModified": 1711197542,
"narHash": "sha256-RMM+G49X56W8gE2sg08TUsuR30KcU0LNLttsSRgxTCM=",
"owner": "jlesquembre",
"repo": "clj-nix",
"rev": "7d9e244ea96988524ba3bd6c2bbafdf0a5340b96",
"rev": "20109727c6623b486d37fbd957d64c2a8232ccde",
"type": "github"
},
"original": {
@ -26,7 +26,7 @@
"clj-nix_2": {
"inputs": {
"devshell": "devshell_2",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": [
"notifierClj",
"helpers",
@ -50,15 +50,16 @@
"clj2nix": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1673786922,
"narHash": "sha256-MrwSNEXpq20/AvMxW49MRbuqf8C2M4Vei3jtZeXYjJk=",
"lastModified": 1685699489,
"narHash": "sha256-QPkF7QiE0dmiqUpHmX7mBIhMCgbnZDjJG5bQ6702AOs=",
"owner": "hlolli",
"repo": "clj2nix",
"rev": "04b0dfbfc69c6316b8613d061e3fe4619d79cd9f",
"rev": "66ae6a15c3aab59cb31523e825e5270be082bfe4",
"type": "github"
},
"original": {
@ -89,23 +90,19 @@
},
"devshell": {
"inputs": {
"flake-utils": [
"helpers",
"clj-nix",
"flake-utils"
],
"nixpkgs": [
"helpers",
"clj-nix",
"nixpkgs"
]
],
"systems": "systems"
},
"locked": {
"lastModified": 1658746384,
"narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=",
"lastModified": 1700815693,
"narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=",
"owner": "numtide",
"repo": "devshell",
"rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b",
"rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51",
"type": "github"
},
"original": {
@ -175,6 +172,41 @@
"type": "github"
}
},
"flake-part": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1685546676,
"narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1685546676,
"narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-utils": {
"locked": {
"lastModified": 1656928814,
@ -190,18 +222,25 @@
"type": "github"
}
},
"flake-utils_2": {
"gitignore": {
"inputs": {
"nixpkgs": [
"helpers",
"clj2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
@ -215,18 +254,17 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1684439334,
"narHash": "sha256-GSBblSbzl0ArXvRGn9EpjP/5j2hmu3b2IjQeY1llO08=",
"ref": "with-deps",
"rev": "b047ccd1226517e757bc8084c2cba630f4bd10b9",
"revCount": 69,
"lastModified": 1712261209,
"narHash": "sha256-Jgbe0+ExLJMM9JS07EqO5J1YtqzvXuJXdgA+Pk23HUg=",
"ref": "refs/heads/master",
"rev": "388036ef098361205602575eeb3651110844e9cc",
"revCount": 108,
"type": "git",
"url": "https://git.fudo.org/fudo-public/nix-helpers.git"
"url": "https://fudo.dev/public/nix-helpers.git"
},
"original": {
"ref": "with-deps",
"type": "git",
"url": "https://git.fudo.org/fudo-public/nix-helpers.git"
"url": "https://fudo.dev/public/nix-helpers.git"
}
},
"helpers_2": {
@ -246,12 +284,36 @@
"rev": "b047ccd1226517e757bc8084c2cba630f4bd10b9",
"revCount": 69,
"type": "git",
"url": "https://git.fudo.org/fudo-public/nix-helpers.git"
"url": "https://fudo.dev/public/nix-helpers.git"
},
"original": {
"ref": "with-deps",
"type": "git",
"url": "https://git.fudo.org/fudo-public/nix-helpers.git"
"url": "https://fudo.dev/public/nix-helpers.git"
}
},
"nix-fetcher-data": {
"inputs": {
"flake-part": "flake-part",
"flake-parts": "flake-parts",
"nixpkgs": [
"helpers",
"clj-nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1685572850,
"narHash": "sha256-lYKEqFG9F84xu51H1rM1u+Ip88cINL0+W26sT+vFEZc=",
"owner": "jlesquembre",
"repo": "nix-fetcher-data",
"rev": "f14967db6c92c79b77419f52c22a698518c91120",
"type": "github"
},
"original": {
"owner": "jlesquembre",
"repo": "nix-fetcher-data",
"type": "github"
}
},
"nixpkgs": {
@ -269,18 +331,54 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs-lib": {
"locked": {
"lastModified": 1684580438,
"narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=",
"dir": "lib",
"lastModified": 1682879489,
"narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7dc71aef32e8faf065cb171700792cf8a65c152d",
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1682879489,
"narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712168706,
"narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-22.11",
"ref": "nixos-23.11",
"type": "indirect"
}
},
@ -308,17 +406,17 @@
"utils": "utils_5"
},
"locked": {
"lastModified": 1684784801,
"narHash": "sha256-7d8blW6tVHMTdgAQB2Dh470XsvWbD5gICwgXrS/90Xg=",
"lastModified": 1711254672,
"narHash": "sha256-ZeZqjZ5Jp6uLcFaRXkPxoNM8uR2QeWix4J1hm0opvqo=",
"ref": "refs/heads/master",
"rev": "6ff2823f55812d527ce6fd022caf78a438afb371",
"revCount": 9,
"rev": "4a38a05d1a0826df790e857f080c18cf8161516c",
"revCount": 11,
"type": "git",
"url": "https://git.fudo.org/fudo-public/notifier.git"
"url": "https://fudo.dev/public/notifier.git"
},
"original": {
"type": "git",
"url": "https://git.fudo.org/fudo-public/notifier.git"
"url": "https://fudo.dev/public/notifier.git"
}
},
"root": {
@ -359,6 +457,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,
@ -375,12 +503,15 @@
}
},
"utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -421,7 +552,7 @@
},
"utils_5": {
"inputs": {
"systems": "systems"
"systems": "systems_3"
},
"locked": {
"lastModified": 1681202837,
@ -439,14 +570,14 @@
},
"utils_6": {
"inputs": {
"systems": "systems_2"
"systems": "systems_4"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {

5
flake.nix
View File

@ -5,7 +5,7 @@
nixpkgs.url = "nixpkgs/nixos-23.11";
utils.url = "github:numtide/flake-utils";
helpers = {
url = "git+https://fudo.dev/public/nix-helpers.git?ref=with-deps";
url = "git+https://fudo.dev/public/nix-helpers.git";
inputs.nixpkgs.follows = "nixpkgs";
};
notifierClj = {
@ -22,6 +22,7 @@
cljLibs = {
"org.fudo/notifier" = "${notifierClj.packages."${system}".notifier}";
};
in {
packages = rec {
default = tattler;
@ -37,7 +38,7 @@
default = updateDeps;
updateDeps = pkgs.mkShell {
buildInputs = with helpers.packages."${system}";
[ (updateCljDeps cljLibs) ];
[ (updateClojureDeps cljLibs) ];
};
tattler = pkgs.mkShell {
buildInputs = [ self.packages."${system}".tattler ];