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

nix/versions bump default versions with new nixpkgs/master

Browse source
This commit is contained in:
steveej 2019-03-31 22:48:33 +02:00
parent 115bef2513
commit d4d3d6bc40
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix/default.nix
View file

@ -22,6 +22,7 @@
[ "nixos" (mkChannelSource "channelsNixosStable" + "/nixos") ] [ "nixos" (mkChannelSource "channelsNixosStable" + "/nixos") ]
[ "channels-nixos-stable" (mkChannelSource "channelsNixosStable") ] [ "channels-nixos-stable" (mkChannelSource "channelsNixosStable") ]
[ "channels-nixos-unstable" (mkChannelSource "channelsNixosUnstable") ] [ "channels-nixos-unstable" (mkChannelSource "channelsNixosUnstable") ]
[ "nixpkgs-master" (mkChannelSource "nixpkgsMaster") ]
[ "home-manager-module" (mkChannelSource "homeManagerModule") ] [ "home-manager-module" (mkChannelSource "homeManagerModule") ]
]; ];
in (import (mkChannelSource "channelsNixosStable") {}).writeText "channels.rc" '' in (import (mkChannelSource "channelsNixosStable") {}).writeText "channels.rc" ''

17
nix/variables/versions.nix
View file

@ -1,15 +1,20 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-18.09"; ref = "nixos-19.03";
rev = "7e88992a8c7b2de0bcb89182d8686b27bd93e46a"; rev = "3a4ffdd38b56801ce616aa08791121d36769e884";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "44b02b52ea6a49674f124f50009299f192ed78bb"; rev = "07b42ccf2de451342982b550657636d891c4ba35";
};
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "d8c7f0bd3f42bc9e687b12ce7f0a4ef747f27933";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager/"; url = "https://github.com/rycee/home-manager";
ref = "release-18.09"; ref = "master";
rev = "dd94a849df69fe62fe2cb23a74c2b9330f1189ed"; rev = "03162970cd6dadfac58f169cd50aed5a5aeec14f";
}; };
} }

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

@ -7,6 +7,11 @@
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>"; rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable | awk '{ print $1 }' | tr -d '\n' -%>";
}; };
nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/";
ref = "master";
rev = "<% git ls-remote https://github.com/NixOS/nixpkgs.git master | head -n1 | awk '{ print $1 }' | tr -d '\n' -%>";
};
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "master"; ref = "master";