diff options
Diffstat (limited to 'pkgs/development/libraries')
23 files changed, 137 insertions, 65 deletions
diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 1ee0970ffad2..6892ea6364d7 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }: stdenv.mkDerivation rec { - name = "granite-${version}"; - version = "5.1.0"; + pname = "granite"; + version = "5.2.0"; + + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "elementary"; - repo = "granite"; + repo = pname; rev = version; sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; }; @@ -21,10 +23,10 @@ stdenv.mkDerivation rec { gettext gobjectIntrospection ninja - perl pkgconfig - vala_0_40 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged ]; + buildInputs = [ glib gnome3.libgee @@ -33,9 +35,12 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extension to GTK+ used by elementary OS"; - longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + longDescription = '' + Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions + designed for use in apps built for elementary OS. + ''; homepage = https://github.com/elementary/granite; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ vozz worldofpeace ]; }; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index a21e2aacde2a..e568ea9eb650 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { rm -vf BUILD ''; + NIX_CFLAGS_COMPILE = "-Wno-error=unknown-warning-option"; + enableParallelBuilds = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 71da2c716f84..a1df933149fd 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gssapi-impl=mit" ]; - doCheck = true; + doCheck = !stdenv.hostPlatform.isDarwin; meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 2b95742c44c0..eec68015c25b 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation { buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "An image loading and rendering library for X11"; + platforms = platforms.unix; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index b9781ba9aa08..a4a009c66580 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "incrtcl-${version}"; version = "4.0.4"; - + src = fetchurl { url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz; sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3"; @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { libPrefix = "itcl3.4"; }; - meta = { + meta = with stdenv.lib; { homepage = http://incrtcl.sourceforge.net/; description = "Object Oriented Enhancements for Tcl/Tk"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.tcltk; }; } diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 36eedadc4c2e..29fabdbb3b63 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jama-${version}"; version = "1.2.5"; - + src = fetchurl { url = https://math.nist.gov/tnt/jama125.zip; sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { cp *.h $out/include ''; - meta = { + meta = with stdenv.lib; { homepage = https://math.nist.gov/tnt/; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.publicDomain; }; } diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index de4848c7dda4..eb9282274328 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; platforms = platforms.unix; + license = licenses.jasper; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index daee9adb1fdc..5ec10cc7e0df 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation { -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.sander ]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.sander ]; + license = licenses.afl21; }; } diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index b9d66fdc9716..e34699d7740e 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -3,13 +3,14 @@ stdenv.mkDerivation { name = "gwt-dnd-2.6.5"; builder = ./builder.sh; - + src = fetchurl { url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar; sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; - }; + }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index b182964f6579..ec407076906d 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -3,13 +3,14 @@ stdenv.mkDerivation { name = "gwt-widgets-0.2.0"; builder = ./builder.sh; - + src = fetchurl { url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz; sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; - }; + }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + platforms = platforms.unix; + license = with licenses; [ afl21 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 97ffcb647d62..a478ab0fc502 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - - meta = { - platforms = stdenv.lib.platforms.unix; + + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 221a2e93e4fc..500c575f73aa 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation { inherit unzip; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = http://httpunit.sourceforge.net; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 99d213a01dac..16755471acd7 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation { sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; + homepage = http://www.jdom.org; + platforms = platforms.unix; + license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index ad5192f94ce2..98291a7763ca 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -10,8 +10,9 @@ stdenv.mkDerivation { PREFIX=''''${out}''; buildInputs = [ jdk ]; - meta = { - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.sander ]; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.sander ]; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 6f6534cee3ea..691b9905b04f 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Java full-text search engine"; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 551375d33bd6..ae93765ff981 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Generic unit testing framework and methodology for testing any kind of code"; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 2b50c09af5cc..c459a4048e45 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "leveldb-${version}"; - version = "1.18"; + version = "1.20"; src = fetchFromGitHub { owner = "google"; repo = "leveldb"; rev = "v${version}"; - sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d"; + sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y"; }; buildPhase = '' - make all leveldbutil libmemenv.a + make all ''; installPhase = (stdenv.lib.optionalString stdenv.isDarwin '' - for file in *.dylib*; do + for file in out-shared/*.dylib*; do install_name_tool -id $out/lib/$file $file done '') + # XXX consider removing above after transition to cmake in the next release @@ -27,9 +27,10 @@ stdenv.mkDerivation rec { mkdir -p $out/include/leveldb/helpers cp helpers/memenv/memenv.h $out/include/leveldb/helpers - cp lib* $out/lib + cp out-shared/lib* $out/lib + cp out-static/lib* $out/lib - cp leveldbutil $out/bin + cp out-static/leveldbutil $out/bin "; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 25d4386cec2c..d57461853d33 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "1plg9l1avnjsg6khrd88yj9cbzbbkwzpc5synmicqndb35wndn5h"; + sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 904cdc6a3daa..48b7acf2896c 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,13 +1,20 @@ -{ fetchurl, stdenv, octave ? null }: +{ fetchurl, stdenv, octave ? null, cmake }: -stdenv.mkDerivation rec { - name = "nlopt-2.4.2"; +let + + version = "2.5.0"; + +in + +stdenv.mkDerivation { + name = "nlopt-${version}"; src = fetchurl { - url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz"; - sha256 = "12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0"; + url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"; + sha256 = "1bmlsdzkw8xbigiihffyb0kdaqbyfn7dr8s5pdgavy7z05bpmpf6"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ octave ]; configureFlags = [ @@ -24,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://ab-initio.mit.edu/nlopt/; + homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix new file mode 100644 index 000000000000..8d0839041890 --- /dev/null +++ b/pkgs/development/libraries/openscenegraph/3.4.0.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip +, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 +, cairo, poppler, librsvg, libpng, libtiff, libXrandr +, xineLib, boost +, withApps ? false +, withSDL ? false, SDL +, withQt4 ? false, qt4 +}: + +stdenv.mkDerivation rec { + name = "openscenegraph-${version}"; + version = "3.4.0"; + + src = fetchurl { + url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; + sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw"; + }; + + nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + + buildInputs = [ + freetype libjpeg jasper libxml2 zlib gdal curl libX11 + cairo poppler librsvg libpng libtiff libXrandr boost + xineLib + ] ++ lib.optional withSDL SDL + ++ lib.optional withQt4 qt4; + + enableParallelBuilding = true; + + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + + meta = with stdenv.lib; { + description = "A 3D graphics toolkit"; + homepage = http://www.openscenegraph.org/; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = "OpenSceneGraph Public License - free LGPL-based license"; + }; +} diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index cddc2038791e..9f5ef3ff68c8 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "openscenegraph"; repo = "OpenSceneGraph"; - rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36"; - sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id"; + rev = "d011ca4e8d83549a3688bf6bb8cd468dd9684822"; + sha256 = "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q"; }; nativeBuildInputs = [ pkgconfig cmake doxygen ]; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 28b96d17aa60..196fb59bb171 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "simgear-${version}"; - version = "2017.3.1"; - shortVersion = "2017.3"; + version = "2018.2.2"; + shortVersion = "2018.2"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "1x71wvycs2bjgmmacswgk6091p65p46fr40mr7f4kcipnx88bq0f"; + sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5"; }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto @@ -28,4 +28,3 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; }; } - diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix index 7eae5819daf1..71b3dc24fe21 100644 --- a/pkgs/development/libraries/webkitgtk/2.22.nix +++ b/pkgs/development/libraries/webkitgtk/2.22.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.22.2"; + version = "2.22.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l"; + sha256 = "0wnddhm2bihmmkmi919lyxskvjk2wrzx6azkiypyjfwm08lm9zcx"; }; patches = optionals stdenv.isDarwin [ |