diff --git a/machines/compute01/ds-fr/default.nix b/machines/compute01/ds-fr/default.nix index 547543b..5793dee 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 = "fca8f72cd60c00e74d7735ec13e4e3a22e8e1244"; 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"; diff --git a/npins/sources.json b/npins/sources.json index 3ea0d3a..57da36f 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -240,9 +240,9 @@ "url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs" }, "branch": "main", - "revision": "e27e07f9c03a3bc756f9447a2288ca6f14130ffc", + "revision": "0a4b564221481b5c40a677f8bfd5760f7b3398f8", "url": null, - "hash": "06vydk09wniygpy04yjh07g9raswimhwwfj1cysigx2lxrg0997a" + "hash": "121fqmr1jvsnnc5marvnsj3ic0w9f11lq3sx9ly197kc5rc1naj3" }, "nixos-24.05": { "type": "Channel",