ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pkgs: diff-flake: 0.2.0 -> 0.3.0

Browse source 
Change how `devShells` is handled: always build for the current system
and instead query for the name of the shell that should be built.
This commit is contained in:
Bruno BELANYI 2023-03-16 11:33:19 +00:00
parent 5413bf7fbb
commit b56674728f
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/diff-flake/default.nix
View file

@ -1,7 +1,7 @@
{ lib, coreutils, git, gnused, makeWrapper, stdenvNoCC }: { lib, coreutils, git, gnused, makeWrapper, stdenvNoCC }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "diff-flake"; pname = "diff-flake";
version = "0.2.0"; version = "0.3.0";
src = ./diff-flake; src = ./diff-flake;

16
pkgs/diff-flake/diff-flake
View file

@ -22,13 +22,9 @@ sanitize_output() {
add_shell() { add_shell() {
local SYSTEM local SYSTEM
if [ $# -gt 0 ] && [ -n "$1" ]; then
SYSTEM="$1"
else
SYSTEM="$(nix eval --raw --impure --expr 'builtins.currentSystem')" SYSTEM="$(nix eval --raw --impure --expr 'builtins.currentSystem')"
fi
# Use 'inputDerivation' attribute to make sure that it is build-able # Use 'inputDerivation' attribute to make sure that it is build-able
FLAKE_OUTPUTS+=("devShells.$SYSTEM.default.inputDerivation") FLAKE_OUTPUTS+=("devShells.$SYSTEM.$1.inputDerivation")
} }
add_host() { add_host() {
@ -56,10 +52,10 @@ usage() {
print_err " specify the name of a NixOS output configuration whose" print_err " specify the name of a NixOS output configuration whose"
print_err " closure should be diffed, can be used multiple times" print_err " closure should be diffed, can be used multiple times"
print_err " if no host name is given, defaults to current hostname" print_err " if no host name is given, defaults to current hostname"
print_err " --shell [system]" print_err " --shell [name]"
print_err " specify a specific system's devShell output whose closure" print_err " specify a specific devShell configuration name whose closure"
print_err " should be diffed, can be used multiple times" print_err " should be diffed, can be used multiple times"
print_err " if no system is given, defaults to current system" print_err " if no name is given, defaults to 'default'"
print_err "" print_err ""
print_err "when no flake outputs are specified, automatically queries for" print_err "when no flake outputs are specified, automatically queries for"
print_err "all NixOS configurations, and devShell for current system" print_err "all NixOS configurations, and devShell for current system"
@ -108,7 +104,7 @@ parse_args() {
add_shell "$1" add_shell "$1"
shift shift
else else
add_shell add_shell "default"
fi fi
;; ;;
--) --)
@ -152,7 +148,7 @@ if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
for host in $(list_nixos_configurations); do for host in $(list_nixos_configurations); do
add_host "$host" add_host "$host"
done done
add_shell add_shell "default"
fi fi
for out in "${FLAKE_OUTPUTS[@]}"; do for out in "${FLAKE_OUTPUTS[@]}"; do