From edc6ba42bd8f1ff428d92022e53fdc73fb09eeea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 30 Oct 2019 22:09:49 +0100 Subject: [PATCH] feat(deploy): manage versions in json --- _versions/home-manager.json | 7 +++++++ _versions/krops.json | 7 +++++++ _versions/nixpkgs-unstable.json | 7 +++++++ _versions/nixpkgs.json | 7 +++++++ _versions/stockholm.json | 7 +++++++ deploy.nix | 18 +++++++++--------- nixpkgs.json | 7 ------- update-channels | 19 +++++++++++++++++++ 8 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 _versions/home-manager.json create mode 100644 _versions/krops.json create mode 100644 _versions/nixpkgs-unstable.json create mode 100644 _versions/nixpkgs.json create mode 100644 _versions/stockholm.json delete mode 100644 nixpkgs.json create mode 100755 update-channels diff --git a/_versions/home-manager.json b/_versions/home-manager.json new file mode 100644 index 0000000..be89516 --- /dev/null +++ b/_versions/home-manager.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/rycee/home-manager.git", + "rev": "dff5f07952e61da708dc8b348ea677414e992215", + "date": "2019-10-29T23:11:09+01:00", + "sha256": "16ibf367ay6dkwv6grrkpx8nf0nz3jlr3xxpjv4zjj0v3imwlq6b", + "fetchSubmodules": false +} diff --git a/_versions/krops.json b/_versions/krops.json new file mode 100644 index 0000000..9e7c6ad --- /dev/null +++ b/_versions/krops.json @@ -0,0 +1,7 @@ +{ + "url": "https://cgit.krebsco.de/krops", + "rev": "89a83135e7ac5e1452c04f5581c00ff293bd01f5", + "date": "2019-06-29T13:39:10+02:00", + "sha256": "0fxm471rpkijijhvbfgpw6y1k5qdrww2v351v2lyswkvrrqgmidk", + "fetchSubmodules": false +} diff --git a/_versions/nixpkgs-unstable.json b/_versions/nixpkgs-unstable.json new file mode 100644 index 0000000..b53d8ee --- /dev/null +++ b/_versions/nixpkgs-unstable.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/NixOS/nixpkgs-channels.git", + "rev": "4cd2cb43fb3a87f48c1e10bb65aee99d8f24cb9d", + "date": "2019-10-23T18:19:15+00:00", + "sha256": "1d6rmq67kdg5gmk94wx2774qw89nvbhy6g1f2lms3c9ph37hways", + "fetchSubmodules": false +} diff --git a/_versions/nixpkgs.json b/_versions/nixpkgs.json new file mode 100644 index 0000000..b95e15a --- /dev/null +++ b/_versions/nixpkgs.json @@ -0,0 +1,7 @@ +{ + "url": "https://github.com/NixOS/nixpkgs-channels.git", + "rev": "c75de8bc12cc7e713206199e5ca30b224e295041", + "date": "2019-10-27T17:40:06+01:00", + "sha256": "1awipcjfvs354spzj2la1nzmi9rh2ci2mdapzf4kkabf58ilra6x", + "fetchSubmodules": false +} diff --git a/_versions/stockholm.json b/_versions/stockholm.json new file mode 100644 index 0000000..8f5048b --- /dev/null +++ b/_versions/stockholm.json @@ -0,0 +1,7 @@ +{ + "url": "https://cgit.krebsco.de/stockholm", + "rev": "ea5b591d065b721666fc3527ad45a7545a594a77", + "date": "2019-10-23T21:00:14+02:00", + "sha256": "0fyxwmyb5b3nlmi6jni6ny2a63h8g4z0bsrb4gbbzvw31gf6mwhb", + "fetchSubmodules": false +} diff --git a/deploy.nix b/deploy.nix index 03dcd14..bd22533 100644 --- a/deploy.nix +++ b/deploy.nix @@ -1,7 +1,7 @@ let krops = builtins.fetchGit { url = "https://cgit.krebsco.de/krops/"; - ref = "v1.14.0"; + ref = (importJson _versions/krops.json).rev; }; lib = import "${krops}/lib"; pkgs = import "${krops}/pkgs" {}; @@ -15,20 +15,20 @@ let nixos-config.symlink = "system/configuration.nix"; nixpkgs.git = { - url = https://github.com/NixOS/nixpkgs-channels; - ref = (importJson ./nixpkgs.json).rev; + url = "https://github.com/NixOS/nixpkgs-channels"; + ref = (importJson _versions/nixpkgs.json).rev; }; nixos-unstable.git = { - url = https://github.com/NixOS/nixpkgs-channels; - ref = "07d4df5"; + url = "https://github.com/NixOS/nixpkgs-channels"; + ref = (importJson _versions/nixpkgs-unstable.json).rev; }; home-manager.git = { - url = https://github.com/rycee/home-manager; - ref = "31e8494"; + url = "https://github.com/rycee/home-manager"; + ref = (importJson _versions/home-manager.json).rev; }; stockholm.git = { - url = https://cgit.krebsco.de/stockholm; - ref = "421a9792"; + url = "https://cgit.krebsco.de/stockholm"; + ref = (importJson _versions/stockholm.json).rev; }; secrets.pass = { dir = toString ~/.password-store/systems; diff --git a/nixpkgs.json b/nixpkgs.json deleted file mode 100644 index 69aea1b..0000000 --- a/nixpkgs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "27a5ddcf747fb2bb81ea9c63f63f2eb3eec7a2ec", - "date": "2019-10-23T23:56:43+02:00", - "sha256": "1bp11q2marsqj3g2prdrghkhmv483ab5pi078d83xkhkk2jh3h81", - "fetchSubmodules": false -} \ No newline at end of file diff --git a/update-channels b/update-channels new file mode 100755 index 0000000..a59b8dc --- /dev/null +++ b/update-channels @@ -0,0 +1,19 @@ +#!/bin/sh +fetch() { + rev=$1 + output=$2 + url=${3:-https://github.com/NixOS/nixpkgs-channels.git} + + printf "\033[1m$url\033[0m $rev\n" + nix-prefetch-git \ + --url "${url}" \ + --rev "${rev}" \ + > "${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/krops.json "https://cgit.krebsco.de/stockholm"