From 5a00e58904df83c168f3971984916d479277e409 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 21 Nov 2020 18:22:54 +0100 Subject: chore(3p): Bump nixpkgs to nixos-unstable from 2020-11-21 Included fixes for random breakage: * 3p/awscli: pick from the stable channel; it is broken on unstable * 3p/googletest: bumped version & removed patches that nixpkgs applies * 3p/lisp/cffi: bumped library version for SBCL compat * 3p/nix: fix libsystemd attribute * 3p/nix: reformatted (clang-format handling of ternaries changed) * glittershark/home: Use home-manager from nixkpgs * glittershark/kernel: bumped linux-ck patch hash * glittershark/kernel: removed "patch patch" * multi/whitby: Use home-manager from nixpkgs * tazjin/frog: drop Sourcetrail (it doesn't build currently) Note that in addition to these changes, some previous CLs updated the versions of git and cgit which was necessary for this channel bump, but which could not be done in the same commit due to the nature of the subtree merges. Change-Id: If2563e8a68e2750c4b913a976ff7b93b42e8b7f3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2110 Tested-by: BuildkiteCI Reviewed-by: multi Reviewed-by: glittershark --- users/multi/whitby/home-manager.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'users/multi') diff --git a/users/multi/whitby/home-manager.nix b/users/multi/whitby/home-manager.nix index da748cc25b..8d34f6ebd1 100644 --- a/users/multi/whitby/home-manager.nix +++ b/users/multi/whitby/home-manager.nix @@ -1,11 +1,6 @@ { config ? throw "not a readTree target", ... }: let - homeManagerSrc = (fetchTarball { - url = "https://github.com/nix-community/home-manager/archive/9b1b55ba0264a55add4b7b4e022bdc2832b531f6.tar.gz"; - sha256 = "1lvnprvqfsjhi811ldagvfy4ilysxdj4arzi0f0gskll6czwjdr7"; - }); - depot = import {}; pkgs = import {}; @@ -14,7 +9,10 @@ in { programs = { - home-manager = { enable = true; path = homeManagerSrc; }; + home-manager = { + enable = true; + path = pkgs.home-manager.src; + }; bash = { enable = true; -- cgit 1.4.1