From 423c3f1caefdf5f125a2acf7456b5ca0273cee4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 11 Jan 2020 15:34:31 +0100
Subject: Add iridologie via spip

---
 pkgs/private/webapps/default.nix                |  1 +
 pkgs/private/webapps/iridologie/default.nix     | 15 +++++++++++++++
 pkgs/private/webapps/iridologie/iridologie.json | 13 +++++++++++++
 pkgs/webapps/spip/default.nix                   |  4 ++--
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/private/webapps/iridologie/default.nix
 create mode 100644 pkgs/private/webapps/iridologie/iridologie.json

(limited to 'pkgs')

diff --git a/pkgs/private/webapps/default.nix b/pkgs/private/webapps/default.nix
index e9aa13c..12b690b 100644
--- a/pkgs/private/webapps/default.nix
+++ b/pkgs/private/webapps/default.nix
@@ -4,6 +4,7 @@ rec {
 
   aten = callPackage ./aten { inherit composerEnv mylibs; };
   chloe = callPackage ./chloe { inherit mylibs spip; };
+  iridologie = callPackage ./iridologie { inherit mylibs spip; };
   connexionswing = callPackage ./connexionswing { inherit composerEnv mylibs;};
   ludivinecassal = callPackage ./ludivinecassal { inherit composerEnv mylibs; };
   piedsjaloux = callPackage ./piedsjaloux { inherit composerEnv mylibs; };
diff --git a/pkgs/private/webapps/iridologie/default.nix b/pkgs/private/webapps/iridologie/default.nix
new file mode 100644
index 0000000..8e05736
--- /dev/null
+++ b/pkgs/private/webapps/iridologie/default.nix
@@ -0,0 +1,15 @@
+{ environment ? "prod"
+, varDir ? "/var/lib/iridologie_${environment}"
+, spip, stdenv, mylibs, sassc }:
+let
+  siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec {
+    installPhase = ''
+      cp -a . $out
+      '';
+  });
+in
+spip.override {
+  ldap = true;
+  siteName = "iridologie";
+  inherit environment siteDir;
+}
diff --git a/pkgs/private/webapps/iridologie/iridologie.json b/pkgs/private/webapps/iridologie/iridologie.json
new file mode 100644
index 0000000..cf3b0aa
--- /dev/null
+++ b/pkgs/private/webapps/iridologie/iridologie.json
@@ -0,0 +1,13 @@
+{
+  "tag": "01bd963-master",
+  "meta": {
+    "name": "iridologie",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
+    "branch": "master"
+  },
+  "git": {
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
+    "rev": "01bd96345b523e4e6469fdbbb675abd3e7f4662f",
+    "fetchSubmodules": true
+  }
+}
diff --git a/pkgs/webapps/spip/default.nix b/pkgs/webapps/spip/default.nix
index 8099f53..20d5c8c 100644
--- a/pkgs/webapps/spip/default.nix
+++ b/pkgs/webapps/spip/default.nix
@@ -7,10 +7,10 @@
 let
   app = stdenv.mkDerivation rec {
     name = "${siteName}-${environment}-spip-${version}";
-    version = "3.2.3";
+    version = "3.2.7";
     src = fetchzip {
       url = "https://files.spip.net/spip/archives/SPIP-v${version}.zip";
-      sha256 = "1r1mjvsnrp6mvkgjakvi3x4ms8m8k5mp93micbbg8r99fj7qlfkq";
+      sha256 = "0n4kc95nhn524zbb11bpfjs965pm4v026s3m3q44pl8nyms91r33";
     };
     paches = lib.optionals ldap [ ./spip_ldap_patch.patch ];
     buildPhase = ''
-- 
cgit v1.2.3