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

Revert "default.nix: lib = import 4lib/krebs" 

This reverts commit 981664337f
This commit is contained in:
tv 2015-07-28 21:00:53 +02:00
parent 8170b28196
commit f98248672e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
default.nix
View File

@ -1,12 +1,8 @@
{ 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}/1systems/${system-name}.nix" "${user-name}/1systems/${system-name}.nix"

11
tv/4lib/default.nix
View File

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