diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-13 19:34:19 +0200 |
commit | 3e31d23d994b94b9883a39037e328c026491b999 (patch) | |
tree | aa5fec3413ae5b31a32ce37423ed677206121883 /pkgs/development/libraries | |
parent | 0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4 (diff) | |
parent | 2c07921cff84dfb0b9e0f6c2d10ee2bfee6a85ac (diff) |
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries')
17 files changed, 89 insertions, 69 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 2144dc4eec266..9f41bf1af47ce 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.78"; + version = "1.4.82"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "15nrrv94vp8i1azi2bcpi08wxb2dbqlmy9y6jyfw0n1vkr6gz2fw"; + sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index dd926ac208179..0a2badea7cbfb 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig , libstartup_notification, gobjectIntrospection, gtk-doc -, python27, pythonPackages, libxml2 }: +, xorgserver, dbus, python2 }: stdenv.mkDerivation rec { pname = "bamf"; version = "0.5.3"; name = "${pname}-${version}"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz"; sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l"; @@ -16,22 +18,40 @@ stdenv.mkDerivation rec { pkgconfig gtk-doc gobjectIntrospection + vala + # Tests + xorgserver + dbus + (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ])) ]; - buildInputs = [ libgtop libwnck3 vala libstartup_notification - python27 pythonPackages.libxslt libxml2 glib ]; + buildInputs = [ + libgtop + libwnck3 + libstartup_notification + glib + ]; + # Fix hard-coded path + # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' substituteInPlace data/Makefile.in \ - --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user' + --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' ''; + configureFlags = [ + "--enable-headless-tests" + ]; + # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" + "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" ]; + # TODO: Requires /etc/machine-id + doCheck = false; + # ignore deprecation errors NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index c1c867abcdf58..a2188f687d136 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curlcpp-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; rev = "${version}"; - sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q"; + sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; }; buildInputs = [ cmake curl ]; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ddc962d0aab64..405d80031e37a 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,13 +1,11 @@ -{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng -, cfg ? {} +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , darwin, libtiff, freetype }: -let inherit (composableDerivation) edf; in - -let version = "1.3.4"; in -composableDerivation.composableDerivation {} { +let + version = "1.3.4"; +in stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { @@ -18,6 +16,23 @@ composableDerivation.composableDerivation {} { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + libGLU_combined + libjpeg + zlib + libpng + libXft + ]; + + configureFlags = [ + "--enable-gl" + "--enable-largefile" + "--enable-shared" + "--enable-threads" + "--enable-xft" + ]; + propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff]) @@ -25,33 +40,6 @@ composableDerivation.composableDerivation {} { enableParallelBuilding = true; - flags = - # this could be tidied up (?).. eg why does it require freeglut without glSupport? - edf { name = "cygwin"; } # use the CygWin libraries default=no - // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes - // edf { name = "shared"; } # turn on shared libraries default=no - // edf { name = "threads"; } # enable multi-threading support - // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) - // edf { name = "largefile"; } # omit support for large files - // edf { name = "localjpeg"; disable = { buildInputs = [libjpeg]; }; } # use local JPEG library, default=auto - // edf { name = "localzlib"; disable = { buildInputs = [zlib]; }; } # use local ZLIB library, default=auto - // edf { name = "localpng"; disable = { buildInputs = [libpng]; }; } # use local PNG library, default=auto - // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no - // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no - // edf { name = "xdbe"; }; # turn on Xdbe support default=no - - cfg = { - largefileSupport = true; # is default - glSupport = true; # doesn't build without it. Why? - localjpegSupport = false; - localzlibSupport = false; - localpngSupport = false; - sharedSupport = true; - threadsSupport = true; - xftSupport = true; - } // cfg; - meta = { description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 75335f08545e1..ccf2d6d058559 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.06.25.00"; + version = "2018.07.09.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0i0c2130xjrpzf5k29j09ckl1nc9ab2hapf5l6004axq6v1kw9sa"; + sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 424ffd184994b..20dda589b9cc8 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { version = "1.1"; }; + PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6"; @@ -21,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://hspell.ivrix.org.il/; platforms = stdenv.lib.platforms.all; maintainers = [ ]; -# Note that I don't speak hebrew, so I can only fix compile problems }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index e81ea18103dc5..e76308d22acb6 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libelf }: let - version = "20180129"; + version = "20180527"; src = fetchurl { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index d9a77f4bb8ba5..4b547fde3ab0c 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -2,7 +2,7 @@ }: let - version = "61.1"; + version = "61.2"; in stdenv.mkDerivation rec { name = "libndctl-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "1k996p757nwvkg86firx0yh39dsa9jx5w14rlfl4hlg2h9kkivnx"; + sha256 = "0vid78jzhmzh505bpwn8mvlamfhcvl6rlfjc29y4yn7zslpydxl7"; }; outputs = [ "out" "man" "dev" ]; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 7d8ec42700c54..d1dae0cfee6e5 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2.1"; + version = "0.3.0.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; + sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index f2be3b7831a38..b12ed9613510d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,19 +16,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.4.0"; + version = "4.5.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1djaz3b5n4ksyw6z4n4qs82g5zyxdl2gm4rsb5181bv1rdiisqs6"; + sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "0rhas7hbisfh0aib75nsh9wspxj8pvcqagds1mp2jgfls7hfna0r"; + sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 07edc24ecabc4..94aba672887d0 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { name = "odpic-${version}"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz"; - sha256 = "1z793mg8hmy067xhllip7ca84xy07ca1cqilnr35mbvhmydp03zz"; + sha256 = "0hw6b38vnh0cgm1iwpgkqa2am86baal6irp9bglacblwh8sshqdi"; }; - patches = [ (fetchpatch { - url = https://github.com/oracle/odpi/commit/31fdd70c06be711840a2668f572c7ee7c4434d18.patch; - sha256 = "1f00zp4w7l4vnkg0fmvnkga20ih8kjd5bxvr1nryziibjh1xp41j"; - }) ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ oracle-instantclient ] diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 7b10db9245c53..05888ad60bb17 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { name = "olm-${version}"; - version = "2.2.1"; + version = "2.3.0"; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; homepage = https://matrix.org/git/olm/about; + platforms = stdenv.lib.platforms.linux; }; src = fetchurl { url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; - sha256 = "1spgsjmsw8afm2hg1mrq9c7cli3p17wl0ns7qbzn0h6ksh193709"; + sha256 = "1y2yasq94zjw3nadn1915j85xwc5j3pic3brhp0h83l6hkxi8dsk"; }; doCheck = true; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index b50ff61219fd4..5407a79cd7750 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -41,6 +41,8 @@ let ./qtbase.patch ./qtbase-darwin.patch ./qtbase-revert-no-macos10.10.patch + ] ++ optionals stdenv.isDarwin [ + ./qtbase-darwin-nseventtype.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch new file mode 100644 index 0000000000000..9ef6e8ef06927 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch @@ -0,0 +1,13 @@ +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -404,8 +404,8 @@ void QCocoaWindow::setVisible(bool visible) + removeMonitor(); + monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSLeftMouseDownMask|NSRightMouseDownMask|NSOtherMouseDownMask|NSMouseMovedMask handler:^(NSEvent *e) { + QPointF localPoint = QCocoaScreen::mapFromNative([NSEvent mouseLocation]); +- const auto button = e.type == NSEventTypeMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]); +- const auto eventType = e.type == NSEventTypeMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress; ++ const auto button = e.type == NSMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]); ++ const auto eventType = e.type == NSMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress; + QWindowSystemInterface::handleMouseEvent(window(), window()->mapFromGlobal(localPoint.toPoint()), localPoint, + Qt::MouseButtons(uint(NSEvent.pressedMouseButtons & 0xFFFF)), button, eventType); + }]; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index dc3c2c1571381..f6e4a04728288 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.15"; + name = "tdb-1.3.16"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl"; + sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 12576eed14ce6..e43c626842404 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.36"; + name = "tevent-0.9.37"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx"; + sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 82b72a0fc7b34..59f6af7eddb21 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.13"; + version = "1.5.14"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j"; + sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5"; }; nativeBuildInputs = [ pkgconfig ]; |