From 0a4c73170ac279cd26c9c605bc72a299397b799a Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 21 Nov 2024 13:36:24 +0100 Subject: [PATCH] fix(ds-fr): Switch to nix-pkgs --- machines/compute01/ds-fr/default.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/machines/compute01/ds-fr/default.nix b/machines/compute01/ds-fr/default.nix index 547543b..adf6563 100644 --- a/machines/compute01/ds-fr/default.nix +++ b/machines/compute01/ds-fr/default.nix @@ -1,7 +1,14 @@ -{ config, ... }: +{ + config, + pkgs, + sources, + ... +}: let host = "demarches.dgnum.eu"; + + dgn-id = "f270f1cdd09e643a9c666c94df1841234430de49"; in { imports = [ ./module.nix ]; @@ -11,6 +18,18 @@ in services.demarches-simplifiees = { enable = true; + package = + ((import sources.nix-pkgs { inherit pkgs; }).demarches-simplifiees.override { + initialDeploymentDate = "20230923"; + }).overrideAttrs + (old: { + dsModules = old.dsModules.overrideAttrs { + prePatch = '' + ${pkgs.lib.getExe pkgs.git} apply -p1 < ${builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${dgn-id}.patch"} + ''; + }; + }); + secretFile = config.age.secrets."ds-fr-secret_file".path; initialDeploymentDate = "20230923";