From 6b53d1164c3b51999ffef9e11587285c1ac9c7c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Wed, 19 Dec 2018 01:39:00 +0100
Subject: multiple improvements

Add a generic fetch_git script.
New applications:
pal duplicity duply pdftk googler jrnl apg newsboat vcsh xmr-stak urlwatch pass
---
 default.nix | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index d828027..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 = "";
@@ -50,11 +59,15 @@ let
     configureFlags = oldAttrs.configureFlags ++ [ "--with-slrnpull" ];
   });
 
-  ldapvi = nixpkgs.ldapvi.overrideAttrs (oldAttrs: rec {
-    name = "ldapvi-${version}";
-    version = "f1d42ba-master";
-    src = fetchgit (lib.importJSON ./ldapvi.json);
-  });
+  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
@@ -66,4 +79,16 @@ in
     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;
   }
-- 
cgit v1.2.3