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

libqalculate, qalculate-gtk: 0.9.7 -> 0.9.8

Browse Source
This commit is contained in:
Gabriel Ebner 2016-06-19 17:33:45 +02:00
parent 8f91feb848
commit e5b3b685f4
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/science/math/qalculate-gtk/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }: { stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qalculate-gtk-${version}"; name = "qalculate-gtk-${version}";
version = "0.9.7"; version = "0.9.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qalculate/${name}.tar.gz"; url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4"; sha256 = "15ci0p7jlikk2rira6ykgrmcdvgpxzprpqmkdxx6hsg4pvzrj54s";
}; };
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ]; buildInputs = [ libqalculate gtk3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The ultimate desktop calculator"; description = "The ultimate desktop calculator";
homepage = http://qalculate.sourceforge.net; homepage = http://qalculate.github.io;
maintainers = with maintainers; [ gebner ]; maintainers = with maintainers; [ gebner ];
platforms = platforms.all; platforms = platforms.all;
}; };

28
pkgs/development/libraries/libqalculate/default.nix
View File

@ -1,22 +1,28 @@
{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig }: { stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig, doxygen, autoreconfHook, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqalculate-0.9.7"; name = "libqalculate-${version}";
version = "0.9.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qalculate/${name}.tar.gz"; url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; sha256 = "07rd95a0wsqs3iymr64mlljn191f8gdnjvr9d4l1spjv3s8j5wdi";
}; };
outputs = [ "out" "doc" ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];
buildInputs = [ readline ];
buildInputs = [ intltool pkgconfig ];
propagatedBuildInputs = [ cln libxml2 glib ]; propagatedBuildInputs = [ cln libxml2 glib ];
meta = { preBuild = ''
pushd docs/reference
doxygen Doxyfile
popd
'';
meta = with stdenv.lib; {
description = "An advanced calculator library"; description = "An advanced calculator library";
homepage = http://qalculate.sourceforge.net; homepage = http://qalculate.github.io;
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = with maintainers; [ urkud gebner ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }