diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/private/webapps/default.nix | 1 | ||||
-rw-r--r-- | pkgs/private/webapps/iridologie/default.nix | 15 | ||||
-rw-r--r-- | pkgs/private/webapps/iridologie/iridologie.json | 13 | ||||
-rw-r--r-- | pkgs/webapps/spip/default.nix | 4 |
4 files changed, 31 insertions, 2 deletions
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 { | |||
4 | 4 | ||
5 | aten = callPackage ./aten { inherit composerEnv mylibs; }; | 5 | aten = callPackage ./aten { inherit composerEnv mylibs; }; |
6 | chloe = callPackage ./chloe { inherit mylibs spip; }; | 6 | chloe = callPackage ./chloe { inherit mylibs spip; }; |
7 | iridologie = callPackage ./iridologie { inherit mylibs spip; }; | ||
7 | connexionswing = callPackage ./connexionswing { inherit composerEnv mylibs;}; | 8 | connexionswing = callPackage ./connexionswing { inherit composerEnv mylibs;}; |
8 | ludivinecassal = callPackage ./ludivinecassal { inherit composerEnv mylibs; }; | 9 | ludivinecassal = callPackage ./ludivinecassal { inherit composerEnv mylibs; }; |
9 | piedsjaloux = callPackage ./piedsjaloux { inherit composerEnv mylibs; }; | 10 | 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 @@ | |||
1 | { environment ? "prod" | ||
2 | , varDir ? "/var/lib/iridologie_${environment}" | ||
3 | , spip, stdenv, mylibs, sassc }: | ||
4 | let | ||
5 | siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec { | ||
6 | installPhase = '' | ||
7 | cp -a . $out | ||
8 | ''; | ||
9 | }); | ||
10 | in | ||
11 | spip.override { | ||
12 | ldap = true; | ||
13 | siteName = "iridologie"; | ||
14 | inherit environment siteDir; | ||
15 | } | ||
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 @@ | |||
1 | { | ||
2 | "tag": "01bd963-master", | ||
3 | "meta": { | ||
4 | "name": "iridologie", | ||
5 | "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "git": { | ||
9 | "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie", | ||
10 | "rev": "01bd96345b523e4e6469fdbbb675abd3e7f4662f", | ||
11 | "fetchSubmodules": true | ||
12 | } | ||
13 | } | ||
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 @@ | |||
7 | let | 7 | let |
8 | app = stdenv.mkDerivation rec { | 8 | app = stdenv.mkDerivation rec { |
9 | name = "${siteName}-${environment}-spip-${version}"; | 9 | name = "${siteName}-${environment}-spip-${version}"; |
10 | version = "3.2.3"; | 10 | version = "3.2.7"; |
11 | src = fetchzip { | 11 | src = fetchzip { |
12 | url = "https://files.spip.net/spip/archives/SPIP-v${version}.zip"; | 12 | url = "https://files.spip.net/spip/archives/SPIP-v${version}.zip"; |
13 | sha256 = "1r1mjvsnrp6mvkgjakvi3x4ms8m8k5mp93micbbg8r99fj7qlfkq"; | 13 | sha256 = "0n4kc95nhn524zbb11bpfjs965pm4v026s3m3q44pl8nyms91r33"; |
14 | }; | 14 | }; |
15 | paches = lib.optionals ldap [ ./spip_ldap_patch.patch ]; | 15 | paches = lib.optionals ldap [ ./spip_ldap_patch.patch ]; |
16 | buildPhase = '' | 16 | buildPhase = '' |