diff --git a/_versions/nixpkgs-unstable.json b/_versions/nixpkgs-unstable.json index d364904..f2f4cd5 100644 --- a/_versions/nixpkgs-unstable.json +++ b/_versions/nixpkgs-unstable.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels.git", - "rev": "3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5", - "date": "2019-11-29T18:09:02-05:00", - "sha256": "1mgqx1h8i9npxzmywdhkgm67iwsa0rvicwjs5wjssxlzx0hf6z5z", + "rev": "bb1013511e1e5edcf314df8321acf2f3c536df0d", + "date": "2019-12-01T23:55:47+00:00", + "sha256": "0qycfgnf0k2bxk7k88h80l8kyq9232knbn9ybiv3nla69hjlslrk", "fetchSubmodules": false } diff --git a/_versions/nixpkgs.json b/_versions/nixpkgs.json index c4b8cb7..f81d3df 100644 --- a/_versions/nixpkgs.json +++ b/_versions/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels.git", - "rev": "b2448a9fde1225c3681e576ab4d35d68631ca75e", - "date": "2019-11-29T14:56:18+01:00", - "sha256": "1npciv7vjjxx1hlyxg1pnpi64dvf4amcp3vwwv5cvpzsi0hj3zl7", + "rev": "72a2ced252348defc877bea0a8b551272c0be3f9", + "date": "2019-12-03T02:09:55+00:00", + "sha256": "0vxqx5zsc8blzny89pwmhap4l105ryhpay1xviyxvcn7hx93i39x", "fetchSubmodules": false } diff --git a/deploy.nix b/deploy.nix index 5bb37de..e5fda1b 100644 --- a/deploy.nix +++ b/deploy.nix @@ -4,10 +4,7 @@ let inherit (object) url; ref = object.rev; }; - krops = builtins.fetchGit { - url = "https://cgit.krebsco.de/krops/"; - ref = (importJson _versions/krops.json).rev; - }; + krops = builtins.fetchGit (gitFromJson _versions/krops.json); lib = import "${krops}/lib"; pkgs = import "${krops}/pkgs" {}; importJson = (import {}).lib.importJSON; diff --git a/niveum-update b/niveum-update index 93b29eb..2206765 100755 --- a/niveum-update +++ b/niveum-update @@ -11,9 +11,9 @@ fetch() { > "${output}" } -fetch "refs/heads/nixos-19.09" _versions/nixpkgs.json -fetch "refs/heads/nixos-unstable" _versions/nixpkgs-unstable.json - -fetch "refs/heads/release-19.09" _versions/home-manager.json "https://github.com/rycee/home-manager.git" -fetch "refs/tags/v1.15.0" _versions/krops.json "https://cgit.krebsco.de/krops" -fetch "ea5b591d065b721666fc3527ad45a7545a594a77" _versions/stockholm.json "https://cgit.krebsco.de/stockholm" +fetch "refs/heads/nixos-19.09" _versions/nixpkgs.json & +fetch "refs/heads/nixos-unstable" _versions/nixpkgs-unstable.json & +fetch "refs/heads/release-19.09" _versions/home-manager.json "https://github.com/rycee/home-manager.git" & +fetch "refs/tags/v1.15.0" _versions/krops.json "https://cgit.krebsco.de/krops" & +fetch "ea5b591d065b721666fc3527ad45a7545a594a77" _versions/stockholm.json "https://cgit.krebsco.de/stockholm" & +wait