Merge branch 'update/hexchen' into 'main'

sources: update nix-hexchen

See merge request hacc/infra/haccfiles!39
This commit is contained in:
hexchen 2021-03-09 11:50:38 +00:00
commit f4cfc1a6b2
3 changed files with 5 additions and 2 deletions

View file

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

View file

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

View file

@ -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)