From 7c8bd4d494d0f5caceb48e1b35c8d6643e8f5f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Sun, 13 Oct 2024 19:41:19 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20(cesium)=20add=20projet-probleme-in?= =?UTF-8?q?verse-3D=20as=20flake=20input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 57 ++++++++++++++----- flake.nix | 6 ++ .../nginx/n7/projet-probleme-inverse-3D.nix | 16 ++---- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 04ff832..061b085 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1728673344, - "narHash": "sha256-Iqo1nHEkBeucGE48EWYbZkx9LAPAWyEkzAWH+fPXTUM=", + "lastModified": 1728763831, + "narHash": "sha256-KOp33tls7jRAhcmu77aVxKpSMou8QgK0BC+Y3sYLuGo=", "owner": "nix-community", "repo": "disko", - "rev": "a3619332369e1d254c68be5f019b3a8632e79bbc", + "rev": "b6215392ec3bd05e9ebfbb2f7945c414096fce8f", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1728650932, - "narHash": "sha256-mGKzqdsRyLnGNl6WjEr7+sghGgBtYHhJQ4mjpgRTCsU=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "65ae9c147349829d3df0222151f53f79821c5134", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { @@ -345,11 +345,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728632221, - "narHash": "sha256-LnBVdKPsreziZkYbeFqiSYP7tPFlprt9ej2QGd2aNlw=", + "lastModified": 1728833717, + "narHash": "sha256-GkS9SnKRb/PrdcqptLPNxweDdf3Zx2Lk5szEt07P4mE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3326a0b3974fc04d991990f6497fe1a7d9892439", + "rev": "6634ab618862f1d041c286567a58c554e6136068", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1728263287, - "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -407,11 +407,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -692,6 +692,32 @@ "url": "https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais" } }, + "projet-probleme-inverse-3D": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1728839431, + "narHash": "sha256-A7F9lyRmfJ2xJa+cbi3UYp0+v8DHmIv8Qa1IA1plox0=", + "ref": "refs/heads/master", + "rev": "086d4b65d1b1115ee5fdf183aa10e839d2e02166", + "revCount": 72, + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/projet-probleme-inverse-3D" + }, + "original": { + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/projet-probleme-inverse-3D" + } + }, "projet-systemes-algorithmes-repartis": { "inputs": { "flake-parts": [ @@ -767,6 +793,7 @@ "projet-modelisation-geometrique": "projet-modelisation-geometrique", "projet-oral-anglais": "projet-oral-anglais", "projet-oral-japonais": "projet-oral-japonais", + "projet-probleme-inverse-3D": "projet-probleme-inverse-3D", "projet-systemes-algorithmes-repartis": "projet-systemes-algorithmes-repartis", "resume": "resume", "systems": "systems", diff --git a/flake.nix b/flake.nix index c806fe8..e109cde 100644 --- a/flake.nix +++ b/flake.nix @@ -117,6 +117,12 @@ inputs.flake-parts.follows = "flake-parts"; inputs.systems.follows = "systems"; }; + projet-probleme-inverse-3D = { + url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-probleme-inverse-3D"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + inputs.systems.follows = "systems"; + }; TP-calcul-parallele = { url = "git+https://git.fainsin.bzh/ENSEEIHT/TP-calcul-parallele"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/cesium/services/nginx/n7/projet-probleme-inverse-3D.nix b/hosts/cesium/services/nginx/n7/projet-probleme-inverse-3D.nix index 7c217db..fa8e615 100644 --- a/hosts/cesium/services/nginx/n7/projet-probleme-inverse-3D.nix +++ b/hosts/cesium/services/nginx/n7/projet-probleme-inverse-3D.nix @@ -1,19 +1,13 @@ { - pkgs, + inputs, + system, location, vhost, ... -}: let - pages = pkgs.fetchgit { - url = "https://git.fainsin.bzh/ENSEEIHT/projet-probleme-inverse-3D"; - rev = "9c75aadaf1b779e4f88fd42de163dedd8d5e918a"; # pages - sha256 = "19s8ccvarlps70aqc8njn92sbmmjbpc1d7q08hdb5apghmkplj9f"; - }; -in { +}: { services.nginx.virtualHosts.${vhost}.locations."/${location}/" = { - alias = "${pages}/"; - index = "index.html"; - tryFiles = "$uri $uri/ /projet-probleme-inverse-3D/index.html"; + alias = inputs.projet-probleme-inverse-3D.packages.${system}.slides + "/"; + tryFiles = "$uri $uri/ /${location}/index.html"; }; services.gatus.settings.endpoints = [