From 6db7a6666a43ecbc469a283ea12133d987782089 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Jun 2025 06:43:47 +0000 Subject: [PATCH 1/5] sigil: 2.4.2 -> 2.5.1 (cherry picked from commit 2cac66e0898db1a7c229cdbfda6c845565ba1904) --- pkgs/by-name/si/sigil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index 9fdb16fe57a7..46ad4b1b574f 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.4.2"; + version = "2.5.1"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw="; + hash = "sha256-1Z+OosEZJEHiUz+62wYuNeAyQXARh14WAtqBVjq1FZw="; }; pythonPath = with python3Packages; [ lxml ]; From 030670fc283e3b7afaa9c664b78668551901ab70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jun 2025 14:15:53 +0000 Subject: [PATCH 2/5] sigil: 2.5.1 -> 2.5.2 (cherry picked from commit 078eb997e8a9c233163ec4bb12ef89b69876b91e) --- pkgs/by-name/si/sigil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index 46ad4b1b574f..c59b70df0f08 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-1Z+OosEZJEHiUz+62wYuNeAyQXARh14WAtqBVjq1FZw="; + hash = "sha256-nMPBkAAah4qbatvtfkCJqdo6BVL0NuxFZEHhSiB4uXY="; }; pythonPath = with python3Packages; [ lxml ]; From 487020a594792e3e9bdd4d9c2ae102d0982753f1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 20 Jul 2025 14:43:14 +0800 Subject: [PATCH 3/5] sigil: 2.5.2 -> 2.6.0 (cherry picked from commit 3f9ae4be8ec6a8b18c49bb48487e617bf0d24460) --- pkgs/by-name/si/sigil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index c59b70df0f08..5f011ef0c114 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-nMPBkAAah4qbatvtfkCJqdo6BVL0NuxFZEHhSiB4uXY="; + hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA="; }; pythonPath = with python3Packages; [ lxml ]; From b837427e895f176f9130dca39de1a2a3b9ecf99c Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 20 Jul 2025 14:45:52 +0800 Subject: [PATCH 4/5] sigil: wrap qt app (cherry picked from commit 86dbfd8c158cac379c1abe5b5128a250cbc357b4) --- pkgs/by-name/si/sigil/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index 5f011ef0c114..c75a39e7f2dc 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -57,10 +57,28 @@ stdenv.mkDerivation rec { runHook postInstall ''; + dontWrapQtApps = true; + preFixup = '' qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; + fixupPhase = + let + sigil = + if stdenv.hostPlatform.isDarwin then + "$out/Applications/Sigil.app/Contents/MacOS/Sigil" + else + "$out/bin/sigil"; + in + '' + runHook preFixup + + wrapQtApp "${sigil}" + + runHook postFixup + ''; + meta = { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = "https://github.com/Sigil-Ebook/Sigil/"; From da1ae97e53f108c540ffc4690bb2f2d9f7016899 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Sep 2025 02:08:05 +0000 Subject: [PATCH 5/5] sigil: 2.6.0 -> 2.6.2 (cherry picked from commit 8e2edd632affc4d7c5ee796738b66d1a9ec96c69) --- pkgs/by-name/si/sigil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index c75a39e7f2dc..e15163489769 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-orOuY+gCh7X24jfnGgCbqRWDbtQqrlopYx9sWN2VawA="; + hash = "sha256-3+ODd0/kkXfAchsErLjy6FDHoyVP9VyxbINKMn3N/PM="; }; pythonPath = with python3Packages; [ lxml ];