From 99825b89caf0ca292119f76aa85b9d71a7305409 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 10 Sep 2024 22:17:04 +0200 Subject: [PATCH] fix(stirling-pdf): Make it build again --- machines/compute01/stirling-pdf/default.nix | 35 +++------------------ 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/machines/compute01/stirling-pdf/default.nix b/machines/compute01/stirling-pdf/default.nix index f356d0b..35977da 100644 --- a/machines/compute01/stirling-pdf/default.nix +++ b/machines/compute01/stirling-pdf/default.nix @@ -1,42 +1,15 @@ -{ pkgs, nixpkgs, ... }: +{ nixpkgs, ... }: let - dgn-id = "5891e1bbda792e0546f8d785cdd4d3f570a01579"; + dgn-id = "f756a0f47e704db815a7af6786f6eb0aec628d6b"; in { services.stirling-pdf = { enable = true; - package = nixpkgs.unstable.stirling-pdf.overrideAttrs (old: rec { - version = "0.26.1"; - - src = pkgs.fetchFromGitHub { - owner = "Stirling-Tools"; - repo = "Stirling-PDF"; - rev = "v${version}"; - hash = "sha256-msxP2n8Varc7/h9RVwYRBuD253JZu6/p7zQC1lmNmqc="; - }; - - deps = old.deps.overrideAttrs (_: { - patches = [ - ./01-spotless.patch - ./05-java-output-test.patch - ]; - - doCheck = false; - outputHash = "sha256-i2PJmsuJ8jqTUNwj4HoiWynaK4LlLrqjIZ67rSSYypc="; - }); - - patches = [ - ./01-spotless.patch - ./02-propsfile.patch - ./03-jar-timestamps.patch - (pkgs.substituteAll { - src = ./04-local-maven-deps.patch; - inherit deps; - }) - ./05-java-output-test.patch + package = nixpkgs.unstable.stirling-pdf.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ (builtins.fetchurl "https://git.dgnum.eu/DGNum/Stirling-PDF/commit/${dgn-id}.patch") ]; });