Use more up to date version of yarn2nix

5 files changed, 21 insertions, 3 deletions

diff --git a/default.nix b/default.nix
index 5e8c4d3..d003e90 100644
--- a/default.nix
+++ b/default.nix
@@ -310,6 +310,7 @@ let
       (with perlPackages; [ TimeDate FileWhich TextIconv ]);
   };
 
+  mypkgs.yarn2nix = yarn2nixPackage.yarn2nix;
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
 in
@@ -372,6 +373,5 @@ in
     inherit notmuch;
     stgit = gitAndTools.stgit;
     inherit bundix;
-    inherit yarn2nix;
     bower2nix = nodePackages.bower2nix;
   })
diff --git a/fetched/yarn2nix.json b/fetched/yarn2nix.json
new file mode 100644
index 0000000..81914e3
--- /dev/null
+++ b/fetched/yarn2nix.json
@@ -0,0 +1,15 @@
+{
+  "tag": "780e33a-master",
+  "meta": {
+    "name": "yarn2nix",
+    "url": "https://github.com/moretea/yarn2nix",
+    "branch": "master"
+  },
+  "github": {
+    "owner": "moretea",
+    "repo": "yarn2nix",
+    "rev": "780e33a07fd821e09ab5b05223ddb4ca15ac663f",
+    "sha256": "1f83cr9qgk95g3571ps644rvgfzv2i4i7532q8pg405s4q5ada3h",
+    "fetchSubmodules": true
+  }
+}
diff --git a/libs.nix b/libs.nix
index 57b0f64..0b5e0c1 100644
--- a/libs.nix
+++ b/libs.nix
@@ -7,7 +7,7 @@ let nixpkgs_unstable = import (builtins.fetchTarball {
 }) {};
 in
   with nixpkgs_unstable;
-{
+rec {
   inherit nixpkgs_unstable;
   fetchedGithub = path:
     let
@@ -53,4 +53,6 @@ in
       ''
         makeWrapper "$f" "$out" ${toString args}
       '';
+
+  yarn2nixPackage = callPackage (fetchedGithub ./fetched/yarn2nix.json).src {};
 }
diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 2376e54..d6915c2 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -10,6 +10,7 @@
   {
     _module.args = {
       mylibs = import ../libs.nix;
+      mypkgs = import ../default.nix;
       myconfig = {
         env = import environment;
         ips = {
diff --git a/scripts/make-env b/scripts/make-env
index d374c31..ec10865 100755
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-nix-env -r -i -A immaePackages -f "<nixpkgs>"
+nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"