X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=default.nix;h=5227b47df06d030de89ab71808b9a2a08f56c6f7;hb=6b53d1164c3b51999ffef9e11587285c1ac9c7c9;hp=1b9b4b08d4211543d24b33a8d02dbe1b44cac32d;hpb=177da38b243b59d273c0400b04a79e2b05af6bc3;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/default.nix b/default.nix
index 1b9b4b0..5227b47 100644
--- a/default.nix
+++ b/default.nix
@@ -10,6 +10,15 @@ let
       src = fetchFromGitHub json.github;
     };
 
+  fetchedGit = path:
+    let
+      json = lib.importJSON path;
+    in rec {
+      version = json.tag;
+      name = "${json.meta.name}-${version}";
+      src = fetchgit json.git;
+    };
+
   ledger = (nixpkgs.ledger.override { boost = boost166; }).overrideAttrs (oldAttrs:
     fetchedGithub ./fetched/ledger.json // {
       postInstall = "";
@@ -33,9 +42,53 @@ let
     }
   );
 
+  weboob = pythonPackages.weboob.overrideAttrs (oldAttrs: rec {
+    postInstall = ''${oldAttrs.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 {
+    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" ];
+  });
+
+  ldapvi = nixpkgs.ldapvi.overrideAttrs (oldAttrs: fetchedGit ./fetched/ldapvi.json);
+
+  nixos = import ./nixos_tools.nix {};
+
+  pass = nixpkgs.pass.overrideAttrs (oldAttrs:
+    fetchedGit ./fetched/pass.json // {
+      patches = oldAttrs.patches ++ [ ./patches/pass-fix-pass-init.patch ];
+    }
+  );
+
   #weechat = callPackage nixpkgs.weechat { guileSupport = false; luaSupport = false; rubySupport = false; tclSupport = false; };
 in
   {
+    inherit nix-prefetch-scripts;
     inherit ledger;
-    inherit taskwarrior vit;
+    inherit taskwarrior vit timewarrior;
+    inherit weboob;
+    inherit slrn;
+    inherit sc-im;
+    inherit ldapvi;
+    inherit pal;
+    inherit duplicity duply;
+    inherit pdftk;
+    inherit googler;
+    inherit jrnl;
+    inherit apg;
+    inherit newsboat;
+    inherit vcsh;
+    inherit xmr-stak;
+    inherit urlwatch;
+    inherit pass;
+    #inherit nixos;
   }