steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/os/devices/167.233.1.14: update to nixos-21.05

Browse source
This commit is contained in:
steveej 2021-08-21 22:56:11 +02:00
parent f1449bdac8
commit d1c2451adb
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix/os/devices/167.233.1.14/hw.nix
View file

@ -2,10 +2,6 @@
let let
stage1Modules = [ stage1Modules = [
# "aesni_intel"
# "kvm-intel"
"aes_x86_64"
"virtio_balloon" "virtio_balloon"
"virtio_scsi" "virtio_scsi"
"virtio_net" "virtio_net"

19
nix/os/devices/167.233.1.14/versions.nix
View file

@ -1,18 +1,23 @@
let let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09"; ref = "nixos-21.05";
rev = "51aaa3fa1b69559456f9bd4968bd5b179a784f67"; rev = "a1007637cea374bd1bafd754cfd5388894c49129";
}; };
in in
{ {
inherit nixpkgs; inherit nixpkgs;
"channels-nixos-stable" = nixpkgs; "channels-nixos-stable" = nixpkgs;
"channels-nixos-20.09" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "068984c00e0d4e54b6684d98f6ac47c92dcb642e";
};
"channels-nixos-20.03" = { "channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03"; ref = "nixos-20.03";
rev = "ff6fda61600cc60404bab5cb6b18b8636785b7bc"; rev = "1db42b7fe3878f3f5f7a4f2dc210772fd080e205";
}; };
"channels-nixos-19.09" = { "channels-nixos-19.09" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
@ -22,16 +27,16 @@ in
"channels-nixos-unstable" = { "channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "24c9b05ac53e422f1af81a156f1fd58499eb27fb"; rev = "253aecf69ed7595aaefabde779aa6449195bebb7";
}; };
"nixpkgs-master" = { "nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "9b3e35d991ea6a43f256069dcb2e006006730d05"; rev = "77506e4f258f1922148986a73a713006318e9fe9";
}; };
"home-manager-module" = { "home-manager-module" = {
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
ref = "release-20.09"; ref = "release-21.05";
rev = "7339784e07217ed0232e08d1ea33b610c94657d8"; rev = "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef";
}; };
} }

13
nix/os/devices/167.233.1.14/versions.tmpl.nix
View file

@ -1,14 +1,19 @@
let let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09"; ref = "nixos-21.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
in in
{ {
inherit nixpkgs; inherit nixpkgs;
"channels-nixos-stable" = nixpkgs; "channels-nixos-stable" = nixpkgs;
"channels-nixos-20.09" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-20.09 | awk '{ print $1 }' | tr -d '\n' -%>";
};
"channels-nixos-20.03" = { "channels-nixos-20.03" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.03"; ref = "nixos-20.03";
@ -31,7 +36,7 @@ in
}; };
"home-manager-module" = { "home-manager-module" = {
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
ref = "release-20.09"; ref = "release-21.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-20.09 | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
} }