Suppert flaky-nix on ci.
This commit is contained in:
parent
a054f24472
commit
58a1cd9aae
|
@ -8,8 +8,13 @@ let
|
||||||
git show -q --oneline
|
git show -q --oneline
|
||||||
echo "Evaluating nix-expression."
|
echo "Evaluating nix-expression."
|
||||||
export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
|
export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
|
||||||
nix-instantiate --add-root ./drv --indirect $FLAGS
|
if [[ -e "flake.nix" ]]; then
|
||||||
drv=$(readlink -f ./drv)
|
echo "Flake detected. Using flake.nix"
|
||||||
|
drv=$(${pkgs.nixFlakes}/bin/flaky-nix eval --raw ".#defaultPackage.x86_64-linux".drvPath")
|
||||||
|
else
|
||||||
|
nix-instantiate --add-root ./drv --indirect $FLAGS
|
||||||
|
drv=$(readlink -f ./drv)
|
||||||
|
fi
|
||||||
echo "Evaluation done."
|
echo "Evaluation done."
|
||||||
nix-jobs realise $drv
|
nix-jobs realise $drv
|
||||||
laminarc set "RESULTDRV=$drv"
|
laminarc set "RESULTDRV=$drv"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
self: super: {
|
self: super: {
|
||||||
# pkgs assumed to be present on a non nixos host
|
# pkgs assumed to be present on a non nixos host
|
||||||
|
nixFlakes = self.writeShellScriptBin "flaky-nix" ''exec ${self.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"'';
|
||||||
core-system-pkgs = {
|
core-system-pkgs = {
|
||||||
inherit (self)
|
inherit (self)
|
||||||
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
|
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
|
||||||
|
@ -13,8 +14,8 @@ self: super: {
|
||||||
htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
|
htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
|
||||||
tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
|
tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
|
||||||
entr libargon2 mblaze niv compsize mediainfo asciinema gomuks nix-output-monitor fdroidserver jq cachix
|
entr libargon2 mblaze niv compsize mediainfo asciinema gomuks nix-output-monitor fdroidserver jq cachix
|
||||||
|
nixFlakes
|
||||||
;
|
;
|
||||||
nixFlakes = self.writeShellScriptBin "flaky-nix" ''exec ${self.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
my-home-pkgs = {
|
my-home-pkgs = {
|
||||||
|
|
Loading…
Reference in a new issue