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

diff --git a/default.nix b/default.nix
index 92dea9c..4e6657c 100644
--- a/default.nix
+++ b/default.nix
@@ -78,7 +78,7 @@ let
 
   nixos = import ./nixos_tools.nix {};
 
-  pass = nixpkgs.pass.overrideAttrs (oldAttrs:
+  pass = (nixpkgs.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (oldAttrs:
     fetchedGit ./fetched/pass.json // {
       patches = oldAttrs.patches ++ [ ./patches/pass-fix-pass-init.patch ];
     }
@@ -109,7 +109,7 @@ let
       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;
@@ -200,6 +200,32 @@ let
     propagatedBuildInputs = [ perl ncurses ];
   });
 
+  nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json);
+
+  pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec {
+    propagatedBuildInputs = [ psycopg2 psutil ];
+  });
+
+  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}"
+    '';
+  });
+
+  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
@@ -225,10 +251,30 @@ in
     inherit pass;
     inherit ranger;
     inherit profanity;
-    inherit weechat;
+    inherit weechat irssi;
     inherit note terminal_velocity;
     inherit mtop;
     inherit tiv;
-    inherit cnagios;
+    inherit cnagios nagios-cli;
+    inherit abook khard khal;
+    inherit graphicsmagick;
+    inherit youtube-dl;
+    inherit pg_activity pgloader;
+    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;
+    inherit pelican;
     #inherit nixos;
   }