From 5f0c714d804adec7b117339d307d25aba3b687bb Mon Sep 17 00:00:00 2001 From: technofab Date: Thu, 16 Apr 2026 12:52:24 +0200 Subject: [PATCH] chore: pin flake input versions, use rensa autodiscovery, etc. --- flake.lock | 8 ++++---- flake.nix | 8 +------- nix/repo/devShells.nix | 14 ++++++++++++-- nix/repo/flake.lock | 16 ++++++++++------ nix/repo/flake.nix | 8 ++++---- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 85629e5..764b3f6 100644 --- a/flake.lock +++ b/flake.lock @@ -37,17 +37,17 @@ }, "locked": { "dir": "lib", - "lastModified": 1766497301, - "narHash": "sha256-W7WeOXMUZROMtbU1qQNWy/yai+k8gG09YACFQ7ImpsQ=", + "lastModified": 1775132170, + "narHash": "sha256-ZhXcliu8E1KXlaviFnMHQpb/VSIbsALSFZoeb9Z6bhc=", "owner": "rensa-nix", "repo": "core", - "rev": "e08c48b5db1052bfb8b8dad764e05decc1af893e", + "rev": "bfdb2c1aa85cd4af286b0833b046e13a96d64d6a", "type": "gitlab" }, "original": { "dir": "lib", "owner": "rensa-nix", - "ref": "v0.1.1", + "ref": "v0.2.0", "repo": "core", "type": "gitlab" } diff --git a/flake.nix b/flake.nix index 62addff..d1c79d8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - ren.url = "gitlab:rensa-nix/core/v0.1.1?dir=lib"; + ren.url = "gitlab:rensa-nix/core/v0.2.0?dir=lib"; }; outputs = { @@ -18,12 +18,6 @@ // { pkgs = import i.nixpkgs {inherit system;}; }; - cellBlocks = with ren.blocks; [ - (simple "devShells") - (simple "docs") - (simple "ci") - (simple "soonix") - ]; } { packages = ren.select self [ diff --git a/nix/repo/devShells.nix b/nix/repo/devShells.nix index c6dafe0..fe152d4 100644 --- a/nix/repo/devShells.nix +++ b/nix/repo/devShells.nix @@ -6,12 +6,22 @@ inherit (inputs) pkgs devshell treefmt devtools-lib; inherit (cell) soonix; treefmtWrapper = treefmt.mkWrapper pkgs { + projectRootFile = "flake.nix"; programs = { alejandra.enable = true; statix.enable = true; deadnix.enable = true; mdformat.enable = true; }; + settings.formatter.mdformat = { + excludes = ["CHANGELOG.md"]; + command = let + pkg = pkgs.python3.withPackages (p: [ + p.mdformat + p.mdformat-mkdocs + ]); + in "${pkg}/bin/mdformat"; + }; }; in { default = devshell.mkShell { @@ -27,13 +37,13 @@ in { { name = "treefmt"; stage_fixed = true; - run = "${treefmtWrapper}/bin/treefmt"; + run = "${treefmtWrapper}/bin/treefmt; #{files}"; env.TERM = "dumb"; } { name = "soonix"; stage_fixed = true; - run = "${soonix.packages."soonix:update"}/bin/soonix:update"; + run = "nix run .#soonix:update; #{files}"; } ]; }; diff --git a/nix/repo/flake.lock b/nix/repo/flake.lock index 674f1ee..4b0577e 100644 --- a/nix/repo/flake.lock +++ b/nix/repo/flake.lock @@ -13,6 +13,7 @@ "original": { "dir": "lib", "owner": "rensa-nix", + "ref": "v0.1.0", "repo": "devshell", "type": "gitlab" } @@ -30,6 +31,7 @@ "original": { "dir": "lib", "owner": "rensa-nix", + "ref": "v0.1.0", "repo": "devtools", "type": "gitlab" } @@ -55,16 +57,17 @@ "nixmkdocs": { "locked": { "dir": "lib", - "lastModified": 1766404754, - "narHash": "sha256-EjBe6x6BT8ckPirMWhSf1GfaFxORYxR/Uu71FvSAm60=", + "lastModified": 1767549915, + "narHash": "sha256-by3r2qddlyzylup5fzSaDwtoy3eFHNKb65IuIq6bsAs=", "owner": "TECHNOFAB", "repo": "nixmkdocs", - "rev": "cfa9606eeeb9288e2799896d7d42b3d3860f9ccb", + "rev": "f3b2f4b19178e97c5580367be0f97e61a085db6d", "type": "gitlab" }, "original": { "dir": "lib", "owner": "TECHNOFAB", + "ref": "v1.1.0", "repo": "nixmkdocs", "type": "gitlab" } @@ -82,16 +85,17 @@ "soonix-lib": { "locked": { "dir": "lib", - "lastModified": 1766044966, - "narHash": "sha256-VB8PgA5QYmehFCGGz8YmlmuhCG43ab9rK9ufdKmfjao=", + "lastModified": 1769607658, + "narHash": "sha256-gF9/QmmaNRgqkC5cqSGgwWvGXj9Mj4qMDkvvF/5BlSA=", "owner": "TECHNOFAB", "repo": "soonix", - "rev": "e9860d65a0123af948c1a2da65664a6d481efe05", + "rev": "19a88a0c2681bbc85bc2cbe4f2860316d50fe957", "type": "gitlab" }, "original": { "dir": "lib", "owner": "TECHNOFAB", + "ref": "v0.2.0", "repo": "soonix", "type": "gitlab" } diff --git a/nix/repo/flake.nix b/nix/repo/flake.nix index 5d4f888..d49aed0 100644 --- a/nix/repo/flake.nix +++ b/nix/repo/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib"; - devshell.url = "gitlab:rensa-nix/devshell?dir=lib"; - devtools-lib.url = "gitlab:rensa-nix/devtools?dir=lib"; - soonix-lib.url = "gitlab:TECHNOFAB/soonix?dir=lib"; + nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs/v1.1.0?dir=lib"; + devshell.url = "gitlab:rensa-nix/devshell/v0.1.0?dir=lib"; + devtools-lib.url = "gitlab:rensa-nix/devtools/v0.1.0?dir=lib"; + soonix-lib.url = "gitlab:TECHNOFAB/soonix/v0.2.0?dir=lib"; nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.1.2?dir=lib"; treefmt-nix = { url = "github:numtide/treefmt-nix";