diff options
| author | lassulus <lass@lassul.us> | 2017-03-05 00:26:56 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-03-05 00:26:56 +0100 |
| commit | 11acb51ce70407f7a5c1dd705add30c97a9c9ef9 (patch) | |
| tree | b4879262b4ba1f3c1ced1e7a4baa9703c1fdb904 | |
| parent | 694cf22e02ffd7041c5f2cf7b31f3fc0bb3cc7e9 (diff) | |
| parent | 59870808ac04f4f9c829c3dcf87d02c63ea37feb (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | shared/2configs/default.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/urlwatch.nix | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix index bf2ce84..49c0d3d 100644 --- a/shared/2configs/default.nix +++ b/shared/2configs/default.nix @@ -11,7 +11,7 @@ with import <stockholm/lib>; nixos-config.symlink = "stockholm/${user.name}/1systems/${host.name}.nix"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-04 + ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 @ 2017-03-03 }; secrets.file = if getEnv "dummy_secrets" == "true" @@ -30,10 +30,6 @@ with import <stockholm/lib>; ]; nix.useSandbox = true; - nixpkgs.config.packageOverrides = pkgs: { - nano = pkgs.vim; - }; - environment.systemPackages = with pkgs; [ git rxvt_unicode.terminfo diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 1d3ee39..33fb7e4 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "53a2baa"; # nixos-unstable (17.03-rc) + ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03 }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 6e11e02..5779240 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -31,7 +31,7 @@ with import <stockholm/lib>; ## other - https://nixos.org/channels/nixos-16.09/git-revision + https://nixos.org/channels/nixos-17.03/git-revision https://nixos.org/channels/nixos-unstable/git-revision ## 2014-10-17 |