From 549d3b72e9f5cbbee6d757044db413d0993d5771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Thu, 14 Dec 2023 15:12:41 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20(hydrogen/services)=20flak?= =?UTF-8?q?ify=20projet-oral-japonais?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 2 ++ hosts/hydrogen/services/nginx/n7/default.nix | 2 +- .../services/nginx/n7/projet-oral-japonais.nix | 12 ++---------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 3ccf1de..549578f 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,8 @@ "git+https://git.fainsin.bzh/ENSEEIHT/projet-intelligence-artificielle-multimedia"; projet-audionumerique.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique"; + projet-oral-japonais.url = + "git+https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais"; }; nixConfig = { diff --git a/hosts/hydrogen/services/nginx/n7/default.nix b/hosts/hydrogen/services/nginx/n7/default.nix index c1c3ddf..285440d 100644 --- a/hosts/hydrogen/services/nginx/n7/default.nix +++ b/hosts/hydrogen/services/nginx/n7/default.nix @@ -31,7 +31,7 @@ import ./projet-long.nix pkgs; "/projet-oral-japonais/" = # # - import ./projet-oral-japonais.nix pkgs; + import ./projet-oral-japonais.nix { inherit inputs system; }; "/projet-oral-anglais/" = # # import ./projet-oral-anglais.nix pkgs; diff --git a/hosts/hydrogen/services/nginx/n7/projet-oral-japonais.nix b/hosts/hydrogen/services/nginx/n7/projet-oral-japonais.nix index fddcdbe..afef959 100644 --- a/hosts/hydrogen/services/nginx/n7/projet-oral-japonais.nix +++ b/hosts/hydrogen/services/nginx/n7/projet-oral-japonais.nix @@ -1,11 +1,3 @@ -{ pkgs, ... }: -let - pages = pkgs.fetchgit { - url = "https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais"; - rev = "60fa70fb958c992282dbcff536ebc5d4d7e174a0"; # pages - sha256 = "1kc6jngpna41zf00i5i1d2wf8sp60w42jwa6xilzprawww0yr17i"; - }; -in { - alias = "${pages}/"; - index = "slides.html"; +{ inputs, system, ... }: { + alias = inputs.projet-oral-japonais.packages.${system}.slides + "/"; }