assorted static-nix-shell packages: use `srcRoot`

This commit is contained in:
Colin 2024-02-25 17:37:38 +00:00
parent e757e35065
commit d5643a6a5d
19 changed files with 59 additions and 59 deletions

View File

@ -91,7 +91,7 @@ let
authFailJson = pkgs.writeText "sftp-auth-fail.json" (builtins.toJSON authResponseFail); authFailJson = pkgs.writeText "sftp-auth-fail.json" (builtins.toJSON authResponseFail);
unwrappedAuthProgram = pkgs.static-nix-shell.mkBash { unwrappedAuthProgram = pkgs.static-nix-shell.mkBash {
pname = "sftpgo_external_auth_hook"; pname = "sftpgo_external_auth_hook";
src = ./.; srcRoot = ./.;
pkgs = [ "coreutils" ]; pkgs = [ "coreutils" ];
}; };
authProgram = pkgs.writeShellScript "sftpgo-auth-hook" '' authProgram = pkgs.writeShellScript "sftpgo-auth-hook" ''

View File

@ -49,7 +49,7 @@ in
type = types.package; type = types.package;
default = pkgs.static-nix-shell.mkPython3Bin { default = pkgs.static-nix-shell.mkPython3Bin {
pname = "ntfy-waiter"; pname = "ntfy-waiter";
src = ./.; srcRoot = ./.;
pkgs = [ "ntfy-sh" ]; pkgs = [ "ntfy-sh" ];
}; };
description = '' description = ''

View File

