fix(ds-fr): Switch to nix-pkgs
Some checks failed
Check meta / check_meta (pull_request) Successful in 20s
Check meta / check_dns (pull_request) Successful in 21s
Check workflows / check_workflows (pull_request) Successful in 21s
Run pre-commit on all files / check (push) Successful in 23s
Build all the nodes / bridge01 (pull_request) Successful in 57s
Build all the nodes / geo01 (pull_request) Successful in 56s
Build all the nodes / geo02 (pull_request) Successful in 1m9s
Build all the nodes / rescue01 (pull_request) Successful in 1m9s
Build all the nodes / storage01 (pull_request) Successful in 57s
Build all the nodes / vault01 (pull_request) Successful in 1m6s
Build all the nodes / web02 (pull_request) Successful in 1m1s
Run pre-commit on all files / check (pull_request) Successful in 25s
Build all the nodes / web03 (pull_request) Successful in 1m0s
Build all the nodes / web01 (pull_request) Successful in 1m35s
Build all the nodes / compute01 (pull_request) Failing after 9m1s

This commit is contained in:
Tom Hubrecht 2024-11-21 13:36:24 +01:00
parent 32f68a54a9
commit 385c0d6605
Signed by: thubrecht
SSH key fingerprint: SHA256:CYNvFo44Ar9qCNnWNnvJVhs0QXO9AZjOLlPeWcSij3Q
2 changed files with 22 additions and 3 deletions

View file

@ -1,7 +1,14 @@
{ config, ... }: {
config,
pkgs,
sources,
...
}:
let let
host = "demarches.dgnum.eu"; host = "demarches.dgnum.eu";
dgn-id = "f270f1cdd09e643a9c666c94df1841234430de49";
in in
{ {
imports = [ ./module.nix ]; imports = [ ./module.nix ];
@ -11,6 +18,18 @@ in
services.demarches-simplifiees = { services.demarches-simplifiees = {
enable = true; 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; secretFile = config.age.secrets."ds-fr-secret_file".path;
initialDeploymentDate = "20230923"; initialDeploymentDate = "20230923";

View file

@ -240,9 +240,9 @@
"url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs" "url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs"
}, },
"branch": "main", "branch": "main",
"revision": "e27e07f9c03a3bc756f9447a2288ca6f14130ffc", "revision": "0a4b564221481b5c40a677f8bfd5760f7b3398f8",
"url": null, "url": null,
"hash": "06vydk09wniygpy04yjh07g9raswimhwwfj1cysigx2lxrg0997a" "hash": "121fqmr1jvsnnc5marvnsj3ic0w9f11lq3sx9ly197kc5rc1naj3"
}, },
"nixos-24.05": { "nixos-24.05": {
"type": "Channel", "type": "Channel",