From d2f68277e0bde5985ad7098a99f9ff110a75e4e3 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom@hubrecht.ovh>
Date: Fri, 1 Dec 2023 14:04:20 +0100
Subject: [PATCH] feat(ds-fr): Use imagemagick and make things work

---
 machines/compute01/ds-fr/module.nix          | 2 +-
 machines/compute01/ds-fr/package/default.nix | 3 +--
 machines/compute01/ds-fr/package/dgnum.nix   | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/machines/compute01/ds-fr/module.nix b/machines/compute01/ds-fr/module.nix
index 3a9756c..220979c 100644
--- a/machines/compute01/ds-fr/module.nix
+++ b/machines/compute01/ds-fr/module.nix
@@ -176,6 +176,7 @@ in {
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" "ds-fr-setup.service" ];
         requires = [ "ds-fr-setup.service" ];
+        path = [ pkgs.imagemagick ];
 
         serviceConfig = {
           ExecStart = "${ds-fr}/bin/ds-fr rails server";
@@ -395,6 +396,5 @@ in {
     };
 
     users.groups.${cfg.group} = { };
-
   };
 }
diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix
index b1ccbd4..12d0cad 100644
--- a/machines/compute01/ds-fr/package/default.nix
+++ b/machines/compute01/ds-fr/package/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, git, fetchYarnDeps, yarn, fixup_yarn_lock
+{ lib, stdenv, fetchFromGitHub, git, fetchYarnDeps, yarn, fixup_yarn_lock, imagemagick
 , nodejs, ruby_3_2, bundlerEnv, logDir ? "/var/log/ds-fr"
 , dataDir ? "/var/lib/ds-fr", initialDeploymentDate ? "17941030" }:
 
@@ -96,7 +96,6 @@ in stdenv.mkDerivation {
     ./patches/smtp_settings.patch
     ./patches/garage.patch
     ./patches/secrets-fc.patch
-    ./patches/uninterlace_png.patch
   ];
 
   postPatch = builtins.concatStringsSep "\n"
diff --git a/machines/compute01/ds-fr/package/dgnum.nix b/machines/compute01/ds-fr/package/dgnum.nix
index 37c11f8..102964d 100644
--- a/machines/compute01/ds-fr/package/dgnum.nix
+++ b/machines/compute01/ds-fr/package/dgnum.nix
@@ -29,6 +29,4 @@ builtins.map (id:
     "0a5a24fdf887b2117217ca04eb6c8484f53a459b"
     # modifs diverses vers version DN
     "4eb57682c0dd8468a439bd88302222fc24f38044"
-    # Merge branch 'main' of git.dgnum.eu:DGNum/demarches-normaliennes
-    "1c527f28df1beadfb116eedec572555c0fb3b950"
   ]