From a35b04034af7a7517e7ef7bb44ffeaad3533936a Mon Sep 17 00:00:00 2001 From: technofab Date: Sun, 24 Nov 2024 17:24:35 +0100 Subject: [PATCH] refactor: split up into another flake to make import easier allows users to use the nixlet dir as flake input, this way not all of them have to be downloaded individually from GitLab's package registry --- flake.nix | 10 +--- nixlets/default.nix | 10 ++++ nixlets/flake.lock | 122 ++++++++++++++++++++++++++++++++++++++++++++ nixlets/flake.nix | 9 ++++ 4 files changed, 142 insertions(+), 9 deletions(-) create mode 100644 nixlets/default.nix create mode 100644 nixlets/flake.lock create mode 100644 nixlets/flake.nix diff --git a/flake.nix b/flake.nix index d7015e3..e9ea0bb 100644 --- a/flake.nix +++ b/flake.nix @@ -19,15 +19,7 @@ ]; systems = import systems; flake = { - # █▄ █ █ ▀▄▀ █ █▀▀ ▀█▀ █▀ - # █ ▀█ █ █ █ █▄▄ ██▄ █ ▄█ - nixlets = with nixlet-lib; { - mosquitto = mkNixlet ./nixlets/mosquitto; - attic = mkNixlet ./nixlets/attic; - postgres = mkNixlet ./nixlets/postgres; - tikv = mkNixlet ./nixlets/tikv; - surrealdb = mkNixlet ./nixlets/surrealdb; - }; + nixlets = import ./nixlets {inherit nixlet-lib;}; }; perSystem = { lib, diff --git a/nixlets/default.nix b/nixlets/default.nix new file mode 100644 index 0000000..e9c3dc3 --- /dev/null +++ b/nixlets/default.nix @@ -0,0 +1,10 @@ +{nixlet-lib, ...}: +# █▄ █ █ ▀▄▀ █ █▀▀ ▀█▀ █▀ +# █ ▀█ █ █ █ █▄▄ ██▄ █ ▄█ +with nixlet-lib; { + mosquitto = mkNixlet ./mosquitto; + attic = mkNixlet ./attic; + postgres = mkNixlet ./postgres; + tikv = mkNixlet ./tikv; + surrealdb = mkNixlet ./surrealdb; +} diff --git a/nixlets/flake.lock b/nixlets/flake.lock new file mode 100644 index 0000000..fb6ad04 --- /dev/null +++ b/nixlets/flake.lock @@ -0,0 +1,122 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "kubenix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixlet-lib", + "nixpkgs" + ], + "systems": "systems", + "treefmt": "treefmt" + }, + "locked": { + "lastModified": 1709908607, + "narHash": "sha256-cG5PftryvQT5vTtRJGGsnfFgdobaUmD2klVVhzddFiU=", + "owner": "TECHNOFAB11", + "repo": "kubenix", + "rev": "ddfdd8d0903acff4a0a52b84e4395da1778dcc4c", + "type": "github" + }, + "original": { + "owner": "TECHNOFAB11", + "repo": "kubenix", + "type": "github" + } + }, + "nixlet-lib": { + "inputs": { + "kubenix": "kubenix", + "nixpkgs": "nixpkgs" + }, + "locked": { + "dir": "lib", + "lastModified": 1715604447, + "narHash": "sha256-nwfMNUjTUyOeFEet4ChZjXiBnKbudOaJiNltZ+acJUo=", + "owner": "technofab", + "repo": "nixlets", + "rev": "97348a70ece7f6e48f1f3c4537c3500fe0510d34", + "type": "gitlab" + }, + "original": { + "id": "nixlet-lib", + "type": "indirect" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixlet-lib": "nixlet-lib" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "treefmt": { + "inputs": { + "nixpkgs": [ + "nixlet-lib", + "kubenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688026376, + "narHash": "sha256-qJmkr9BWDpqblk4E9/rCsAEl39y2n4Ycw6KRopvpUcY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "df3f32b0cc253dfc7009b7317e8f0e7ccd70b1cf", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nixlets/flake.nix b/nixlets/flake.nix new file mode 100644 index 0000000..cf9b715 --- /dev/null +++ b/nixlets/flake.nix @@ -0,0 +1,9 @@ +{ + description = "Use this as an input to access the nixlets. Override nixlet-lib to newer versions if needed."; + + outputs = import ./.; + + inputs = { + nixlet-lib = "gitlab:technofab/nixlets?dir=lib"; + }; +}