Use more up to date version of yarn2nix

diff --git a/default.nix b/default.nix
index 5e8c4d3a9a4d5ff01dd7edf9a6b62d20c0a0e9a3..d003e908fe21301c13a13c674bee07909e1ab4dc 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -310,6 +310,7 @@ let
       (with perlPackages; [ TimeDate FileWhich TextIconv ]);
   };
 
       (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
 # 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 notmuch;
     stgit = gitAndTools.stgit;
     inherit bundix;

-    inherit yarn2nix;

     bower2nix = nodePackages.bower2nix;
   })
     bower2nix = nodePackages.bower2nix;
   })

diff --git a/fetched/yarn2nix.json b/fetched/yarn2nix.json
new file mode 100644 (file)
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 57b0f64d6f37253e1523e735aec76777354fbb98..0b5e0c1ab8bdbd41331412d768e2b466fd91ed3c 100644 (file)
--- a/libs.nix
+++ b/libs.nix
@@ -7,7 +7,7 @@ let nixpkgs_unstable = import (builtins.fetchTarball {
 }) {};
 in
   with nixpkgs_unstable;
 }) {};
 in
   with nixpkgs_unstable;

-{
+rec {

   inherit nixpkgs_unstable;
   fetchedGithub = path:
     let
   inherit nixpkgs_unstable;
   fetchedGithub = path:
     let


@@ -53,4 +53,6 @@ in
       ''
         makeWrapper "$f" "$out" ${toString args}
       '';
       ''
         makeWrapper "$f" "$out" ${toString args}
       '';

+
+  yarn2nixPackage = callPackage (fetchedGithub ./fetched/yarn2nix.json).src {};

 }
 }

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 2376e542c95d39fbab8b830d70803fd9b037c4ca..d6915c291076ad1238a6f70c03b644f0d5bb6665 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -10,6 +10,7 @@
   {
     _module.args = {
       mylibs = import ../libs.nix;
   {
     _module.args = {
       mylibs = import ../libs.nix;

+      mypkgs = import ../default.nix;

       myconfig = {
         env = import environment;
         ips = {
       myconfig = {
         env = import environment;
         ips = {

diff --git a/scripts/make-env b/scripts/make-env
index d374c31244371570eeb6dd03a8eaca1d4a72dde6..ec108652d48c188f021c9f1f3b01875405b1c9a4 100755 (executable)
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -1,3 +1,3 @@
 #!/bin/bash
 
 #!/bin/bash
 

-nix-env -r -i -A immaePackages -f "<nixpkgs>"
+nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"