summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/default.nix6
-rw-r--r--pkgs/haskell/default.nix5
-rw-r--r--pkgs/override/default.nix6
-rw-r--r--pkgs/rpi/default.nix4
-rw-r--r--pkgs/simple/alacritty-tv.nix4
-rw-r--r--pkgs/simple/bash-fzf-history.nix5
-rw-r--r--pkgs/simple/default.nix6
-rw-r--r--pkgs/simple/pinentry-urxvt/default.nix6
-rw-r--r--pkgs/simple/q/default.nix5
-rw-r--r--pkgs/vim/default.nix5
-rw-r--r--pkgs/vim/vim.nix8
11 files changed, 11 insertions, 49 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 41e17c8..fb90696 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,11 +1,7 @@
self: super:
let
- inherit (super) lib;
-
- mylib = import ../lib/pure.nix {
- inherit lib;
- };
+ inherit (super) lib mylib;
pushBack = x: xs:
if builtins.elem x xs then
diff --git a/pkgs/haskell/default.nix b/pkgs/haskell/default.nix
index 7baaa89..df90096 100644
--- a/pkgs/haskell/default.nix
+++ b/pkgs/haskell/default.nix
@@ -9,10 +9,7 @@ let
};
in
self: super: let
- inherit (super) lib;
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
+ inherit (super) lib mylib;
in {
haskell = super.haskell // {
packages = lib.mapAttrs (name: value:
diff --git a/pkgs/override/default.nix b/pkgs/override/default.nix
index cf64142..67175a5 100644
--- a/pkgs/override/default.nix
+++ b/pkgs/override/default.nix
@@ -1,11 +1,7 @@
self: super:
let
- inherit (super) lib;
-
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
+ inherit (super) mylib;
in
mylib.mapNixDir (path: import path self super) ./.
diff --git a/pkgs/rpi/default.nix b/pkgs/rpi/default.nix
index 50f8aad..6a30f74 100644
--- a/pkgs/rpi/default.nix
+++ b/pkgs/rpi/default.nix
@@ -1,9 +1,7 @@
self: super:
let
- mylib = import ../../lib/pure.nix {
- inherit (super) lib;
- };
+ inherit (super) mylib;
in
{
diff --git a/pkgs/simple/alacritty-tv.nix b/pkgs/simple/alacritty-tv.nix
index efbcc6e..cb8f960 100644
--- a/pkgs/simple/alacritty-tv.nix
+++ b/pkgs/simple/alacritty-tv.nix
@@ -1,12 +1,10 @@
{ lib
+, mylib
, pkgs
, variant ? "x220"
}:
let
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
font-size = arg: {
program = "${pkgs.font-size-alacritty}/bin/font-size-alacritty";
args = [arg];
diff --git a/pkgs/simple/bash-fzf-history.nix b/pkgs/simple/bash-fzf-history.nix
index f35d5e8..50f102c 100644
--- a/pkgs/simple/bash-fzf-history.nix
+++ b/pkgs/simple/bash-fzf-history.nix
@@ -1,4 +1,5 @@
{ lib
+, mylib
, pkgs
, edit-key ? "ctrl-e"
@@ -15,10 +16,6 @@
, load-keyseq ? start-keyseq
}: let
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
-
script = pkgs.writeBash "bash-fzf-history.sh" ''
if ! command -v fzf >/dev/null; then
# Alternatively rewrite ${pkgs.fzf}/share/fzf/* to use absolute paths.
diff --git a/pkgs/simple/default.nix b/pkgs/simple/default.nix
index 1c4a53b..1e63017 100644
--- a/pkgs/simple/default.nix
+++ b/pkgs/simple/default.nix
@@ -1,11 +1,7 @@
self: super:
let
- inherit (super) lib;
-
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
+ inherit (super) lib mylib;
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
diff --git a/pkgs/simple/pinentry-urxvt/default.nix b/pkgs/simple/pinentry-urxvt/default.nix
index 7363f26..6868207 100644
--- a/pkgs/simple/pinentry-urxvt/default.nix
+++ b/pkgs/simple/pinentry-urxvt/default.nix
@@ -1,10 +1,6 @@
-{ lib, pkgs, ... }@args:
+{ lib, mylib, pkgs, ... }@args:
let
- mylib = import ../../../lib/pure.nix {
- inherit lib;
- };
-
# config cannot be declared in the input attribute set because that would
# cause callPackage to inject the wrong config. Instead, get it from ...
# via args.
diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix
index 03e924e..a1e60e3 100644
--- a/pkgs/simple/q/default.nix
+++ b/pkgs/simple/q/default.nix
@@ -1,11 +1,8 @@
{ lib
+, mylib
, pkgs
}:
let
- mylib = import ../../../lib/pure.nix {
- inherit lib;
- };
-
q-cal = let
# Maximum width of cal's output.
diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix
index 20e845a..f83ca3a 100644
--- a/pkgs/vim/default.nix
+++ b/pkgs/vim/default.nix
@@ -1,8 +1,5 @@
self: super: let
- inherit (super) lib;
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
+ inherit (super) lib mylib;
in {
tv = super.tv // {
vim = {
diff --git a/pkgs/vim/vim.nix b/pkgs/vim/vim.nix
index e026f13..b5f7d4e 100644
--- a/pkgs/vim/vim.nix
+++ b/pkgs/vim/vim.nix
@@ -1,10 +1,4 @@
-{ lib, pkgs }:
-
-let
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
-in
+{ lib, mylib, pkgs }:
pkgs.tv.vim.makePlugin (pkgs.writeTextFile (let
name = "vim";