DGNum/infrastructure
13
6
Fork 3
Code Issues 20 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions 2

fix(ds-fr): patch everything

Browse source
This commit is contained in:
Tom Hubrecht 2023-11-28 20:51:16 +01:00
parent fa799c9dda
commit 1f725215db
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
machines/compute01/ds-fr/package/default.nix
View file

@ -51,23 +51,7 @@ let
patches = [ patches = [
# Disable functionnalities as we only precompile assets # Disable functionnalities as we only precompile assets
./patches/build.patch ./patches/build.patch
] ++ (builtins.map ({ id, hash ? lib.fakeHash }: ] ++ dgn-patches;
fetchpatch {
url =
"https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch";
inherit hash;
}) [
# remplacement l'arrache de quelques logos vers versions DGNum
{
id = "05d34a880ebb34265ebbcac0a83625b3a976c348";
hash = "sha256-3VTBom8Lz6F/NXvjLzdhBddXS5FerV5eNHUkDPBDeD8=";
}
# ajout des NDD usuels ENS et DGNum pour autoriser les changements d'adresse mail
{
id = "bc4742aaacb174a55a08baae5f354ada3fba4577";
hash = "sha256-LShcRzj/lnFQyJtc9+RxNQq8tsCcdYrwhe2BjqLr1pQ=";
}
]);
OTP_SECRET_KEY = "precompile_placeholder"; OTP_SECRET_KEY = "precompile_placeholder";
SECRET_KEY_BASE = "precompile_placeholder"; SECRET_KEY_BASE = "precompile_placeholder";
@ -94,6 +78,24 @@ let
''; '';
}; };
dgn-patches = builtins.map ({ id, hash ? lib.fakeHash }:
fetchpatch {
url =
"https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch";
inherit hash;
}) [
# remplacement l'arrache de quelques logos vers versions DGNum
{
id = "05d34a880ebb34265ebbcac0a83625b3a976c348";
hash = "sha256-3VTBom8Lz6F/NXvjLzdhBddXS5FerV5eNHUkDPBDeD8=";
}
# ajout des NDD usuels ENS et DGNum pour autoriser les changements d'adresse mail
{
id = "bc4742aaacb174a55a08baae5f354ada3fba4577";
hash = "sha256-LShcRzj/lnFQyJtc9+RxNQq8tsCcdYrwhe2BjqLr1pQ=";
}
];
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "demarches-simplifiees.fr-${version}"; name = "demarches-simplifiees.fr-${version}";
@ -107,7 +109,7 @@ in stdenv.mkDerivation {
./patches/smtp_settings.patch ./patches/smtp_settings.patch
./patches/garage.patch ./patches/garage.patch
./patches/secrets-fc.patch ./patches/secrets-fc.patch
]; ] ++ dgn-patches;
buildPhase = '' buildPhase = ''
rm -rf public rm -rf public