diff options
Diffstat (limited to 'pkgs/development/libraries')
74 files changed, 617 insertions, 312 deletions
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index ca1446dd935..31434741126 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.6.0"; + version = "5.2.7.0"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz"; + sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0="; }; buildInputs = [ diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 24ad128a584..1d0256f3b27 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.5"; + version = "2021.Q1.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "OSX4alrR49jqIu2QZcTieurUnyWQJ0wheDwFiNd9QcY="; + sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w="; }; buildInputs = [ diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index c636d672332..a66db480017 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config , opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL -, freeimage, python, clfft, clblas +, freeimage, python3, clfft, clblas , doxygen, buildDocs ? false , cudaSupport ? false, cudatoolkit }: @@ -39,9 +39,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - python + python3 ]; + strictDeps = true; + buildInputs = [ opencl-clhpp fftw fftwFloat blas lapack diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 7aa4859ef0e..b1c6c6396c8 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python, wafHook +, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkg-config python wafHook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; + strictDeps = true; + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 540e152655f..ccfafd36a8a 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -37,14 +37,16 @@ stdenv.mkDerivation rec { url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; }) + (fetchpatch { + name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; + sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; + }) ]; postPatch = '' substituteInPlace rtmidi.pc.in \ --replace 'Requires:' 'Requires.private:' - substituteInPlace CMakeLists.txt \ - --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ - --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 700fe4f4686..dc585217cea 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.24"; + version = "4.4.34"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0="; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix new file mode 100644 index 00000000000..de9c182df14 --- /dev/null +++ b/pkgs/development/libraries/bearssl/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchurl }: + +let + version = "0.6"; + sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; + +in +stdenv.mkDerivation { + pname = "bearssl"; + inherit version; + + src = fetchurl { + url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "lib" "dev" "out" ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -D build/brssl $bin/brssl + install -D build/testcrypto $bin/testcrypto + install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so + install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a + install -Dm644 -t $dev/include inc/*.h + touch $out + runHook postInstall + ''; + + meta = { + homepage = "https://www.bearssl.org/"; + description = "An implementation of the SSL/TLS protocol written in C"; + longDescription = '' + BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) + written in C. It aims at offering the following features: + + * Be correct and secure. In particular, insecure protocol versions and + choices of algorithms are not supported, by design; cryptographic + algorithm implementations are constant-time by default. + + * Be small, both in RAM and code footprint. For instance, a minimal + server implementation may fit in about 20 kilobytes of compiled code + and 25 kilobytes of RAM. + + * Be highly portable. BearSSL targets not only “big” operating systems + like Linux and Windows, but also small embedded systems and even + special contexts like bootstrap code. + + * Be feature-rich and extensible. SSL/TLS has many defined cipher + suites and extensions; BearSSL should implement most of them, and + allow extra algorithm implementations to be added afterwards, + possibly from third parties. + ''; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.Profpatsch ]; + }; + +} diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 03f6e96e187..5ce7ad477bf 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.24"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; + sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; }; buildInputs = [ bctoolbox belr ]; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 833d200ffa3..8f0a116f1aa 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -2,15 +2,16 @@ , bctoolbox , cmake , fetchFromGitLab +, lib , libantlr3c , mbedtls -, lib, stdenv +, stdenv , zlib }: stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.26"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4="; + sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index b38757525ab..acd2393f75e 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.3.2"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; + sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 0369f603b8e..33f9daf7b50 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; inherit postPatch; - buildInputs = [ python bzip2 zlib gmp openssl boost ] + buildInputs = [ python3 bzip2 zlib gmp openssl boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 0adcb327cc4..f29295bb130 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.9"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 74d167144a9..73ffd6c12b2 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python }: +{ lib, stdenv, fetchurl, fetchpatch, python2 }: stdenv.mkDerivation rec { name = "clearsilver-0.10.5"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; }; - PYTHON_SITE = "$(out)/site-packages"; + PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}"; configureFlags = [ - "--with-python=${python}/bin/python" + "--with-python=${python2.interpreter}" "--disable-apache" "--disable-perl" "--disable-ruby" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out - mkdir -p $out/site-packages + mkdir -p $out/${python2.sitePackages} ''; patches = [ diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/development/libraries/coordgenlibs/default.nix index f0f0718ab10..267c7df9452 100644 --- a/pkgs/development/libraries/coordgenlibs/default.nix +++ b/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "1.4.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "18s3y9v6x246hapxy0cy4srnll4qqzqfx003j551l5f27b2ng8fn"; + sha256 = "sha256-lfA0y/tT64C/7NjBff4HEzIfhZ3piFBkQjX5xVbFXFc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index aceb2d61e38..e0f9ed59912 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }: +{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }: stdenv.mkDerivation rec { pname = "cppcms"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python openssl ]; + buildInputs = [ pcre zlib python2 openssl ]; + + strictDeps = true; cmakeFlags = [ "--no-warn-unused-cli" diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index f9456b8acac..3de84b684e5 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python2 ]; cmakeFlags = ["-DWITH_TESTS=ON"]; + strictDeps = true; + doCheck = true; postPatch = '' diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index be22e24044d..b3654087ffd 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.4"; + version = "1.1.6"; outputs = [ "out" "dev" ]; @@ -48,13 +48,9 @@ in stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d"; + sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; }; - # Add missing include - # https://github.com/NVIDIA/egl-wayland/pull/24 - patches = [ ./eglmesaext.patch ]; - nativeBuildInputs = [ meson ninja @@ -69,6 +65,13 @@ in stdenv.mkDerivation rec { wayland ]; + postFixup = '' + # Doubled prefix in pc file after postbuild hook replaces includedir prefix variable with dev output path + substituteInPlace $dev/lib/pkgconfig/wayland-eglstream.pc \ + --replace "=$dev/$dev" "=$dev" \ + --replace "Requires:" "Requires.private:" + ''; + meta = with lib; { description = "The EGLStream-based Wayland external platform"; homepage = "https://github.com/NVIDIA/egl-wayland/"; diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/pkgs/development/libraries/egl-wayland/eglmesaext.patch deleted file mode 100644 index 9384ecff9b0..00000000000 --- a/pkgs/development/libraries/egl-wayland/eglmesaext.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c -index 01c9cb3..45736b0 100644 ---- a/src/wayland-eglsurface.c -+++ b/src/wayland-eglsurface.c -@@ -37,6 +37,7 @@ - #include <sys/types.h> - #include <netinet/in.h> - #include <fcntl.h> -+#include <EGL/eglmesaext.h> - - #define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3 - diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index 088354aecb2..47926e2ec0b 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -9,7 +9,7 @@ , wafHook , makeWrapper , qt4 -, pythonPackages +, pythonPackages ? null , pythonSupport ? false # Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11 , stlfacadeSupport ? false diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 888f26f2da7..4e28f84bacd 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -5,7 +5,7 @@ , fftw , fftwFloat , enablePython ? false -, pythonPackages +, pythonPackages ? null , llvmPackages }: let diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index bf6c030589b..d53206ca667 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ graphviz gtk2 gtkmm2 python ]; + nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; + buildInputs = [ graphviz gtkmm2 ]; + + strictDeps = true; meta = with lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index af451281402..d493f31d375 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -9,10 +9,8 @@ , doxygen , protobuf , crc32c -, c-ares , fetchurl , openssl -, zlib , libnsl }: let @@ -33,7 +31,7 @@ let }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ]; + buildInputs = [ grpc openssl protobuf ]; postPatch = '' sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \ @@ -55,7 +53,7 @@ in stdenv.mkDerivation rec { sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; }; - buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ]; + buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ]; nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 937f73e95fc..5cdd9886690 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z"; + sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz"; fetchSubmodules = true; }; patches = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 72646fc198b..9ead894e0d2 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info , meson, ninja }: @@ -26,7 +26,16 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo glib pango fribidi libxml2 ]; - patches = [ ./4.x-nix_share_path.patch ]; + patches = [ + ./4.x-nix_share_path.patch + + # fixes intermittent "gtksourceview-gresources.h: no such file" errors + (fetchpatch { + name = "ensure-access-to-resources-in-corelib-build.patch"; + url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch"; + sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0="; + }) + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index b98588eb410..bcd0fcee92c 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -1,20 +1,43 @@ -{ stdenv, lib, fetchFromGitHub, - pkg-config, autoreconfHook, - flex, yacc, zlib, libxml2 }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, arpack +, bison +, blas +, cmake +, flex +, fop +, glpk +, gmp +, lapack +, libxml2 +, libxslt +, pkg-config +, python3 +, sourceHighlight +, suitesparse +, xmlto +}: stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.5"; + version = "0.9.1"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz"; + sha256 = "sha256-i6Zg6bfHZ9NHwqCouX9m9YqD0VtiWW8DEkxS0hdUyIE="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ flex yacc zlib libxml2 ]; + patches = [ + (fetchpatch { + name = "pkg-config-paths.patch"; + url = "https://github.com/igraph/igraph/commit/980521cc948777df471893f7b6de8f3e3916a3c0.patch"; + sha256 = "0mbq8v5h90c3dhgmyjazjvva3rn57qhnv7pkc9hlbqdln9gpqg0g"; + }) + ]; # Normally, igraph wants us to call bootstrap.sh, which will call # tools/getversion.sh. Instead, we're going to put the version directly @@ -22,16 +45,69 @@ stdenv.mkDerivation rec { # bootstrap. ~ C. postPatch = '' echo "${version}" > IGRAPH_VERSION + '' + lib.optionalString stdenv.isAarch64 '' + # https://github.com/igraph/igraph/issues/1694 + substituteInPlace tests/CMakeLists.txt \ + --replace "igraph_scg_grouping3" "" \ + --replace "igraph_scg_semiprojectors2" "" ''; + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ + cmake + fop + libxml2 + libxslt + pkg-config + python3 + sourceHighlight + xmlto + ]; + + buildInputs = [ + arpack + bison + blas + flex + glpk + gmp + lapack + libxml2 + suitesparse + ]; + + cmakeFlags = [ + "-DIGRAPH_USE_INTERNAL_BLAS=OFF" + "-DIGRAPH_USE_INTERNAL_LAPACK=OFF" + "-DIGRAPH_USE_INTERNAL_ARPACK=OFF" + "-DIGRAPH_USE_INTERNAL_GLPK=OFF" + "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" + "-DIGRAPH_USE_INTERNAL_GMP=OFF" + "-DIGRAPH_GLPK_SUPPORT=ON" + "-DIGRAPH_GRAPHML_SUPPORT=ON" + "-DIGRAPH_ENABLE_LTO=ON" + "-DIGRAPH_ENABLE_TLS=ON" + "-DBUILD_SHARED_LIBS=ON" + ]; + doCheck = true; - meta = { + preCheck = '' + # needed to find libigraph.so + export LD_LIBRARY_PATH="$PWD/src" + ''; + + postInstall = '' + mkdir -p "$out/share" + cp -r doc "$out/share" + ''; + + meta = with lib; { description = "The network analysis package"; homepage = "https://igraph.org/"; - license = lib.licenses.gpl2; - # NB: Known to fail tests on aarch64. - platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.MostAwesomeDude ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; } diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index 78cc48d8209..b2cc4ab08b4 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { --replace '.so' '.dylib' ''; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; + + strictDeps = true; makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ]; diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix index b9f16d3cfae..3cebc05f3d8 100644 --- a/pkgs/development/libraries/kdiagram/default.nix +++ b/pkgs/development/libraries/kdiagram/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "kdiagram"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = pname; rev = "v${version}"; - sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc="; + sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtbase qtsvg ]; diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index 50ba2c300b3..93aa169737b 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.9.1"; + version = "1.10.0"; in mkDerivation { @@ -24,7 +24,7 @@ mkDerivation { }; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850"; + sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 0a1dabef328..2a7fb196ea6 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -13,25 +13,28 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; - nativeBuildInputs = [] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildPhase = '' - make all + doCheck = true; + + buildFlags = [ "all" ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + # remove shared objects from "all" target + sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile ''; - installPhase = " - mkdir -p $out/{bin,lib,include} + installPhase = '' + runHook preInstall - cp -r include $out - mkdir -p $out/include/leveldb/helpers - cp helpers/memenv/memenv.h $out/include/leveldb/helpers + install -D -t $out/include/leveldb include/leveldb/* + install -D helpers/memenv/memenv.h $out/include/leveldb/helpers - cp out-shared/lib* $out/lib - cp out-static/lib* $out/lib + install -D -t $out/lib out-{static,shared}/lib* + install -D -t $out/bin out-static/{leveldbutil,db_bench} - cp out-static/leveldbutil $out/bin - "; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/google/leveldb"; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index d51eac7bdb6..6cbf1d20437 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -15,5 +15,12 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; + # The package failed to build with error: + # gcc: error: unrecognized command line option '-m64' + # + # See: + # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d + # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 81b84e0f181..99692f63d45 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI="; + sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 647fb6825af..2822b45f871 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.21"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; + sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 4ad60bcfb18..a26f0c3f3a4 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,17 +1,18 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libmspack-0.7.1alpha"; + pname = "libmspack"; + version = "0.10.1alpha"; src = fetchurl { - url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz"; - sha256 = "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp"; + url = "https://www.cabextract.org.uk/libmspack/${pname}-${version}.tar.gz"; + sha256 = "13janaqsvm7aqc4agjgd4819pbgqv50j88bh5kci1z70wvg65j5s"; }; meta = { description = "A de/compression library for various Microsoft formats"; homepage = "https://www.cabextract.org.uk/libmspack"; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 6ad0435a84e..6afced2d6d1 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-+xC4wDEeWi3RteF04C/qjMmjM+lmhtrtXZZyM1UUli4="; + sha256 = "0d586c8mbk50hjslq32n70sdp2a7lbsjv9zhky4w6jy950rrdfqh"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index ba39926576d..41283ed7ccd 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "0brmzr863chybm5y0q5hld5mhf6kx0bl4dddr7j69adlraak7x6s"; + sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 40f6b3b1aee..f27b58a02bb 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf, - pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, bzip2 +, doxygen +, gettext +, imagemagick +, libgsf +, xmlto +}: stdenv.mkDerivation rec { name = "libpst-0.6.75"; @@ -9,14 +19,24 @@ stdenv.mkDerivation rec { sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + doxygen + gettext + xmlto + ]; + buildInputs = [ - boost libgsf bzip2 - xmlto gettext imagemagick doxygen + bzip2 + imagemagick + libgsf ]; configureFlags = [ "--enable-python=no" + "--disable-static" + "--enable-libpst-shared" ]; doCheck = true; @@ -24,8 +44,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; - license = licenses.gpl2; - maintainers = [maintainers.tohl]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.tohl ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index d108bf4e6df..6eb1bb93f6b 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.12.1"; + version = "0.12.2"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv"; + sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns="; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index d47c7b50abe..8ef4513a18d 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,12 +1,8 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake -, opentracing-cpp, protobuf, zlib -, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null +, opentracing-cpp, protobuf +, enableGrpc ? false, grpc, openssl }: -assert enableGrpc -> grpc != null; -assert enableGrpc -> openssl != null; -assert enableGrpc -> c-ares != null; - stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; version = "0.14.0"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - opentracing-cpp protobuf zlib + opentracing-cpp protobuf ] ++ lib.optionals enableGrpc [ - grpc openssl c-ares c-ares.cmake-config + grpc openssl ]; cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ]; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index e6996a53c83..b9ca9405618 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -2,14 +2,15 @@ , belle-sip , cmake , fetchFromGitLab +, lib , soci , sqlite -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec { pname = "lime"; - version = "4.4.21"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I="; + sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index a59b460734d..229e82c323a 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.25"; + version = "0.9.28"; src = fetchgit { url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w"; + sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 6321e35f7f4..ad770046d33 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.32"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps="; + sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g"; }; patches = [ diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index e8053ce2702..958be905f83 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.7"; + version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; + nativeBuildInputs = [ flex which antlr ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4="; + sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw="; }; prePatch = '' @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { --replace "/bin/mv" "${coreutils}/bin/mv" ''; + parallelBuild = true; + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; homepage = "http://nco.sourceforge.net/"; - license = lib.licenses.gpl3; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index a4201d0aa2a..9b5043a1e23 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -3,7 +3,7 @@ multimediaSupport ? true }: let - version = "2.2.2"; + version = "2.2.3"; in stdenv.mkDerivation { pname = "notcurses"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-PzSstz5jODWbMLSClm3yZSHJKMXuDfxwj/h9Qo6kAVg="; + sha256 = "sha256-O6bu/tEotsxHAx6rCi0xRaklmF0l6neYwwscF2w0HJg="; }; meta = { diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index ec40bc393d5..b6aa7149168 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, opencl-headers }: stdenv.mkDerivation rec { pname = "opencl-clhpp"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; propagatedBuildInputs = [ opencl-headers ]; + strictDeps = true; + cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_TESTS=OFF" diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 11872cd47cc..a65e978f981 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -18,7 +18,7 @@ , enableUnfree ? false , enableIpp ? false -, enablePython ? false, pythonPackages +, enablePython ? false, pythonPackages ? null , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk @@ -36,6 +36,8 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; +assert enablePython -> pythonPackages != null; + let version = "3.4.8"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2edf02e738f..49ac7954169 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1j"; - sha256 = "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma"; + version = "1.1.1k"; + sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 2b99f29f4c0..e760868524f 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.32"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q="; + sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"; }; # Do not build static libraries diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 0247d12715f..d4af69532b3 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg }: stdenv.mkDerivation { pname = "partio"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "lib" ]; nativeBuildInputs = [ unzip cmake doxygen ]; - buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ]; + buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu ]; buildPhase = '' make partio @@ -32,6 +32,8 @@ stdenv.mkDerivation { mv $dev/include/*.h $dev/include/partio ''; + strictDeps = true; + meta = with lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 7cacab9bdf4..44065904d99 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -11,6 +11,38 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix + + # fix compilation errors (fails depending on number of cores filesystem ordering?) + # https://gitlab.com/hepcedar/rivet/-/merge_requests/220 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff"; + sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc"; + }) + # https://gitlab.com/hepcedar/rivet/-/merge_requests/223 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff"; + sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc"; + }) + + # fix for new python and fix transparency gs 9.52 + # gs 9.52 opacity fix + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff"; + sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v"; + }) + + # make-plots: fix wrong logic in Plot.set_xmax() + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff"; + sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p"; + }) + + # fix https://gitlab.com/hepcedar/rivet/-/issues/200 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff"; + includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ]; + sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3"; + }) ]; latex = texlive.combine { inherit (texlive) diff --git a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch index ce1085f37f7..a4fb8b41e7a 100644 --- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -1,19 +1,19 @@ diff --git a/meson_options.txt b/meson_options.txt -index a6c8af72..8e5c3d73 100644 +index e2a1e028..310029f2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,6 +10,9 @@ option('media-session', description: 'Build and install pipewire-media-session', - type: 'boolean', - value: true) + type: 'feature', + value: 'auto') +option('media-session-prefix', + description: 'Install directory for pipewire-media-session and its support files', + type: 'string') option('man', description: 'Build manpages', - type: 'boolean', + type: 'feature', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 4a70b0b0..84c9a19e 100644 +index 5c4d1af0..7296220f 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -10,7 +10,7 @@ install_data( diff --git a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 2a92711626b..cb695fa398c 100644 --- a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,29 +1,29 @@ diff --git a/meson.build b/meson.build -index ffee41b4..bab6f019 100644 +index 97d4d939..b17358e5 100644 --- a/meson.build +++ b/meson.build -@@ -318,8 +318,8 @@ alsa_dep = (get_option('pipewire-alsa') - ? dependency('alsa', version : '>=1.1.7') - : dependency('', required: false)) - +@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' + + alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) + -installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name) -installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name) +installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name) +installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name) - installed_tests_enabled = get_option('installed_tests') + installed_tests_enabled = not get_option('installed_tests').disabled() installed_tests_template = files('template.test.in') - + diff --git a/meson_options.txt b/meson_options.txt -index f03033c3..32df6c53 100644 +index fba0d647..8c6106cd 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -18,6 +18,9 @@ option('installed_tests', +@@ -26,6 +26,9 @@ option('installed_tests', description: 'Install manual and automated test executables', - type: 'boolean', - value: false) + type: 'feature', + value: 'disabled') +option('installed_test_prefix', + description: 'Prefix for installed tests', + type: 'string') option('gstreamer', description: 'Build GStreamer plugins', - type: 'boolean', + type: 'feature', diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 5c5578abc8d..955a4d9da6e 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -39,11 +39,11 @@ let fontDirectories = []; }; - mesonBool = b: if b then "true" else "false"; + mesonEnable = b: if b then "enabled" else "disabled"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.23"; + version = "0.3.24"; outputs = [ "out" @@ -61,7 +61,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - hash = "sha256:1HMUrE1NBmrdBRMKX3LRlXaCEH3wqP2jGtW8Rp9oyQA="; + hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI="; }; patches = [ @@ -103,22 +103,23 @@ let ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; mesonFlags = [ - "-Ddocs=true" - "-Dman=false" # we don't have xmltoman - "-Dexamples=${mesonBool withMediaSession}" # only needed for `pipewire-media-session` + "-Ddocs=enabled" + "-Dman=disabled" # we don't have xmltoman + "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session` "-Dudevrulesdir=lib/udev/rules.d" - "-Dinstalled_tests=true" + "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dgstreamer=${mesonBool gstreamerSupport}" - "-Dffmpeg=${mesonBool ffmpegSupport}" - "-Dbluez5=${mesonBool bluezSupport}" - "-Dbluez5-backend-hsp-native=${mesonBool nativeHspSupport}" - "-Dbluez5-backend-hfp-native=${mesonBool nativeHfpSupport}" - "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" - "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" + "-Dlibcamera=disabled" + "-Dgstreamer=${mesonEnable gstreamerSupport}" + "-Dffmpeg=${mesonEnable ffmpegSupport}" + "-Dbluez5=${mesonEnable bluezSupport}" + "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}" + "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}" + "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dpipewire_config_dir=/etc/pipewire" ]; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 15000564637..1c06020653e 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,20 +1,33 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub +, lib +, stdenv +, cmake +}: stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.0"; + version = "1.14.1"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6"; + sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE="; }; - outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + cmake + ]; - hardeningDisable = [ "fortify" ]; + postPatch = '' + # Wrong paths in pkg-config file generated by CMake + # https://github.com/pupnp/pupnp/pull/205/files#r588946478 + substituteInPlace CMakeLists.txt \ + --replace '\''${exec_prefix}/' "" \ + --replace '\''${prefix}/' "" + ''; meta = { description = "An open source UPnP development kit for Linux"; @@ -26,9 +39,9 @@ stdenv.mkDerivation rec { UPnP Device Architecture Specification. ''; - license = "BSD-style"; + license = lib.licenses.bsd3; - homepage = "http://pupnp.sourceforge.net/"; + homepage = "https://pupnp.github.io/pupnp/"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index fdb68d89bc3..ef0d2c82c02 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper, + lib, stdenv, fetchurl, fetchpatch, fetchgit, fetchFromGitHub, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, llvmPackages_5, @@ -48,6 +48,27 @@ let }; version = "5.212.0-alpha4"; }; + + # Even if developed in the public, QtWebEngine does not have official + # releases or new tags since the Qt company made 5.15.3 proprietary. + # Apparently they care more about licensing than the security of their users. + # See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html + qtwebengine = + let + branchName = "5.15.3"; + rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0"; + in + { + version = "${branchName}-${lib.substring 0 8 rev}"; + + src = fetchgit { + url = "https://github.com/qt/qtwebengine.git"; + sha256 = "19l1i4sk3pvnwbvz5s97jchqawfz8k1xmjza29bgvkp1zz96r0jx"; + inherit rev branchName; + fetchSubmodules = true; + leaveDotGit = true; + }; + }; }; patches = { @@ -83,11 +104,16 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] - ++ optionals stdenv.isDarwin [ - ./qtwebengine-darwin-no-platform-check.patch - ./qtwebengine-mac-dont-set-dsymutil-path.patch - ]; + qtwebengine = [ + # Fix crashes with non en_US.UTF-8 locales + (fetchpatch { + url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch"; + sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2"; + }) + ] ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-mac-dont-set-dsymutil-path.patch + ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 617b2c1d9d2..f994c7ef6c9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -2,6 +2,7 @@ , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel , bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which +, nodejs, qtbase, perl , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -25,7 +26,15 @@ qtModule { name = "qtwebengine"; qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ - bison coreutils flex git gperf ninja pkg-config python2 which gn + bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs + + # qmake looks for syncqt instead of syncqt.pl and fails with a cryptic + # error if it can't find it. syncqt.pl also has a /usr/bin/env shebang, so + # it can't be directly used in a sandboxed build environment. + (writeScriptBin "syncqt" '' + #!${stdenv.shell} + exec ${perl}/bin/perl ${qtbase.dev}/bin/syncqt.pl "$@" + '') ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -40,9 +49,17 @@ qtModule { hardeningDisable = [ "format" ]; postPatch = - # Patch Chromium build tools '' - ( cd src/3rdparty/chromium; patchShebangs . ) + # Patch Chromium build tools + ( + cd src/3rdparty/chromium; + + # Manually fix unsupported shebangs + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true + + patchShebangs . + ) '' # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` @@ -120,7 +137,7 @@ qtModule { if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fi - ''; + ''; qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index da56c07779b..b4a201c08cc 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -5,7 +5,7 @@ buildEnv { paths = [ qtbase ] ++ paths; pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ]; - extraOutputsToInstall = [ "dev" ]; + extraOutputsToInstall = [ "out" "dev" ]; postBuild = '' rm "$out/bin/qmake" diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 278fdecc1a6..c93ea5ba78b 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM="; + hash = "sha256-2DI/PL29aiZcxOrGZBzXwAnNgZQpSDjyyGKgl+vDErk="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 96f7108e3fe..b9a34b113eb 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M="; + hash = "sha256-LbQqyJxRqb6vpXiYSkRlF1FeqXJJXktPafGmYDDK02U="; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 965d92179b6..e62d6f0076f 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo="; + hash = "sha256-9p6PIXdHFIgHgNWZzqVz5O9i2Np0z/iyxodG2cLrpGs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index ab0957474ad..d721cfece96 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE="; + hash = "sha256-+6h1E5uWNKjjaeO5ZIi854CWYi0QGQ5mVUHdi9+4vX4="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index beb0c61e683..c63e8249cfc 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro="; + hash = "sha256-Jxg3n203tV0L+UrmeQEuzX0TKpFu5An2cnuEA/F/SNY="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 5863e1f0a57..1339e035ebf 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4="; + hash = "sha256-gdto7BbrSRa3UiRNvTW1KLkHyjrcxdah4+L+1Gdm0wA="; }; preConfigure = '' diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index 42c84b3ed61..1eea35a34e7 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -6,10 +6,10 @@ # Enable BLAS interface with 64-bit integer width. , blas64 ? false -# Target architecture, use "zen" or "zen2", optimization for Zen and -# other families is pretty much mutually exclusive in the AMD fork of -# BLIS. -, withArchitecture ? "zen" +# Target architecture. "amd64" compiles kernels for all Zen +# generations. To build kernels for specific Zen generations, +# use "zen", "zen2", or "zen3". +, withArchitecture ? "amd64" # Enable OpenMP-based threading. , withOpenMP ? true @@ -20,13 +20,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "amd-blis"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "amd"; repo = "blis"; rev = version; - sha256 = "1b2f5bwi0gkw2ih2rb7wfzn3m9hgg7k270kg43rmzpr2acpy86xa"; + hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY="; }; inherit blas64; @@ -36,7 +36,10 @@ in stdenv.mkDerivation rec { python3 ]; - doCheck = true; + # Tests currently fail with non-Zen CPUs due to a floating point + # exception in one of the generic kernels. Try to re-enable the + # next release. + doCheck = false; enableParallelBuilding = true; @@ -51,8 +54,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libblas.so.3 - ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3 + ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 382f868a99a..23e44bf28b0 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , gfortran, blas, lapack, eigen }: stdenv.mkDerivation rec { pname = "arpack"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "opencollab"; repo = "arpack-ng"; rev = version; - sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr"; + sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA="; }; + patches = [ + # https://github.com/opencollab/arpack-ng/pull/301 + (fetchpatch { + name = "pkg-config-paths.patch"; + url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch"; + excludes = [ "CHANGES" ]; + sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ gfortran @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}" + "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" ]; preCheck = if stdenv.isDarwin then '' @@ -36,12 +46,6 @@ stdenv.mkDerivation rec { export OMP_NUM_THREADS=2 ''; - postInstall = '' - mkdir -p $out/lib/pkgconfig - cp arpack.pc $out/lib/pkgconfig/ - ''; - - meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' @@ -49,7 +53,7 @@ stdenv.mkDerivation rec { problems. ''; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel dotlambda ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index aca395001f9..fcb49d70a3b 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -4,7 +4,7 @@ , gfortran , blas , boost -, python +, python3 , ocl-icd , opencl-headers , Accelerate, CoreGraphics, CoreVideo, OpenCL @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran blas - python + python3 boost ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { OpenCL ]; + strictDeps = true; + meta = with lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 166d0f2911d..cd737a82a29 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }: +{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }: stdenv.mkDerivation rec { version = "1.3.14"; @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; - checkInputs = [ python ]; doCheck = false; # fails, probably missing something meta = with lib; { diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 2f1006404b7..e67cb1736b7 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.4"; + version = "2020.3.6"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h"; + sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index f561864a750..2c87d421bab 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { pname = "soci"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "SOCI"; repo = pname; rev = version; - sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; + sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM="; }; # Do not build static libraries - cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; + cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ sqlite ]; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 3a3f5c79763..01ec3a4fba2 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"; + sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 553c42da7c4..27705c57858 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (rec { pname = "talloc"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"; + sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index deed5b64d2c..b8ea203ef17 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -1,26 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, - texinfo, bison, flex, expat, file +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, expat +, file +, flex +, texinfo }: stdenv.mkDerivation rec { pname = "udunits"; - version = "2.2.27.6"; + version = "unstable-2021-03-17"; src = fetchFromGitHub { owner = "Unidata"; repo = "UDUNITS-2"; - rev = "v${version}"; - sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm"; + rev = "c83da987387db1174cd2266b73dd5dd556f4476b"; + hash = "sha256-+HW21+r65OroCxMK2/B5fe7zHs4hD4xyoJK2bhdJGyQ="; }; - nativeBuildInputs = [ autoreconfHook texinfo bison flex file ]; - buildInputs = [ expat ]; + nativeBuildInputs = [ + autoreconfHook + texinfo + bison + flex + file + ]; + buildInputs = [ + expat + ]; meta = with lib; { homepage = "https://www.unidata.ucar.edu/software/udunits/"; description = "A C-based package for the programatic handling of units of physical quantities"; - license = licenses.bsdOriginal; + longDescription = '' + The UDUNITS package supports units of physical quantities. Its C library + provides for arithmetic manipulation of units and for conversion of + numeric values between compatible units. The package contains an extensive + unit database, which is in XML format and user-extendable. The package + also contains a command-line utility for investigating units and + converting values. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres pSub ]; platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 490adf8e325..28722dc8fca 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -59,7 +59,7 @@ with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.30.5"; + version = "2.30.6"; outputs = [ "out" "dev" ]; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx"; + sha256 = "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh"; }; patches = optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index a0d1378aa70..2037d815a81 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch -, pkg-config +, argp-standalone +, curl , meson , ninja +, pkg-config , zstd -, curl -, argp-standalone }: stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.8"; + version = "1.1.9"; outputs = [ "out" "lib" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q"; + hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA="; }; nativeBuildInputs = [ @@ -29,25 +29,23 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - zstd curl + zstd ] ++ lib.optional stdenv.isDarwin argp-standalone; - # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS - # https://github.com/zchunk/zchunk/pull/35 - patches = [ - (fetchpatch { - name = "darwin-support.patch"; - url = "https://github.com/zchunk/zchunk/commit/f7db2ac0a95028a7f82ecb89862426bf53a69232.patch"; - sha256 = "0cm84gyii4ly6nsmagk15g9kbfa13rw395nqk3fdcwm0dpixlkh4"; - }) -]; - meta = with lib; { - description = "File format designed for highly efficient deltas while maintaining good compression"; homepage = "https://github.com/zchunk/zchunk"; + description = "File format designed for highly efficient deltas while maintaining good compression"; + longDescription = '' + zchunk is a compressed file format that splits the file into independent + chunks. This allows you to only download changed chunks when downloading a + new version of the file, and also makes zchunk files efficient over rsync. + + zchunk files are protected with strong checksums to verify that the file + you downloaded is, in fact, the file you wanted. + ''; license = licenses.bsd2; - maintainers = with maintainers; []; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 8cfec83af54..90758db16ed 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,80 +1,81 @@ -{ lib, stdenv -, perl -, pkg-config +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, zip -, unzip +, cmake +, perl +, pkg-config , python3 , xmlto +, zip , zlib }: stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.71"; + version = "0.13.72"; src = fetchFromGitHub { owner = "gdraheim"; - repo = "zziplib"; + repo = pname; rev = "v${version}"; - sha256 = "P+7D57sc2oIABhk3k96aRILpGnsND5SLXHh2lqr9O4E="; + hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q="; }; patches = [ - # Install man pages + # apply https://github.com/gdraheim/zziplib/pull/113 (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch"; - sha256 = "wVExEZN8Ml1/3GicB0ZYsLVS3KJ8BSz8i4Gu46naz1Y="; - excludes = [ "GNUmakefile" ]; + url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff"; + sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y"; }) - - # Fix man page formatting (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/22ed64f13dc239f86664c60496261f544bce1088.patch"; - sha256 = "ScFVWLc4LQPqkcHn9HK/VkLula4b5HzuYl0b5vi4Ikc="; + url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff"; + sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny"; + }) + (fetchpatch { + url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff"; + sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg"; }) ]; nativeBuildInputs = [ + cmake perl pkg-config - zip python3 xmlto + zip ]; - buildInputs = [ zlib ]; - checkInputs = [ - unzip - ]; - - # tests are broken (https://github.com/gdraheim/zziplib/issues/20), - # and test/zziptests.py requires network access + # test/zziptests.py requires network access # (https://github.com/gdraheim/zziplib/issues/24) - doCheck = false; - checkTarget = "check"; + cmakeFlags = [ + "-DZZIP_TESTCVE=OFF" + "-DBUILD_SHARED_LIBS=True" + "-DBUILD_STATIC_LIBS=False" + "-DBUILD_TESTS=OFF" + "-DMSVC_STATIC_RUNTIME=OFF" + "-DZZIPSDL=OFF" + "-DZZIPTEST=OFF" + "-DZZIPWRAP=OFF" + "-DBUILDTESTS=OFF" + ]; meta = with lib; { + homepage = "https://github.com/gdraheim/zziplib"; description = "Library to extract data from files archived in a zip file"; - longDescription = '' - The zziplib library is intentionally lightweight, it offers the ability - to easily extract data from files archived in a single zip - file. Applications can bundle files into a single zip archive and - access them. The implementation is based only on the (free) subset of - compression with the zlib algorithm which is actually used by the - zip/unzip tools. + The zziplib library is intentionally lightweight, it offers the ability to + easily extract data from files archived in a single zip file. + Applications can bundle files into a single zip archive and access them. + The implementation is based only on the (free) subset of compression with + the zlib algorithm which is actually used by the zip/unzip tools. ''; - license = with licenses; [ lgpl2Plus mpl11 ]; - - homepage = "http://zziplib.sourceforge.net/"; - - maintainers = [ ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = python3.meta.platforms; }; } |