From 85e639ffaa7fda21fea8503796a64768a1b7b194 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Fri, 17 May 2024 22:10:00 +0200 Subject: [PATCH] helixo --- flake.lock | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 +- 2 files changed, 128 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5fd2e84..632f661 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,47 @@ { "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "heliox-cli": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "systems": "systems", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1707925122, + "narHash": "sha256-/pBQaPi8tLzPGBiUcJB57iQK7+L79dBwpMDpCzu2Jus=", + "ref": "refs/heads/main", + "rev": "e05db87d0f38244e6d81f25f0d15b9760e632213", + "revCount": 7, + "type": "git", + "url": "https://git.ghoscht.com/heliox/cli" + }, + "original": { + "type": "git", + "url": "https://git.ghoscht.com/heliox/cli" + } + }, "nh": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1714905986, @@ -19,6 +58,56 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1714409183, "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", @@ -34,7 +123,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1714409183, "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", @@ -49,8 +138,42 @@ }, "root": { "inputs": { + "heliox-cli": "heliox-cli", "nh": "nh", + "nixpkgs": "nixpkgs_4" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1706462057, + "narHash": "sha256-7dG1D4iqqt0bEbBqUWk6lZiSqqwwAO0Hd1L5opVyhNM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "c6153c2a3ff4c38d231e3ae99af29b87f1df5901", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 6ad2993..6f6d638 100644 --- a/flake.nix +++ b/flake.nix @@ -4,16 +4,18 @@ nh = { url = "github:viperml/nh"; }; + heliox-cli.url = "git+https://git.ghoscht.com/heliox/cli"; }; outputs = { nh, + heliox-cli, self, nixpkgs, ... } @ inputs: let pkgs = nixpkgs.legacyPackages.x86_64-linux; in { - # hydraJobs.nh = pkgs.lib.customisation.hydraJob nh.packages.x86_64-linux.nh; hydraJobs.neo-cowsay = pkgs.lib.hydraJob pkgs.neo-cowsay; + hydraJobs.heliox = pkgs.lib.hydraJob heliox-cli.packages.x86_64-linux.default; }; }