maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Suppert flaky-nix on ci.

Browse source
This commit is contained in:
Malte Brandy 2021-06-18 17:54:56 +02:00
parent a054f24472
commit 58a1cd9aae
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/roles/laminar/projects.nix
View file

@ -8,8 +8,13 @@ let
git show -q --oneline
echo "Evaluating nix-expression."
export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
nix-instantiate --add-root ./drv --indirect $FLAGS
drv=$(readlink -f ./drv)
if [[ -e "flake.nix" ]]; then
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."
nix-jobs realise $drv
laminarc set "RESULTDRV=$drv"

3
overlays/pkgSets.nix
View file

@ -1,5 +1,6 @@
self: super: {
# 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 = {
inherit (self)
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
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
nixFlakes
;
nixFlakes = self.writeShellScriptBin "flaky-nix" ''exec ${self.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"'';
};
my-home-pkgs = {