diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index c6e575a97a69..21874519a7c7 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -11,7 +11,7 @@ { lib , stdenv , program ? "pdfstudio" -, year ? "2022" +, year ? "2023" , fetchurl , callPackage , jdk11 @@ -31,27 +31,23 @@ in { pdfstudioviewer = callPackage ./common.nix rec { inherit desktopName pname program year; - version = "${year}.2.4"; + version = "${year}.0.3"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; - sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg="; + sha256 = "sha256-JQx5yJLjwW4VRXLM+/VNDXFN8ZcHJxlxyKDIzc++hEs="; }; jdk = jdk17; - - # Bad hash, got sha256-afRhx9VCVRFUJoUnqs1bzF0yXpz3yEgLiFjMRB9xvsk= - # Likely unstable. - broken = true; }; pdfstudio2021 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.1"; + version = "${year}.2.2"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-yELpza2C3HJJIP+ZQP7x3Tfez0Nl6ctCbHCmTmpX3jo="; + sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -61,14 +57,24 @@ in pdfstudio2022 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.4"; + version = "${year}.2.5"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ="; + sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; + + pdfstudio2023 = callPackage ./common.nix rec { + inherit desktopName longDescription pname program year; + version = "${year}.0.3"; + src = fetchurl { + url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; + sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; + }; + jdk = jdk17; + }; }.${pname} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14bbc19384bf..76bab0c90f42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30333,17 +30333,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - pdfstudio2021 = callPackage ../applications/misc/pdfstudio { - year = "2021"; - }; + pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; - pdfstudio2022 = callPackage ../applications/misc/pdfstudio { - year = "2022"; - }; + pdfstudio2022 = callPackage ../applications/misc/pdfstudio { year = "2022"; }; - pdfstudioviewer = callPackage ../applications/misc/pdfstudio { - program = "pdfstudioviewer"; - }; + pdfstudio2023 = callPackage ../applications/misc/pdfstudio { year = "2023"; }; + + pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; }; abaddon = callPackage ../applications/networking/instant-messengers/abaddon { };