From db343436f0e678ef3a97e6f8ac559ffa0507e422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 10 May 2020 19:10:05 +0200
Subject: Migrate mylibs to niv (work in progress)

---
 modules/private/websites/richie/production.nix |  8 ++++++--
 modules/private/websites/richie/richie.json    | 14 --------------
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 modules/private/websites/richie/richie.json

(limited to 'modules/private/websites/richie')

diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix
index d7da458..a6957af 100644
--- a/modules/private/websites/richie/production.nix
+++ b/modules/private/websites/richie/production.nix
@@ -2,7 +2,11 @@
 let
   cfg = config.myServices.websites.richie.production;
   vardir = "/var/lib/richie_production";
-  richieSrc = pkgs.stdenv.mkDerivation (pkgs.mylibs.fetchedGitPrivate ./richie.json // {
+  richieSrc = pkgs.stdenv.mkDerivation rec {
+    version = pkgs.sources.websites-richie-app.version;
+    pname = "richie";
+    name = "${pname}-${version}";
+    src = pkgs.sources.websites-richie-app;
     phases = "installPhase";
     installPhase = ''
       cp -a $src $out
@@ -12,7 +16,7 @@ let
       ln -sf ${vardir}/photos $out/
       sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php
       '';
-  });
+  };
   webappdir = config.services.websites.webappDirsPaths.richie_production;
   secretPath = config.secrets.fullPaths."websites/richie/production";
   apacheUser = config.services.httpd.Prod.user;
diff --git a/modules/private/websites/richie/richie.json b/modules/private/websites/richie/richie.json
deleted file mode 100644
index f51d8c1..0000000
--- a/modules/private/websites/richie/richie.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "11490d4-master",
-  "meta": {
-    "name": "richie",
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie",
-    "rev": "11490d4591034deca7681aae8d9a22ca6cd8da4a",
-    "sha256": "1rlq5qkbaw9n7yxhyvvimrizwkpqlhhsc8mhipzxlwk1si81fci1",
-    "fetchSubmodules": true
-  }
-}
-- 
cgit v1.2.3