submodules : branches + maj

8 years ago · 022235ebd6
parent 2898c80bb2
commit 022235ebd6
4 changed files with 6 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,11 +1,12 @@
 [submodule "nixpkgs"]
 	path = nixpkgs
 	url = https://github.com/NixOS/nixpkgs.git
-	branch = release-16.03
+	branch = nixos-unstable
 [submodule "nixos-template-base"]
 	path = nixos-template-base
 	url = ssh://git@gogs.prunetwork.fr:10022/nixos-config/nixos-template-base.git
-	branch = master
+	branch = nixos-unstable
 [submodule "capgemini-cmb"]
 	path = capgemini-cmb
 	url = ssh://git@gogs.prunetwork.fr:10022/Capgemini-CDS-Arkea/template-nixos.git
+    branch = master
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e4e00a44ccf3ed473db62788f7a4b6dadc6e40a4
+Subproject commit f699920c8ae95ba492068ddc07566f31eb36238d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e74a1825d9636db49d903294a18c5804548b143a
+Subproject commit e2178821d85136f281fe33daec3cf264a366d2fd
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 45344fdf193ad8aebcc7e3d4c1c997c8067b7b16
+Subproject commit 6011e3ea93e78e45dc2cb6cdf63afeb516670681