From dba033ed10838c9ff8c1720d41f8845c5199927e Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 14 Jun 2015 18:48:53 +0200 Subject: lib: take lib instead of pkgs argument --- lib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/default.nix') diff --git a/lib/default.nix b/lib/default.nix index 995e3dbc..26653d96 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,16 +1,16 @@ -{ pkgs, ... }: +{ lib, ... }: with builtins; let - inherit (pkgs.lib) stringAsChars; + inherit (lib) stringAsChars; in { # "7.4.335" -> "74" - majmin = with pkgs.lib; x : concatStrings (take 2 (splitString "." x)); + majmin = with lib; x : concatStrings (take 2 (splitString "." x)); concat = xs : -- cgit v1.2.3 From 8ee650ed25eb7b3f879b97b66d38a57bc6439ed7 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 14 Jun 2015 19:15:56 +0200 Subject: modules/tv/git: initial commit (incl. lib.git) --- lib/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib/default.nix') diff --git a/lib/default.nix b/lib/default.nix index 26653d96..27cf0e25 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -3,10 +3,20 @@ with builtins; let - inherit (lib) stringAsChars; + inherit (lib) mapAttrs stringAsChars; in -{ +rec { + git = import ./git.nix { + lib = lib // { + inherit addNames; + }; + }; + + addName = name: set: + set // { inherit name; }; + + addNames = mapAttrs addName; # "7.4.335" -> "74" -- cgit v1.2.3