multiple improvements

[perso/Immae/Config/Nix.git] / default.nix

diff --git a/default.nix b/default.nix
index 1844121f457f5b118c141e111c305e72f983b17b..5227b47df06d030de89ab71808b9a2a08f56c6f7 100644 (file)
--- 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 = "";
@@ -50,13 +59,36 @@ let
     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;
   }