From b7cb55562913a05cee11c41a6b475b981910eca1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 22 Dec 2018 15:28:08 +0100
Subject: [PATCH] Migrate modifier packages to separate variable

---
 default.nix | 55 +++++++++++++++++++++--------------------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/default.nix b/default.nix
index 8ceee41..f509385 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,6 @@
 with import <nixpkgs> {};
 let
+  mypkgs = {};
   nixpkgs = import <nixpkgs> {};
   postHook =  ''
     header() {
@@ -34,13 +35,13 @@ let
       src = fetchgit json.git;
     };
 
-  ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old:
+  mypkgs.ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (_old:
     fetchedGithub ./fetched/ledger.json // {
       postInstall = "";
     }
   );
 
-  taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec {
+  mypkgs.taskwarrior = nixpkgs.taskwarrior.overrideAttrs (old: rec {
     postInstall = ''${old.postInstall}
       mkdir -p "$out/share/vim/vimfiles/ftdetect"
       mkdir -p "$out/share/vim/vimfiles/syntax"
@@ -51,20 +52,20 @@ let
     '';
   });
 
-  vit = (nixpkgs.vit.override { inherit taskwarrior; }).overrideAttrs (old:
+  mypkgs.vit = (nixpkgs.vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old:
     fetchedGithub ./fetched/vit.json // {
       buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth];
     }
   );
 
-  weboob = pythonPackages.weboob.overrideAttrs (old: rec {
+  mypkgs.weboob = pythonPackages.weboob.overrideAttrs (old: rec {
     postInstall = ''${old.postInstall or ""}
       mkdir -p $out/share/bash-completion/completions/
       cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob
     '';
   });
 
-  slrn = nixpkgs.slrn.overrideAttrs (old: rec {
+  mypkgs.slrn = nixpkgs.slrn.overrideAttrs (old: rec {
     version = "1.0.3a";
     name = "slrn-${version}";
     src = fetchurl {
@@ -74,17 +75,17 @@ let
     configureFlags = old.configureFlags ++ [ "--with-slrnpull" ];
   });
 
-  ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json);
+  mypkgs.ldapvi = nixpkgs.ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json);
 
   nixos = import ./nixos_tools.nix {};
 
-  pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old:
+  mypkgs.pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old:
     fetchedGit ./fetched/pass.json // {
       patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ];
     }
   );
 
-  profanity = (nixpkgs.profanity.override {
+  mypkgs.profanity = (nixpkgs.profanity.override {
     notifySupport = true;
     inherit libnotify gpgme gdk_pixbuf;
     python = python3;
@@ -92,7 +93,7 @@ let
     configureFlags = old.configureFlags ++ [ "--enable-plugins" ];
   });
 
-  weechat = nixpkgs.weechat.override {
+  mypkgs.weechat = nixpkgs.weechat.override {
     configure = { availablePlugins, ... }: {
       plugins = with availablePlugins; [
          (python.withPackages (ps: with ps; [websocket_client emoji]))
@@ -102,7 +103,7 @@ let
   };
 
   buildPerlPackage = callPackage <nixpkgs/pkgs/development/perl-modules/generic> { };
-  note = buildPerlPackage rec {
+  mypkgs.note = buildPerlPackage rec {
     name = "note-1.3.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz";
@@ -119,7 +120,7 @@ let
     };
   };
 
-  terminal_velocity = with python2Packages; buildPythonApplication rec {
+  mypkgs.terminal_velocity = with python2Packages; buildPythonApplication rec {
     pname = "terminal-velocity-git";
     version = "0.2.0";
 
@@ -138,7 +139,7 @@ let
     };
   };
 
-  mtop = buildPerlPackage rec {
+  mypkgs.mtop = buildPerlPackage rec {
     name = "mtop-${version}";
     version = "0.6.6";
     src = fetchurl {
@@ -161,7 +162,7 @@ let
     };
   };
 
-  tiv = buildPerlPackage rec {
+  mypkgs.tiv = buildPerlPackage rec {
     name = "tiv-${version}";
     version = "2015";
     src = fetchurl {
@@ -179,7 +180,7 @@ let
     '';
   };
 
-  cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec {
+  mypkgs.cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec {
     configureFlags = [
       "--with-etc-dir=/etc/cnagios"
       "--with-var-dir=/var/lib/naemon"
@@ -200,13 +201,13 @@ let
     propagatedBuildInputs = [ perl ncurses ];
   });
 
-  nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json);
+  mypkgs.nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json);
 
-  pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec {
+  mypkgs.pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec {
     propagatedBuildInputs = [ psycopg2 psutil ];
   });
 
-  pgloader = stdenv.mkDerivation (fetchedGithub ./fetched/pgloader.json // rec {
+  mypkgs.pgloader = stdenv.mkDerivation (fetchedGithub ./fetched/pgloader.json // rec {
     buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ];
     LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
     buildPhase = ''
@@ -222,22 +223,18 @@ let
     '';
   });
 
-  pelican = python3Packages.pelican.overrideAttrs(old: fetchedGithub ./fetched/pelican.json // rec {
+  mypkgs.pelican = python3Packages.pelican.overrideAttrs(old: fetchedGithub ./fetched/pelican.json // rec {
     propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.pyyaml ];
   });
 
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
 in
-  {
+  mypkgs // {
     inherit nix-prefetch-scripts;
     inherit nix-generate-from-cpan;
-    inherit ledger;
-    inherit taskwarrior vit timewarrior;
-    inherit weboob;
-    inherit slrn;
+    inherit timewarrior;
     inherit sc-im;
-    inherit ldapvi;
     inherit pal;
     inherit duplicity duply;
     inherit pdftk;
@@ -248,18 +245,11 @@ in
     inherit vcsh;
     inherit xmr-stak;
     inherit urlwatch;
-    inherit pass;
     inherit ranger;
-    inherit profanity;
-    inherit weechat irssi;
-    inherit note terminal_velocity;
-    inherit mtop;
-    inherit tiv;
-    inherit cnagios nagios-cli;
+    inherit irssi;
     inherit abook khard khal;
     inherit graphicsmagick;
     inherit youtube-dl;
-    inherit pg_activity pgloader;
     inherit ncmpc;
     inherit cadaver;
     inherit mairix notmuch;
@@ -275,7 +265,6 @@ in
     inherit iotop iperf;
     inherit keybase;
     inherit bogofilter;
-    inherit pelican;
     # todo: lx* ?, unrar, unzip, zeromq?
     #inherit nextcloud-client;
     #inherit nixos;
-- 
2.41.0