mirror of
https://gitlab.com/rensa-nix/utils.git
synced 2026-05-04 14:19:31 +02:00
chore: pin flake input versions, use rensa autodiscovery, etc.
This commit is contained in:
parent
a48eecbdc5
commit
5f0c714d80
5 changed files with 31 additions and 23 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -37,17 +37,17 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1766497301,
|
"lastModified": 1775132170,
|
||||||
"narHash": "sha256-W7WeOXMUZROMtbU1qQNWy/yai+k8gG09YACFQ7ImpsQ=",
|
"narHash": "sha256-ZhXcliu8E1KXlaviFnMHQpb/VSIbsALSFZoeb9Z6bhc=",
|
||||||
"owner": "rensa-nix",
|
"owner": "rensa-nix",
|
||||||
"repo": "core",
|
"repo": "core",
|
||||||
"rev": "e08c48b5db1052bfb8b8dad764e05decc1af893e",
|
"rev": "bfdb2c1aa85cd4af286b0833b046e13a96d64d6a",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"owner": "rensa-nix",
|
"owner": "rensa-nix",
|
||||||
"ref": "v0.1.1",
|
"ref": "v0.2.0",
|
||||||
"repo": "core",
|
"repo": "core",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
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 = {
|
outputs = {
|
||||||
|
|
@ -18,12 +18,6 @@
|
||||||
// {
|
// {
|
||||||
pkgs = import i.nixpkgs {inherit system;};
|
pkgs = import i.nixpkgs {inherit system;};
|
||||||
};
|
};
|
||||||
cellBlocks = with ren.blocks; [
|
|
||||||
(simple "devShells")
|
|
||||||
(simple "docs")
|
|
||||||
(simple "ci")
|
|
||||||
(simple "soonix")
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
packages = ren.select self [
|
packages = ren.select self [
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,22 @@
|
||||||
inherit (inputs) pkgs devshell treefmt devtools-lib;
|
inherit (inputs) pkgs devshell treefmt devtools-lib;
|
||||||
inherit (cell) soonix;
|
inherit (cell) soonix;
|
||||||
treefmtWrapper = treefmt.mkWrapper pkgs {
|
treefmtWrapper = treefmt.mkWrapper pkgs {
|
||||||
|
projectRootFile = "flake.nix";
|
||||||
programs = {
|
programs = {
|
||||||
alejandra.enable = true;
|
alejandra.enable = true;
|
||||||
statix.enable = true;
|
statix.enable = true;
|
||||||
deadnix.enable = true;
|
deadnix.enable = true;
|
||||||
mdformat.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 {
|
in {
|
||||||
default = devshell.mkShell {
|
default = devshell.mkShell {
|
||||||
|
|
@ -27,13 +37,13 @@ in {
|
||||||
{
|
{
|
||||||
name = "treefmt";
|
name = "treefmt";
|
||||||
stage_fixed = true;
|
stage_fixed = true;
|
||||||
run = "${treefmtWrapper}/bin/treefmt";
|
run = "${treefmtWrapper}/bin/treefmt; #{files}";
|
||||||
env.TERM = "dumb";
|
env.TERM = "dumb";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "soonix";
|
name = "soonix";
|
||||||
stage_fixed = true;
|
stage_fixed = true;
|
||||||
run = "${soonix.packages."soonix:update"}/bin/soonix:update";
|
run = "nix run .#soonix:update; #{files}";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
16
nix/repo/flake.lock
generated
16
nix/repo/flake.lock
generated
|
|
@ -13,6 +13,7 @@
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"owner": "rensa-nix",
|
"owner": "rensa-nix",
|
||||||
|
"ref": "v0.1.0",
|
||||||
"repo": "devshell",
|
"repo": "devshell",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
@ -30,6 +31,7 @@
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"owner": "rensa-nix",
|
"owner": "rensa-nix",
|
||||||
|
"ref": "v0.1.0",
|
||||||
"repo": "devtools",
|
"repo": "devtools",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
@ -55,16 +57,17 @@
|
||||||
"nixmkdocs": {
|
"nixmkdocs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1766404754,
|
"lastModified": 1767549915,
|
||||||
"narHash": "sha256-EjBe6x6BT8ckPirMWhSf1GfaFxORYxR/Uu71FvSAm60=",
|
"narHash": "sha256-by3r2qddlyzylup5fzSaDwtoy3eFHNKb65IuIq6bsAs=",
|
||||||
"owner": "TECHNOFAB",
|
"owner": "TECHNOFAB",
|
||||||
"repo": "nixmkdocs",
|
"repo": "nixmkdocs",
|
||||||
"rev": "cfa9606eeeb9288e2799896d7d42b3d3860f9ccb",
|
"rev": "f3b2f4b19178e97c5580367be0f97e61a085db6d",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"owner": "TECHNOFAB",
|
"owner": "TECHNOFAB",
|
||||||
|
"ref": "v1.1.0",
|
||||||
"repo": "nixmkdocs",
|
"repo": "nixmkdocs",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
@ -82,16 +85,17 @@
|
||||||
"soonix-lib": {
|
"soonix-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1766044966,
|
"lastModified": 1769607658,
|
||||||
"narHash": "sha256-VB8PgA5QYmehFCGGz8YmlmuhCG43ab9rK9ufdKmfjao=",
|
"narHash": "sha256-gF9/QmmaNRgqkC5cqSGgwWvGXj9Mj4qMDkvvF/5BlSA=",
|
||||||
"owner": "TECHNOFAB",
|
"owner": "TECHNOFAB",
|
||||||
"repo": "soonix",
|
"repo": "soonix",
|
||||||
"rev": "e9860d65a0123af948c1a2da65664a6d481efe05",
|
"rev": "19a88a0c2681bbc85bc2cbe4f2860316d50fe957",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"owner": "TECHNOFAB",
|
"owner": "TECHNOFAB",
|
||||||
|
"ref": "v0.2.0",
|
||||||
"repo": "soonix",
|
"repo": "soonix",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs?dir=lib";
|
nixmkdocs.url = "gitlab:TECHNOFAB/nixmkdocs/v1.1.0?dir=lib";
|
||||||
devshell.url = "gitlab:rensa-nix/devshell?dir=lib";
|
devshell.url = "gitlab:rensa-nix/devshell/v0.1.0?dir=lib";
|
||||||
devtools-lib.url = "gitlab:rensa-nix/devtools?dir=lib";
|
devtools-lib.url = "gitlab:rensa-nix/devtools/v0.1.0?dir=lib";
|
||||||
soonix-lib.url = "gitlab:TECHNOFAB/soonix?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";
|
nix-gitlab-ci-lib.url = "gitlab:TECHNOFAB/nix-gitlab-ci/3.1.2?dir=lib";
|
||||||
treefmt-nix = {
|
treefmt-nix = {
|
||||||
url = "github:numtide/treefmt-nix";
|
url = "github:numtide/treefmt-nix";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue