From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 22 Dec 2018 14:44:57 +0000 (+0100)
Subject: Remove useless qualified import of nixpkgs
X-Git-Tag: nur_publish~407
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=90a37f5e5c86704f29d1270ea003cf1078fabc3a

Remove useless qualified import of nixpkgs
---

diff --git a/default.nix b/default.nix
index f509385..0dfd007 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,6 @@
 with import <nixpkgs> {};
 let
   mypkgs = {};
-  nixpkgs = import <nixpkgs> {};
   postHook =  ''
     header() {
       echo -ne "\033[1;36m"
@@ -35,13 +34,13 @@ let
       src = fetchgit json.git;
     };
 
-  mypkgs.ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old:
+  mypkgs.ledger = (ledger.override { boost = boost166; }).overrideAttrs (_old:
     fetchedGithub ./fetched/ledger.json // {
       postInstall = "";
     }
   );
 
-  mypkgs.taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec {
+  mypkgs.taskwarrior = taskwarrior.overrideAttrs (old: rec {
     postInstall = ''${old.postInstall}
       mkdir -p "$out/share/vim/vimfiles/ftdetect"
       mkdir -p "$out/share/vim/vimfiles/syntax"
@@ -52,7 +51,7 @@ let
     '';
   });
 
-  mypkgs.vit = (nixpkgs.vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old:
+  mypkgs.vit = (vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old:
     fetchedGithub ./fetched/vit.json // {
       buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth];
     }
@@ -65,7 +64,7 @@ let
     '';
   });
 
-  mypkgs.slrn = nixpkgs.slrn.overrideAttrs (old: rec {
+  mypkgs.slrn = slrn.overrideAttrs (old: rec {
     version = "1.0.3a";
     name = "slrn-${version}";
     src = fetchurl {
@@ -75,17 +74,17 @@ let
     configureFlags = old.configureFlags ++ [ "--with-slrnpull" ];
   });
 
-  mypkgs.ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json);
+  mypkgs.ldapvi = ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json);
 
   nixos = import ./nixos_tools.nix {};
 
-  mypkgs.pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old:
+  mypkgs.pass = (pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old:
     fetchedGit ./fetched/pass.json // {
       patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ];
     }
   );
 
-  mypkgs.profanity = (nixpkgs.profanity.override {
+  mypkgs.profanity = (profanity.override {
     notifySupport = true;
     inherit libnotify gpgme gdk_pixbuf;
     python = python3;
@@ -93,7 +92,7 @@ let
     configureFlags = old.configureFlags ++ [ "--enable-plugins" ];
   });
 
-  mypkgs.weechat = nixpkgs.weechat.override {
+  mypkgs.weechat = weechat.override {
     configure = { availablePlugins, ... }: {
       plugins = with availablePlugins; [
          (python.withPackages (ps: with ps; [websocket_client emoji]))