Commit 3210c8b7 authored by NTBBloodbath's avatar NTBBloodbath Committed by Masum Reza
Browse files

penpot-desktop: 0.10.0 -> 0.11.0

parent 6509831a

pkgs/by-name/pe/penpot-desktop/electron-package-lock.diff

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
diff --git i/package-lock.json w/package-lock.json

index 039e3c0..135e0a0 100644

--- i/package-lock.json

+++ w/package-lock.json

@@ -18,7 +18,7 @@

 				"@commitlint/cli": "^19.6.1",

 				"@commitlint/config-conventional": "^19.6.0",

 				"@eslint/js": "^9.19.0",

-				"electron": "^34.0.1",

+				"electron": "^33.3.1",

 				"electron-builder": "^25.1.8",

 				"eslint": "^9.19.0",

 				"globals": "^15.14.0",

@@ -3495,9 +3495,9 @@

 			}

 		},

 		"node_modules/electron": {

-			"version": "34.0.1",

-			"resolved": "https://registry.npmjs.org/electron/-/electron-34.0.1.tgz",

-			"integrity": "sha512-aArw5tAM80i3CKwEREnyZSM1SkARf5Jd1yBMTIdOL4pB1M+p/oDeyWSFI9Dl+vujyfJKiK4SS5+j19wna1onMw==",

+			"version": "33.3.1",

+			"resolved": "https://registry.npmjs.org/electron/-/electron-33.3.1.tgz",

+			"integrity": "sha512-Z7l2bVgpdKxHQMI4i0CirBX2n+iCYKOx5mbzNM3BpOyFELwlobEXKmzCmEnwP+3EcNeIhUQyIEBFQxN06QgdIw==",

 			"dev": true,

 			"hasInstallScript": true,

 			"license": "MIT",

diff --git i/package.json w/package.json

index 9525e62..deb065e 100644

--- i/package.json

+++ w/package.json

@@ -43,7 +43,7 @@

 		"@commitlint/cli": "^19.6.1",

 		"@commitlint/config-conventional": "^19.6.0",

 		"@eslint/js": "^9.19.0",

-		"electron": "^34.0.1",

+		"electron": "^33.1.1",

 		"electron-builder": "^25.1.8",

 		"eslint": "^9.19.0",

 		"globals": "^15.14.0",

pkgs/by-name/pe/penpot-desktop/package.nix

+9 −15
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  buildNpmPackage,

  copyDesktopItems,

  electron_33,

  electron,

  fetchFromGitHub,

  jq,

  makeDesktopItem,
@@ -15,29 +15,24 @@ let 
  description = "Unofficial desktop application for the open-source design tool, Penpot";

  icon = "penpot";

  nodejs = nodejs_22;

  electron = electron_33;

in

buildNpmPackage rec {

  pname = "penpot-desktop";

  version = "0.10.0";

  version = "0.11.0";



  src = fetchFromGitHub {

    owner = "author-more";

    repo = "penpot-desktop";

    tag = "v${version}";

    hash = "sha256-KlTE61k5rl13GPpOznpugSn1hmn55Cd/Z9vhwDjWhPo=";

    hash = "sha256-33LAhR0L7pAnS27dz5DuqgfUllyAFA9JVZRmrHoajE4=";

  };



  patches = [

    ./electron-package-lock.diff # this downgrades electron version from 34 to 33 to match the latest available version in nixpkgs

  ];



  makeCacheWritable = true;

  npmFlags = [

    "--engine-strict"

    "--legacy-peer-deps"

  ];

  npmDepsHash = "sha256-DWZ1ih4i0vyYlShBWkJTCq0IKgT4CgEmvURnGoQiSy0=";

  npmDepsHash = "sha256-BR51Oi9Ffxy7d0fBkSQ6Iz/PVi+ghIaLqzm3Loq6aDo=";

  # Do not run the default build script as it leads to errors caused by the electron-builder configuration

  dontNpmBuild = true;
@@ -81,11 +76,9 @@ buildNpmPackage rec { 
      --inherit-argv0



    pushd build

    for icon in icon.*; do

      dir=$out/share/icons/hicolor/"''${icon%.*}"/apps

    dir=$out/share/icons/hicolor/512x512/apps

    mkdir -p "$dir"

      cp "$icon" "$dir"/${icon}.png

    done

    cp icon.png "$dir"/${icon}.png

    popd



    runHook postInstall
@@ -105,10 +98,11 @@ buildNpmPackage rec { 
  meta = {

    changelog = "https://github.com/author-more/penpot-desktop/releases/tag/v${version}";

    inherit description;

    homepage = "https://github.com/author-more/penpot.desktop";

    homepage = "https://github.com/author-more/penpot-desktop";

    license = lib.licenses.agpl3Only;

    maintainers = with lib.maintainers; [ ntbbloodbath ];

    platforms = electron.meta.platforms;

    badPlatforms = lib.platforms.darwin;

    mainProgram = "penpot-desktop";

  };

}