From 2053ddac783c931053676ebc2b02bc8b82d89399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 8 Aug 2020 21:40:31 +0200
Subject: Upgrade nixos-unstable

---
 modules/private/websites/isabelle/aten_app/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'modules/private/websites/isabelle')

diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index 30d10ba..f967b9a 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,12 +1,16 @@
 { environment ? "prod"
 , varDir ? "/var/lib/aten_${environment}"
-, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }:
+, composerEnv, fetchgit, runCommand, nodejs-10_x, jq, libsass, python, fetchurl, yarn2nix-moretea, yarn, sources }:
 let
+  yarn2nix-moretea' = yarn2nix-moretea.override({
+    yarn = yarn.override({ nodejs = nodejs-10_x; });
+    nodejs = nodejs-10_x;
+  });
   packagesource = sources.websites-isabelle-aten;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
     cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
     '';
-  yarnModules = yarn2nix-moretea.mkYarnModules rec {
+  yarnModules = yarn2nix-moretea'.mkYarnModules rec {
     name = "aten-yarn";
     pname = name;
     version = "v1.0.0";
@@ -18,8 +22,8 @@ let
         buildInputs = [ libsass python ];
         postInstall = let
           nodeHeaders = fetchurl {
-            url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-            sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
+            url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz";
+            sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
           };
         in
           ''
@@ -46,7 +50,7 @@ let
         rm -rf var/{log,cache}
         ln -sf ${varDir}/{log,cache} var/
         '';
-      buildInputs = [ yarnModules yarn2nix-moretea.yarn ];
+      buildInputs = [ yarnModules yarn2nix-moretea'.yarn ];
       passthru = {
         inherit varDir;
         inherit environment;
-- 
cgit v1.2.3