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

feat(common,steveej-t14,graphical): udpate to nixos-22.05

Browse source
This commit is contained in:
steveej 2022-06-02 11:34:21 +02:00
parent aec8ff4e9a
commit 4a2ee46f7f
13 changed files with 42 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nix/variables/versions.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.11";
rev = "00acdb2aa817048fbe1f91ece18fe7de09762531";
ref = "nixos-22.05";
rev = "08950a6e29cf7bddee466592eb790a417550f7f9";
};
in
@ -12,25 +12,19 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "88579effa7e88c25087faf6de6388d0cd1738dc0";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
rev = "ff377a78794d412a35245e05428c8f95fef3951f";
rev = "f1c167688a6f81f4a51ab542e5f476c8c595e457";
};
"nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "2ac65dd85b7fbe81b88e3c2a80d351aba4c4a9d8";
rev = "5ebfb1845b1a77716ecd706b8f589c722584ed2a";
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.11";
rev = "697cc8c68ed6a606296efbbe9614c32537078756";
ref = "release-22.05";
rev = "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675";
};
}

14
nix/variables/versions.tmpl.nix
View file

@ -1,8 +1,8 @@
let
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-21.11";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "nixos-22.05";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
in
@ -12,12 +12,6 @@ in
suffix = "/nixos";
};
"channels-nixos-stable" = nixpkgs;
# "channels-nixos-21.05" = {
# url = "https://github.com/NixOS/nixpkgs/";
# ref = "nixos-21.05";
# rev = "<% git ls-remote https://github.com/nixos/nixpkgs nixos-21.05 | awk '{ print $1 }' | tr -d '\n' -%>";
# };
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable";
@ -30,7 +24,7 @@ in
};
"home-manager-module" = {
url = "https://github.com/nix-community/home-manager";
ref = "release-21.11";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-21.11 | awk '{ print $1 }' | tr -d '\n' -%>";
ref = "release-22.05";
rev = "<% git ls-remote https://github.com/nix-community/home-manager.git release-22.05 | awk '{ print $1 }' | tr -d '\n' -%>";
};
}