Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma krops: RIP deployment option

Browse Source
This commit is contained in:
makefu 2018-11-30 23:18:53 +01:00
parent 91e05287a7
commit 861d4481f7
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
makefu/krops.nix
View File

@ -7,7 +7,6 @@
host-src = { host-src = {
secure = false; secure = false;
full = false;
torrent = false; torrent = false;
hw = false; hw = false;
musnix = false; musnix = false;
@ -23,7 +22,11 @@
{ {
# nixos-18.09 @ 2018-09-18 # nixos-18.09 @ 2018-09-18
# + uhub/sqlite: 5dd7610401747 # + uhub/sqlite: 5dd7610401747
nixpkgs = if test then { # + hovercraft: 7134801b17d72
nixpkgs = if host-src.arm6 then {
# TODO: we want to track the unstable channel
symlink = "/nix/var/nix/profiles/per-user/root/channels/nixos/";
} else {
file = { file = {
path = toString (pkgs.fetchFromGitHub { path = toString (pkgs.fetchFromGitHub {
owner = "makefu"; owner = "makefu";
@ -33,14 +36,6 @@
}); });
useChecksum = true; useChecksum = true;
}; };
} else if host-src.full then {
git.ref = nixpkgs-src.rev;
git.url = nixpkgs-src.url;
} else if host-src.arm6 then {
# TODO: we want to track the unstable channel
symlink = "/nix/var/nix/profiles/per-user/root/channels/nixos/";
} else {
file = "/home/makefu/store/${nixpkgs-src.rev}";
}; };
nixos-config.symlink = "stockholm/makefu/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/makefu/1systems/${name}/config.nix";

2
makefu/update-channel.sh
View File

@ -6,4 +6,4 @@ nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \
--rev refs/heads/master' \ --rev refs/heads/master' \
> $dir/nixpkgs.json > $dir/nixpkgs.json
newref=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') newref=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/')
echo git commit $dir/nixpkgs.json -m "nixpkgs: $oldref -> $newref" echo "git commit $dir/nixpkgs.json -m 'ma nixpkgs: $oldref -> $newref'"