diff options
Diffstat (limited to 'pkgs/development/libraries')
9 files changed, 64 insertions, 18 deletions
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix new file mode 100644 index 00000000000..3c4fe70c19d --- /dev/null +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, boost, curl, leatherman }: + +stdenv.mkDerivation rec { + name = "cpp-hocon-${version}"; + version = "0.1.2"; + + src = fetchFromGitHub { + sha256 = "0v2mnak6fh13dkl25lfvw1la2dfjqrh3lq1d40r3a52m56vwflrg"; + rev = version; + repo = "cpp-hocon"; + owner = "puppetlabs"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost curl leatherman ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = " A C++ port of the Typesafe Config library"; + license = licenses.asl20; + maintainers = [ maintainers.womfoo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index fa418af5601..550ec2bf5c3 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts , substituteAll }: /** Font configuration scheme @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ "--disable-docs" - # just ~1MB; this is what you get when loading config fails for some reason - "--with-default-fonts=${fontbhttf}" + # just <1MB; this is what you get when loading config fails for some reason + "--with-default-fonts=${dejavu_fonts.minimal}" ]; # We should find a better way to access the arch reliably. @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postInstall = '' cd "$out/etc/fonts" - "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ + "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index b996cd228c7..53c2a335cc0 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,4 +1,4 @@ -{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }: +{ runCommand, lib, writeText, fontconfig, fontDirectories }: runCommand "fc-cache" rec { diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 2d0a21ea9dd..3cd4a894b37 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -1,10 +1,10 @@ -{ runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }: +{ runCommand, libxslt, fontconfig, dejavu_fonts, fontDirectories }: runCommand "fonts.conf" { buildInputs = [ libxslt fontconfig ]; - # Add a default font for non-nixos systems. fontbhttf is only about 1mb. - fontDirectories = fontDirectories ++ [ fontbhttf ]; + # Add a default font for non-nixos systems, <1MB and in nixos defaults. + fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 37ab6b4f8fd..f106bbe6ebc 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { patches = [ ./gcj-type-mismatch.patch ]; + hardeningDisable = [ "fortify" "format" ]; + preConfigure = '' find -name \*.jar -or -name \*.class -exec rm -v {} \; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index a4b007fa399..bc62a04808f 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.7.5"; + version = "0.9.0"; src = fetchFromGitHub { - sha256 = "103qzhjhgw7jh0xcaxag735wfm6q35xprq5wmdimfhhmmrmjr51g"; + sha256 = "18nidasykbwdd9qzwc8pnzhczy6acr3rsxwvv2v3j5gq3nbsk2mc"; rev = version; repo = "leatherman"; owner = "puppetlabs"; @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost cmake curl ]; - # curl upgrade to 7.50.0 (#17152) broke the curl mock tests, disabling for now - # upstream bug raised https://tickets.puppetlabs.com/browse/LTH-108 - cmakeFlags = [ "-DLEATHERMAN_MOCK_CURL=OFF" ]; - meta = with stdenv.lib; { homepage = https://github.com/puppetlabs/leatherman/; description = "A collection of C++ and CMake utility libraries"; diff --git a/pkgs/development/libraries/liborc/default.nix b/pkgs/development/libraries/liborc/default.nix new file mode 100644 index 00000000000..2b298c97379 --- /dev/null +++ b/pkgs/development/libraries/liborc/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "liborc-${version}"; + version = "0.4.16"; + + src = fetchurl { + url = "http://http.debian.net/debian/pool/main/o/orc/orc_${version}.orig.tar.gz"; + sha256 = "1asq58gm87ig60ib4cs69hyqhnsirqkdlidnchhx83halbdlw3kh"; + }; + + meta = with stdenv.lib; { + homepage = https://packages.debian.org/wheezy/liborc-0.4-0; + description = "Orc is a library and set of tools for compiling and executing very simple programs that operate on arrays of data."; + license = with licenses; [ bsd2 bsd3 ]; + }; +} diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 66cc0720799..707129a16bb 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection -, valaSupport ? true, vala_0_23 +, valaSupport ? true, vala_0_32 , libintlOrEmpty , intltool, python }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala_0_23 ]; + ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; @@ -33,8 +33,7 @@ stdenv.mkDerivation { # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check" - + stdenv.lib.optionalString (!valaSupport) " --enable-vala=no" - + stdenv.lib.optionalString (valaSupport) " --enable-vala=yes" + + " --enable-vala=${if valaSupport then "yes" else "no"}" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 50d8f5e8745..4d140932402 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; + # disable flaky networking test + postPatch = '' + substituteInPlace test/stream.cpp \ + --replace 'ifndef UCOMMON_SYSRUNTIME' 'if 0' + ''; + # ucommon.pc has link time depdendencies on -lssl, -lcrypto, -lz, -lgnutls propagatedBuildInputs = [ openssl zlib gnutls ]; |