alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #221908 from wegank/timeline-wx

Browse source 
timeline: fix build, migrate to wxPython_4_2
This commit is contained in:
Weijia Wang 2023-03-19 20:00:17 +02:00 committed by GitHub
parent 13891fbe76 4d7acf6184
commit 0dc63a4021
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/office/timeline/default.nix
View file

@ -9,6 +9,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "timeline"; pname = "timeline";
version = "2.6.0"; version = "2.6.0";
format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip";
@ -18,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
pythonPath = with python3.pkgs; [ pythonPath = with python3.pkgs; [
wxPython_4_0 wxPython_4_2
humblewx humblewx
icalendar icalendar
markdown markdown

5
pkgs/development/python-modules/humblewx/default.nix
View file

@ -1,7 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, buildPythonPackage , buildPythonPackage
, wxPython_4_0 , wxPython_4_2
, python , python
}: }:
@ -16,8 +16,7 @@ buildPythonPackage rec {
sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210"; sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210";
}; };
# timeline is not compatible with wxPython_4_1. reported upstream propagatedBuildInputs = [ wxPython_4_2 ];
propagatedBuildInputs = [ wxPython_4_0 ];
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck