aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-24 23:55:36 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-24 23:55:36 +0200
commitea3a7a25ed93f413abc756ed0e1b95db2b1b5027 (patch)
tree6a28eabf0655a9aa554d2b5450887cf72e8afd40
parente96787f10b97d2b3b6f8917408f69a0eb500ea97 (diff)
downloadNix-ea3a7a25ed93f413abc756ed0e1b95db2b1b5027.tar.gz
Nix-ea3a7a25ed93f413abc756ed0e1b95db2b1b5027.tar.zst
Nix-ea3a7a25ed93f413abc756ed0e1b95db2b1b5027.zip
Fix packages and make buildslist sandboxed
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix18
-rw-r--r--pkgs/webapps/infcloud/default.nix1
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index 08e6955..a1a87b2 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,4 +1,4 @@
1{ mylibs, runCommand, buildBowerComponents, pythonPackages, jq, yarn, nodejs }: 1{ mylibs, runCommand, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs }:
2let 2let
3 buildslist_src = mylibs.fetchedGit ./buildslist.json; 3 buildslist_src = mylibs.fetchedGit ./buildslist.json;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
@@ -13,6 +13,18 @@ let
13 yarnNix = ./yarn-packages.nix; 13 yarnNix = ./yarn-packages.nix;
14 pkgConfig = { 14 pkgConfig = {
15 all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; }; 15 all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
16 node-sass = {
17 buildInputs = [ libsass python ];
18 postInstall = let
19 nodeHeaders = fetchurl {
20 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
21 sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
22 };
23 in
24 ''
25 node scripts/build.js --tarball=${nodeHeaders}
26 '';
27 };
16 }; 28 };
17 }; 29 };
18 buildslist_bower = buildBowerComponents { 30 buildslist_bower = buildBowerComponents {
@@ -25,11 +37,9 @@ pythonPackages.buildPythonPackage rec {
25 pname = "buildbot-buildslist"; 37 pname = "buildbot-buildslist";
26 inherit (pythonPackages.buildbot-pkg) version; 38 inherit (pythonPackages.buildbot-pkg) version;
27 39
28 __noChroot = true;
29 preConfigure = '' 40 preConfigure = ''
30 export HOME=$PWD 41 export HOME=$PWD
31 cp -a ${buildslist_yarn}/node_modules . 42 ln -s ${buildslist_yarn}/node_modules .
32 chmod -R u+w node_modules
33 cp -a ${buildslist_bower}/bower_components ./libs 43 cp -a ${buildslist_bower}/bower_components ./libs
34 chmod -R u+w libs 44 chmod -R u+w libs
35 ''; 45 '';
diff --git a/pkgs/webapps/infcloud/default.nix b/pkgs/webapps/infcloud/default.nix
index 0d73f52..d949d26 100644
--- a/pkgs/webapps/infcloud/default.nix
+++ b/pkgs/webapps/infcloud/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
7 sha256 = "1fjhs0cj0b9fhf5ysfz281mknmmg1z551bas143sxfcqlpa5aiiq"; 7 sha256 = "1fjhs0cj0b9fhf5ysfz281mknmmg1z551bas143sxfcqlpa5aiiq";
8 }; 8 };
9 buildPhase = '' 9 buildPhase = ''
10 patchShebangs .
10 ./cache_update.sh 11 ./cache_update.sh
11 rm config.js 12 rm config.js
12 ''; 13 '';