From b186473e68980125d0ec43a40516104df0e0d47f Mon Sep 17 00:00:00 2001 From: hexchen Date: Tue, 2 Mar 2021 20:37:36 +0000 Subject: [PATCH] sources: update nix-hexchen lots of fancy new stuff, but most importantly: we no longer import all of my user config, just the very base. none of that fancy stuff is active right now, this should mostly be a no-op unless we do the same restructure that i have just done in my nixfiles here as well. --- common/hexchen.nix | 2 +- nix/sources.json | 2 +- pkgs/default.nix | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/hexchen.nix b/common/hexchen.nix index e4ad471..3db0968 100644 --- a/common/hexchen.nix +++ b/common/hexchen.nix @@ -4,6 +4,6 @@ let sources = import ../nix/sources.nix; in { imports = [ - (sources.nix-hexchen + "/users/hexchen") + (import sources.nix-hexchen).users.hexchen.base ]; } diff --git a/nix/sources.json b/nix/sources.json index c1f56ac..167d2b2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -27,7 +27,7 @@ "branch": "main", "ref": "main", "repo": "https://gitlab.com/hexchen/nixfiles.git", - "rev": "029493c1ad1e30007b25ac37bb09fdc75b4108e3", + "rev": "eeacd84d9576e9e957c4e413b7475c61c917f924", "type": "git" }, "nixos-mailserver": { diff --git a/pkgs/default.nix b/pkgs/default.nix index 74ea8e6..0c68469 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,7 @@ let sources = import ../nix/sources.nix; pkgs = import sources.nixpkgs args; + unstable = import sources.nixpkgs-unstable args; callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); @@ -32,6 +33,8 @@ let --prefix "LD_LIBRARY_PATH" : "${pkgs.lib.makeLibraryPath wrapLibraries}" ''; }); + + inherit (unstable) bottom; }; in pkgs.extend(_: _: newpkgs)