X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=default.nix;h=0dfd0076021e8eba25ea5dcb4b0aa7c40727569a;hb=90a37f5e5c86704f29d1270ea003cf1078fabc3a;hp=92dea9cdb5c19a22730b134f66c87a1060343f09;hpb=364c87ba89ac8261ac151ec2d1229b203b8a2ad1;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/default.nix b/default.nix
index 92dea9c..0dfd007 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 with import <nixpkgs> {};
 let
-  nixpkgs = import <nixpkgs> {};
+  mypkgs = {};
   postHook =  ''
     header() {
       echo -ne "\033[1;36m"
@@ -34,14 +34,14 @@ let
       src = fetchgit json.git;
     };
 
-  ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (oldAttrs:
+  mypkgs.ledger = (ledger.override { boost = boost166; }).overrideAttrs (_old:
     fetchedGithub ./fetched/ledger.json // {
       postInstall = "";
     }
   );
 
-  taskwarrior = nixpkgs.taskwarrior.overrideAttrs (oldAttrs: rec {
-    postInstall = ''${oldAttrs.postInstall}
+  mypkgs.taskwarrior = taskwarrior.overrideAttrs (old: rec {
+    postInstall = ''${old.postInstall}
       mkdir -p "$out/share/vim/vimfiles/ftdetect"
       mkdir -p "$out/share/vim/vimfiles/syntax"
       ln -s "../../../../share/doc/task/scripts/vim/ftdetect/task.vim" "$out/share/vim/vimfiles/ftdetect/"
@@ -51,48 +51,48 @@ let
     '';
   });
 
-  vit = (nixpkgs.vit.override { inherit taskwarrior; }).overrideAttrs (oldAttrs:
+  mypkgs.vit = (vit.override { taskwarrior = mypkgs.taskwarrior; }).overrideAttrs (old:
     fetchedGithub ./fetched/vit.json // {
-      buildInputs = oldAttrs.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth];
+      buildInputs = old.buildInputs ++ [perlPackages.TryTiny perlPackages.TextCharWidth];
     }
   );
 
-  weboob = pythonPackages.weboob.overrideAttrs (oldAttrs: rec {
-    postInstall = ''${oldAttrs.postInstall or ""}
+  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 (oldAttrs: rec {
+  mypkgs.slrn = slrn.overrideAttrs (old: rec {
     version = "1.0.3a";
     name = "slrn-${version}";
     src = fetchurl {
       url = "http://www.jedsoft.org/releases/slrn/slrn-${version}.tar.bz2";
       sha256 = "1b1d9iikr60w0vq86y9a0l4gjl0jxhdznlrdp3r405i097as9a1v";
     };
-    configureFlags = oldAttrs.configureFlags ++ [ "--with-slrnpull" ];
+    configureFlags = old.configureFlags ++ [ "--with-slrnpull" ];
   });
 
-  ldapvi = nixpkgs.ldapvi.overrideAttrs (oldAttrs: fetchedGit ./fetched/ldapvi.json);
+  mypkgs.ldapvi = ldapvi.overrideAttrs (old: fetchedGit ./fetched/ldapvi.json);
 
   nixos = import ./nixos_tools.nix {};
 
-  pass = nixpkgs.pass.overrideAttrs (oldAttrs:
+  mypkgs.pass = (pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old:
     fetchedGit ./fetched/pass.json // {
-      patches = oldAttrs.patches ++ [ ./patches/pass-fix-pass-init.patch ];
+      patches = old.patches ++ [ ./patches/pass-fix-pass-init.patch ];
     }
   );
 
-  profanity = (nixpkgs.profanity.override {
+  mypkgs.profanity = (profanity.override {
     notifySupport = true;
     inherit libnotify gpgme gdk_pixbuf;
     python = python3;
-  }).overrideAttrs (oldAttrs: rec {
-    configureFlags = oldAttrs.configureFlags ++ [ "--enable-plugins" ];
+  }).overrideAttrs (old: rec {
+    configureFlags = old.configureFlags ++ [ "--enable-plugins" ];
   });
 
-  weechat = nixpkgs.weechat.override {
+  mypkgs.weechat = weechat.override {
     configure = { availablePlugins, ... }: {
       plugins = with availablePlugins; [
          (python.withPackages (ps: with ps; [websocket_client emoji]))
@@ -102,14 +102,14 @@ 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";
       sha256 = "1h645rnb5vpms48fcyzvp7cwwcbf9k5xq49w2bpniyzzgk2brjrq";
     };
     outputs = ["out" "man"];
-    buildInputs = [ perlPackages.YAML ];
+    propragatedBuildInputs = [ perlPackages.YAML ];
     meta = with stdenv.lib; {
       description = "A perl script for maintaining notes";
       homepage    = http://www.daemon.de/NOTE;
@@ -119,7 +119,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 +138,7 @@ let
     };
   };
 
-  mtop = buildPerlPackage rec {
+  mypkgs.mtop = buildPerlPackage rec {
     name = "mtop-${version}";
     version = "0.6.6";
     src = fetchurl {
@@ -161,7 +161,7 @@ let
     };
   };
 
-  tiv = buildPerlPackage rec {
+  mypkgs.tiv = buildPerlPackage rec {
     name = "tiv-${version}";
     version = "2015";
     src = fetchurl {
@@ -179,7 +179,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,18 +200,40 @@ let
     propagatedBuildInputs = [ perl ncurses ];
   });
 
+  mypkgs.nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json);
+
+  mypkgs.pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec {
+    propagatedBuildInputs = [ psycopg2 psutil ];
+  });
+
+  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 = ''
+      export PATH=$PATH:$out/bin
+      export HOME=$TMPDIR
+      make pgloader
+    '';
+    dontStrip = true;
+    enableParallelBuilding = false;
+    installPhase = ''
+      install -Dm755 build/bin/pgloader "$out/bin/pgloader"
+      wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
+    '';
+  });
+
+  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;
@@ -222,13 +244,27 @@ in
     inherit vcsh;
     inherit xmr-stak;
     inherit urlwatch;
-    inherit pass;
     inherit ranger;
-    inherit profanity;
-    inherit weechat;
-    inherit note terminal_velocity;
-    inherit mtop;
-    inherit tiv;
-    inherit cnagios;
+    inherit irssi;
+    inherit abook khard khal;
+    inherit graphicsmagick;
+    inherit youtube-dl;
+    inherit ncmpc;
+    inherit cadaver;
+    inherit mairix notmuch;
+    inherit ctags;
+    inherit s3cmd;
+    inherit solc; # solidity
+    inherit rtorrent;
+    inherit strace;
+    inherit vdirsyncer;
+    inherit w3m lynx links;
+    inherit gitRepo;
+    inherit valgrind;
+    inherit iotop iperf;
+    inherit keybase;
+    inherit bogofilter;
+    # todo: lx* ?, unrar, unzip, zeromq?
+    #inherit nextcloud-client;
     #inherit nixos;
   }