Update dependencies

This commit is contained in:
Charlotte Van Petegem 2021-04-16 10:45:04 +02:00
parent 3212896eea
commit bfc1702f36
No known key found for this signature in database
GPG key ID: 019E764B7184435A
4 changed files with 12 additions and 17 deletions

18
flake.lock generated
View file

@ -53,16 +53,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1618388647, "lastModified": 1618560353,
"narHash": "sha256-qs2LLMWfFI51MiSyt4azliM6tdBgaIonRqD7Oq8Nxjk=", "narHash": "sha256-8I2frsJ7raO0k4tl49D31DgaRKd/bZ4LP7pBmgR7/1g=",
"owner": "nixos", "owner": "chvp",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3d70196ea1b4586414122ae1aadff5c37ef9611", "rev": "c4a1855ef2ee48298d9a55e7e040c8abebd6f6b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "chvp",
"ref": "nixos-unstable-small", "ref": "nixos-rebuild-remote-flakes",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -80,11 +80,11 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1618392274, "lastModified": 1618507051,
"narHash": "sha256-kX7Hpn/nl//eWDa1QzkiSdbskdeH+HwWFP0iIo7gYH8=", "narHash": "sha256-+e3AuL7BxxHyRfLiEsDnm5kwZk3EvKntqMYS3jtvEPw=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "0b101bd6b34ed4b44d6d0126d2508d68801f1ba3", "rev": "c87df35ff6a925ea88a0cb98662c91b451bf1cfc",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,7 +7,7 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:chvp/nixpkgs/nixos-rebuild-remote-flakes";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/staging"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/staging";
}; };

View file

@ -2,7 +2,4 @@
set -euo pipefail set -euo pipefail
set -x set -x
drv=$(nix eval .#nixosConfigurations.$1.config.system.build.toplevel.drvPath | tr -d '"')
nix copy --derivation -s --to "ssh://root@$1" "$drv"
ssh root@$1 nix build -L --no-link "$drv"
nixos-rebuild --flake .#$1 --target-host root@$1 $2 nixos-rebuild --flake .#$1 --target-host root@$1 $2

View file

@ -6,9 +6,7 @@ nix flake update
if [ -z "${OVERRIDE:-}" ] if [ -z "${OVERRIDE:-}" ]
then then
nix build --no-link --profile /nix/var/nix/profiles/per-user/charlotte/`hostname` .#nixosConfigurations.`hostname`.config.system.build.toplevel su -c "nixos-rebuild --flake . --build-host root@urithiru switch"
su -c "nixos-rebuild --flake . switch"
else else
nix build --no-link --override-input nixpkgs ../nixpkgs --no-write-lock-file --profile /nix/var/nix/profiles/per-user/charlotte/`hostname` .#nixosConfigurations.`hostname`.config.system.build.toplevel su -c "nixos-rebuild --flake . --build-host root@urithiru --override-input nixpkgs ../nixpkgs --no-write-lock-file switch"
su -c "nixos-rebuild --flake . --override-input nixpkgs ../nixpkgs --no-write-lock-file switch"
fi fi