hacc/haccfiles
8
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

sources: update nix-hexchen

Browse source 
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.
This commit is contained in:
hexchen 2021-03-02 20:37:36 +00:00 committed by schweby
parent 6f2cc7bf7f
commit b186473e68
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/hexchen.nix
View file

@ -4,6 +4,6 @@ let
sources = import ../nix/sources.nix; sources = import ../nix/sources.nix;
in { in {
imports = [ imports = [
(sources.nix-hexchen + "/users/hexchen") (import sources.nix-hexchen).users.hexchen.base
]; ];
} }

2
nix/sources.json
View file

@ -27,7 +27,7 @@
"branch": "main", "branch": "main",
"ref": "main", "ref": "main",
"repo": "https://gitlab.com/hexchen/nixfiles.git", "repo": "https://gitlab.com/hexchen/nixfiles.git",
"rev": "029493c1ad1e30007b25ac37bb09fdc75b4108e3", "rev": "eeacd84d9576e9e957c4e413b7475c61c917f924",
"type": "git" "type": "git"
}, },
"nixos-mailserver": { "nixos-mailserver": {

3
pkgs/default.nix
View file

@ -3,6 +3,7 @@
let let
sources = import ../nix/sources.nix; sources = import ../nix/sources.nix;
pkgs = import sources.nixpkgs args; pkgs = import sources.nixpkgs args;
unstable = import sources.nixpkgs-unstable args;
callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
@ -32,6 +33,8 @@ let
--prefix "LD_LIBRARY_PATH" : "${pkgs.lib.makeLibraryPath wrapLibraries}" --prefix "LD_LIBRARY_PATH" : "${pkgs.lib.makeLibraryPath wrapLibraries}"
''; '';
}); });
inherit (unstable) bottom;
}; };
in pkgs.extend(_: _: newpkgs) in pkgs.extend(_: _: newpkgs)