diff --git a/flake.lock b/flake.lock index 38af292..71328ac 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "TP-calcul-parallele": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1702648833, + "narHash": "sha256-gTEE0OrbXHtqjlvSa8d99lzTKfxK/H7VNY3dF38xXPM=", + "ref": "refs/heads/master", + "rev": "352ce6df4e77f5fe7de6b804e14422cda2f6fcff", + "revCount": 3, + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/TP-calcul-parallele" + }, + "original": { + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/TP-calcul-parallele" + } + }, "agenix": { "inputs": { "agenix": "agenix_2", @@ -146,7 +165,7 @@ }, "disko": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1702569759, @@ -217,6 +236,24 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "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_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -237,7 +274,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixos-anywhere", @@ -258,24 +295,6 @@ "type": "github" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "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_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -334,6 +353,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_5" }, + "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_8": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_6" + }, "locked": { "lastModified": 1696343447, "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", @@ -446,7 +483,7 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" @@ -494,9 +531,9 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -517,10 +554,10 @@ "nixos-anywhere": { "inputs": { "disko": "disko_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixos-images": "nixos-images", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -595,16 +632,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -682,6 +719,24 @@ } }, "nixpkgs-lib_5": { + "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_6": { "locked": { "dir": "lib", "lastModified": 1696019113, @@ -716,6 +771,22 @@ } }, "nixpkgs_10": { + "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_11": { "locked": { "lastModified": 1700612854, "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", @@ -731,7 +802,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -748,6 +819,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1702272962, + "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1702312524, "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", @@ -763,7 +850,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1699354722, "narHash": "sha256-abmqUReg4PsyQSwv4d0zjcWpMHrd3IFJiTb2tZpfF04=", @@ -779,7 +866,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1702310776, "narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=", @@ -795,22 +882,6 @@ "type": "github" } }, - "nixpkgs_5": { - "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_6": { "locked": { "lastModified": 1702312524, @@ -908,8 +979,8 @@ }, "projet-audionumerique": { "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6" + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1702487657, @@ -927,8 +998,8 @@ }, "projet-intelligence-artificielle-multimedia": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_7" + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1702567767, @@ -946,8 +1017,8 @@ }, "projet-oral-anglais": { "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_8" + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1702566510, @@ -965,8 +1036,8 @@ }, "projet-oral-japonais": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_9" + "flake-parts": "flake-parts_7", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1702567061, @@ -985,7 +1056,7 @@ "resume": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "typst": "typst" }, "locked": { @@ -1004,6 +1075,7 @@ }, "root": { "inputs": { + "TP-calcul-parallele": "TP-calcul-parallele", "agenix": "agenix", "disko": "disko", "flake-utils": "flake-utils", @@ -1012,7 +1084,7 @@ "lanzaboote": "lanzaboote", "nixos-anywhere": "nixos-anywhere", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "projet-audionumerique": "projet-audionumerique", "projet-intelligence-artificielle-multimedia": "projet-intelligence-artificielle-multimedia", "projet-oral-anglais": "projet-oral-anglais", @@ -1169,8 +1241,8 @@ "typst": { "inputs": { "crane": "crane_3", - "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_11", + "flake-parts": "flake-parts_8", + "nixpkgs": "nixpkgs_12", "systems": "systems_5" }, "locked": { diff --git a/flake.nix b/flake.nix index 066e167..98f4443 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,8 @@ "git+https://git.fainsin.bzh/ENSEEIHT/projet-oral-japonais"; projet-oral-anglais.url = "git+https://git.fainsin.bzh/ENSEEIHT/projet-oral-anglais"; + TP-calcul-parallele.url = + "git+https://git.fainsin.bzh/ENSEEIHT/TP-calcul-parallele"; }; nixConfig = { diff --git a/hosts/hydrogen/services/nginx/n7/TP-calcul-parallele.nix b/hosts/hydrogen/services/nginx/n7/TP-calcul-parallele.nix index b2ab085..a6c9bcd 100644 --- a/hosts/hydrogen/services/nginx/n7/TP-calcul-parallele.nix +++ b/hosts/hydrogen/services/nginx/n7/TP-calcul-parallele.nix @@ -1,11 +1,3 @@ -{ pkgs, ... }: -let - pages = pkgs.fetchgit { - url = "https://git.fainsin.bzh/ENSEEIHT/TP-calcul-parallele"; - rev = "7222bd269d5f2fb3873cd8cacb83bf5123b1f91a"; # pages - sha256 = "1anj0xixcql068wijqb344ay1cf8xl7x6mfmbvvcrqv21ni61xx3"; - }; -in { - alias = "${pages}/"; - index = "report.html"; +{ inputs, system, ... }: { + alias = inputs.TP-calcul-parallele.packages.${system}.report + "/"; } diff --git a/hosts/hydrogen/services/nginx/n7/default.nix b/hosts/hydrogen/services/nginx/n7/default.nix index b34932b..dd2edd6 100644 --- a/hosts/hydrogen/services/nginx/n7/default.nix +++ b/hosts/hydrogen/services/nginx/n7/default.nix @@ -42,7 +42,7 @@ } // { "/TP-calcul-parallele/" = # # - import ./TP-calcul-parallele.nix pkgs; + import ./TP-calcul-parallele.nix { inherit inputs system; }; "/TP-reinforcement-learning/" = # # import ./TP-reinforcement-learning.nix pkgs;