From a3d281ea34a6e3c66789455c1c1edf223030a589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 24 Jan 2019 09:56:31 +0100 Subject: Purify wallabag's website --- virtual/modules/websites/tools/tools/wallabag.nix | 50 +++++++++++++++++------ 1 file changed, 37 insertions(+), 13 deletions(-) (limited to 'virtual/modules/websites/tools/tools/wallabag.nix') diff --git a/virtual/modules/websites/tools/tools/wallabag.nix b/virtual/modules/websites/tools/tools/wallabag.nix index 03291dc..d742c5d 100644 --- a/virtual/modules/websites/tools/tools/wallabag.nix +++ b/virtual/modules/websites/tools/tools/wallabag.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, env, phpPackages, php, which }: +{ stdenv, fetchurl, writeText, env, composerEnv, phpPackages, php, which }: let wallabag = rec { varDir = "/var/lib/wallabag"; @@ -56,8 +56,31 @@ let ldap_name_attribute: cn ldap_enabled_attribute: null ''; - webappDir = stdenv.mkDerivation rec { - __noChroot = true; + webappDir = composerEnv.buildPackage rec { + packages = { + "fr3d/ldap-bundle" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "fr3d-ldap-bundle-5a8927c11af45fa06331b97221c6da1a4a237475"; + src = fetchurl { + url = https://api.github.com/repos/Maks3w/FR3DLdapBundle/zipball/5a8927c11af45fa06331b97221c6da1a4a237475; + sha256 = "168zkd82j200wd6h0a3lq81g5s2pifg889rv27q2g429nppsbfxc"; + }; + }; + }; + "zendframework/zend-ldap" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "zendframework-zend-ldap-b63c7884a08d3a6bda60ebcf7d6238cf8ad89f49"; + src = fetchurl { + url = https://api.github.com/repos/zendframework/zend-ldap/zipball/b63c7884a08d3a6bda60ebcf7d6238cf8ad89f49; + sha256 = "0mn4yqnb5prqhrbbybmw1i2rx7xf4s4wagbdq9qi55fa0vk3jgw9"; + }; + }; + }; + }; + noDev = true; + doRemoveVendor = false; # Beware when upgrading, I probably messed up with the migrations table # (due to a psql bug in wallabag) version = "2.3.6"; @@ -66,21 +89,22 @@ let url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; sha256 = "0m0dy3r94ks5pfxyb9vbgrsm0vrwdl3jd5wqwg4f5vd107lq90q1"; }; + unpackPhase = '' + unpackFile "$src" + sourceRoot=${version} + src=$PWD/${version} + ''; patches = [ ./wallabag_ldap.patch ]; - dontBuild = "true"; - installPhase = '' - cp -a . $out - cd $out - export SYMFONY_ENV=prod - php -d memory_limit=-1 ${phpPackages.composer}/libexec/composer/composer.phar require --update-no-dev -o --prefer-dist fr3d/ldap-bundle - rm -rf web/assets var/cache app/config/parameters.yml data - mv var var_old + preInstall = '' + export SYMFONY_ENV="prod" + ''; + postInstall = '' + rm -rf web/assets var/{cache,logs,sessions} app/config/parameters.yml data ln -sf ${parameters} app/config/parameters.yml - ln -sf ../../../../../${varDir}/var var + ln -sf ../../../../../../${varDir}/var/{cache,logs,sessions} var ln -sf ../../../../../${varDir}/data data ln -sf ../../../../../../${varDir}/assets web/assets ''; - buildInputs = [ php phpPackages.composer ]; }; activationScript = '' install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ -- cgit v1.2.3