Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e445e49baf | ||
|
|
ef3cf30a34 | ||
|
|
86a0792b6e | ||
|
|
d1aea76dd9 | ||
|
|
cdc9e18035 | ||
|
|
374ba596ab |
@@ -16,7 +16,7 @@ Simple Nix flake library for:
|
|||||||
From your new project folder:
|
From your new project folder:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2#default' --refresh
|
nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.5#default' --refresh
|
||||||
```
|
```
|
||||||
|
|
||||||
## Use the library (existing repo)
|
## Use the library (existing repo)
|
||||||
@@ -24,7 +24,7 @@ nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2#
|
|||||||
Add this flake input:
|
Add this flake input:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
inputs.devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2";
|
inputs.devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.5";
|
||||||
inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -96,7 +96,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
toolNameWidth = builtins.foldl' (
|
toolNameWidth = builtins.foldl' (
|
||||||
maxWidth: t: builtins.max maxWidth (builtins.stringLength t.name)
|
maxWidth: t: pkgs.lib.max maxWidth (builtins.stringLength t.name)
|
||||||
) 0 tools;
|
) 0 tools;
|
||||||
toolLabelWidth = toolNameWidth + 1;
|
toolLabelWidth = toolNameWidth + 1;
|
||||||
|
|
||||||
@@ -107,7 +107,8 @@
|
|||||||
in
|
in
|
||||||
''
|
''
|
||||||
if command -v ${t.bin} >/dev/null 2>&1; then
|
if command -v ${t.bin} >/dev/null 2>&1; then
|
||||||
printf " $CYAN %-${toString toolLabelWidth}s$RESET ${colorVar}%s$RESET\n" "${t.name}:" "$(${t.bin} ${t.versionCmd})"
|
version="$(${t.bin} ${t.versionCmd} 2>/dev/null | head -n 1 | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//')"
|
||||||
|
printf " $CYAN %-${toString toolLabelWidth}s$RESET ${colorVar}%s$RESET\n" "${t.name}:" "$version"
|
||||||
fi
|
fi
|
||||||
''
|
''
|
||||||
) tools;
|
) tools;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2";
|
devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.5";
|
||||||
devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -23,15 +23,8 @@
|
|||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
];
|
];
|
||||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||||
in
|
|
||||||
{
|
|
||||||
devShells = forAllSystems (
|
|
||||||
system:
|
|
||||||
let
|
|
||||||
pkgs = import nixpkgs { inherit system; };
|
|
||||||
env = devshell-lib.lib.mkDevShell {
|
|
||||||
inherit system;
|
|
||||||
|
|
||||||
|
mkDevShellConfig = pkgs: {
|
||||||
# includeStandardPackages = false; # opt out of nixfmt/gitlint/gitleaks/shfmt defaults
|
# includeStandardPackages = false; # opt out of nixfmt/gitlint/gitleaks/shfmt defaults
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
@@ -80,24 +73,52 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
{
|
||||||
|
devShells = forAllSystems (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
pkgs = import nixpkgs { inherit system; };
|
||||||
|
config = mkDevShellConfig pkgs;
|
||||||
|
env = devshell-lib.lib.mkDevShell (
|
||||||
|
({ inherit system; } // config)
|
||||||
|
// {
|
||||||
|
extraPackages = config.extraPackages ++ [ self.packages.${system}.release ];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
in
|
||||||
{
|
{
|
||||||
default = env.shell;
|
default = env.shell;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
packages = forAllSystems (system: {
|
||||||
|
release = devshell-lib.lib.mkRelease {
|
||||||
|
inherit system;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
checks = forAllSystems (
|
checks = forAllSystems (
|
||||||
system:
|
system:
|
||||||
let
|
let
|
||||||
env = devshell-lib.lib.mkDevShell { inherit system; };
|
pkgs = import nixpkgs { inherit system; };
|
||||||
|
config = mkDevShellConfig pkgs;
|
||||||
|
env = devshell-lib.lib.mkDevShell ({ inherit system; } // config);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit (env) pre-commit-check;
|
inherit (env) pre-commit-check;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
formatter = forAllSystems (system: (devshell-lib.lib.mkDevShell { inherit system; }).formatter);
|
formatter = forAllSystems (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
pkgs = import nixpkgs { inherit system; };
|
||||||
|
config = mkDevShellConfig pkgs;
|
||||||
|
in
|
||||||
|
(devshell-lib.lib.mkDevShell ({ inherit system; } // config)).formatter
|
||||||
|
);
|
||||||
|
|
||||||
# Optional: release command (`release`)
|
# Release command (`release`)
|
||||||
#
|
#
|
||||||
# The release script always updates VERSION first, then:
|
# The release script always updates VERSION first, then:
|
||||||
# 1) runs release steps in order (file writes and scripts)
|
# 1) runs release steps in order (file writes and scripts)
|
||||||
@@ -107,6 +128,7 @@
|
|||||||
# Runtime env vars available in release.run/postVersion:
|
# Runtime env vars available in release.run/postVersion:
|
||||||
# BASE_VERSION, CHANNEL, PRERELEASE_NUM, FULL_VERSION, FULL_TAG
|
# BASE_VERSION, CHANNEL, PRERELEASE_NUM, FULL_VERSION, FULL_TAG
|
||||||
#
|
#
|
||||||
|
# To customize release behavior in your repo, edit:
|
||||||
# packages = forAllSystems (
|
# packages = forAllSystems (
|
||||||
# system:
|
# system:
|
||||||
# {
|
# {
|
||||||
|
|||||||
Reference in New Issue
Block a user