diff --git a/flake.lock b/flake.lock index 151b5bf..06fb292 100644 --- a/flake.lock +++ b/flake.lock @@ -255,6 +255,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_8" }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_11": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_9" + }, "locked": { "lastModified": 1696343447, "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", @@ -807,6 +825,24 @@ } }, "nixpkgs-lib_8": { + "locked": { + "dir": "lib", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_9": { "locked": { "dir": "lib", "lastModified": 1696019113, @@ -873,6 +909,22 @@ } }, "nixpkgs_12": { + "locked": { + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1700612854, "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", @@ -888,7 +940,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -904,7 +956,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1695644571, "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", @@ -1174,10 +1226,29 @@ "url": "https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais" } }, + "projet-systemes-algorithmes-repartis": { + "inputs": { + "flake-parts": "flake-parts_10", + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1702827963, + "narHash": "sha256-r5y0alg9ceUeJW0G5KNYXsIy//IrYoHZM55Q6IxHMw0=", + "ref": "refs/heads/main", + "rev": "22b727dbfcdd074baf0b5a4109d21d14fb8ffde4", + "revCount": 19, + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/projet-systemes-algorithmes-repartis" + }, + "original": { + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/projet-systemes-algorithmes-repartis" + } + }, "resume": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "typst": "typst" }, "locked": { @@ -1211,6 +1282,7 @@ "projet-modelisation-geometrique": "projet-modelisation-geometrique", "projet-oral-anglais": "projet-oral-anglais", "projet-oral-japonais": "projet-oral-japonais", + "projet-systemes-algorithmes-repartis": "projet-systemes-algorithmes-repartis", "resume": "resume", "treefmt-nix": "treefmt-nix_2" } @@ -1363,7 +1435,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1702461037, @@ -1382,8 +1454,8 @@ "typst": { "inputs": { "crane": "crane_3", - "flake-parts": "flake-parts_10", - "nixpkgs": "nixpkgs_13", + "flake-parts": "flake-parts_11", + "nixpkgs": "nixpkgs_14", "systems": "systems_5" }, "locked": { diff --git a/flake.nix b/flake.nix index f9c9e57..f2ab1a4 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,7 @@ resume.url = "git+https://git.fainsin.bzh/Laurent/resume"; projet-intelligence-artificielle-multimedia.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-intelligence-artificielle-multimedia"; projet-modelisation-geometrique.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-modelisation-geometrique"; + projet-systemes-algorithmes-repartis.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-systemes-algorithmes-repartis"; projet-audionumerique.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique"; projet-oral-japonais.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais"; projet-oral-anglais.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-oral-anglais"; diff --git a/hosts/hydrogen/services/nginx/n7/default.nix b/hosts/hydrogen/services/nginx/n7/default.nix index 6c9b5ef..8033630 100644 --- a/hosts/hydrogen/services/nginx/n7/default.nix +++ b/hosts/hydrogen/services/nginx/n7/default.nix @@ -15,7 +15,7 @@ } // { "/projet-audionumerique/" = import ./projet-audionumerique.nix {inherit inputs system;}; - "/projet-systemes-algorithmes-repartis/" = import ./projet-systemes-algorithmes-repartis.nix pkgs; + "/projet-systemes-algorithmes-repartis/" = import ./projet-systemes-algorithmes-repartis.nix {inherit inputs system;}; "/projet-intelligence-artificielle-multimedia/" = import ./projet-intelligence-artificielle-multimedia.nix {inherit inputs system;}; "/projet-probleme-inverse-3D/" = import ./projet-probleme-inverse-3D.nix pkgs; "/projet-modelisation-geometrique/" = import ./projet-modelisation-geometrique.nix {inherit inputs system;}; diff --git a/hosts/hydrogen/services/nginx/n7/projet-systemes-algorithmes-repartis.nix b/hosts/hydrogen/services/nginx/n7/projet-systemes-algorithmes-repartis.nix index 76bf1bb..2afb004 100644 --- a/hosts/hydrogen/services/nginx/n7/projet-systemes-algorithmes-repartis.nix +++ b/hosts/hydrogen/services/nginx/n7/projet-systemes-algorithmes-repartis.nix @@ -1,10 +1,7 @@ -{pkgs, ...}: let - pages = pkgs.fetchgit { - url = "https://git.fainsin.bzh/ENSEEIHT/projet-systemes-algorithmes-repartis"; - rev = "1826a53d95b19400b8dd252cd05b20012e3c3dac"; # pages - sha256 = "0n81hpcj7lj5i7jhl8af869vy6fp6bhyrk4fdl6y2rpjgp64zmq2"; - }; -in { - alias = "${pages}/"; - index = "slides.html"; +{ + inputs, + system, + ... +}: { + alias = inputs.projet-systemes-algorithmes-repartis.packages.${system}.slides + "/"; }