Unverified Commit 419dcad7 authored by Toma's avatar Toma Committed by GitHub
Browse files

stirling-pdf 0.33.1 -> 1.0.2, license fixes (#423606)

parents 83aafa51 148e2e3d
Loading
Loading
Loading
Loading
+1529 −1052

File changed.

Preview size limit exceeded, changes collapsed.

+5 −4
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "stirling-pdf";
  version = "0.33.1";
  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "Stirling-Tools";
    repo = "Stirling-PDF";
    rev = "v${finalAttrs.version}";
    hash = "sha256-Cl2IbFfw6TH904Y63YQnXS/mDEuUB6AdCoRT4G+W0hU=";
    hash = "sha256-mO1fOmkLDUFz46/d1+TF24pDBRNoteQ+hlrwgIRV8EQ=";
  };

  patches = [
@@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
  gradleFlags = [
    "-x"
    "spotlessApply"
    "-DDISABLE_ADDITIONAL_FEATURES=true"
  ];

  doCheck = true;
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
  installPhase = ''
    runHook preInstall

    install -Dm644 build/libs/Stirling-PDF-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
    install -Dm644 ./stirling-pdf/build/libs/stirling-pdf-*.jar $out/share/stirling-pdf/Stirling-PDF.jar
    makeWrapper ${jre}/bin/java $out/bin/Stirling-PDF \
        --add-flags "-jar $out/share/stirling-pdf/Stirling-PDF.jar"

@@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/Stirling-Tools/Stirling-PDF/releases/tag/v${finalAttrs.version}";
    description = "Locally hosted web application that allows you to perform various operations on PDF files";
    homepage = "https://github.com/Stirling-Tools/Stirling-PDF";
    license = lib.licenses.gpl3Only;
    license = lib.licenses.mit;
    mainProgram = "Stirling-PDF";
    maintainers = with lib.maintainers; [ tomasajt ];
    platforms = jre.meta.platforms;
+7 −7
Original line number Diff line number Diff line
diff --git a/build.gradle b/build.gradle
index e12cbd3..094a219 100644
index 3dba68da..fde06f16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -173,6 +173,7 @@ task writeVersion {
@@ -75,6 +75,7 @@ tasks.register('writeVersion') {
         def props = new Properties()
     props.setProperty('version', version)
         props.setProperty("version", version)
         props.store(propsFile.newWriter(), null)
+        propsFile.text = propsFile.readLines().tail().join('\n')
     }
 }
 
 swaggerhubUpload {