public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30200 from joncojonathan/update-gramps426

Browse Source 
Update gramps426
This commit is contained in:
Jörg Thalheim 2017-10-07 22:31:00 +01:00 committed by GitHub
commit 8f8a7f34f5
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/misc/gramps/default.nix
View File

@ -1,23 +1,31 @@
{ stdenv, fetchurl, gtk3, pythonPackages, intltool, { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
pango, gsettings_desktop_schemas }: pango, gsettings_desktop_schemas,
# Optional packages:
enableOSM ? true, osm-gps-map
}:
let let
inherit (pythonPackages) python buildPythonApplication; inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec { in buildPythonApplication rec {
version = "4.1.1"; version = "4.2.6";
name = "gramps-${version}"; name = "gramps-${version}";
buildInputs = [ intltool gtk3 ]; buildInputs = [ intltool gtk3 ]
# Map support
++ stdenv.lib.optional enableOSM osm-gps-map
;
# Currently broken # Currently broken
doCheck = false; doCheck = false;
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz"; owner = "gramps-project";
sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; repo = "gramps";
rev = "v${version}";
sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1";
}; };
pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ]; pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ];
# Same installPhase as in buildPythonApplication but without --old-and-unmanageble # Same installPhase as in buildPythonApplication but without --old-and-unmanageble
# install flag. # install flag.

4
pkgs/top-level/all-packages.nix
View File

@ -14837,7 +14837,9 @@ with pkgs;
gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
gramps = callPackage ../applications/misc/gramps { }; gramps = callPackage ../applications/misc/gramps {
pythonPackages = python3Packages;
};
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };

3
pkgs/top-level/python-packages.nix
View File

@ -2093,7 +2093,8 @@ in {
buildInputs = [ pkgs.db ]; buildInputs = [ pkgs.db ];
# Judging from SyntaxError in test # Judging from SyntaxError in test
disabled = isPy3k; # disabled = isPy3k;
doCheck = false; # test suite breaks python3 compatibility
# Path to database need to be set. # Path to database need to be set.
# Somehow the setup.py flag is not propagated. # Somehow the setup.py flag is not propagated.