Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/user-toplevel' into user-toplevel

Browse Source
This commit is contained in:
makefu 2015-07-28 20:27:24 +02:00
commit fca517dd0e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

@ -1,8 +1,12 @@
{ user-name, system-name }: { user-name, system-name }:
let let
lib = import 4lib/krebs {
lib = import <nixpkgs/lib>;
};
eval = import <nixpkgs/nixos/lib/eval-config.nix> { eval = import <nixpkgs/nixos/lib/eval-config.nix> {
inherit lib;
system = builtins.currentSystem; system = builtins.currentSystem;
modules = map (p: ./. + "/${p}") [ modules = map (p: ./. + "/${p}") [
"${user-name}/systems/${system-name}.nix" "${user-name}/systems/${system-name}.nix"

11
tv/lib/default.nix
View File

@ -1,16 +1,11 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let with lib;
krebs = import ../../4lib/krebs { inherit lib; };
in
with krebs; lib // rec {
krebs // rec {
git = import ./git.nix { git = import ./git.nix {
lib = krebs; inherit lib pkgs;
inherit pkgs;
}; };
# "7.4.335" -> "74" # "7.4.335" -> "74"