aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-24 11:29:24 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-24 11:31:24 +0100
commitbb3210df1f8f09f34b196a8f8bec42bbc7573bd5 (patch)
treed301747279cdc870a062c4f64d7e2c1fa273193f
parenta3d281ea34a6e3c66789455c1c1edf223030a589 (diff)
downloadNix-bb3210df1f8f09f34b196a8f8bec42bbc7573bd5.tar.gz
Nix-bb3210df1f8f09f34b196a8f8bec42bbc7573bd5.tar.zst
Nix-bb3210df1f8f09f34b196a8f8bec42bbc7573bd5.zip
Purify mediagoblin website
This was the last known step to purify the install. Fixes https://git.immae.eu/mantisbt/view.php?id=79 Fixes https://git.immae.eu/mantisbt/view.php?id=114
-rw-r--r--default.nix1
-rw-r--r--virtual/modules/websites/tools/mediagoblin/bower-packages.nix8
-rw-r--r--virtual/modules/websites/tools/mediagoblin/mediagoblin.nix9
3 files changed, 17 insertions, 1 deletions
diff --git a/default.nix b/default.nix
index 7e7ef0a..75e1e0a 100644
--- a/default.nix
+++ b/default.nix
@@ -312,4 +312,5 @@ in
312 stgit = gitAndTools.stgit; 312 stgit = gitAndTools.stgit;
313 inherit bundix; 313 inherit bundix;
314 inherit yarn2nix; 314 inherit yarn2nix;
315 bower2nix = nodePackages.bower2nix;
315 }) 316 })
diff --git a/virtual/modules/websites/tools/mediagoblin/bower-packages.nix b/virtual/modules/websites/tools/mediagoblin/bower-packages.nix
new file mode 100644
index 0000000..03af849
--- /dev/null
+++ b/virtual/modules/websites/tools/mediagoblin/bower-packages.nix
@@ -0,0 +1,8 @@
1# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
2{ fetchbower, buildEnv }:
3buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
4 (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0")
5 (fetchbower "video.js" "4.11.4" "~4.11.4" "05prdvyk0rxbkh7sdd0d9ns5l5crwvc68wzkyqmrdjw367pcv8sn")
6 (fetchbower "leaflet" "0.7.7" "~0.7.3" "0jim285bljmxxngpm3yx6bnnd10n2whwkgmmhzpcd1rdksnr5nca")
7 (fetchbower "tinymce" "4.1.10" "~4.1.7" "16jyvdb9bq8gjwhs69q8p88vdixalajrz81nsmbrzzxhkih57dyx")
8]; }
diff --git a/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix b/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
index 2e62242..54470a4 100644
--- a/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
+++ b/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
@@ -1,4 +1,4 @@
1{ env, makeWrapper, stdenv, writeText, fetchurl, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }: 1{ env, makeWrapper, stdenv, writeText, fetchurl, buildBowerComponents, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }:
2let 2let
3 plugins = { 3 plugins = {
4 basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec { 4 basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec {
@@ -108,6 +108,11 @@ in
108 rec { 108 rec {
109 socketsDir = "/run/mediagoblin"; 109 socketsDir = "/run/mediagoblin";
110 varDir = "/var/lib/mediagoblin"; 110 varDir = "/var/lib/mediagoblin";
111 bowerComponents = buildBowerComponents {
112 name = "mediagoblin-bower-components";
113 generated = ./bower-packages.nix;
114 src = (fetchedGit ./mediagoblin.json).src;
115 };
111 mediagoblin = stdenv.mkDerivation (fetchedGit ./mediagoblin.json // rec { 116 mediagoblin = stdenv.mkDerivation (fetchedGit ./mediagoblin.json // rec {
112 preConfigure = '' 117 preConfigure = ''
113 # ./bootstrap.sh 118 # ./bootstrap.sh
@@ -120,6 +125,8 @@ in
120 ''; 125 '';
121 configureFlags = [ "--with-python3" "--without-virtualenv" ]; 126 configureFlags = [ "--with-python3" "--without-virtualenv" ];
122 postBuild = '' 127 postBuild = ''
128 cp -a ${bowerComponents}/bower_components/* extlib
129 chmod -R u+w extlib
123 make extlib 130 make extlib
124 ''; 131 '';
125 installPhase = '' 132 installPhase = ''