Merge pull request #206717 from gador/pinegrow-7

This commit is contained in:
Sandro 2022-12-30 22:01:41 +01:00 committed by GitHub
commit f4916e1bed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions

View file

@ -10,18 +10,36 @@
, gtk3 , gtk3
, wrapGAppsHook , wrapGAppsHook
, makeWrapper , makeWrapper
, pinegrowVersion ? "7"
}: }:
let
# major version upgrade requires a new license. So keep version 6 around.
versions = {
"6" = {
version = "6.8";
src = fetchurl {
url = "https://download.pinegrow.com/PinegrowLinux64.${versions."6".version}.zip";
sha256 = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk=";
};
};
"7" = {
version = "7.03";
src = fetchurl {
url = "https://download.pinegrow.com/PinegrowLinux64.${versions."7".version}.zip";
sha256 = "sha256-MdaJBmOPr1+J235IZPd3EBzbDTiORginyVKsjSkKbpE=";
};
};
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pinegrow"; pname = "pinegrow";
# deactivate auto update, because an old 6.21 version is getting mixed up # deactivate auto update, because an old 6.21 version is getting mixed up
# see e.g. https://github.com/NixOS/nixpkgs/pull/184460 # see e.g. https://github.com/NixOS/nixpkgs/pull/184460
version = "6.8"; # nixpkgs-update: no auto update version = versions.${pinegrowVersion}.version; # nixpkgs-update: no auto update
src = fetchurl { src = versions.${pinegrowVersion}.src;
url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip";
sha256 = "sha256-gqRmu0VR8Aj57UwYYLKICd4FnYZMhM6pTTSGIY5MLMk=";
};
nativeBuildInputs = [ nativeBuildInputs = [
unzip unzip

View file

@ -31070,6 +31070,8 @@ with pkgs;
pijuice = with python3Packages; toPythonApplication pijuice; pijuice = with python3Packages; toPythonApplication pijuice;
pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; };
pinegrow = callPackage ../applications/editors/pinegrow { }; pinegrow = callPackage ../applications/editors/pinegrow { };
piper = callPackage ../os-specific/linux/piper { }; piper = callPackage ../os-specific/linux/piper { };