From 5b23846110d02494c88a3592a132e79240ec2a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Wed, 13 Dec 2023 17:27:30 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20(hydrogen/services)=20flak?= =?UTF-8?q?ify=20projet-audionumerique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 90 +++++++++++++++++-- flake.nix | 9 +- hosts/hydrogen/services/nginx/n7/default.nix | 2 +- .../nginx/n7/projet-audionumerique.nix | 12 +-- 4 files changed, 91 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 52a3ab3..d66f4fc 100644 --- a/flake.lock +++ b/flake.lock @@ -262,6 +262,24 @@ "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" + }, "locked": { "lastModified": 1696343447, "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", @@ -398,11 +416,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1702467096, - "narHash": "sha256-LyI/3QlvhbUy/i9ncdGLWfuI65lm+ffillYxZ2Q8we4=", + "lastModified": 1702476903, + "narHash": "sha256-rzewhikIDI9WkkVQsxCDNVff6ZVdKb1IjkvKjErtYzU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "55cb565e6de201a09bc5a7fb91a9a87448cea321", + "rev": "b2e5a80e2ff1fcbf8164a45c5ef8ebffbb511fae", "type": "github" }, "original": { @@ -556,6 +574,24 @@ } }, "nixpkgs-lib": { + "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_2": { "locked": { "dir": "lib", "lastModified": 1696019113, @@ -654,6 +690,22 @@ } }, "nixpkgs_6": { + "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_7": { "locked": { "lastModified": 1700794826, "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", @@ -669,7 +721,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1700612854, "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", @@ -685,7 +737,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -732,10 +784,29 @@ "type": "github" } }, + "projet-audionumerique": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1702478973, + "narHash": "sha256-1HVWuzIsC9ycoC0Wy5iKk5dZ6c/pN2HuprCAhq6ijUU=", + "ref": "refs/heads/master", + "rev": "77706a8d0f1550d14db45ff03e8ea826e2b9a445", + "revCount": 5, + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique" + }, + "original": { + "type": "git", + "url": "https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique" + } + }, "projet-intelligence-artificielle-multimedia": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1701038653, @@ -754,7 +825,7 @@ "resume": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "typst": "typst" }, "locked": { @@ -782,6 +853,7 @@ "nixos-anywhere": "nixos-anywhere", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", + "projet-audionumerique": "projet-audionumerique", "projet-intelligence-artificielle-multimedia": "projet-intelligence-artificielle-multimedia", "resume": "resume" } @@ -950,8 +1022,8 @@ "typst": { "inputs": { "crane": "crane_3", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_8", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_9", "systems": "systems_6" }, "locked": { diff --git a/flake.nix b/flake.nix index eae5298..3ccf1de 100644 --- a/flake.nix +++ b/flake.nix @@ -33,11 +33,16 @@ 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-audionumerique.url = + "git+https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique"; }; nixConfig = { - extra-substituters = - [ "https://nix-community.cachix.org" "https://hyprland.cachix.org" ]; + extra-substituters = [ + # + "https://nix-community.cachix.org" + "https://hyprland.cachix.org" + ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" diff --git a/hosts/hydrogen/services/nginx/n7/default.nix b/hosts/hydrogen/services/nginx/n7/default.nix index ddb592c..c1c3ddf 100644 --- a/hosts/hydrogen/services/nginx/n7/default.nix +++ b/hosts/hydrogen/services/nginx/n7/default.nix @@ -11,7 +11,7 @@ } // { "/projet-audionumerique/" = # # - import ./projet-audionumerique.nix pkgs; + import ./projet-audionumerique.nix { inherit inputs system; }; "/projet-systemes-algorithmes-repartis/" = # # import ./projet-systemes-algorithmes-repartis.nix pkgs; diff --git a/hosts/hydrogen/services/nginx/n7/projet-audionumerique.nix b/hosts/hydrogen/services/nginx/n7/projet-audionumerique.nix index 49c4551..31fdfb7 100644 --- a/hosts/hydrogen/services/nginx/n7/projet-audionumerique.nix +++ b/hosts/hydrogen/services/nginx/n7/projet-audionumerique.nix @@ -1,11 +1,3 @@ -{ pkgs, ... }: -let - pages = pkgs.fetchgit { - url = "https://git.fainsin.bzh/ENSEEIHT/projet-audionumerique"; - rev = "ece8c09f81430c4cc39dddbb1ad7f518f09aaa67"; # pages - sha256 = "130islkd3jy9vbjm3wnvadamk3n9qqlm8jn7yzywxagjyyrxg0y0"; - }; -in { - alias = "${pages}/"; - index = "slides.html"; +{ inputs, system, ... }: { + alias = inputs.projet-audionumerique.packages.${system}.slides + "/"; }