From c1aaaca7f7febe0c587342ae74e7045bb9a67c5a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 28 Aug 2015 21:31:59 +0200 Subject: krebs += pkgs.writeC lib.toC --- tv/5pkgs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tv/5pkgs/default.nix') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 7b5d10a60..a0a22df9f 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: let inherit (pkgs) callPackage; - kpkgs = import ../../krebs/5pkgs { inherit pkgs; }; + kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; }; in kpkgs // { -- cgit v1.2.3 From 09257f97823e9a57cda749c2d5a69b18ef484cec Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Aug 2015 00:19:52 +0200 Subject: tv: use only pkgs --- tv/5pkgs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tv/5pkgs/default.nix') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index a0a22df9f..ce137d961 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,11 +1,10 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: let inherit (pkgs) callPackage; - kpkgs = import ../../krebs/5pkgs { inherit lib pkgs; }; in -kpkgs // { +{ charybdis = callPackage ./charybdis {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; -- cgit v1.2.3 From 22a171f3e0405d504e8c8c3b32f73a8087a5ed66 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 29 Aug 2015 00:36:50 +0200 Subject: krebs pkgs += charybdis lentil much While there, put everything into subdirectories. --- tv/5pkgs/default.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'tv/5pkgs/default.nix') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index ce137d961..4175292f2 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -5,8 +5,5 @@ let in { - charybdis = callPackage ./charybdis {}; - lentil = callPackage ./lentil {}; - much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; } -- cgit v1.2.3