diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/tryton/default.nix | 37 | ||||
-rw-r--r-- | pkgs/applications/office/trytond/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/python-modules/cdecimal/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/python-modules/goocalendar/default.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
5 files changed, 112 insertions, 13 deletions
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 51d5b083e6bd..0df9fd899dc5 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,22 +1,45 @@ -{ stdenv, fetchurl, python2Packages, librsvg }: +{ stdenv +, python2Packages +, pkgconfig +, librsvg +, gobjectIntrospection +, atk +, gtk3 +, gtkspell3 +, gnome3 +, goocanvas2 +}: with stdenv.lib; python2Packages.buildPythonApplication rec { - name = "tryton-${version}"; - version = "4.6.2"; - src = fetchurl { - url = "mirror://pypi/t/tryton/${name}.tar.gz"; - sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9"; + pname = "tryton"; + version = "4.8.0"; + src = python2Packages.fetchPypi { + inherit pname version; + sha256 = "1ywgna4hhmji8pfrwhdfj1ns49vs9nwppqb7iy7jr27wrxk4bm6b"; }; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = with python2Packages; [ chardet dateutil pygtk librsvg + pygobject3 + goocalendar + cdecimal + ]; + buildInputs = [ + atk + gtk3 + gnome3.defaultIconTheme + gtkspell3 + goocanvas2 ]; makeWrapperArgs = [ ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"'' + ''--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"'' + ''--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'' ]; meta = { description = "The client of the Tryton application platform"; @@ -30,6 +53,6 @@ python2Packages.buildPythonApplication rec { ''; homepage = http://www.tryton.org/; license = licenses.gpl3Plus; - maintainers = [ maintainers.johbo ]; + maintainers = with maintainers; [ johbo udono ]; }; } diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index efa7f2a410d7..31c6a7059fc0 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { - name = "trytond-${version}"; - version = "4.6.2"; - src = fetchurl { - url = "mirror://pypi/t/trytond/${name}.tar.gz"; - sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda"; + pname = "trytond"; + version = "4.8.0"; + src = python2Packages.fetchPypi { + inherit pname version; + sha256 = "114c0ea15b8395117bf8c669b7da8af4961001297fbd034c780a42a40e079e3a"; }; # Tells the tests which database to use @@ -25,12 +25,15 @@ python2Packages.buildPythonApplication rec { relatorio werkzeug wrapt + ipaddress # extra dependencies bcrypt pydot python-Levenshtein simplejson + cdecimal + html2text ] ++ stdenv.lib.optional withPostgresql psycopg2); meta = { description = "The server of the Tryton application platform"; @@ -44,6 +47,6 @@ python2Packages.buildPythonApplication rec { ''; homepage = http://www.tryton.org/; license = licenses.gpl3Plus; - maintainers = [ maintainers.johbo ]; + maintainers = with maintainers; [ udono johbo ]; }; } diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix new file mode 100644 index 000000000000..2c0b0e623ca9 --- /dev/null +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }: + +with stdenv.lib; + +buildPythonPackage rec { + pname = "cdecimal"; + version = "2.3"; + + disabled = isPy3k; + + src = fetchurl { + url="http://www.bytereef.org/software/mpdecimal/releases/${pname}-${version}.tar.gz"; + sha256 = "d737cbe43ed1f6ad9874fb86c3db1e9bbe20c0c750868fde5be3f379ade83d8b"; + }; + + # Upstream tests are not included s. a. http://www.bytereef.org/mpdecimal/testing.html + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast drop-in replacement for decimal.py"; + homepage = http://www.bytereef.org/mpdecimal/; + license = licenses.bsd2; + maintainers = [ maintainers.udono ]; + }; +} diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix new file mode 100644 index 000000000000..f6e67ad43923 --- /dev/null +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, pkgconfig +, gtk3 +, gobjectIntrospection +, pygtk +, pygobject3 +, goocanvas2 +, isPy3k + }: + +with stdenv.lib; + +buildPythonPackage rec { + pname = "GooCalendar"; + version = "0.3"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1p7qbcv06xipg48sgpdlqf72ajl3n1qlypcc0giyi1a72zpyf823"; + }; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + propagatedBuildInputs = [ + pygtk + pygobject3 + ]; + buildInputs = [ + gtk3 + goocanvas2 + ]; + + # No upstream tests available + doCheck = false; + + meta = with stdenv.lib; { + description = "A calendar widget for GTK using PyGoocanvas."; + homepage = https://goocalendar.tryton.org/; + license = licenses.gpl2; + maintainers = [ maintainers.udono ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca5cfb677a2e..998aac285c42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -223,6 +223,8 @@ in { bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + cdecimal = callPackage ../development/python-modules/cdecimal { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dbf = callPackage ../development/python-modules/dbf { }; @@ -253,6 +255,8 @@ in { globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + goocalendar = callPackage ../development/python-modules/goocalendar { }; + gssapi = callPackage ../development/python-modules/gssapi { }; h5py = callPackage ../development/python-modules/h5py { |