diff options
Diffstat (limited to 'pkgs/development/libraries')
51 files changed, 524 insertions, 170 deletions
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index d2d74769a1fc..b3ae8c7aa31c 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "5.0"; + version = "5.0.1"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "15r631kddphw3wsvrxrkdbq9y7m0q8kx0kwc9zq97x6ksg3v0gs3"; + sha256 = "0mmz7kdpzs7xf40qypn4qyka4nq2dykz9sdkimfgpdka9l7lrfwv"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Computational Geometry Algorithms Library"; - homepage = http://cgal.org; + homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; platforms = platforms.all; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 87684a4bbe4a..50de0c88a5be 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,24 +1,24 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost -, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl -, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost +, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl +, python, rapidjson, snappy, thrift, which, zlib, zstd , enableShared ? true }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df"; - sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq"; + rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c"; + sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1jbghpppabsix2rkxbnh41inj9lcxfz4q94p96xzxshh4g3mhb4s"; + sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -35,6 +35,14 @@ in stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch + # Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work. + # Remove this when updating to the next version. + (fetchpatch { + name = "arrow-use-upstream-cmake-target-names.patch"; + url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch"; + sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1"; + stripLen = 1; + }) ] ++ lib.optionals (!enableShared) [ # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. ./jemalloc-disable-shared.patch @@ -48,7 +56,6 @@ in stdenv.mkDerivation rec { buildInputs = [ boost brotli - double-conversion flatbuffers gflags glog @@ -57,7 +64,6 @@ in stdenv.mkDerivation rec { rapidjson snappy thrift - uriparser zlib zstd python.pkgs.python @@ -71,29 +77,41 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_TESTS=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-DARROW_PARQUET=ON" "-DARROW_PLASMA=ON" # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" - "-Duriparser_SOURCE=SYSTEM" + "-DARROW_USE_GLOG=ON" + "-DARROW_WITH_BROTLI=ON" + "-DARROW_WITH_LZ4=ON" + "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_ZLIB=ON" + "-DARROW_WITH_ZSTD=ON" + # Parquet options: + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + "-DTHRIFT_COMPILER=${thrift}/bin/thrift" + "-DTHRIFT_VERSION=${thrift.version}" ] ++ lib.optionals (!enableShared) [ "-DARROW_BUILD_SHARED=OFF" + "-DARROW_BOOST_USE_SHARED=OFF" + "-DARROW_GFLAGS_USE_SHARED=OFF" + "-DARROW_PROTOBUF_USE_SHARED=OFF" "-DARROW_TEST_LINKAGE=static" "-DOPENSSL_USE_STATIC_LIBS=ON" + ] ++ lib.optionals stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests + "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; - installCheckPhase = (lib.optionalString stdenv.isDarwin '' - for f in release/*test{,s}; do - install_name_tool -add_rpath "$out"/lib "$f" - done - '') - + (let + installCheckPhase = + let excludedTests = lib.optionals stdenv.isDarwin [ # Some plasma tests need to be patched to use a shorter AF_UNIX socket # path on Darwin. See https://github.com/NixOS/nix/pull/1085 @@ -103,7 +121,7 @@ in stdenv.mkDerivation rec { in '' ctest -L unittest -V \ --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' - ''); + ''; meta = { description = "A cross-language development platform for in-memory data"; diff --git a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch index 0f7955724e16..564f67273886 100644 --- a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch +++ b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch @@ -1,11 +1,11 @@ diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -1428,6 +1428,7 @@ if(ARROW_JEMALLOC) - "--with-jemalloc-prefix=je_arrow_" - "--with-private-namespace=je_arrow_private_" - "--without-export" -+ "--disable-shared" - # Don't override operator new() - "--disable-cxx" "--disable-libdl" - # See https://github.com/jemalloc/jemalloc/issues/1237 +@@ -1317,6 +1317,7 @@ if(ARROW_JEMALLOC) + "--with-jemalloc-prefix=je_arrow_" + "--with-private-namespace=je_arrow_private_" + "--without-export" ++ "--disable-shared" + # Don't override operator new() + "--disable-cxx" "--disable-libdl" + # See https://github.com/jemalloc/jemalloc/issues/1237 diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index c3cc9d84aa45..93ee2ddc7046 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, cppunit }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, cppunit +}: stdenv.mkDerivation rec { pname = "cpp-utilities"; @@ -10,6 +15,17 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb"; }; + # See https://github.com/Martchus/cpp-utilities/issues/18 + patches = [ + (fetchpatch { + url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch"; + sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj"; + }) + (fetchpatch { + url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch"; + sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j"; + }) + ]; nativeBuildInputs = [ cmake ]; checkInputs = [ cppunit ]; diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix index 73a6ff77522f..23824e350016 100644 --- a/pkgs/development/libraries/dnnl/default.nix +++ b/pkgs/development/libraries/dnnl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dnnl"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "intel"; repo = "mkl-dnn"; rev = "v${version}"; - sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9"; + sha256 = "17bydid5v43lgwvgxv25i67iiyirmwgbdzvv9wpjig34ryhx8hvf"; }; # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631 diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix new file mode 100644 index 000000000000..e55313bc9fe4 --- /dev/null +++ b/pkgs/development/libraries/doctest/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, installShellFiles, cmake }: + +stdenv.mkDerivation rec { + pname = "doctest"; + version = "2.3.5"; + + src = fetchFromGitHub { + owner = "onqtam"; + repo = "doctest"; + rev = version; + sha256 = "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/onqtam/doctest"; + description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 425346df816e..dc7610ee1782 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 0c50b069d394..6eb6289d376d 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "6.1.1"; pname = "fmt"; + version = "6.1.2"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "0arii4hs33lqlbfwilnxiq8mqcvdwz66b24qa7fdjiga02j8kl2n"; + sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi"; }; outputs = [ "out" "dev" ]; @@ -16,17 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DFMT_TEST=TRUE" - "-DBUILD_SHARED_LIBS=TRUE" + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; - enableParallelBuilding = true; - doCheck = true; - # preCheckHook ensures the test binaries can find libfmt.so - preCheck = '' - export LD_LIBRARY_PATH="$PWD" - ''; meta = with stdenv.lib; { description = "Small, safe and fast formatting library"; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 639ad8d0e51a..803cf853be14 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -18,6 +18,7 @@ , netsurf , pango , poly2tri-c +, poppler , bzip2 , json-glib , gettext @@ -34,14 +35,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.20"; + version = "0.4.22"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93"; + sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; }; patches = [ @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { netsurf.libnsgif pango poly2tri-c + poppler bzip2 libraw libwebp diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 8d94dacbb61b..da76c6dfedcf 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "geoclue"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = pname; repo = pname; rev = version; - sha256 = "0a8wmf5v3x4035ixz9jypj7c6qknvs6gjv2zawa3msq1j75rf2r5"; + sha256 = "13fk6n4j74lvcsrg3kwbw1mkxgcr3iy9dnysmy0pclfsym8z5m5m"; }; patches = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; + homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index eafd85cc92aa..8e3327d880f9 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1wkipk7240vqpy8and2r8n7wnqyl4dcn41cyla4zcns2jhbr23vb"; + sha256 = "0yjsrb11hlfwbiw0xi71ami9nrvz6jwj160h9qgl50icd79ngn46"; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index e7f575b04be7..614a8f048aa5 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,31 +1,43 @@ -{stdenv, fetchurl, tcl}: +{ stdenv, fetchurl, writeText, tcl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "incrtcl"; version = "4.2.0"; src = fetchurl { - url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.2.0.tar.gz; + url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz"; sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw"; }; buildInputs = [ tcl ]; configureFlags = [ "--with-tcl=${tcl}/lib" ]; + enableParallelBuilding = true; + patchPhase = '' - substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" + substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" ''; + preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" + configureFlags="--exec_prefix=$prefix $configureFlags" ''; - passthru = { - libPrefix = "itcl3.4"; - }; + postInstall = '' + rmdir $out/bin + mv $out/lib/itcl${version}/* $out/lib + rmdir $out/lib/itcl${version} + ''; + + setupHook = writeText "setup-hook.sh" '' + export ITCL_LIBRARY=@out@/lib + ''; + + outputs = [ "out" "dev" "man" ]; meta = with stdenv.lib; { - homepage = http://incrtcl.sourceforge.net/; + homepage = "http://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; - platforms = platforms.unix; - license = licenses.tcltk; + license = licenses.tcltk; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/irrlicht/common.nix b/pkgs/development/libraries/irrlicht/common.nix new file mode 100644 index 000000000000..f330c30fda11 --- /dev/null +++ b/pkgs/development/libraries/irrlicht/common.nix @@ -0,0 +1,11 @@ +{ fetchzip }: + +rec { + pname = "irrlicht"; + version = "1.8.4"; + + src = fetchzip { + url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip"; + sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f"; + }; +} diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 788772888c6d..f411ecdeea65 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +let + common = import ./common.nix { inherit fetchzip; }; +in stdenv.mkDerivation rec { - pname = "irrlicht"; - version = "1.8.4"; + pname = common.pname; + version = common.version; - src = fetchzip { - url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip"; - sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f"; - }; + src = common.src; preConfigure = '' cd source/Irrlicht @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://irrlicht.sourceforge.net/; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix new file mode 100644 index 000000000000..beead1f9b857 --- /dev/null +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: + +let + common = import ./common.nix { inherit fetchzip; }; +in + +stdenv.mkDerivation rec { + pname = "irrlicht-mac"; + version = common.version; + + src = fetchFromGitHub { + owner = "quiark"; + repo = "IrrlichtCMake"; + rev = "523a5e6ef84be67c3014f7b822b97acfced536ce"; + sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi"; + }; + + postUnpack = '' + cp -r ${common.src}/* $sourceRoot/ + chmod -R 777 $sourceRoot + ''; + + patches = [ ./mac_device.patch ]; + dontFixCmake = true; + + cmakeFlags = [ + "-DIRRLICHT_STATIC_LIBRARY=ON" + "-DIRRLICHT_BUILD_EXAMPLES=OFF" + "-DIRRLICHT_INSTALL_MEDIA_FILES=OFF" + "-DIRRLICHT_ENABLE_X11_SUPPORT=OFF" + "-DIRRLICHT_BUILD_TOOLS=OFF" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ unzip OpenGL Cocoa IOKit ]; + + meta = { + homepage = http://irrlicht.sourceforge.net/; + license = stdenv.lib.licenses.zlib; + description = "Open source high performance realtime 3D engine written in C++"; + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/irrlicht/mac_device.patch b/pkgs/development/libraries/irrlicht/mac_device.patch new file mode 100644 index 000000000000..dc68c509975c --- /dev/null +++ b/pkgs/development/libraries/irrlicht/mac_device.patch @@ -0,0 +1,20 @@ +--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm ++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +@@ -39,7 +39,7 @@ + #include <IOKit/hidsystem/IOHIDUsageTables.h> + #else + /* The header was moved here in Mac OS X 10.1 */ +-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h> ++#include <IOKit/hid/IOHIDUsageTables.h> + #endif + #include <IOKit/hid/IOHIDLib.h> + #include <IOKit/hid/IOHIDKeys.h> +@@ -496,7 +496,7 @@ + { + [[NSAutoreleasePool alloc] init]; + [NSApplication sharedApplication]; +- [NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; ++ [NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; + [NSApp finishLaunching]; + } diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix new file mode 100644 index 000000000000..36503fc1add9 --- /dev/null +++ b/pkgs/development/libraries/itktcl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, tcl, tk, incrtcl }: + +stdenv.mkDerivation rec { + pname = "itk-tcl"; + version = "4.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itk${version}.tar.gz"; + sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s"; + }; + + buildInputs = [ tcl tk incrtcl ]; + enableParallelBuilding = true; + + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--with-itcl=${incrtcl}/lib" + "--with-tkinclude=${tk.dev}/include" + ]; + + postInstall = '' + rmdir $out/bin + mv $out/lib/itk${version}/* $out/lib + rmdir $out/lib/itk${version} + ''; + + outputs = [ "out" "dev" "man" ]; + + meta = with stdenv.lib; { + homepage = "http://incrtcl.sourceforge.net/"; + description = "Mega-widget toolkit for incr Tk"; + license = licenses.tcltk; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 124c961b96ac..42965c0ad07c 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -14,12 +14,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.17"; + majorVersion = "1.18"; version = majorVersion; src = fetchurl { url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs"; + sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 17a754a027ab..62abc1bd68ca 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "leveldb"; @@ -11,16 +11,14 @@ stdenv.mkDerivation rec { sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y"; }; + nativeBuildInputs = [] + ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + buildPhase = '' make all ''; - installPhase = (stdenv.lib.optionalString stdenv.isDarwin '' - 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 - " + installPhase = " mkdir -p $out/{bin,lib,include} cp -r include $out diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index a0f44a332205..01a73f4a1308 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }: +{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb"; + sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor libressl udev ]; + buildInputs = [ libcbor libressl ] + ++ stdenv.lib.optionals stdenv.isLinux [ udev ] + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ]; + patches = [ ./detect_apple_ld.patch ]; + + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with stdenv.lib; { description = '' @@ -20,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Yubico/libfido2; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; - + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch new file mode 100644 index 000000000000..de972e0f3586 --- /dev/null +++ b/pkgs/development/libraries/libfido2/detect_apple_ld.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2020-02-19 17:21:59.000000000 +0000 ++++ b/CMakeLists.txt 2020-02-23 15:57:34.241115306 +0000 +@@ -296,7 +296,7 @@ + endif() + + # export list +-if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang") ++if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + # clang + lld + string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} + " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm") diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 4c3fb6704843..2c84379aa8e5 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb"; + sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 7b70510dec3c..a306eb2ed68f 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "liblinear"; @@ -14,14 +14,11 @@ stdenv.mkDerivation rec { make lib ''; - installPhase = let - libSuff = stdenv.hostPlatform.extensions.sharedLibrary; - in '' + installPhase = '' mkdir -p $out/lib $out/bin $out/include ${if stdenv.isDarwin then '' cp liblinear.so.3 $out/lib/liblinear.3.dylib ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib - install_name_tool -id liblinear.3.dylib $out/lib/liblinear.3.dylib '' else '' cp liblinear.so.3 $out/lib/liblinear.so.3 ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so @@ -31,6 +28,8 @@ stdenv.mkDerivation rec { cp linear.h $out/include ''; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + meta = with stdenv.lib; { description = "A library for large linear classification"; homepage = https://www.csie.ntu.edu.tw/~cjlin/liblinear/; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 76c86d6f515a..c40e45afaf0b 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.2"; + version = "1.24.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "10mjfmiznaxvfk0f9wr18kyxz3mpdrvnh0qw9g8c1nv0z5vf9r2a"; + sha256 = "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/libqmi/; + homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 9292760c6e66..e4e87eba8587 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp"; }; - patches = [ - (fetchpatch { - name = "rename-internal-functions-to-avoid-conflicts-and-fix-build.patch"; - url = "https://gitlab.gnome.org/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8.patch"; - sha256 = "1n9nyzq5qrvw7s6sj5gzj33ia3rrx719jpys1cfhfbayg2sxyd4n"; - }) - ]; - postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 2d2f2da6a399..6925bd2de4b8 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.68.3"; + version = "2.68.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk"; + sha256 = "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; - homepage = https://wiki.gnome.org/Projects/libsoup; + homepage = "https://wiki.gnome.org/Projects/libsoup"; license = stdenv.lib.licenses.gpl2; inherit (glib.meta) maintainers platforms; }; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index ad0557049e3e..61fefc7d4dbb 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-host; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; - license = licenses.bsd2; + license = with licenses; [ gpl3Plus lgpl21Plus ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 71ac22e85a8f..2cd5bd8a3412 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchgit, cmake, pkgconfig, json_c }: stdenv.mkDerivation { - name = "libubox-2017-09-29"; + pname = "libubox"; + version = "unstable-2020-01-20"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "632688e8d6cde32781e4ec685d59afb0938300ad"; - sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c"; + rev = "43a103ff17ee5872669f8712606578c90c14591d"; + sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4"; }; cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 0dec9daee6ac..3d0a94a35d0b 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; }; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix new file mode 100644 index 000000000000..3e73c9266a03 --- /dev/null +++ b/pkgs/development/libraries/lyra/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "lyra"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "bfgroup"; + repo = "lyra"; + rev = version; + sha256 = "1wcwsmg41bmjir6pjrjxrwccqj25d9068ifi9m6xz6q3fhaq6s81"; + }; + + nativeBuildInputs = [ meson ninja ]; + + enableParallelBuilding = true; + + postPatch = "sed -i s#/usr#$out#g meson.build"; + + postInstall = '' + mkdir -p $out/include + cp -R $src/include/* $out/include + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/bfgroup/Lyra"; + description = "A simple to use, composable, command line parser for C++ 11 and beyond"; + platforms = platforms.linux; + license = licenses.boost; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 53c4594f535b..351b38b3345e 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "3.0.22"; + version = "3.0.23"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "18yvnnbwqndagzaa2nwh3g7gb52dghaypxpkmc2h5l88770bl17f"; + sha256 = "1754m8y7fyk0dyf7cglhavsk66g5kdqhnmgicib1jkcgjbl69f15"; }; # a distinct dev output makes python-mapnik fail diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index b56e33e40241..07c248fa58ac 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "6.18.0"; + version = "6.20.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx"; + sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; }; buildInputs = [ diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 4d7ecd92e618..cb8ee0ce8491 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "mlt"; - version = "6.18.0"; + version = "6.20.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx"; + sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk"; }; buildInputs = [ diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 115d818d9365..c66329fa633a 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -1,5 +1,4 @@ { stdenv -, fetchpatch , autoconf , automake , fetchFromGitHub @@ -8,23 +7,15 @@ stdenv.mkDerivation rec { pname = "mypaint-brushes"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mypaint"; repo = pname; rev = "v${version}"; - sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; - sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 40ee4f890d49..dec4e61a7bc8 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.7"; + name = "nss_wrapper-1.1.8"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1pa7gakprkxblxdqbcy2242lk924gvzdgfr5648wb7cslksm7hbq"; + sha256 = "1cnzhnz68ywx1jwj6xaxv8hg8hpm63ssxmrlhsz3sfgjhfkmw95l"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 63657cfc5e6e..d9028ddfbb5b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,7 +7,8 @@ with stdenv.lib; let - common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec { + common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + stdenv.mkDerivation rec { pname = "openssl"; inherit version; @@ -130,7 +131,7 @@ let license = licenses.openssl; platforms = platforms.all; maintainers = [ maintainers.peti ]; - }; + } // extraMeta; }; in { @@ -145,6 +146,7 @@ in { then ./1.0.2/use-etc-ssl-certs-darwin.patch else ./1.0.2/use-etc-ssl-certs.patch) ]; + extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ]; }; openssl_1_1 = common { diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 8f693a32e35c..2309e6671f85 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -6,7 +6,7 @@ let inherit name; src = fetchurl { - url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz"; + url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 065d65449867..486c6eaa2241 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - maintainers = [ maintainers.vanschelven ]; + maintainers = [ ]; platforms = platforms.unix; branch = "7.0"; diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 7fbef9a986ab..9b9f459e4c3b 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - maintainers = with maintainers; [ vanschelven dtzWill ]; + maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; branch = "8.0"; diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 8efcd0de2f14..9825c0c40355 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, zlib, fetchpatch }: +{ stdenv, fetchFromGitHub, cmake, python, zlib }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -11,13 +11,6 @@ stdenv.mkDerivation rec { sha256 = "1c2gc0k9wgbgn7y7wmq2ylp0gvdbmagc1x8c4jwbsncl1gy6x4g2"; }; - patches = [ - (fetchpatch { - url = "https://github.com/mattgodbolt/seasocks/commit/5753b50ce3b2232d166843450043f88a4a362422.patch"; - sha256 = "1c20xjma8jdgcr5m321srpmys6b4jvqkazfqr668km3r2ck5xncl"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python ]; diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 907e0cc50760..05c641fab891 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -17,15 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake gperftools ]; meta = with stdenv.lib; { - homepage = https://github.com/google/sentencepiece; + homepage = "https://github.com/google/sentencepiece"; description = "Unsupervised text tokenizer for Neural Network-based text generation"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ pashashocky ]; }; } diff --git a/pkgs/development/libraries/sundials/3.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 879f13e8bf53..12840b769403 100644 --- a/pkgs/development/libraries/sundials/3.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -2,6 +2,8 @@ , cmake , fetchurl , python +# GNU Octave needs KLU for ODE solvers +, suitesparse , liblapack , gfortran , lapackSupport ? true }: @@ -12,14 +14,17 @@ let liblapackShared = liblapack.override { in stdenv.mkDerivation rec { pname = "sundials"; - version = "3.2.1"; + version = "2.7.0"; - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ]; + buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ + gfortran + suitesparse + ]; nativeBuildInputs = [ cmake ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; + sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk"; }; patches = [ @@ -34,6 +39,10 @@ in stdenv.mkDerivation rec { "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" ] ++ stdenv.lib.optionals (lapackSupport) [ "-DSUNDIALS_INDEX_TYPE=int32_t" + # GNU Octave needs KLU for ODE solvers + "-DKLU_ENABLE=ON" + "-DKLU_INCLUDE_DIR=${suitesparse}/include" + "-DKLU_LIBRARY_DIR=${suitesparse}/lib" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix new file mode 100644 index 000000000000..f294c887b0ce --- /dev/null +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchFromGitHub +, installShellFiles +, cmake +, ninja +, ocl-icd +, opencl-headers +, lyra +, nlohmann_json +, ronn +, doctest +}: + +stdenv.mkDerivation rec { + pname = "sycl-info"; + version = "unstable-2019-11-19"; + + src = fetchFromGitHub { + owner = "codeplaysoftware"; + repo = "sycl-info"; + rev = "b47d498ee2d6b77ec21972de5882e8e12efecd6c"; + sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m"; + }; + + buildInputs = [ + nlohmann_json + ronn + opencl-headers + ocl-icd + doctest + lyra + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + cmakeFlags = [ + "-DBUILD_TESTING=ON" + "-DBUILD_DOCS=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include" + ]; + + # Required for ronn to compile the manpage. + RUBYOPT = "-KU -E utf-8:utf-8"; + + meta = with stdenv.lib; + { + homepage = "https://github.com/codeplaysoftware/sycl-info"; + description = "Tool to show information about available SYCL implementations"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ davidtwco ]; + }; +} diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 5a8ebe84ba69..4c0b16c140b6 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -4,11 +4,12 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.14"; + pname = "talloc"; + version = "2.1.16"; src = fetchurl { - url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di"; + url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; + sha256 = "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr"; }; nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o + ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix new file mode 100644 index 000000000000..1f7124411ac3 --- /dev/null +++ b/pkgs/development/libraries/ubus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, cmake, fetchgit, libubox, libjson }: + +stdenv.mkDerivation { + pname = "ubus"; + version = "unstable-2020-01-05"; + + src = fetchgit { + url = "https://git.openwrt.org/project/ubus.git"; + rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee"; + sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4"; + }; + + cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + buildInputs = [ libubox libjson ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "OpenWrt system message/RPC bus"; + homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix new file mode 100644 index 000000000000..e3bdea8c8890 --- /dev/null +++ b/pkgs/development/libraries/uci/default.nix @@ -0,0 +1,25 @@ +{ stdenv, cmake, fetchgit, pkgconfig, libubox }: + +stdenv.mkDerivation { + pname = "uci"; + version = "unstable-2020-01-27"; + + src = fetchgit { + url = "https://git.openwrt.org/project/uci.git"; + rev = "e8d83732f9eb571dce71aa915ff38a072579610b"; + sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by"; + }; + + hardeningDisable = [ "all" ]; + cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ]; + buildInputs = [ libubox ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "OpenWrt Unified Configuration Interface"; + homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix new file mode 100644 index 000000000000..d1e3934d882c --- /dev/null +++ b/pkgs/development/libraries/ucx/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, doxygen +, numactl, rdma-core, libbfd, libiberty, perl, zlib +}: + +let + version = "1.7.0"; + +in stdenv.mkDerivation { + name = "ucx-${version}"; + + src = fetchFromGitHub { + owner = "openucx"; + repo = "ucx"; + rev = "v${version}"; + sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h"; + }; + + nativeBuildInputs = [ autoreconfHook doxygen ]; + + buildInputs = [ numactl rdma-core libbfd libiberty perl zlib ]; + + configureFlags = [ + "--with-rdmacm=${rdma-core}" + "--with-dc" + "--with-rc" + "--with-dm" + "--with-verbs=${rdma-core}" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Unified Communication X library"; + homepage = http://www.openucx.org; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.markuskowa ]; + }; +} diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 71bd608e93a1..5c508f133e14 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }: - +{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3 +, libGLU, epoxy, libX11, libdrm, mesa +}: stdenv.mkDerivation rec { - pname = "virglrenderer"; - version = "0.7.0"; + version = "0.8.1"; src = fetchurl { - url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2"; - sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; + sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ]; - # Fix use of fd_set without proper include - prePatch = '' - sed -e '1i#include <sys/select.h>' -i vtest/util.c - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; @@ -27,5 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.xeji ]; }; - } diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 8c2823d74b0a..41495b1c2e50 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.18"; + version = "1.20"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"; + sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 971ab485221d..ef50bf31a367 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -30,12 +30,12 @@ let meta = with stdenv.lib; { description = "Search engine library"; - homepage = https://xapian.org/; + homepage = "https://xapian.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }; in { - xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp"; + xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i"; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch index cce96a2762bf..d763a2a2b434 100644 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -6,9 +6,9 @@ diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc // test for keepalives DEFINE_TESTCASE(keepalive1, remote) { + SKIP_TEST("Fails in darwin nix build environment"); - XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass", - "Multi remote databases are currently buggy"); + Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + /* Test that keep-alives work */ diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc --- xapian-core.old/tests/api_scalability.cc +++ xapian-core.new/tests/api_scalability.cc |