From 1b88aa463d977e5c248cc508cfde1311911e65c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Wed, 29 Nov 2023 15:34:38 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20(hydrogen/nginx)=20projet-intellige?= =?UTF-8?q?nce-artificielle-multimedia=20stop=20using=20pages,=20use=20the?= =?UTF-8?q?=20flake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/hydrogen/services/nginx/n7/default.nix | 6 ++++-- ...rojet-intelligence-artificielle-multimedia.nix | 15 ++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/hosts/hydrogen/services/nginx/n7/default.nix b/hosts/hydrogen/services/nginx/n7/default.nix index 3440e72..ddb592c 100644 --- a/hosts/hydrogen/services/nginx/n7/default.nix +++ b/hosts/hydrogen/services/nginx/n7/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ inputs, system, pkgs, ... }: { services.nginx.virtualHosts = { "n7.laurent.fainsin.bzh" = { enableACME = true; @@ -17,7 +17,9 @@ import ./projet-systemes-algorithmes-repartis.nix pkgs; "/projet-intelligence-artificielle-multimedia/" = # # - import ./projet-intelligence-artificielle-multimedia.nix pkgs; + import ./projet-intelligence-artificielle-multimedia.nix { + inherit inputs system; + }; "/projet-probleme-inverse-3D/" = # # import ./projet-probleme-inverse-3D.nix pkgs; diff --git a/hosts/hydrogen/services/nginx/n7/projet-intelligence-artificielle-multimedia.nix b/hosts/hydrogen/services/nginx/n7/projet-intelligence-artificielle-multimedia.nix index f2e27fa..ce632d5 100644 --- a/hosts/hydrogen/services/nginx/n7/projet-intelligence-artificielle-multimedia.nix +++ b/hosts/hydrogen/services/nginx/n7/projet-intelligence-artificielle-multimedia.nix @@ -1,12 +1,5 @@ -{ pkgs, ... }: -let - pages = pkgs.fetchgit { - url = - "https://git.fainsin.bzh/ENSEEIHT/projet-intelligence-artificielle-multimedia"; - rev = "8d7708db070170f6f3b276c5ea6f2f1b38e57ee5"; # pages - sha256 = "07cmnxmhb4l2chb8h9y45jnm10fqlmlq9d7zwllgk6l3gc0m3rdp"; - }; -in { - alias = "${pages}/"; - index = "slides.html"; +{ inputs, system, ... }: { + alias = + inputs.projet-intelligence-artificielle-multimedia.packages.${system}.slides + + "/"; }