diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/allegro/5.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/babl/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/babl/fix-darwin.patch | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/cctz/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/dlib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/exiv2/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/exiv2/fix-cmake.patch | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/gegl/3.0.nix | 38 | ||||
-rw-r--r-- | pkgs/development/libraries/graphene/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/hunspell/dictionaries.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libgnurl/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/mutest/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/poco/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/vapoursynth/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 36 |
15 files changed, 111 insertions, 123 deletions
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 46e3d02963d82..b267c62d6c706 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.4.0"; + version = "5.2.5.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "01y3hirn5b08f188nnhb2cbqj4vzysr7l2qpz2208srv8arzmj2d"; + sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; }; buildInputs = [ @@ -28,14 +28,6 @@ stdenv.mkDerivation rec { libpulseaudio libpthreadstubs ]; - patches = [ - # fix compilation with mesa 18.2.5 - (fetchpatch { - url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch"; - sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m"; - }) - ]; - postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c ''; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index eff6ff626325e..d95797d5a5f6c 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,15 +1,41 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gobject-introspection +, lcms2 +}: stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.66"; + version = "0.1.72"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n"; + url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"; }; - doCheck = true; + patches = [ + # Apple linker does not know --version-script flag + # https://gitlab.gnome.org/GNOME/babl/merge_requests/26 + ./fix-darwin.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gobject-introspection + ]; + + buildInputs = [ + lcms2 + ]; + + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "Image pixel format conversion library"; diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch new file mode 100644 index 0000000000000..eaeff63689fcb --- /dev/null +++ b/pkgs/development/libraries/babl/fix-darwin.patch @@ -0,0 +1,16 @@ +diff --git a/babl/meson.build b/babl/meson.build +index b551c9a..f452435 100644 +--- a/babl/meson.build ++++ b/babl/meson.build +@@ -24,9 +24,9 @@ + ] + + # Linker arguments +-babl_link_args = [ ++babl_link_args = cc.get_supported_link_arguments([ + '-Wl,--version-script,' + version_script, +-] ++]) + if platform_win32 + babl_link_args += '-Wl,--no-undefined' + endif diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 457b51dea7a31..5897f84efff0a 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, darwin }: stdenv.mkDerivation rec { pname = "cctz"; @@ -13,8 +13,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + installTargets = [ "install_hdrs" "install_shared_lib" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e28b1add7e288..dfa5509fb98e1 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "19.16"; pname = "dlib"; + version = "19.17"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p"; + sha256 = "0g11ilma6cll3bd2ahm66j1sjb9v4rxz3xjbfkcg5pjsvb49n029"; }; postPatch = '' diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 9b05165e1b2bf..ec6f07f0953ab 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -14,20 +14,15 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub rec { owner = "exiv2"; repo = "exiv2"; - rev = version; - sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c"; + rev = "v${version}"; + sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; - patches = [ - # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments - ./fix-cmake.patch - ]; - cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" @@ -58,7 +53,7 @@ stdenv.mkDerivation rec { "doc" ]; - doCheck = stdenv.isLinux; + doCheck = true; # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. checkTarget = "tests"; @@ -72,6 +67,14 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString stdenv.isAarch64 '' rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} + + ${stdenv.lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + # Removing tests depending on charset conversion + substituteInPlace ../test/Makefile --replace "conversions.sh" "" + rm -f ../tests/bugfixes/redmine/test_issue_460.py + rm -f ../tests/bugfixes/redmine/test_issue_662.py + ''} ''; postCheck = '' diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch deleted file mode 100644 index 1e19aed8b9044..0000000000000 --- a/pkgs/development/libraries/exiv2/fix-cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 34087004..41b3a068 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -239,9 +239,9 @@ install(FILES - ${CMAKE_BINARY_DIR}/exiv2lib_export.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) - --install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - - # ****************************************************************************** - # exiv2 application diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix deleted file mode 100644 index 54ee7662d06e9..0000000000000 --- a/pkgs/development/libraries/gegl/3.0.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: - -stdenv.mkDerivation rec { - name = "gegl-0.3.34"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; - }; - - hardeningDisable = [ "format" ]; - - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 - ]; - - propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc - - nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; - - meta = with stdenv.lib; { - description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; - license = licenses.gpl3; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 7c61b222486fd..c439e763e73d8 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -5,6 +5,7 @@ , ninja , python3 , mutest +, nixosTests , glib , gtk-doc , docbook_xsl @@ -57,6 +58,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + tests = { + installedTests = nixosTests.graphene; + }; + }; + meta = with stdenv.lib; { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index b9a283d80d2e3..4fa369e299d24 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -640,12 +640,12 @@ in rec { uk_UA = uk-ua; uk-ua = mkDict rec { name = "hunspell-dict-uk-ua-${version}"; - version = "4.2.5"; - _version = "4-2.5"; + version = "4.6.3"; + _version = "4-6.3"; src = fetchurl { url = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/${_version}/@@download/file/dict-uk_UA-${version}.oxt"; - sha256 = "1s2i9cd569g97kafrswczvwmvg7m9aks8qsbxd1mi73zy2y1r7n4"; + sha256 = "14rd07yx4fx2qxjr5xqc8qy151idd8k2hr5yi18d9r8gccnm9w50"; }; dictFileName = "uk_UA"; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 4c10a288474f2..0bb3af37eee16 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -2,23 +2,38 @@ libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.64.0"; - pname = "libgnurl"; + version = "7.65.3"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8"; + sha256 = "19l7jw3x83qk7yay5968pc39vzvxl55mhn1nmjh51miyda405qa9"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; - + buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; configureFlags = [ "--disable-ntlm-wb" "--without-ca-bundle" "--with-ca-fallback" + # below options will cause errors if enabled + "--disable-ftp" + "--disable-tftp" + "--disable-file" + "--disable-ldap" + "--disable-dict" + "--disable-rtsp" + "--disable-telnet" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--without-ssl" # disables only openssl, not ssl in general + "--without-libpsl" + "--without-librtmp" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index b247706067e7f..423a93b69a804 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { pname = "mutest"; - version = "unstable-2019-10-12"; + version = "unstable-2019-08-26"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "ebassi"; repo = "mutest"; - rev = "822b5ddf07f957135ba39889d81e513d525b9b8e"; - sha256 = "0a5fjdq9p0q5bibqngbbpd9lga0gzrv8yj5wgdfb8ylxzg0jph2p"; + rev = "e6246c9ae4f36ffe8c021f0a80438f6c7a6efa3a"; + sha256 = "0gdqwq6fvk06wld4rhnw5752hahrvhd69zrci045x25rwx90x26q"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 993e53f2133d1..c19e343f19aec 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 65132806d883b..53d70f4d369d6 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R46"; + version = "R47.2"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1xbwva12l68awplardf47ydlx904wifw468npaxa9cx9dvd5mv13"; + sha256 = "004h0vvih7dlhkcz6l2786pf7s04qhiv0bii4gjx23cxyklglh9i"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ]; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index b85616842ea63..4d820bd951980 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,18 +6,17 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"; + sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a"; }; - # $out for the library, $bin for rootston, and $examples for the example - # programs (in examples) AND rootston - outputs = [ "out" "bin" "examples" ]; + # $out for the library and $examples for the example programs (in examples): + outputs = [ "out" "examples" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -32,31 +31,13 @@ stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; - postPatch = '' - # It happens from time to time that the version wasn't updated: - sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build - ''; - postInstall = '' - # Copy the library to $bin and $examples - for output in "$bin" "$examples"; do - mkdir -p $output/lib - cp -P libwlroots* $output/lib/ - done + # Copy the library to $examples + mkdir -p $examples/lib + cp -P libwlroots* $examples/lib/ ''; postFixup = '' - # Install rootston (the reference compositor) to $bin and $examples (this - # has to be done after the fixup phase to prevent broken binaries): - for output in "$bin" "$examples"; do - mkdir -p $output/bin - cp rootston/rootston $output/bin/ - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ - $output/bin/rootston - mkdir $output/etc - cp ../rootston/rootston.ini.example $output/etc/rootston.ini - done # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle # screenshot output-layout multi-pointer rotation tablet touch pointer @@ -65,9 +46,6 @@ stdenv.mkDerivation rec { cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do cp "$binary" "$examples/bin/wlroots-$binary" - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ - "$examples/bin/wlroots-$binary" done ''; |