colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: sane-scripts: order the non-resholve scripts, rename py-scripts

Browse Source
This commit is contained in:
Colin 2023-06-06 08:15:16 +00:00
parent 7fcff0b6a2
commit c542e120ef
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/additional/sane-scripts/default.nix
View File

@ -38,7 +38,7 @@ let
oath-toolkit oath-toolkit
openssh openssh
openssl openssl
py-scripts.ip-check nix-shell-scripts.ip-check
rmlint rmlint
rsync rsync
ssh-to-age ssh-to-age
@ -91,7 +91,7 @@ let
let let
rmPy = builtins.concatStringsSep rmPy = builtins.concatStringsSep
"\n" "\n"
(lib.mapAttrsToList (name: pkg: "rm ${pkg.pname}") py-scripts) (lib.mapAttrsToList (name: pkg: "rm ${pkg.pname}") nix-shell-scripts)
; ;
in '' in ''
# remove python library files, and python binaries (those are packaged further below) # remove python library files, and python binaries (those are packaged further below)
@ -105,7 +105,7 @@ let
''; '';
}; };
py-scripts = { nix-shell-scripts = {
# anything added to this attrset gets symlink-joined into `sane-scripts` # anything added to this attrset gets symlink-joined into `sane-scripts`
backup-ls = static-nix-shell.mkBash { backup-ls = static-nix-shell.mkBash {
pname = "sane-backup-ls"; pname = "sane-backup-ls";
@ -180,19 +180,19 @@ let
cp -R lib/* $out/bin/lib/ cp -R lib/* $out/bin/lib/
''; '';
}; };
reclaim-boot-space = static-nix-shell.mkPython3Bin {
pname = "sane-reclaim-boot-space";
src = ./src;
};
ip-reconnect = static-nix-shell.mkPython3Bin { ip-reconnect = static-nix-shell.mkPython3Bin {
pname = "sane-ip-reconnect"; pname = "sane-ip-reconnect";
src = ./src; src = ./src;
}; };
reclaim-boot-space = static-nix-shell.mkPython3Bin {
pname = "sane-reclaim-boot-space";
src = ./src;
};
}; };
in in
symlinkJoin { symlinkJoin {
name = "sane-scripts"; name = "sane-scripts";
paths = [ shell-scripts ] ++ lib.attrValues py-scripts; paths = [ shell-scripts ] ++ lib.attrValues nix-shell-scripts;
meta = { meta = {
description = "collection of scripts associated with uninsane systems"; description = "collection of scripts associated with uninsane systems";
homepage = "https://git.uninsane.org"; homepage = "https://git.uninsane.org";