Add def function to simplify overrides

2 files changed, 6 insertions, 2 deletions

diff --git a/default.nix b/default.nix
index dee8d9a..11f4d37 100644
--- a/default.nix
+++ b/default.nix
@@ -20,5 +20,6 @@ let
       qsubAttr = qsubAttrs: f: attrs: i: qsub qsubAttrs (f attrs i);
       qsubAttrs = attrs: nixpkgs.lib.mapAttrs (_: x: qsubAttr attrs x);
       ref = callBionix ./lib/references.nix {};
+      def = f: defs: attrs: f (defs // attrs);
   });
 in bionix
diff --git a/test-tnpair.nix b/test-tnpair.nix
index 77b5727..f8c49ec 100644
--- a/test-tnpair.nix
+++ b/test-tnpair.nix
@@ -2,8 +2,11 @@ with (import <nixpkgs> {});
 with lib;
 
 let
-  bionix = (import <bionix> {}).extend (self: super: {
-    bwa = super.bwa // { index = attrs: super.bwa.index ({ flags = "-a is" ; } // attrs); };
+  bionix = (import <bionix> {}).extend (self: super: with self; {
+    bwa = with super.bwa; {
+      align = align;
+      index = def index { flags = "-a is"; };
+    };
   });
 
 in