@ -16,7 +16,7 @@
let let
battery_estimate = pkgs.static-nix-shell.mkBash { battery_estimate = pkgs.static-nix-shell.mkBash {
pname = "battery_estimate"; pname = "battery_estimate";
src = ./.; srcRoot = ./.;
}; };
in pkgs.substituteAll { in pkgs.substituteAll {
src = ./conky.conf; src = ./conky.conf;

View File

@ -5,7 +5,7 @@
let let
mimeo-open-desktop = pkgs.static-nix-shell.mkPython3Bin { mimeo-open-desktop = pkgs.static-nix-shell.mkPython3Bin {
pname = "mimeo-open-desktop"; pname = "mimeo-open-desktop";
src = ./.; srcRoot = ./.;
pkgs = [ "mimeo" ]; pkgs = [ "mimeo" ];
}; };

View File

@ -26,7 +26,7 @@ in
packageUnwrapped = pkgs.static-nix-shell.mkBash { packageUnwrapped = pkgs.static-nix-shell.mkBash {
pname = "sway-autoscaler"; pname = "sway-autoscaler";
pkgs = [ "jq" "sway" "util-linux" ]; pkgs = [ "jq" "sway" "util-linux" ];
src = ./.; srcRoot = ./.;
}; };
services.sway-autoscaler = { services.sway-autoscaler = {

View File

@ -5,7 +5,7 @@ let
tty = "tty${builtins.toString cfg.config.vt}"; tty = "tty${builtins.toString cfg.config.vt}";
redirect-tty = pkgs.static-nix-shell.mkPython3Bin { redirect-tty = pkgs.static-nix-shell.mkPython3Bin {
pname = "redirect-tty"; pname = "redirect-tty";
src = ./.; srcRoot = ./.;
}; };
launcher = pkgs.writeShellApplication { launcher = pkgs.writeShellApplication {
name = "unl0kr-login"; name = "unl0kr-login";

View File

@ -5,7 +5,7 @@
let let
waybar-media = pkgs.static-nix-shell.mkBash { waybar-media = pkgs.static-nix-shell.mkBash {
pname = "waybar-media"; pname = "waybar-media";
src = ./.; srcRoot = ./.;
pkgs = [ "jq" "playerctl" ]; pkgs = [ "jq" "playerctl" ];
}; };
in in

View File

@ -10,7 +10,7 @@
let let
wob-pulse = pkgs.static-nix-shell.mkBash { wob-pulse = pkgs.static-nix-shell.mkBash {
pname = "wob-pulse"; pname = "wob-pulse";
src = ./.; srcRoot = ./.;
pkgs = [ "coreutils" "gnugrep" "gnused" "pulseaudio" ]; pkgs = [ "coreutils" "gnugrep" "gnused" "pulseaudio" ];
}; };
cfg = config.sane.programs.wob; cfg = config.sane.programs.wob;

View File

@ -4,7 +4,7 @@ let
hash-path-with-salt = pkgs.static-nix-shell.mkBash { hash-path-with-salt = pkgs.static-nix-shell.mkBash {
pname = "hash-path-with-salt"; pname = "hash-path-with-salt";
src = ./.; srcRoot = ./.;
}; };
cfg = config.sane.derived-secrets; cfg = config.sane.derived-secrets;

View File

@ -71,32 +71,32 @@ let
block_suspend = pkgs.static-nix-shell.mkBash { block_suspend = pkgs.static-nix-shell.mkBash {
pname = "sxmo_hook_block_suspend.sh"; pname = "sxmo_hook_block_suspend.sh";
pkgs = [ "procps" ]; pkgs = [ "procps" ];
src = ./hooks; srcRoot = ./hooks;
}; };
inputhandler = pkgs.static-nix-shell.mkBash { inputhandler = pkgs.static-nix-shell.mkBash {
pname = "sxmo_hook_inputhandler.sh"; pname = "sxmo_hook_inputhandler.sh";
pkgs = [ "coreutils" "playerctl" "pulseaudio" ]; pkgs = [ "coreutils" "playerctl" "pulseaudio" ];
src = ./hooks; srcRoot = ./hooks;
}; };
postwake = pkgs.static-nix-shell.mkBash { postwake = pkgs.static-nix-shell.mkBash {
pname = "sxmo_hook_postwake.sh"; pname = "sxmo_hook_postwake.sh";
pkgs = [ "coreutils" ]; pkgs = [ "coreutils" ];
src = ./hooks; srcRoot = ./hooks;
}; };
rotate = pkgs.static-nix-shell.mkBash { rotate = pkgs.static-nix-shell.mkBash {
pname = "sxmo_hook_rotate.sh"; pname = "sxmo_hook_rotate.sh";
pkgs = [ "sway" ]; pkgs = [ "sway" ];
src = ./hooks; srcRoot = ./hooks;
}; };
start = pkgs.static-nix-shell.mkBash { start = pkgs.static-nix-shell.mkBash {
pname = "sxmo_hook_start.sh"; pname = "sxmo_hook_start.sh";
pkgs = [ "systemd" "xdg-user-dirs" ]; pkgs = [ "systemd" "xdg-user-dirs" ];
src = ./hooks; srcRoot = ./hooks;
}; };
suspend = pkgs.static-nix-shell.mkPython3Bin { suspend = pkgs.static-nix-shell.mkPython3Bin {
pname = "sxmo_suspend.sh"; pname = "sxmo_suspend.sh";
pkgs = [ "rtl8723cs-wowlan" "util-linux" ]; pkgs = [ "rtl8723cs-wowlan" "util-linux" ];
src = ./hooks; srcRoot = ./hooks;
extraMakeWrapperArgs = [ "--add-flags" "--verbose" ]; extraMakeWrapperArgs = [ "--add-flags" "--verbose" ];
}; };
}; };

View File

@ -5,7 +5,7 @@
let let
waybar-sxmo-status = pkgs.static-nix-shell.mkBash { waybar-sxmo-status = pkgs.static-nix-shell.mkBash {
pname = "waybar-sxmo-status"; pname = "waybar-sxmo-status";
src = ./.; srcRoot = ./.;
pkgs = [ "sxmo-utils" "sxmo-utils.runtimeDeps" ]; pkgs = [ "sxmo-utils" "sxmo-utils.runtimeDeps" ];
}; };
in in

View File

@ -3,7 +3,7 @@
let let
install-bluetooth = pkgs.static-nix-shell.mkBash { install-bluetooth = pkgs.static-nix-shell.mkBash {
pname = "install-bluetooth"; pname = "install-bluetooth";
src = ./.; srcRoot = ./.;
pkgs = [ "gnused" ]; pkgs = [ "gnused" ];
}; };
in in

View File

@ -3,7 +3,7 @@
let let
install-nm = pkgs.static-nix-shell.mkPython3Bin { install-nm = pkgs.static-nix-shell.mkPython3Bin {
pname = "install-nm"; pname = "install-nm";
src = ./.; srcRoot = ./.;
}; };
in in
{ {

View File

@ -7,19 +7,19 @@ let
ensure-dir = pkgs.static-nix-shell.mkBash { ensure-dir = pkgs.static-nix-shell.mkBash {
pname = "ensure-dir"; pname = "ensure-dir";
src = ./.; srcRoot = ./.;
}; };
ensure-file = pkgs.static-nix-shell.mkBash { ensure-file = pkgs.static-nix-shell.mkBash {
pname = "ensure-file"; pname = "ensure-file";
src = ./.; srcRoot = ./.;
}; };
ensure-symlink = pkgs.static-nix-shell.mkBash { ensure-symlink = pkgs.static-nix-shell.mkBash {
pname = "ensure-symlink"; pname = "ensure-symlink";
src = ./.; srcRoot = ./.;
}; };
ensure-perms = pkgs.static-nix-shell.mkBash { ensure-perms = pkgs.static-nix-shell.mkBash {
pname = "ensure-perms"; pname = "ensure-perms";
src = ./.; srcRoot = ./.;
}; };
mountNameFor = path: "${utils.escapeSystemdPath path}.mount"; mountNameFor = path: "${utils.escapeSystemdPath path}.mount";

View File

@ -1,6 +1,6 @@
{ static-nix-shell }: { static-nix-shell }:
static-nix-shell.mkPython3Bin { static-nix-shell.mkPython3Bin {
pname = "eg25-control"; pname = "eg25-control";
src = ./.; srcRoot = ./.;
pkgs = [ "curl" "modemmanager" ]; pkgs = [ "curl" "modemmanager" ];
} }

View File

@ -18,7 +18,7 @@ lib.makeScope newScope (self: with self; {
); );
update-feed = static-nix-shell.mkPython3Bin { update-feed = static-nix-shell.mkPython3Bin {
pname = "update"; pname = "update";
src = ./.; srcRoot = ./.;
pyPkgs = [ "feedsearch-crawler" ]; pyPkgs = [ "feedsearch-crawler" ];
srcPath = "update.py"; srcPath = "update.py";
}; };

View File

@ -9,7 +9,7 @@ gnome-feeds
let let
remove-extra = static-nix-shell.mkPython3Bin { remove-extra = static-nix-shell.mkPython3Bin {
pname = "gpodder-remove-extra"; pname = "gpodder-remove-extra";
src = ./.; srcRoot = ./.;
pyPkgs = _ps: { pyPkgs = _ps: {
"gnome-feeds.listparser" = gnome-feeds.listparser; "gnome-feeds.listparser" = gnome-feeds.listparser;
}; };

View File

@ -6,7 +6,7 @@
static-nix-shell.mkPython3Bin { static-nix-shell.mkPython3Bin {
pname = "rtl8723cs-wowlan"; pname = "rtl8723cs-wowlan";
src = ./.; srcRoot = ./.;
pkgs = { pkgs = {
inherit hostname-debian iw wirelesstools; inherit hostname-debian iw wirelesstools;
}; };

View File

@ -35,172 +35,172 @@ let
# and is made available through `sane-scripts.passthru` # and is made available through `sane-scripts.passthru`
backup-ls = static-nix-shell.mkBash { backup-ls = static-nix-shell.mkBash {
pname = "sane-backup-ls"; pname = "sane-backup-ls";
src = ./src; srcRoot = ./src;
pkgs = [ "duplicity" ]; pkgs = [ "duplicity" ];
}; };
backup-restore = static-nix-shell.mkBash { backup-restore = static-nix-shell.mkBash {
pname = "sane-backup-restore"; pname = "sane-backup-restore";
src = ./src; srcRoot = ./src;
pkgs = [ "duplicity" ]; pkgs = [ "duplicity" ];
}; };
bt-add = static-nix-shell.mkPython3Bin { bt-add = static-nix-shell.mkPython3Bin {
pname = "sane-bt-add"; pname = "sane-bt-add";
src = ./src; srcRoot = ./src;
pyPkgs = [ "requests" "sane-lib.bt" ]; pyPkgs = [ "requests" "sane-lib.bt" ];
pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ]; pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ];
}; };
bt-rm = static-nix-shell.mkPython3Bin { bt-rm = static-nix-shell.mkPython3Bin {
pname = "sane-bt-rm"; pname = "sane-bt-rm";
src = ./src; srcRoot = ./src;
pyPkgs = [ "sane-lib.bt" ]; pyPkgs = [ "sane-lib.bt" ];
pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ]; pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ];
}; };
bt-search = static-nix-shell.mkPython3Bin { bt-search = static-nix-shell.mkPython3Bin {
pname = "sane-bt-search"; pname = "sane-bt-search";
src = ./src; srcRoot = ./src;
pyPkgs = [ "natsort" "requests" ]; pyPkgs = [ "natsort" "requests" ];
}; };
bt-show = static-nix-shell.mkPython3Bin { bt-show = static-nix-shell.mkPython3Bin {
pname = "sane-bt-show"; pname = "sane-bt-show";
src = ./src; srcRoot = ./src;
pyPkgs = [ "sane-lib.bt" ]; pyPkgs = [ "sane-lib.bt" ];
pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ]; pkgs = [ "sane-scripts.lib.bt.propagatedBuildInputs" ];
}; };
clone = static-nix-shell.mkBash { clone = static-nix-shell.mkBash {
pname = "sane-clone"; pname = "sane-clone";
src = ./src; srcRoot = ./src;
pkgs = [ "nix" ]; pkgs = [ "nix" ];
}; };
deadlines = static-nix-shell.mkBash { deadlines = static-nix-shell.mkBash {
pname = "sane-deadlines"; pname = "sane-deadlines";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" "gnused" ]; pkgs = [ "coreutils-full" "gnused" ];
}; };
dev-cargo-loop = static-nix-shell.mkBash { dev-cargo-loop = static-nix-shell.mkBash {
pname = "sane-dev-cargo-loop"; pname = "sane-dev-cargo-loop";
src = ./src; srcRoot = ./src;
pkgs = [ "inotify-tools" "ncurses" ]; pkgs = [ "inotify-tools" "ncurses" ];
}; };
find-dotfiles = static-nix-shell.mkBash { find-dotfiles = static-nix-shell.mkBash {
pname = "sane-find-dotfiles"; pname = "sane-find-dotfiles";
src = ./src; srcRoot = ./src;
pkgs = [ "findutils" ]; pkgs = [ "findutils" ];
}; };
ip-check = static-nix-shell.mkPython3Bin { ip-check = static-nix-shell.mkPython3Bin {
pname = "sane-ip-check"; pname = "sane-ip-check";
src = ./src; srcRoot = ./src;
pkgs = [ "miniupnpc" ]; pkgs = [ "miniupnpc" ];
pyPkgs = [ "requests" "sane-lib.ssdp" ]; pyPkgs = [ "requests" "sane-lib.ssdp" ];
}; };
ip-port-forward = static-nix-shell.mkPython3Bin { ip-port-forward = static-nix-shell.mkPython3Bin {
pname = "sane-ip-port-forward"; pname = "sane-ip-port-forward";
src = ./src; srcRoot = ./src;
pkgs = [ "inetutils" "miniupnpc" ]; pkgs = [ "inetutils" "miniupnpc" ];
pyPkgs = [ "sane-lib.ssdp" ]; pyPkgs = [ "sane-lib.ssdp" ];
}; };
private-change-passwd = static-nix-shell.mkBash { private-change-passwd = static-nix-shell.mkBash {
pname = "sane-private-change-passwd"; pname = "sane-private-change-passwd";
src = ./src; srcRoot = ./src;
pkgs = [ "gocryptfs" "rsync" ]; pkgs = [ "gocryptfs" "rsync" ];
}; };
private-do = static-nix-shell.mkBash { private-do = static-nix-shell.mkBash {
pname = "sane-private-do"; pname = "sane-private-do";
src = ./src; srcRoot = ./src;
pkgs = [ "util-linux" ]; pkgs = [ "util-linux" ];
}; };
private-init = static-nix-shell.mkBash { private-init = static-nix-shell.mkBash {
pname = "sane-private-init"; pname = "sane-private-init";
src = ./src; srcRoot = ./src;
pkgs = [ "gocryptfs" ]; pkgs = [ "gocryptfs" ];
}; };
private-lock = static-nix-shell.mkBash { private-lock = static-nix-shell.mkBash {
pname = "sane-private-lock"; pname = "sane-private-lock";
src = ./src; srcRoot = ./src;
pkgs = [ "util-linux.mount" ]; pkgs = [ "util-linux.mount" ];
}; };
private-unlock = static-nix-shell.mkBash { private-unlock = static-nix-shell.mkBash {
pname = "sane-private-unlock"; pname = "sane-private-unlock";
src = ./src; srcRoot = ./src;
pkgs = [ "util-linux.mount" ]; pkgs = [ "util-linux.mount" ];
}; };
rcp = static-nix-shell.mkBash { rcp = static-nix-shell.mkBash {
pname = "sane-rcp"; pname = "sane-rcp";
src = ./src; srcRoot = ./src;
pkgs = [ "rsync" ]; pkgs = [ "rsync" ];
}; };
reboot = static-nix-shell.mkBash { reboot = static-nix-shell.mkBash {
pname = "sane-reboot"; pname = "sane-reboot";
src = ./src; srcRoot = ./src;
pkgs = [ "nettools" "systemd" ]; pkgs = [ "nettools" "systemd" ];
}; };
reclaim-boot-space = static-nix-shell.mkPython3Bin { reclaim-boot-space = static-nix-shell.mkPython3Bin {
pname = "sane-reclaim-boot-space"; pname = "sane-reclaim-boot-space";
src = ./src; srcRoot = ./src;
}; };
reclaim-disk-space = static-nix-shell.mkBash { reclaim-disk-space = static-nix-shell.mkBash {
pname = "sane-reclaim-disk-space"; pname = "sane-reclaim-disk-space";
src = ./src; srcRoot = ./src;
pkgs = [ "nix" ]; pkgs = [ "nix" ];
}; };
secrets-dump = static-nix-shell.mkBash { secrets-dump = static-nix-shell.mkBash {
pname = "sane-secrets-dump"; pname = "sane-secrets-dump";
src = ./src; srcRoot = ./src;
pkgs = [ "gnugrep" "sops" "oath-toolkit" ]; pkgs = [ "gnugrep" "sops" "oath-toolkit" ];
}; };
secrets-unlock = static-nix-shell.mkBash { secrets-unlock = static-nix-shell.mkBash {
pname = "sane-secrets-unlock"; pname = "sane-secrets-unlock";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" "openssh" "ssh-to-age" ]; pkgs = [ "coreutils-full" "openssh" "ssh-to-age" ];
}; };
secrets-update-keys = static-nix-shell.mkBash { secrets-update-keys = static-nix-shell.mkBash {
pname = "sane-secrets-update-keys"; pname = "sane-secrets-update-keys";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" "findutils" "sops" ]; pkgs = [ "coreutils-full" "findutils" "sops" ];
}; };
shutdown = static-nix-shell.mkBash { shutdown = static-nix-shell.mkBash {
pname = "sane-shutdown"; pname = "sane-shutdown";
src = ./src; srcRoot = ./src;
pkgs = [ "nettools" "systemd" ]; pkgs = [ "nettools" "systemd" ];
}; };
stop-all-servo = static-nix-shell.mkBash { stop-all-servo = static-nix-shell.mkBash {
pname = "sane-stop-all-servo"; pname = "sane-stop-all-servo";
src = ./src; srcRoot = ./src;
pkgs = [ "systemd" ]; pkgs = [ "systemd" ];
}; };
sudo-redirect = static-nix-shell.mkBash { sudo-redirect = static-nix-shell.mkBash {
pname = "sane-sudo-redirect"; pname = "sane-sudo-redirect";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" ]; pkgs = [ "coreutils-full" ];
}; };
sync-from-iphone = static-nix-shell.mkZsh { sync-from-iphone = static-nix-shell.mkZsh {
pname = "sane-sync-from-iphone"; pname = "sane-sync-from-iphone";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" "ifuse" "rsync" ]; pkgs = [ "coreutils-full" "ifuse" "rsync" ];
}; };
sync-music = static-nix-shell.mkPython3Bin { sync-music = static-nix-shell.mkPython3Bin {
pname = "sane-sync-music"; pname = "sane-sync-music";
src = ./src; srcRoot = ./src;
pkgs = [ "ffmpeg" "sox" ]; pkgs = [ "ffmpeg" "sox" ];
pyPkgs = [ "unidecode" ]; pyPkgs = [ "unidecode" ];
}; };
tag-music = static-nix-shell.mkPython3Bin { tag-music = static-nix-shell.mkPython3Bin {
pname = "sane-tag-music"; pname = "sane-tag-music";
src = ./src; srcRoot = ./src;
pyPkgs = [ "mutagen" ]; pyPkgs = [ "mutagen" ];
}; };
vpn = static-nix-shell.mkBash { vpn = static-nix-shell.mkBash {
pname = "sane-vpn"; pname = "sane-vpn";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" "sane-scripts.ip-check" ]; pkgs = [ "coreutils-full" "sane-scripts.ip-check" ];
}; };
which = static-nix-shell.mkBash { which = static-nix-shell.mkBash {
pname = "sane-which"; pname = "sane-which";
src = ./src; srcRoot = ./src;
pkgs = [ "coreutils-full" "file" ]; pkgs = [ "coreutils-full" "file" ];
}; };
wipe = static-nix-shell.mkBash { wipe = static-nix-shell.mkBash {
pname = "sane-wipe"; pname = "sane-wipe";
src = ./src; srcRoot = ./src;
pkgs = [ "dconf" "libsecret" "systemd" ]; pkgs = [ "dconf" "libsecret" "systemd" ];
}; };
}; };