diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix index 40279dc..efd4be6 100644 --- a/machines/compute01/ds-fr/package/default.nix +++ b/machines/compute01/ds-fr/package/default.nix @@ -78,28 +78,10 @@ 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="; - } - # correction des svg des logos DGNum et DN - { - id = "ee474712a3e50d186acd8bbb52f60c1e4fee2f81"; - hash = "sha256-yoPCZOPPOk84n2oAISzjzJ8n3eWtsYqPglayRKcJGII="; - } - ]; + dgn-patches = import ./dgnum.nix { + inherit fetchpatch; + inherit (lib) fakeHash; + }; in stdenv.mkDerivation { name = "demarches-simplifiees.fr-${version}"; diff --git a/machines/compute01/ds-fr/package/dgnum.nix b/machines/compute01/ds-fr/package/dgnum.nix new file mode 100644 index 0000000..9f2514e --- /dev/null +++ b/machines/compute01/ds-fr/package/dgnum.nix @@ -0,0 +1,59 @@ +{ fetchpatch, fakeHash }: + +builtins.map ({ id, hash ? 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="; + } + # correction des svg des logos DGNum et DN + { + id = "ee474712a3e50d186acd8bbb52f60c1e4fee2f81"; + hash = "sha256-yoPCZOPPOk84n2oAISzjzJ8n3eWtsYqPglayRKcJGII="; + } + # modifs Mariannes + { + id = "222ae5abee8a255cb1fe4e19f6a7769b2df1cafb"; + hash = "sha256-26+RKT87c1sbpt/No6f6qLGzTU/UC/3+SQVVUd8dtfk="; + } + # commenter quelques bouts de code inutiles dans l'usage DGNum de DS + { + id = "ab8b515e3dbd340741a4562ab4f87c520ac99434"; + hash = "sha256-0yWAgLq5O1A6Rf4j/W/iKerX5f7ZlKE/tbCZ69Us2jo="; + } + # Update logo-ds.svg and delete commented lines + { + id = "ff36c4ad62f87086781743e843ec2ccde5eab8b6"; + hash = "sha256-XRTZXD0j7Uk9fVKRMnYdGhNZ5yk85LNeg6IVotgw840="; + } + # correction logo DN pour les pages d'erreur + { + id = "bbe8e7d421466eea2b2ea56abf004bf91e29224c"; + hash = "sha256-lo0giMktGn9vNBtn31EGSevEK/FXz6+crJNhVGexJec="; + } + # normalianisation de DN, texte + { + id = "0a630f87e214027e6b49073840fd4e1c1074ed2a"; + hash = "sha256-zu/FtAa/B2eJnpxzZJs1CeA5/Btm25LOjfeHnLLHtmI="; + } + # modifs sur le fichier en anglais + { + id = "e9e644a4d86b44cfad339d9e6af4ae4938e13f75"; + hash = "sha256-LoHzac2lC5YozlXOB4pqIkWPbJk2tq3326Sa+HsHGB8="; + } + # Use our logo in the header + { + id = "e755b13183da2ea94d8d91de45eae71a1a9fb5b9"; + hash = "sha256-tt9vlsI6St1XeLe1c6xa2LTlKHHWMGP+pv1Kv2Q9hFU="; + } + ]