From 1f725215db69dd622b873f30c1ca20413317a330 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom@hubrecht.ovh>
Date: Tue, 28 Nov 2023 20:51:16 +0100
Subject: [PATCH] fix(ds-fr): patch everything

---
 machines/compute01/ds-fr/package/default.nix | 38 ++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix
index e99ec6e..3cd079a 100644
--- a/machines/compute01/ds-fr/package/default.nix
+++ b/machines/compute01/ds-fr/package/default.nix
@@ -51,23 +51,7 @@ let
     patches = [
       # Disable functionnalities as we only precompile assets
       ./patches/build.patch
-    ] ++ (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=";
-        }
-      ]);
+    ] ++ dgn-patches;
 
     OTP_SECRET_KEY = "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 {
   name = "demarches-simplifiees.fr-${version}";
 
@@ -107,7 +109,7 @@ in stdenv.mkDerivation {
     ./patches/smtp_settings.patch
     ./patches/garage.patch
     ./patches/secrets-fc.patch
-  ];
+  ] ++ dgn-patches;
 
   buildPhase = ''
     rm -rf public