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

Update deps with helpers

Browse Source
This commit is contained in:
niten
2024-04-21 12:11:28 -07:00
parent 114dc5d9de
commit f079b882da
4 changed files with 1237 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deps-lock.json
+681 -158
View File
File diff suppressed because it is too large Load Diff
deps.edn
+2 -2
View File
@@ -6,8 +6,8 @@
org.clojure/tools.cli { :mvn/version "1.0.206" } org.clojure/tools.cli { :mvn/version "1.0.206" }
org.fudo/fudo-clojure { org.fudo/fudo-clojure {
:git/url "https://git.fudo.org/fudo-public/fudo-clojure.git" :git/url "https://fudo.dev/public/fudo-clojure.git"
:sha "c6a1ebef2e5b64d432a46ac48639c674e62b7cee" :sha "25467fceddcb9c81180ddb83f3e21f9ef21cd07f"
} }
org.eclipse.paho/org.eclipse.paho.client.mqttv3 { :mvn/version "1.2.5" } org.eclipse.paho/org.eclipse.paho.client.mqttv3 { :mvn/version "1.2.5" }
flake.lock
Generated
+532 -9
View File
@@ -5,6 +5,8 @@
"devshell": "devshell", "devshell": "devshell",
"nix-fetcher-data": "nix-fetcher-data", "nix-fetcher-data": "nix-fetcher-data",
"nixpkgs": [ "nixpkgs": [
"fudo-clojure",
"helpers",
"nixpkgs" "nixpkgs"
] ]
}, },
@@ -22,9 +24,76 @@
"type": "github" "type": "github"
} }
}, },
"clj-nix_2": {
"inputs": {
"devshell": "devshell_2",
"nix-fetcher-data": "nix-fetcher-data_2",
"nixpkgs": [
"helpers",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711197542,
"narHash": "sha256-RMM+G49X56W8gE2sg08TUsuR30KcU0LNLttsSRgxTCM=",
"owner": "jlesquembre",
"repo": "clj-nix",
"rev": "20109727c6623b486d37fbd957d64c2a8232ccde",
"type": "github"
},
"original": {
"owner": "jlesquembre",
"repo": "clj-nix",
"type": "github"
}
},
"clj2nix": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1685699489,
"narHash": "sha256-QPkF7QiE0dmiqUpHmX7mBIhMCgbnZDjJG5bQ6702AOs=",
"owner": "hlolli",
"repo": "clj2nix",
"rev": "66ae6a15c3aab59cb31523e825e5270be082bfe4",
"type": "github"
},
"original": {
"owner": "hlolli",
"repo": "clj2nix",
"type": "github"
}
},
"clj2nix_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_3",
"utils": "utils_4"
},
"locked": {
"lastModified": 1685699489,
"narHash": "sha256-QPkF7QiE0dmiqUpHmX7mBIhMCgbnZDjJG5bQ6702AOs=",
"owner": "hlolli",
"repo": "clj2nix",
"rev": "66ae6a15c3aab59cb31523e825e5270be082bfe4",
"type": "github"
},
"original": {
"owner": "hlolli",
"repo": "clj2nix",
"type": "github"
}
},
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"fudo-clojure",
"helpers",
"clj-nix", "clj-nix",
"nixpkgs" "nixpkgs"
], ],
@@ -44,6 +113,61 @@
"type": "github" "type": "github"
} }
}, },
"devshell_2": {
"inputs": {
"nixpkgs": [
"helpers",
"clj-nix",
"nixpkgs"
],
"systems": "systems_4"
},
"locked": {
"lastModified": 1700815693,
"narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=",
"owner": "numtide",
"repo": "devshell",
"rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": {
"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-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-part": { "flake-part": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
@@ -62,6 +186,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-part_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"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": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
@@ -79,11 +221,166 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_4"
},
"locked": {
"lastModified": 1685546676,
"narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"fudo-clojure": {
"inputs": {
"helpers": "helpers",
"nixpkgs": "nixpkgs_2",
"utils": "utils_3"
},
"locked": {
"lastModified": 1713457607,
"narHash": "sha256-lraQtZ5cc6B6zpu1Md89bGE0dJSMHlBptgaLzWYHmJg=",
"ref": "refs/heads/master",
"rev": "25467fceddcb9c81180ddb83f3e21f9ef21cd07f",
"revCount": 80,
"type": "git",
"url": "https://fudo.dev/public/fudo-clojure.git"
},
"original": {
"type": "git",
"url": "https://fudo.dev/public/fudo-clojure.git"
}
},
"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",
"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"
}
},
"helpers": {
"inputs": {
"clj-nix": "clj-nix",
"clj2nix": "clj2nix",
"nixpkgs": [
"fudo-clojure",
"nixpkgs"
],
"utils": "utils_2"
},
"locked": {
"lastModified": 1712261209,
"narHash": "sha256-Jgbe0+ExLJMM9JS07EqO5J1YtqzvXuJXdgA+Pk23HUg=",
"ref": "refs/heads/master",
"rev": "388036ef098361205602575eeb3651110844e9cc",
"revCount": 108,
"type": "git",
"url": "https://fudo.dev/public/nix-helpers.git"
},
"original": {
"type": "git",
"url": "https://fudo.dev/public/nix-helpers.git"
}
},
"helpers_2": {
"inputs": {
"clj-nix": "clj-nix_2",
"clj2nix": "clj2nix_2",
"nixpkgs": [
"nixpkgs"
],
"utils": "utils_5"
},
"locked": {
"lastModified": 1712261209,
"narHash": "sha256-Jgbe0+ExLJMM9JS07EqO5J1YtqzvXuJXdgA+Pk23HUg=",
"ref": "refs/heads/master",
"rev": "388036ef098361205602575eeb3651110844e9cc",
"revCount": 108,
"type": "git",
"url": "https://fudo.dev/public/nix-helpers.git"
},
"original": {
"type": "git",
"url": "https://fudo.dev/public/nix-helpers.git"
}
},
"nix-fetcher-data": { "nix-fetcher-data": {
"inputs": { "inputs": {
"flake-part": "flake-part", "flake-part": "flake-part",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"fudo-clojure",
"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"
}
},
"nix-fetcher-data_2": {
"inputs": {
"flake-part": "flake-part_2",
"flake-parts": "flake-parts_2",
"nixpkgs": [
"helpers",
"clj-nix", "clj-nix",
"nixpkgs" "nixpkgs"
] ]
@@ -104,17 +401,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685573264, "lastModified": 1673785507,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "narHash": "sha256-EPUT8yVdvJhhjhbgnFWXXd4IUPKSOmww2+z4AmOdyPI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635", "rev": "d06d765eeac716d8f1ca80f0935fd6fc951816ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-22.05", "repo": "nixpkgs",
"type": "indirect" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@@ -153,11 +450,93 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_3": {
"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-lib_4": {
"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": 1713344939,
"narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"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": 1713564160,
"narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"clj-nix": "clj-nix", "fudo-clojure": "fudo-clojure",
"nixpkgs": "nixpkgs", "helpers": "helpers_2",
"utils": "utils" "nixpkgs": "nixpkgs_4",
"utils": "utils_6"
} }
}, },
"systems": { "systems": {
@@ -190,7 +569,82 @@
"type": "github" "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"
}
},
"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"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"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_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
@@ -207,6 +661,75 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"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_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_6": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
flake.nix
+22 -13
View File
@@ -2,36 +2,45 @@
description = "WallFly presence monitor."; description = "WallFly presence monitor.";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; nixpkgs.url = "nixpkgs/nixos-23.11";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
clj-nix = { helpers = {
url = "github:jlesquembre/clj-nix"; url = "git+https://fudo.dev/public/nix-helpers.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
fudo-clojure.url = "git+https://fudo.dev/public/fudo-clojure.git";
}; };
outputs = { self, nixpkgs, utils, clj-nix, ... }: outputs = { self, nixpkgs, utils, helpers, fudo-clojure, ... }:
utils.lib.eachDefaultSystem (system: utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages."${system}"; pkgs = nixpkgs.legacyPackages."${system}";
cljpkgs = clj-nix.packages."${system}"; gs = import nixpkgs { inherit system; };
update-deps = pkgs.writeShellScriptBin "update-deps.sh" ''
${clj-nix.packages."${system}".deps-lock}/bin/deps-lock cljLibs = {
''; "org.fudo/fudo-clojure" =
fudo-clojure.packages."${system}".fudo-clojure;
};
in { in {
packages = { packages = {
wallfly = cljpkgs.mkCljBin { wallfly = helpers.packages."${system}".mkClojureBin {
projectSrc = ./.; projectSrc = ./.;
name = "org.fudo/wallfly"; name = "org.fudo/wallfly";
main-ns = "wallfly.core"; primaryNamespace = "wallfly.core";
jdkRunner = pkgs.jdk17_headless; src = ./.;
inherit cljLibs;
}; };
}; };
defaultPackage = self.packages."${system}".wallfly; defaultPackage = self.packages."${system}".wallfly;
devShell = devShells = rec {
pkgs.mkShell { buildInputs = with pkgs; [ clojure update-deps ]; }; default = updateDeps;
updateDeps = pkgs.mkShell {
buildInputs = with helpers.packages."${system}";
[ (updateClojureDeps cljLibs) ];
};
};
}) // { }) // {
overlay = final: prev: { overlay = final: prev: {
inherit (self.packages."${prev.system}") wallfly; inherit (self.packages."${prev.system}") wallfly;