aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-12-22 15:44:57 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-12-22 15:44:57 +0100
commit90a37f5e5c86704f29d1270ea003cf1078fabc3a (patch)
tree57dd47c103a2d0f2b5b87d7fb3c4d9524f6f4a7d
parentb7cb55562913a05cee11c41a6b475b981910eca1 (diff)
downloadNix-90a37f5e5c86704f29d1270ea003cf1078fabc3a.tar.gz
Nix-90a37f5e5c86704f29d1270ea003cf1078fabc3a.tar.zst
Nix-90a37f5e5c86704f29d1270ea003cf1078fabc3a.zip
Remove useless qualified import of nixpkgs
-rw-r--r--default.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/default.nix b/default.nix
index f509385..0dfd007 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,6 @@
1with import <nixpkgs> {}; 1with import <nixpkgs> {};
2let 2let
3 mypkgs = {}; 3 mypkgs = {};
4 nixpkgs = import <nixpkgs> {};
5 postHook = '' 4 postHook = ''
6 header() { 5 header() {
7 echo -ne "\033[1;36m" 6 echo -ne "\033[1;36m"
@@ -35,13 +34,13 @@ let
35 src = fetchgit json.git; 34 src = fetchgit json.git;
36 }; 35 };
37 36
38 mypkgs.ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old: 37 mypkgs.ledger = (ledger.override { boost = boost166; }).overrideAttrs (_old:
39 fetchedGithub ./fetched/ledger.json // { 38 fetchedGithub ./fetched/ledger.json // {
40 postInstall = ""; 39 postInstall = "";
41 } 40 }
42 ); 41 );
43 42
44 mypkgs.taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec { 43 mypkgs.taskwarrior = taskwarrior.overrideAttrs (old: rec {
45 postInstall = ''${old.postInstall} 44 postInstall = ''${old.postInstall}
46 mkdir -p "$out/share/vim/vimfiles/ftdetect" 45 mkdir -p "$out/share/vim/vimfiles/ftdetect"
47 mkdir -p "$out/share/vim/vimfiles/syntax" 46 mkdir -p "$out/share/vim/vimfiles/syntax"
@@ -52,7 +51,7 @@ let
52 ''; 51 '';
53 }); 52 });
54 53
55 mypkgs.vit = (nixpkgs.vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old: 54 mypkgs.vit = (vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old:
56 fetchedGithub ./fetched/vit.json // { 55 fetchedGithub ./fetched/vit.json // {
57 buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth]; 56 buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth];
58 } 57 }
@@ -65,7 +64,7 @@ let
65 ''; 64 '';
66 }); 65 });
67 66
68 mypkgs.slrn = nixpkgs.slrn.overrideAttrs (old: rec { 67 mypkgs.slrn = slrn.overrideAttrs (old: rec {
69 version = "1.0.3a"; 68 version = "1.0.3a";
70 name = "slrn-${version}"; 69 name = "slrn-${version}";
71 src = fetchurl { 70 src = fetchurl {
@@ -75,17 +74,17 @@ let
75 configureFlags = old.configureFlags ++ [ "--with-slrnpull" ]; 74 configureFlags = old.configureFlags ++ [ "--with-slrnpull" ];
76 }); 75 });
77 76
78 mypkgs.ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json); 77 mypkgs.ldapvi = ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json);
79 78
80 nixos = import ./nixos_tools.nix {}; 79 nixos = import ./nixos_tools.nix {};
81 80
82 mypkgs.pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: 81 mypkgs.pass = (pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old:
83 fetchedGit ./fetched/pass.json // { 82 fetchedGit ./fetched/pass.json // {
84 patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ]; 83 patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ];
85 } 84 }
86 ); 85 );
87 86
88 mypkgs.profanity = (nixpkgs.profanity.override { 87 mypkgs.profanity = (profanity.override {
89 notifySupport = true; 88 notifySupport = true;
90 inherit libnotify gpgme gdk_pixbuf; 89 inherit libnotify gpgme gdk_pixbuf;
91 python = python3; 90 python = python3;
@@ -93,7 +92,7 @@ let
93 configureFlags = old.configureFlags ++ [ "--enable-plugins" ]; 92 configureFlags = old.configureFlags ++ [ "--enable-plugins" ];
94 }); 93 });
95 94
96 mypkgs.weechat = nixpkgs.weechat.override { 95 mypkgs.weechat = weechat.override {
97 configure = { availablePlugins, ... }: { 96 configure = { availablePlugins, ... }: {
98 plugins = with availablePlugins; [ 97 plugins = with availablePlugins; [
99 (python.withPackages (ps: with ps; [websocket_client emoji])) 98 (python.withPackages (ps: with ps; [websocket_client emoji]))