diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
639 files changed, 6922 insertions, 3124 deletions
diff --git a/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix index c26672c1dabc..d46c7a6bcd85 100644 --- a/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix +++ b/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "AntTweakBar-1.16"; - buildInputs = [ unzip xorg.libX11 libGLU libGL ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ xorg.libX11 libGLU libGL ]; src = fetchurl { url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix index 95d1b873edd3..0813a965524b 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20200225.2"; + version = "20200923.3"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; + sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"; }; + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=17" + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/acl/default.nix b/nixpkgs/pkgs/development/libraries/acl/default.nix index 2161ad9e59c3..e0b1f05516cd 100644 --- a/nixpkgs/pkgs/development/libraries/acl/default.nix +++ b/nixpkgs/pkgs/development/libraries/acl/default.nix @@ -6,11 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "acl-2.2.53"; + name = "acl-2.3.0"; src = fetchurl { url = "mirror://savannah/acl/${name}.tar.gz"; - sha256 = "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6"; + sha256 = "sha256-vTj9u7A8eTdK9RRn6+VJfLwDNbgld/MMlRpBqVtTMAk="; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix index 4bd5de8bd48d..fd20a0d9a97c 100644 --- a/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages }: +{ lib, mkDerivation, fetchFromGitHub, ghcWithPackages, nixosTests }: mkDerivation rec { pname = "standard-library"; @@ -19,6 +19,7 @@ mkDerivation rec { rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda ''; + passthru.tests = { inherit (nixosTests) agda; }; meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; diff --git a/nixpkgs/pkgs/development/libraries/allegro/5.nix b/nixpkgs/pkgs/development/libraries/allegro/5.nix index ca1446dd9352..314347411261 100644 --- a/nixpkgs/pkgs/development/libraries/allegro/5.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 208c74981dcb..1d0256f3b274 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q1.3"; + version = "2021.Q1.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "x9VzPALIlgE3eIKY4/qbFg5w+zd2W/jbqFXgJfpvLP4="; + sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/amrnb/default.nix b/nixpkgs/pkgs/development/libraries/amrnb/default.nix index b226c9e36d24..2316961e3994 100644 --- a/nixpkgs/pkgs/development/libraries/amrnb/default.nix +++ b/nixpkgs/pkgs/development/libraries/amrnb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; diff --git a/nixpkgs/pkgs/development/libraries/amrwb/default.nix b/nixpkgs/pkgs/development/libraries/amrwb/default.nix index 776065b28bc7..81938bb4cba7 100644 --- a/nixpkgs/pkgs/development/libraries/amrwb/default.nix +++ b/nixpkgs/pkgs/development/libraries/amrwb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; diff --git a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 976387d49eb0..136ffb79804a 100644 --- a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.0"; + version = "5.16.1"; src = fetchurl { - sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk"; + sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index d240e7e3a9dc..073ad3254a0b 100644 --- a/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; + dontWrapQtApps = true; + meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; diff --git a/nixpkgs/pkgs/development/libraries/arb/default.nix b/nixpkgs/pkgs/development/libraries/arb/default.nix index 1c356b59d8a7..97af236af046 100644 --- a/nixpkgs/pkgs/development/libraries/arb/default.nix +++ b/nixpkgs/pkgs/development/libraries/arb/default.nix @@ -1,26 +1,39 @@ -{lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: +{ lib +, stdenv +, fetchFromGitHub +, mpir +, gmp +, mpfr +, flint +}: + stdenv.mkDerivation rec { pname = "arb"; - version = "2.17.0"; + version = "2.19.0"; + src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1"; + sha256 = "sha256-J/LQVZ8gmssazE7ru89EtvW6cVjaLEHgUHuwjW1nuOE="; }; - buildInputs = [mpir gmp mpfr flint]; + + buildInputs = [ mpir gmp mpfr flint ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ]; + doCheck = true; + meta = with lib; { description = "A library for arbitrary-precision interval arithmetic"; homepage = "https://arblib.org/"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; maintainers = teams.sage.members; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index fe67cf04e602..22264fe01f30 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.2.1"; + version = "10.3.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-fY500kh2mvI/yJTYu4jwXjIxeTPL5NqPPFa+j4mp/MQ="; + sha256 = "sha256-qx7/+lr5AAChGhmjkwL9+8XEq/b6tXipvQ6clc+B5Mc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/nixpkgs/pkgs/development/libraries/arrayfire/default.nix index c636d672332c..a66db4800177 100644 --- a/nixpkgs/pkgs/development/libraries/arrayfire/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/aubio/default.nix b/nixpkgs/pkgs/development/libraries/aubio/default.nix index 7aa4859ef0ed..b1c6c6396c86 100644 --- a/nixpkgs/pkgs/development/libraries/aubio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix b/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix index 29781446c8fe..670dee26b2bf 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libinstpatch"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "swami"; repo = pname; rev = "v${version}"; - sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb"; + sha256 = "sha256-OU6/slrPDgzn9tvXZJKSWbcFbpS/EAsOi52FtjeYdvA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix index 9c636e0205df..821a9ea9226a 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx"; + sha256 = "sha256-f+1CIVSxyScyNF92cPIiZwfnnCVrWfCZlbrIXtduIdY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 79f09f48464f..f074287ab163 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.10"; + version = "0.24.12"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"; + sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; }; patches = [ ./lilv-pkgconfig.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index 45caf0b36c50..616ad5b0c892 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lv2"; - version = "1.18.0"; + version = "1.18.2"; src = fetchurl { url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2"; - sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; + sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4="; }; nativeBuildInputs = [ pkg-config wafHook ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/raul/default.nix b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix index a0089e310441..b1a8288c5f04 100644 --- a/nixpkgs/pkgs/development/libraries/audio/raul/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ boost gtk2 python ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; + buildInputs = [ boost gtk2 ]; + + strictDeps = true; meta = with lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; diff --git a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix index 540e152655f6..ccfafd36a8a3 100644 --- a/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix index 464e79f6c2dd..bc8dc70f9b47 100644 --- a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.4"; + version = "0.6.8"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; + sha256 = "sha256-Ossysa3Forf6za3i4IGLzWxx8j+EoevBeBW7eg0tAt8="; }; nativeBuildInputs = [ pkg-config wafHook python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/suil/default.nix b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix index 0f4dd0f62c47..1c978a18f8f9 100644 --- a/nixpkgs/pkgs/development/libraries/audio/suil/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom +{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom , wafHook , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -17,11 +17,15 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ gtk2 lv2 python serd sord sratom ] + nativeBuildInputs = [ pkg-config wafHook python3 ]; + buildInputs = [ gtk2 lv2 serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); + dontWrapQtApps = true; + + strictDeps = true; + meta = with lib; { homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; diff --git a/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix index 88e81d733b32..3b3c005a015b 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-resampler"; - version = "1.6.2"; + version = "1.8.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; + sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; }; makeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 23d7f9d8629a..39fb5d7eb21e 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -1,30 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.4.64"; + version = "0.5.2"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A="; + sha256 = "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg"; }; + patches = [ + # Remove once https://github.com/awslabs/aws-c-common/pull/764 is merged + (fetchpatch { + url = "https://github.com/awslabs/aws-c-common/commit/4f85fb3e398d4e4d320d3559235267b26cbc9531.patch"; + sha256 = "1jg3mz507w4kwgmg57kvz419gvw47pd9rkjr6jhsmvardmyyskap"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-nullability-extension -Wno-typedef-redefinition"; + doCheck = true; + meta = with lib; { description = "AWS SDK for C common core"; homepage = "https://github.com/awslabs/aws-c-common"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ orivej eelco ]; + maintainers = with maintainers; [ orivej eelco r-burns ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix index 4cfabc77bb2c..b6468a8dae0a 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }: stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbri4dv924ph3cxkmwkl4kdca4dvhc9qda60rdzs6355l76k23n"; + sha256 = "sha256-8Du9Ib3MhPcgetBIi0k1NboaXxZh7iPNhDe7197JnHc="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n ] + buildInputs = [ aws-c-cal aws-c-common aws-c-io aws-checksums s2n-tls ] ++ lib.optional stdenv.hostPlatform.isMusl libexecinfo; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index e2074cc835a6..337149e6f8e3 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }: stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.7.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4="; + sha256 = "0lx72p9xmmnjkz4zkfb1lz0ibw0jsy52qpydhvn56bq85nv44rwx"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7b10fc463dd1..d6fbb97014d7 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl s2n zlib + curl openssl s2n-tls zlib aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index 6e3a5abaaa65..d6e1d75437ef 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.84"; + version = "0.1.86"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo="; + sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix index af727e394d16..03f49c3ee504 100644 --- a/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Beautiful stack trace pretty printer for C++"; homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix index 78ef4c2f3369..fd4e2cfe9f5f 100644 --- a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix +++ b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix @@ -1,8 +1,6 @@ { # general lib -, callPackage -, runCommand , resholvePackage , bash , shellcheck @@ -46,7 +44,9 @@ resholvePackage rec { inherit src; installPhase = '' + runHook preInstall install -Dt $out/bin bashup.events + runHook postInstall ''; inherit doCheck; @@ -54,9 +54,11 @@ resholvePackage rec { # check based on https://github.com/bashup/events/blob/master/.dkrc checkPhase = '' + runHook preCheck SHELLCHECK_OPTS='-e SC2016,SC2145' ${shellcheck}/bin/shellcheck ./bashup.events ${bash}/bin/bash -n ./bashup.events ${bash}/bin/bash ./bashup.events + runHook postCheck ''; solutions = { @@ -70,7 +72,11 @@ resholvePackage rec { inherit doInstallCheck; installCheckInputs = [ bash ]; - installCheckPhase = installCheck "${bash}/bin/bash"; + installCheckPhase = '' + runHook preInstallCheck + ${installCheck "${bash}/bin/bash"} + runHook postInstallCheck + ''; meta = with lib; { inherit branch; diff --git a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index dd72b7eb41df..5a9bbd5a49db 100644 --- a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.21"; + version = "4.5.1"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; + sha256 = "1mm3v01jz2mp8vajsl45s23gw90zafbgg3br5n5yz03aan08f395"; }; # Do not build static libraries diff --git a/nixpkgs/pkgs/development/libraries/bearssl/default.nix b/nixpkgs/pkgs/development/libraries/bearssl/default.nix new file mode 100644 index 000000000000..de9c182df148 --- /dev/null +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix index 03f6e96e187d..36af06dfc55a 100644 --- a/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.24"; + version = "4.5.1"; 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 = "14hkgwr2a9zw44v1s8xscqxa2mwin06jsxpwb3hflh9mp16ymfzv"; }; buildInputs = [ bctoolbox belr ]; diff --git a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index e08fc1ae3ee3..0f8a61bed244 100644 --- a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/nixpkgs/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.21"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw"; + sha256 = "0d1wf0jv9lb0s6r49i9gz5nrx8jzpkx558hywll7idma9d0mr61p"; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/belr/default.nix b/nixpkgs/pkgs/development/libraries/belr/default.nix index b38757525abd..252ac3e80edc 100644 --- a/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.3.2"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; + sha256 = "0m0s7g8d25nbnafbl76w9v3x7q4jhsypxmz1gg80pj7j34xc2dsd"; }; buildInputs = [ bctoolbox ]; diff --git a/nixpkgs/pkgs/development/libraries/boca/default.nix b/nixpkgs/pkgs/development/libraries/boca/default.nix new file mode 100644 index 000000000000..0f848e302408 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boca/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config + +, expat +, libcdio +, libcdio-paranoia +, libpulseaudio +, smooth +, uriparser +, zlib +}: + +stdenv.mkDerivation rec { + pname = "BoCA"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "enzo1982"; + repo = "boca"; + rev = "v${version}"; + sha256 = "sha256-SP/rVt/8VoeUprwJIIMSIBvoC1Zein3F7MR2tqc2vd0="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + expat + libcdio + libcdio-paranoia + libpulseaudio + smooth + uriparser + zlib + ]; + + makeFlags = [ + "prefix=$(out)" + ]; + + meta = with lib; { + description = "A component library used by the fre:ac audio converter"; + license = licenses.gpl2Plus; + homepage = "https://github.com/enzo1982/boca"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/boolstuff/default.nix b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix index b3d754fb5425..79232107cdd2 100644 --- a/nixpkgs/pkgs/development/libraries/boolstuff/default.nix +++ b/nixpkgs/pkgs/development/libraries/boolstuff/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "${baseurl}/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/boost-process/default.nix b/nixpkgs/pkgs/development/libraries/boost-process/default.nix index 97e879809528..148e27faa2b6 100644 --- a/nixpkgs/pkgs/development/libraries/boost-process/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost-process/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir $name diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index abff1268bfae..6158eb875117 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -132,7 +132,8 @@ stdenv.mkDerivation { license = licenses.boost; platforms = platforms.unix ++ platforms.windows; badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" - ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin"; + ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" + ++ optionals (versionOlder version "1.73") lib.platforms.riscv; maintainers = with maintainers; [ peti ]; }; @@ -149,6 +150,9 @@ stdenv.mkDerivation { cat << EOF >> user-config.jam using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; EOF + # Build b2 with buildPlatform CC/CXX. + sed '2i export CC=$CC_FOR_BUILD; export CXX=$CXX_FOR_BUILD' \ + -i ./tools/build/src/engine/build.sh ''; NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin diff --git a/nixpkgs/pkgs/development/libraries/bootil/default.nix b/nixpkgs/pkgs/development/libraries/bootil/default.nix index f21362962048..20ca175d7b89 100644 --- a/nixpkgs/pkgs/development/libraries/bootil/default.nix +++ b/nixpkgs/pkgs/development/libraries/bootil/default.nix @@ -1,18 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }: stdenv.mkDerivation { - name = "bootil-unstable-2015-12-17"; - - meta = { - description = "Garry Newman's personal utility library"; - homepage = "https://github.com/garrynewman/bootil"; - # License unsure - see https://github.com/garrynewman/bootil/issues/21 - license = lib.licenses.free; - maintainers = [ lib.maintainers.abigailbuccaneer ]; - platforms = lib.platforms.all; - # Build uses `-msse` and `-mfpmath=sse` - badPlatforms = [ "aarch64-linux" ]; - }; + pname = "bootil"; + version = "unstable-2015-12-17"; src = fetchFromGitHub { owner = "garrynewman"; @@ -21,11 +11,13 @@ stdenv.mkDerivation { sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg"; }; - patches = [ (fetchpatch { - url = "https://github.com/garrynewman/bootil/pull/22.patch"; - name = "github-pull-request-22.patch"; - sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2"; - }) ]; + patches = [ + (fetchpatch { + url = "https://github.com/garrynewman/bootil/pull/22.patch"; + name = "github-pull-request-22.patch"; + sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2"; + }) + ]; # Avoid guessing where files end up. Just use current directory. postPatch = '' @@ -42,4 +34,15 @@ stdenv.mkDerivation { install -D libbootil_static.a $out/lib/libbootil_static.a cp -r include $out ''; + + meta = with lib; { + description = "Garry Newman's personal utility library"; + homepage = "https://github.com/garrynewman/bootil"; + # License unsure - see https://github.com/garrynewman/bootil/issues/21 + license = licenses.free; + maintainers = [ maintainers.abigailbuccaneer ]; + platforms = platforms.all; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; + }; } diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 7019d39b16c7..aa3eeef48a55 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; + # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. + cmakeFlags = lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; + installPhase = '' mkdir -p $bin/bin $out/include $out/lib diff --git a/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 2346153e2a15..cb40e535b0c3 100644 --- a/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "2.17"; - revision = "2"; - sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb"; + revision = "3"; + sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 0369f603b8e1..33f9daf7b50f 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/brigand/default.nix b/nixpkgs/pkgs/development/libraries/brigand/default.nix index eb46ccc8cd7c..3c0778de1d30 100644 --- a/nixpkgs/pkgs/development/libraries/brigand/default.nix +++ b/nixpkgs/pkgs/development/libraries/brigand/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "https://github.com/edouarda/brigand"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 0adcb327cc4d..b698cf7b404d 100644 --- a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.9"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6"; + sha256 = "1a500ncgznwha0j3c27ak3p4jh5jm6fnnb531k7c0a4i91745agj"; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/nixpkgs/pkgs/development/libraries/caf/default.nix b/nixpkgs/pkgs/development/libraries/caf/default.nix index fdc06df948d7..944b5276c5a9 100644 --- a/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.6"; + version = "0.18.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "03pi2jcdvdxncvv3hmzlamask0db1fc5l79k9rgq9agl0swd0mnz"; + sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx"; }; nativeBuildInputs = [ cmake ]; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; cmakeFlags = [ - "-DCAF_NO_EXAMPLES:BOOL=TRUE" + "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; doCheck = true; checkTarget = "test"; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib + export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io + export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch index 47f419727459..8a14fb3a5fab 100644 --- a/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch +++ b/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch @@ -1,18 +1,7 @@ -From 06b2c6dd6439c01bfb5a4c7b0ec6909c349a66b1 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <freddyrietdijk@fridh.nl> -Date: Thu, 28 Feb 2019 16:25:49 +0100 -Subject: [PATCH] allow setting paths in makefile - -and install headers and libs ---- - Makefile | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index b507e2b0..d21e5c56 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,13 +19,13 @@ BUILD_DIR = out +diff -u a/Makefile b/Makefile +--- a/Makefile 2020-12-27 18:48:53.934098765 +0100 ++++ b/Makefile 2020-12-27 18:50:44.022674117 +0100 +@@ -19,13 +19,13 @@ # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html PREFIX ?= /usr/local EXEC_PREFIX = $(PREFIX) @@ -20,24 +9,16 @@ index b507e2b0..d21e5c56 100644 +BINDIR ?= $(EXEC_PREFIX)/bin DATAROOTDIR = $(PREFIX)/share DOCDIR = $(DATAROOTDIR)/doc/$(CPROG) - SYSCONFDIR = $(PREFIX)/etc + SYSCONFDIR ?= $(PREFIX)/etc HTMLDIR = $(DOCDIR) -INCLUDEDIR = $(DESTDIR)$(PREFIX)/include -LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib +INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include +LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib + PID_FILE ?= /var/run/$(CPROG).pid # build tools - MKDIR = mkdir -p -@@ -270,17 +270,17 @@ build: $(CPROG) $(CXXPROG) - unit_test: $(UNIT_TEST_PROG) - - ifeq ($(CAN_INSTALL),1) --install: $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf -+install: install-headers install-slib $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf - install -d -m 755 "$(DOCDIR)" - install -m 644 *.md "$(DOCDIR)" - install -d -m 755 "$(BINDIR)" +@@ -337,10 +337,10 @@ install -m 755 $(CPROG) "$(BINDIR)/" install-headers: @@ -50,6 +31,3 @@ index b507e2b0..d21e5c56 100644 install-slib: lib$(CPROG).so $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g')) --- -2.19.2 - diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix index 8a3474a491f3..fbbfb6ba7380 100644 --- a/nixpkgs/pkgs/development/libraries/civetweb/default.nix +++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "civetweb"; - version = "1.11"; + version = "1.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; + sha256 = "/q7Q1lavIR3i126uI4NsKByHJ6Tp+DSN60R4YxR506U="; }; makeFlags = [ @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + installTargets = [ + "install-headers" + "install-lib" + "install-slib" + "install" + ]; + preInstall = '' mkdir -p $dev/include mkdir -p $out/lib diff --git a/nixpkgs/pkgs/development/libraries/clearsilver/default.nix b/nixpkgs/pkgs/development/libraries/clearsilver/default.nix index 74d167144a9f..73ffd6c12b23 100644 --- a/nixpkgs/pkgs/development/libraries/clearsilver/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix index 20b0a3b547ca..8d5b389150a4 100644 --- a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = "http://clucene.sourceforge.net"; - platforms = platforms.linux; + platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/cm256cc/default.nix b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix index b40aea70b410..09b0ffba98ba 100644 --- a/nixpkgs/pkgs/development/libraries/cm256cc/default.nix +++ b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cm256cc"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "cm256cc"; rev = "v${version}"; - sha256 = "0d16y3lhdwr644am4sxqpshpbc3qik6dgr1w2c39vy75w9ff61a0"; + sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cminpack/default.nix b/nixpkgs/pkgs/development/libraries/cminpack/default.nix index 39d4849f3801..10d068604369 100644 --- a/nixpkgs/pkgs/development/libraries/cminpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/cminpack/default.nix @@ -8,8 +8,12 @@ stdenv.mkDerivation rec { sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; }; - patchPhase = '' - sed -i s,/usr/local,$out, Makefile + postPatch = '' + substituteInPlace Makefile \ + --replace '/usr/local' '${placeholder "out"}' \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'ranlib -t' '${stdenv.cc.targetPrefix}ranlib' \ + --replace 'ranlib' '${stdenv.cc.targetPrefix}ranlib' ''; preInstall = '' @@ -20,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; license = lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/nixpkgs/pkgs/development/libraries/comedilib/default.nix index fef22dea06ae..d59f4acd8dcc 100644 --- a/nixpkgs/pkgs/development/libraries/comedilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/comedilib/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , flex -, yacc +, bison , xmlto , docbook_xsl , docbook_xml_dtd_44 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex - yacc + bison swig xmlto docbook_xml_dtd_44 diff --git a/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix b/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix deleted file mode 100644 index 968c395d701f..000000000000 --- a/nixpkgs/pkgs/development/libraries/concurrencykit/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "concurrencykit"; - version = "0.6.0"; - - src = fetchurl { - url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; - }; - - #Deleting this line causes "Unknown option --disable-static" - configurePhase = "./configure --prefix=$out"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A library of safe, high-performance concurrent data structures"; - homepage = "http://concurrencykit.org"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix index f0f0718ab10c..3121741ca024 100644 --- a/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix +++ b/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "1.4.2"; + version = "2.0.2"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "18s3y9v6x246hapxy0cy4srnll4qqzqfx003j551l5f27b2ng8fn"; + sha256 = "sha256-BcDqrOotqRPMnzvfjzbeCf8gT3yQzKihywKrpah1D7w="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/nixpkgs/pkgs/development/libraries/cppcms/default.nix index aceb2d61e388..e0f9ed599123 100644 --- a/nixpkgs/pkgs/development/libraries/cppcms/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/cpptest/default.nix b/nixpkgs/pkgs/development/libraries/cpptest/default.nix index 654ad955ae66..17bd39003861 100644 --- a/nixpkgs/pkgs/development/libraries/cpptest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpptest/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "Simple C++ unit testing framework"; maintainers = with maintainers; [ bosu ]; license = lib.licenses.lgpl3; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/nixpkgs/pkgs/development/libraries/cpputest/default.nix index 8e3fadc7f0dc..39bed6025232 100644 --- a/nixpkgs/pkgs/development/libraries/cpputest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpputest/default.nix @@ -1,19 +1,19 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.0"; pname = "cpputest"; + version = "4.0"; src = fetchurl { url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1"; }; - meta = { - homepage = "http://cpputest.github.io/"; + meta = with lib; { + homepage = "https://cpputest.github.io/"; description = "Unit testing and mocking framework for C/C++"; - platforms = lib.platforms.linux ; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.juliendehos ]; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.juliendehos ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/crcpp/default.nix b/nixpkgs/pkgs/development/libraries/crcpp/default.nix index 9410b0715006..3b9f4f942acf 100644 --- a/nixpkgs/pkgs/development/libraries/crcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/crcpp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "crcpp"; - version = "1.0.1.0"; + version = "1.1.0.0"; src = fetchFromGitHub { owner = "d-bahr"; repo = "CRCpp"; rev = "release-${version}"; - sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/croaring/default.nix b/nixpkgs/pkgs/development/libraries/croaring/default.nix index b9c293edfb81..5c1afcbf1365 100644 --- a/nixpkgs/pkgs/development/libraries/croaring/default.nix +++ b/nixpkgs/pkgs/development/libraries/croaring/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://roaringbitmap.org/"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/crypto++/default.nix b/nixpkgs/pkgs/development/libraries/crypto++/default.nix index 0402af92b3b3..fe553cb37b9e 100644 --- a/nixpkgs/pkgs/development/libraries/crypto++/default.nix +++ b/nixpkgs/pkgs/development/libraries/crypto++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nasm, which +{ lib, stdenv, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic }: @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { substituteInPlace GNUmakefile \ --replace "AR = libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" + + # See https://github.com/weidai11/cryptopp/issues/1011 + substituteInPlace GNUmakefile \ + --replace "ZOPT = -O0" "ZOPT =" + ''; + + preConfigure = '' + sh TestScripts/configure.sh ''; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix index 80ec1986f8cf..9f7d020feaf7 100644 --- a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.14.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "sha256-RidUZqDnzRrgW/7LVF+BF01zNcf1cJ/kS7OF/t1Q65c="; + sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index b1a6401284ac..6e97c61a6a5e 100644 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext +{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, fetchpatch }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = - [ openssl db gettext kerberos ] + [ openssl db gettext libkrb5 ] ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isLinux pam; diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 2b9357e3ef0f..51df5a9254a5 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitLab , meson, ninja, nasm, pkg-config +, xxHash , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers @@ -9,19 +10,20 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x"; + sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; # TODO: doxygen (currently only HTML and not build by default). - buildInputs = lib.optional withExamples SDL2 + buildInputs = [ xxHash ] + ++ lib.optional withExamples SDL2 ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ]; mesonFlags= [ diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix index fa7d70d52131..aadd61370b1f 100644 --- a/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -2,19 +2,20 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html +, sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? true }: stdenv.mkDerivation rec { pname = "dlib"; - version = "19.21"; + version = "19.22"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "00jwklnl21l3hlvb0bjc6rl3hgi88vxb41dsn4m0kh436c9v0rl3"; + sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ="; }; postPatch = '' @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" + "-DUSE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix index f9456b8acac4..3de84b684e52 100644 --- a/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/dxflib/default.nix b/nixpkgs/pkgs/development/libraries/dxflib/default.nix index b2cd97398c61..09f2ad3ccad6 100644 --- a/nixpkgs/pkgs/development/libraries/dxflib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dxflib/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro ''; diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index 4709441a1011..a8697207ed1a 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20190909"; # upgrade might break the sage interface + version = "20210223"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = pname; rev = "v${version}"; - sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da"; + sha256 = "sha256-xnSw5cdg4PLa0GT/blCYDz/IG5aj+HG2NHSlyCiH9g0="; }; buildInputs = [ pari diff --git a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix index be22e24044d6..b3654087ffd0 100644 --- a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch deleted file mode 100644 index 9384ecff9b0f..000000000000 --- a/nixpkgs/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/nixpkgs/pkgs/development/libraries/entt/default.nix b/nixpkgs/pkgs/development/libraries/entt/default.nix index 955dd2eeb369..8efc9c05ca34 100644 --- a/nixpkgs/pkgs/development/libraries/entt/default.nix +++ b/nixpkgs/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.5.2"; + version = "3.7.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0"; + sha256 = "sha256-qDjt74nijZhXW7F7GW0CSv6JWOc/kXN7ndbkwSO0+1s="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ethash/default.nix b/nixpkgs/pkgs/development/libraries/ethash/default.nix index 0a10fa3c48c1..2c9eb3ca4444 100644 --- a/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; }; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 916ea2772e19..d861d25e67a7 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -99,7 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support -, lzma ? null # xz-utils +, xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -246,11 +246,6 @@ stdenv.mkDerivation rec { # this should go away in the next release patches = [ - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315"; - sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o="; - name = "fix_libsrt.patch"; - }) # Patch ffmpeg for svt-av1 until version 4.4 (fetchpatch { url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"; @@ -386,7 +381,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") - (enableFeature (lzma != null) "lzma") + (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") @@ -436,7 +431,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext lzma openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 2cc409fc0370..95207b5386f8 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.3.1"; + version = "4.3.2"; branch = "4.3"; - sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l"; + sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 99a084703967..82f1a8bf5646 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers + libvorbis xz soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 36c946e06f7b..97410fda0d31 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl +, fetchpatch , autoreconfHook -, docbook_xml_dtd_412 , docbook_xml_dtd_45 , docbook-xsl-nons , which @@ -14,7 +14,7 @@ , xmlto , appstream-glib , substituteAll -, yacc +, bison , xdg-dbus-proxy , p11-kit , bubblewrap @@ -36,7 +36,7 @@ , fuse , nixosTests , libsoup -, lzma +, xz , zstd , ostree , polkit @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.10.1"; + version = "1.10.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1"; + sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ="; }; patches = [ @@ -94,6 +94,15 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/43581 ./use-flatpak-from-path.patch + # Hardcode flatpak binary path for flatpak-spawn. + # When calling the portal’s Spawn command with FLATPAK_SPAWN_FLAGS_CLEAR_ENV flag, + # it will clear environment, including PATH, making the flatpak run fail. + # https://github.com/flatpak/flatpak/pull/4174 + (fetchpatch { + url = "https://github.com/flatpak/flatpak/commit/495449daf6d3c072519a36c9e4bc6cc1da4d31db.patch"; + sha256 = "gOX/sGupAE7Yg3MVrMhFXzWHpFn+izVyjtkuPzIckuY="; + }) + # Nix environment hacks should not leak into the apps. # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch @@ -105,9 +114,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libxml2 - # Remove 4.1.2 again once the following is merged - # https://github.com/flatpak/flatpak/pull/4102 - docbook_xml_dtd_412 docbook_xml_dtd_45 docbook-xsl-nons which @@ -118,7 +124,7 @@ stdenv.mkDerivation rec { pkg-config xmlto appstream-glib - yacc + bison wrapGAppsNoGuiHook ]; @@ -133,7 +139,7 @@ stdenv.mkDerivation rec { libcap libseccomp libsoup - lzma + xz zstd polkit python3 diff --git a/nixpkgs/pkgs/development/libraries/flite/default.nix b/nixpkgs/pkgs/development/libraries/flite/default.nix index 24927fe853ba..a80c317b06ee 100644 --- a/nixpkgs/pkgs/development/libraries/flite/default.nix +++ b/nixpkgs/pkgs/development/libraries/flite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }: stdenv.mkDerivation rec { pname = "flite"; @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ alsaLib ]; + # https://github.com/festvox/flite/pull/60. + # Replaces `ar` with `$(AR)` in config/common_make_rules. + # Improves cross-compilation compatibility. + patches = [ + (fetchpatch { + url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch"; + sha256 = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8="; + }) + ]; + configureFlags = [ "--enable-shared" ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 0d2983b1f846..474c990d5177 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -37,7 +37,7 @@ let homepage = "http://fmtlib.net/"; downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; - license = licenses.bsd2; + license = licenses.mit; platforms = platforms.all; }; }; diff --git a/nixpkgs/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix index 955b7e0d16f9..c930adbe9b2d 100644 --- a/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -1,6 +1,7 @@ { fetchurl , lib, stdenv , pkg-config +, fetchpatch , meson , ninja , glib @@ -42,6 +43,15 @@ stdenv.mkDerivation rec { sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; + patches = [ + # Fix tests with e-d-s linked with libphonenumber support + # https://gitlab.gnome.org/GNOME/folks/merge_requests/40 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch"; + sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY="; + }) + ]; + mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" @@ -92,6 +102,13 @@ stdenv.mkDerivation rec { doCheck = true; + # Prevents e-d-s add-contacts-stress-test from timing out + checkPhase = '' + runHook preCheck + meson test --timeout-multiplier 4 + runHook postCheck + ''; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 063678cbccc1..212b656adda5 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -8,7 +8,7 @@ , gflags , libiberty , lz4 -, lzma +, xz , zlib , jemalloc , openssl @@ -43,7 +43,7 @@ stdenv.mkDerivation (rec { libiberty openssl lz4 - lzma + xz zlib jemalloc libunwind diff --git a/nixpkgs/pkgs/development/libraries/freetts/default.nix b/nixpkgs/pkgs/development/libraries/freetts/default.nix index f7a605ea872b..dc5f43860305 100644 --- a/nixpkgs/pkgs/development/libraries/freetts/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetts/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip"; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; - buildInputs = [ apacheAnt unzip sharutils jdk ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ apacheAnt sharutils jdk ]; unpackPhase = '' unzip $src -x META-INF/* ''; diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index 7b5fff29a286..adda15696e8a 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, buildPackages +, buildPackages, pkgsHostHost , pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkg-config} ${pkg-config} + --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/nixpkgs/pkgs/development/libraries/ftgl/default.nix b/nixpkgs/pkgs/development/libraries/ftgl/default.nix index c3fd6ffb9407..5588e27356f0 100644 --- a/nixpkgs/pkgs/development/libraries/ftgl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ftgl/default.nix @@ -1,40 +1,47 @@ -{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }: - -let - name = "ftgl-2.1.3-rc5"; -in -stdenv.mkDerivation { - inherit name; +{ lib +, stdenv +, fetchurl +, freetype +, libGL +, libGLU +, OpenGL +}: + +stdenv.mkDerivation rec { + pname = "ftgl"; + version = "2.1.3-rc5"; src = fetchurl { - url = "mirror://sourceforge/ftgl/${name}.tar.gz"; - sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; + url = "mirror://sourceforge/${pname}-${version}.tar.gz"; + hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls="; }; - buildInputs = [ freetype ] - ++ (if stdenv.isDarwin then - [ OpenGL ] - else - [ libGL libGLU ]) - ; + buildInputs = [ + freetype + ] ++ (if stdenv.isDarwin then [ + OpenGL + ] else [ + libGL + libGLU + ]); - configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ]; + configureFlags = [ + "--with-ft-prefix=${lib.getDev freetype}" + ]; enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; description = "Font rendering library for OpenGL applications"; - license = lib.licenses.gpl3Plus; - longDescription = '' - FTGL is a free cross-platform Open Source C++ library that uses - Freetype2 to simplify rendering fonts in OpenGL applications. FTGL - supports bitmaps, pixmaps, texture maps, outlines, polygon mesh, - and extruded polygon rendering modes. + FTGL is a free cross-platform Open Source C++ library that uses Freetype2 + to simplify rendering fonts in OpenGL applications. FTGL supports bitmaps, + pixmaps, texture maps, outlines, polygon mesh, and extruded polygon + rendering modes. ''; - - platforms = lib.platforms.unix; - maintainers = []; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/g2o/default.nix b/nixpkgs/pkgs/development/libraries/g2o/default.nix index 675d994cf0e6..0536ec95c6ff 100644 --- a/nixpkgs/pkgs/development/libraries/g2o/default.nix +++ b/nixpkgs/pkgs/development/libraries/g2o/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU -, qtbase, libqglviewer, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas +, lapack, libGLU, qtbase, libqglviewer, makeWrapper }: mkDerivation rec { pname = "g2o"; - version = "20200410"; + version = "20201223"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; + sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8="; }; # Removes a reference to gcc that is only used in a debug message @@ -18,11 +18,13 @@ mkDerivation rec { separateDebugInfo = true; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; + buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; # Silence noisy warning CXXFLAGS = "-Wno-deprecated-copy"; + dontWrapQtApps = true; + cmakeFlags = [ # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" @@ -41,5 +43,7 @@ mkDerivation rec { license = with licenses; [ bsd3 lgpl3 gpl3 ]; maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; + # fatal error: 'qglviewer.h' file not found + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/gaia/default.nix b/nixpkgs/pkgs/development/libraries/gaia/default.nix index 088354aecb28..47926e2ec0be 100644 --- a/nixpkgs/pkgs/development/libraries/gaia/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/galario/default.nix b/nixpkgs/pkgs/development/libraries/galario/default.nix index 888f26f2da7d..4e28f84bacdb 100644 --- a/nixpkgs/pkgs/development/libraries/galario/default.nix +++ b/nixpkgs/pkgs/development/libraries/galario/default.nix @@ -5,7 +5,7 @@ , fftw , fftwFloat , enablePython ? false -, pythonPackages +, pythonPackages ? null , llvmPackages }: let diff --git a/nixpkgs/pkgs/development/libraries/ganv/default.nix b/nixpkgs/pkgs/development/libraries/ganv/default.nix index bf6c030589b9..d53206ca667b 100644 --- a/nixpkgs/pkgs/development/libraries/ganv/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix index 8add81e27969..92c0ec293cb2 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; + sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/gdal/2.4.nix b/nixpkgs/pkgs/development/libraries/gdal/2.4.nix index 5df29b38a263..70ae3b2b12aa 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/2.4.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/2.4.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl +, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite + nativeBuildInputs = [ unzip ]; + buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] - ++ (with pythonPackages; [ python numpy wrapPython ]) + ++ (with python2Packages; [ python numpy wrapPython ]) ++ lib.optional stdenv.isDarwin libiconv ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 8c02919126ba..15fc84895fb5 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -7,22 +7,20 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - # broken with poppler 20.08, however, can't fetch patches cleanly - version = "3.1.2.post2020-08-26"; + version = "3.2.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9"; - sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9"; + rev = "a33784291d19015217ea2604988e53d448e14a07"; + sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ="; }; sourceRoot = "source/gdal"; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config unzip ]; buildInputs = [ - unzip libjpeg libtiff libpng diff --git a/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix b/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix deleted file mode 100644 index 92d17452c941..000000000000 --- a/nixpkgs/pkgs/development/libraries/gdal/gdal-1_11.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl -, libpng }: - -stdenv.mkDerivation rec { - pname = "gdal"; - version = "1.11.5"; - - src = fetchurl { - url = "https://download.osgeo.org/gdal/${version}/${pname}-${version}.tar.xz"; - sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl"; - }; - - buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ]; - - patches = [ - # This ensures that the python package is installed into gdal's prefix, - # rather than trying to install into python's prefix. - ./python.patch - ]; - - hardeningDisable = [ "format" "fortify" ]; - - # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. - # Unset CC and CXX as they confuse libtool. - preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; - - configureFlags = [ - "--with-jpeg=${libjpeg.dev}" - "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) - "--with-libpng=${libpng.dev}" # optional - "--with-libz=${zlib.dev}" # optional - - "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql57.connector-c}/bin/mysql_config" - "--with-geotiff=${libgeotiff.dev}" - "--with-python" # optional - "--with-static-proj4=${proj}" # optional - "--with-geos=${geos}/bin/geos-config"# optional - ]; - - # Allow use of old proj_api.h - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; - - # Prevent this: - # - # Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ - # /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass - # TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files - # error: bad install directory or PYTHONPATH - preBuild = '' - pythonInstallDir=$out/lib/${python.libPrefix}/site-packages - mkdir -p $pythonInstallDir - export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir - ''; - - enableParallelBuilding = true; - - meta = { - description = "Translator library for raster geospatial data formats"; - homepage = "https://www.gdal.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.marcweber ]; - platforms = with lib.platforms; linux ++ darwin; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/gdal/python.patch b/nixpkgs/pkgs/development/libraries/gdal/python.patch deleted file mode 100644 index 50504c62eddb..000000000000 --- a/nixpkgs/pkgs/development/libraries/gdal/python.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/swig/python/GNUmakefile.old b/swig/python/GNUmakefile -index b4d5e90..2160b83 100644 ---- a/swig/python/GNUmakefile -+++ b/swig/python/GNUmakefile -@@ -67,11 +67,7 @@ egg: - - install: - --ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install --else - $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --endif - - for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done - - diff --git a/nixpkgs/pkgs/development/libraries/gecode/default.nix b/nixpkgs/pkgs/development/libraries/gecode/default.nix index 46b13e6e37f5..fc9835d85db5 100644 --- a/nixpkgs/pkgs/development/libraries/gecode/default.nix +++ b/nixpkgs/pkgs/development/libraries/gecode/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ bison flex ]; buildInputs = [ perl gmp mpfr ] ++ lib.optional enableGist qtbase; diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index af3c9d84ac7c..2093328f5793 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -1,11 +1,10 @@ { lib, stdenv , fetchurl -, fetchpatch , pkg-config , vala , gobject-introspection , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , glib , babl @@ -15,6 +14,7 @@ , librsvg , lensfun , libspiro +, maxflow , netsurf , pango , poly2tri-c @@ -35,25 +35,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.26"; + version = "0.4.28"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; + sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA="; }; - patches = [ - # fix build with darwin: https://github.com/NixOS/nixpkgs/issues/99108 - # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch"; - sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; - }) - ]; - nativeBuildInputs = [ pkg-config gettext @@ -62,7 +53,7 @@ stdenv.mkDerivation rec { vala gobject-introspection gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 ]; @@ -73,6 +64,7 @@ stdenv.mkDerivation rec { librsvg lensfun libspiro + maxflow netsurf.libnsgif pango poly2tri-c diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index 4efc713bb1d7..aef412468a95 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index 63806b31e251..19b03eb620ce 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.1"; + pname = "geos"; + version = "3.9.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; + url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + sha256 = "sha256-fmMFB9ysncB1ZdJJom8GoVyfWwxS3SkSmg49OB1+OCo="; }; enableParallelBuilding = true; @@ -18,6 +19,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 220b68fa18bc..071e749b4002 100644 --- a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.1"; + version = "0.12.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; + sha256 = "IyK1UqyjMO73lySmmcUaMCNF1eB0c4V4s5i38v+XlEw="; }; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix index e2e0ba3bccf4..38ef25770aa9 100644 --- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.3.3"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw"; + sha256 = "sha256-NfEPXjpVnFvh3Y70RZm8nDG0QwJbefF9wYNUq0BZTN4="; }; propagatedBuildInputs = [ libGL ]; diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 0e8ed605a2d6..ce64bef95adb 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.4"; + version = "2.66.8"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ="; + sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs="; }; patches = optionals stdenv.isDarwin [ @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre bash gnum4 # install glib-gettextize and m4 macros for other apps to use + gtk-doc ] ++ optionals stdenv.isLinux [ libselinux util-linuxMinimal # for libmount @@ -99,8 +100,10 @@ stdenv.mkDerivation rec { AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); + strictDeps = true; + nativeBuildInputs = [ - meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 + meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -120,6 +123,8 @@ stdenv.mkDerivation rec { "-DG_DISABLE_CAST_CHECKS" ]; + hardeningDisable = [ "pie" ]; + postPatch = '' chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py @@ -144,7 +149,7 @@ stdenv.mkDerivation rec { cp -r ${buildPackages.glib.devdoc} $devdoc ''; - checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" diff --git a/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch b/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch index 1cb5a730351b..f98af04a7f24 100644 --- a/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch +++ b/nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch @@ -1,12 +1,14 @@ +diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c +index 1282c10a1..feadfe3aa 100644 --- a/gio/gsettingsschema.c +++ b/gio/gsettingsschema.c -@@ -352,6 +352,9 @@ +@@ -360,6 +360,9 @@ initialise_schema_sources (void) try_prepend_data_dir (g_get_user_data_dir ()); -+ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL) ++ if (!is_setuid && (path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL) + try_prepend_dir (path); + - if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) - try_prepend_dir (path); - + /* Disallow loading extra schemas if running as setuid, as that could + * allow reading privileged files. */ + if (!is_setuid && (path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz index f77e490ebf54..bd99c36d7412 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/2.32-35.patch.gz +++ b/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 54882ba67185..b3862cc5c0bc 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-35"; + patchSuffix = "-39"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -63,10 +63,10 @@ stdenv.mkDerivation ({ and using git or something would complicate bootstrapping. Fortunately it's not too big. $ git checkout origin/release/2.32/master; git describe - glibc-2.32-35-g082798622d - $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-35.patch.gz + glibc-2.32-39-g44b3959329 + $ git show --reverse glibc-2.32.. | gzip -n -9 --rsyncable - > 2.32-master.patch.gz */ - ./2.32-35.patch.gz + ./2.32-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch diff --git a/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/nixpkgs/pkgs/development/libraries/glibmm/default.nix index 19567a987212..a9abfbd17764 100644 --- a/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }: stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.64.2"; + version = "2.64.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; + sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ + meson pkg-config + ninja gnum4 glib # for glib-compile-schemas ]; diff --git a/nixpkgs/pkgs/development/libraries/glpng/default.nix b/nixpkgs/pkgs/development/libraries/glpng/default.nix new file mode 100644 index 000000000000..1194d988c073 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glpng/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromRepoOrCz +, cmake +, libGL +, libpng +, pkg-config +, zlib +}: + +stdenv.mkDerivation rec { + pname = "glpng"; + version = "1.46"; + + src = fetchFromRepoOrCz { + repo = "glpng"; + rev = "v${version}"; + hash = "sha256-C7EHaBN0PE/HJB6zcIaYU63+o7/MEz4WU1xr/kIOanM="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + libGL + libpng + zlib + ]; + + meta = with lib; { + homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm"; + description = "PNG loader for OpenGL"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index c5846b523cd2..ab71b2ccf9a9 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -22,7 +22,7 @@ , docbook_xml_dtd_412 , gnome3 , gcr -, kerberos +, libkrb5 , gvfs , dbus , wrapGAppsHook @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.38.0"; + version = "3.38.1"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag="; + sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4="; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gvfs # OwnCloud, Google Drive icu json-glib - kerberos + libkrb5 librest libsecret libsoup diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 74b94e68f564..a08997ea2cdb 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl }: let - rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79"; + rev = "6faca61810d335c7837f320733fe8e15a1431fc2"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "sha256-TSLpYIDGSp1flqCBi2Sgg9IWDV5bcO+Hn2Menv3R6KU="; + sha256 = "06wkkhpbx9slmknr2g7mcd8x3zsdhnmmay25l31h3rkdp1wkq7kx"; }; configSub = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "sha256-DkCGDN/DE3phQ1GO/Ua5ZPPtp0Ya93PnW3yfSK8EV9s="; + sha256 = "1qkph8cqanmgy3s4a18bm1a4vk62i8pf8cy5pc1hkpqwn4g6l0di"; }; in stdenv.mkDerivation { pname = "gnu-config"; - version = "2020-05-04"; + version = "2021-01-25"; buildCommand = '' mkdir -p $out diff --git a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix index 245b0c1e6381..7b3b4561efb1 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -2,7 +2,7 @@ , perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake -, yacc, texinfo +, bison, texinfo # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -55,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp - autogen gperftools gperf gettext automake yacc texinfo ] + autogen gperftools gperf gettext automake bison texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 2cd1e783ea92..e97630871a91 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv +, perl, gmp, autoconf, automake, libidn, p11-kit, libiconv , unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.15"; + version = "3.7.1"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -23,8 +23,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"; + url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz"; + sha256 = "0vxcbig87sdc73h58pmcpbi4al1zgcxid1jn67mhcpna7sbdfxrp"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -45,9 +45,7 @@ stdenv.mkDerivation { # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 # Change p11-kit test to use pkg-config to find p11-kit - postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' - sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' -i tests/cert-tests/name-constraints - '' + lib.optionalString (lib.versionAtLeast version "3.6") '' + postPatch = lib.optionalString (lib.versionAtLeast version "3.6") '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh @@ -71,7 +69,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index d544dd7625dc..64b5be2e2d33 100644 --- a/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.48"; + version = "0.10.49"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; + sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index fdf425432817..d493f31d3750 100644 --- a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }: +{ lib +, stdenv +, clang-tools +, grpc +, curl +, cmake +, pkg-config +, fetchFromGitHub +, doxygen +, protobuf +, crc32c +, fetchurl +, openssl +, libnsl +}: let googleapis = fetchFromGitHub { owner = "googleapis"; @@ -17,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},' \ @@ -39,7 +53,7 @@ in stdenv.mkDerivation rec { sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; }; - buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ]; + buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ]; nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; @@ -58,6 +72,5 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; maintainers = with maintainers; [ ]; - broken = true; # Broken on Hydra since 2020-05-19 }; } diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 51b259a3ca81..326e5da0812c 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; + dontWrapQtApps = true; + configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/nixpkgs/pkgs/development/libraries/grib-api/default.nix b/nixpkgs/pkgs/development/libraries/grib-api/default.nix index 182f05a8ca89..1f7097dc4a3f 100644 --- a/nixpkgs/pkgs/development/libraries/grib-api/default.nix +++ b/nixpkgs/pkgs/development/libraries/grib-api/default.nix @@ -1,6 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, cmake, netcdf, gfortran, libpng, openjpeg, - enablePython ? false, pythonPackages }: + enablePython ? false, pythonPackages ? null }: stdenv.mkDerivation rec { pname = "grib-api"; diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index d6a1b44fe426..5cdd9886690a 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf -, gflags, libnsl +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf +, gflags, abseil-cpp, libnsl }: stdenv.mkDerivation rec { - version = "1.35.0"; # 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 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; + sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz"; fetchSubmodules = true; }; patches = [ @@ -21,17 +21,21 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ] + propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; + buildInputs = [ c-ares.cmake-config openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DCMAKE_CXX_STANDARD=17" ]; # CMake creates a build directory by default, this conflicts with the diff --git a/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/nixpkgs/pkgs/development/libraries/gsasl/default.nix index 48ee0ddd4a51..fc2edc187129 100644 --- a/nixpkgs/pkgs/development/libraries/gsasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsasl/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, lib, stdenv, libidn, kerberos }: +{ fetchurl, lib, stdenv, libidn, libkrb5 }: stdenv.mkDerivation rec { - name = "gsasl-1.8.0"; + name = "gsasl-1.10.0"; src = fetchurl { url = "mirror://gnu/gsasl/${name}.tar.gz"; - sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; + sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; - buildInputs = [ libidn kerberos ]; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/nixpkgs/pkgs/development/libraries/gsm/default.nix b/nixpkgs/pkgs/development/libraries/gsm/default.nix index 13088dda0c91..f70a748a20e7 100644 --- a/nixpkgs/pkgs/development/libraries/gsm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsm/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { }; patchPhase = '' + substituteInPlace Makefile \ + --replace "= gcc " "?= gcc " # Fix include directory sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile '' + optionalString (!staticSupport) ( diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 313a063cae89..40b10d0983ad 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,10 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext -, config , pkg-config , python3 , gst-plugins-base @@ -12,7 +11,7 @@ , gobject-introspection , enableZbar ? false , faacSupport ? false -, faac ? null +, faac , faad2 , libass , libkate @@ -36,7 +35,6 @@ , bluez , chromaprint , curl -, darwin , directfb , fdk_aac , flite @@ -81,24 +79,29 @@ , x265 , libxml2 , srt +, vo-aacenc +, VideoToolbox +, AudioToolbox +, AVFoundation +, CoreMedia +, CoreVideo +, Foundation +, MediaToolbox }: -assert faacSupport -> faac != null; - -let - inherit (lib) optional optionals; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "gst-plugins-bad"; version = "1.18.2"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca"; }; patches = [ + # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch ]; @@ -110,13 +113,15 @@ in stdenv.mkDerivation rec { python3 gettext gobject-introspection - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner ]; buildInputs = [ gst-plugins-base orc + # gobject-introspection has to be in both nativeBuildInputs and + # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection faad2 libass @@ -163,16 +168,17 @@ in stdenv.mkDerivation rec { libxml2 libintl srt - ] ++ optionals enableZbar [ + vo-aacenc + ] ++ lib.optionals enableZbar [ zbar - ] ++ optionals faacSupport [ + ] ++ lib.optionals faacSupport [ faac - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ bluez libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols - ] ++ optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin wildmidi @@ -199,7 +205,7 @@ in stdenv.mkDerivation rec { serd sord sratom - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin [ # For unknown reasons the order is important, e.g. if # VideoToolbox is last, we get: # fatal error: 'VideoToolbox/VideoToolbox.h' file not found @@ -210,7 +216,7 @@ in stdenv.mkDerivation rec { CoreVideo Foundation MediaToolbox - ]); + ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users @@ -241,7 +247,6 @@ in stdenv.mkDerivation rec { "-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing "-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing "-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing - "-Dvoaacenc=disabled" # required `vo-aacenc` library not packaged in nixpkgs as of writing "-Dvoamrwbenc=disabled" # required `vo-amrwbenc` library not packaged in nixpkgs as of writing "-Dvulkan=disabled" # Linux-only, and we haven't figured out yet which of the vulkan nixpkgs it needs "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support @@ -249,10 +254,10 @@ in stdenv.mkDerivation rec { "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing ] - ++ optionals (!stdenv.isLinux) [ + ++ lib.optionals (!stdenv.isLinux) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` ] - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "-Dbluez=disabled" "-Dchromaprint=disabled" "-Ddirectfb=disabled" @@ -269,11 +274,11 @@ in stdenv.mkDerivation rec { "-Dladspa=disabled" # requires lrdf "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs "-Dwildmidi=disabled" # see dependencies above - ] ++ optionals (!gst-plugins-base.glEnabled) [ - "-Dgl=disabled"] - ++ optionals (!gst-plugins-base.waylandEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ + "-Dgl=disabled" + ] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [ "-Dwayland=disabled" - ] ++ optionals (!gst-plugins-base.glEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # but its meson build system does not declare the dependency. "-Dapplemedia=disabled" diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index bac59ac4c48c..4f392622065b 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -31,7 +31,8 @@ # errors. Suspected is that a newer version than clang # is needed than 5.0 but it is not clear. , enableCocoa ? false -, darwin +, Cocoa +, OpenGL , enableGl ? (enableX11 || enableWayland || enableCocoa) , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x"; }; @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { libvisual ] ++ lib.optionals stdenv.isDarwin [ pango - darwin.apple_sdk.frameworks.OpenGL + OpenGL ] ++ lib.optionals enableAlsa [ alsaLib ] ++ lib.optionals enableX11 [ @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableWayland [ wayland wayland-protocols - ] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa + ] ++ lib.optional enableCocoa Cocoa ++ lib.optional enableCdparanoia cdparanoia; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index a5b4c0b827a1..84badf304108 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 1fdd67d836e7..a86308ea3cef 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -1,17 +1,17 @@ -{ callPackage, CoreServices }: +{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }: rec { gstreamer = callPackage ./core { inherit CoreServices; }; gstreamermm = callPackage ./gstreamermm { }; - gst-plugins-base = callPackage ./base { inherit gstreamer; }; + gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; }; - gst-plugins-good = callPackage ./good { inherit gst-plugins-base; }; + gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; }; - gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; }; + gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; - gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; }; + gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; }; gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index dc53a76bbca6..a39eadafb0b7 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index ebd5f83dd15f..774fefbc3584 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index a032f5f5b5a4..b08759b8dba1 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -25,12 +25,13 @@ , libsoup , libpulseaudio , libintl -, darwin +, Cocoa , lame , mpg123 , twolame -, gtkSupport ? false, gtk3 ? null -, raspiCameraSupport ? false, libraspberrypi ? null +, gtkSupport ? false, gtk3 +, qt5Support ? false, qt5 +, raspiCameraSupport ? false, libraspberrypi , enableJack ? true, libjack2 , libXdamage , libXext @@ -43,12 +44,8 @@ , wavpack }: -assert gtkSupport -> gtk3 != null; -assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); +assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); -let - inherit (lib) optionals; -in stdenv.mkDerivation rec { pname = "gst-plugins-good"; version = "1.18.2"; @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp"; }; @@ -67,7 +64,7 @@ stdenv.mkDerivation rec { ninja gettext nasm - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ wayland-protocols ]; @@ -97,33 +94,39 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack - ] ++ optionals raspiCameraSupport [ + ] ++ lib.optionals raspiCameraSupport [ libraspberrypi - ] ++ optionals gtkSupport [ + ] ++ lib.optionals gtkSupport [ # for gtksink gtk3 - ] ++ optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals qt5Support (with qt5; [ + qtbase + qtdeclarative + qtwayland + qtx11extras + ]) ++ lib.optionals stdenv.isDarwin [ + Cocoa + ] ++ lib.optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev wayland - ] ++ optionals enableJack [ + ] ++ lib.optionals enableJack [ libjack2 ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps - ] ++ optionals (!gtkSupport) [ + ] ++ lib.optionals (!qt5Support) [ + "-Dqt5=disabled" + ] ++ lib.optionals (!gtkSupport) [ "-Dgtk3=disabled" - ] ++ optionals (!enableJack) [ + ] ++ lib.optionals (!enableJack) [ "-Djack=disabled" - ] ++ optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only "-Doss=disabled" # Linux only @@ -131,8 +134,7 @@ stdenv.mkDerivation rec { "-Dv4l2-gudev=disabled" # Linux-only "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only - "-Dpulse=disabled" # TODO check if we can keep this enabled - ] ++ optionals (!raspiCameraSupport) [ + ] ++ lib.optionals (!raspiCameraSupport) [ "-Drpicamsrc=disabled" ]; @@ -150,6 +152,9 @@ stdenv.mkDerivation rec { # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; + # must be explicitely set since 5590e365 + dontWrapQtApps = true; + meta = with lib; { description = "GStreamer Good Plugins"; homepage = "https://gstreamer.freedesktop.org"; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index 3175cff4acaa..f0755f201d48 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index bcecd11ce2d2..037face3d128 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp"; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index 8f35829ed384..7c70b7ead1ab 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -16,7 +16,9 @@ , libintl , lib , opencore-amr -, darwin +, IOKit +, CoreFoundation +, DiskArbitration }: stdenv.mkDerivation rec { @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3"; }; @@ -49,11 +51,11 @@ stdenv.mkDerivation rec { x264 libintl opencore-amr - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation DiskArbitration - ]); + ]; mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index a90d21c28e8c..2c92cd2236ff 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "1.18.2"; src = fetchurl { - url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix index 0e467b294330..ac925477adb3 100644 --- a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix @@ -9,9 +9,9 @@ let url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config unzip ]; buildInputs = [ - cdk unzip gtk2 glib ncurses + cdk gtk2 glib ncurses ]; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 56693d24c7a8..d8010cdc63b4 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.5.2"; + version = "0.6.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk="; + sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 4304cb388d1a..8f50c922f514 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg +{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null @@ -12,6 +12,16 @@ assert cupsSupport -> cups != null; with lib; +let + + gtkCleanImmodulesCache = substituteAll { + src = ./hooks/clean-immodules-cache.sh; + gtk_module_path = "gtk-2.0"; + gtk_binary_version = "2.10.0"; + }; + +in + stdenv.mkDerivation rec { pname = "gtk+"; version = "2.24.32"; @@ -27,8 +37,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; setupHooks = [ - ./hooks/gtk2-clean-immodules-cache.sh ./hooks/drop-icon-theme-cache.sh + gtkCleanImmodulesCache ]; nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 5180df634604..d1e478ded262 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv +, substituteAll , fetchurl , fetchpatch , pkg-config @@ -48,21 +50,31 @@ assert cupsSupport -> cups != null; +let + + gtkCleanImmodulesCache = substituteAll { + src = ./hooks/clean-immodules-cache.sh; + gtk_module_path = "gtk-3.0"; + gtk_binary_version = "3.0.0"; + }; + +in + stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.24"; + version = "3.24.27"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; setupHooks = [ - ./hooks/gtk3-clean-immodules-cache.sh ./hooks/drop-icon-theme-cache.sh + gtkCleanImmodulesCache ]; src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc"; + sha256 = "09ksflq5j257bf5zn8q2nnf2flicg9qqgfy7za79z7rkf1shc77p"; }; patches = [ @@ -176,6 +188,8 @@ stdenv.mkDerivation rec { moveToOutput bin/gtk-update-icon-cache "$out" # Launcher moveToOutput bin/gtk-launch "$out" + # Broadway daemon + moveToOutput bin/broadwayd "$out" # TODO: patch glib directly for f in $dev/bin/gtk-encode-symbolic-svg; do @@ -214,7 +228,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 59b0b080a52a..28247d6c9728 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -1,5 +1,6 @@ { lib , stdenv +, substituteAll , fetchurl , pkg-config , gettext @@ -53,21 +54,31 @@ assert cupsSupport -> cups != null; +let + + gtkCleanImmodulesCache = substituteAll { + src = ./hooks/clean-immodules-cache.sh; + gtk_module_path = "gtk-4.0"; + gtk_binary_version = "4.0.0"; + }; + +in + stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.2"; + version = "4.0.3"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; setupHooks = [ - ./hooks/gtk4-clean-immodules-cache.sh ./hooks/drop-icon-theme-cache.sh + gtkCleanImmodulesCache ]; src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "115w3mzwm1xsi1q85qvwfm2yxpsjs2rcajgddzbnwhjicyn0frv2"; + sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; }; nativeBuildInputs = [ @@ -226,7 +237,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin lethalman worldofpeace ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/nixpkgs/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh new file mode 100644 index 000000000000..0868a4a39101 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh @@ -0,0 +1,15 @@ +# shellcheck shell=bash + +fixupOutputHooks+=(_gtkCleanImmodulesCache) + +# Clean comments that link to generator of the file +_gtkCleanImmodulesCache() { + # gtk_module_path is where the modules are installed + # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68 + # gtk_binary_version can be retrived with: + # pkg-config --variable=gtk_binary_version gtk+-3.0 + local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache" + if [ -f "$f" ]; then + sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" + fi +} diff --git a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh deleted file mode 100644 index dde991fd27cd..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh +++ /dev/null @@ -1,12 +0,0 @@ -# shellcheck shell=bash - -fixupOutputHooks+=(_gtk2CleanComments) - -# Clean comments that link to generator of the file -_gtk2CleanComments() { - local f="${prefix:?}/lib/gtk-2.0/2.10.0/immodules.cache" - if [ -f "$f" ]; then - sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" - fi -} - diff --git a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh deleted file mode 100644 index d2d5287831a0..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh +++ /dev/null @@ -1,11 +0,0 @@ -# shellcheck shell=bash - -fixupOutputHooks+=(_gtk3CleanComments) - -# Clean comments that link to generator of the file -_gtk3CleanComments() { - local f="${prefix:?}/lib/gtk-3.0/3.0.0/immodules.cache" - if [ -f "$f" ]; then - sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" - fi -} diff --git a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh b/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh deleted file mode 100644 index 49f7051aabb6..000000000000 --- a/nixpkgs/pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh +++ /dev/null @@ -1,11 +0,0 @@ -# shellcheck shell=bash - -fixupOutputHooks+=(_gtk4CleanComments) - -# Clean comments that link to generator of the file -_gtk4CleanComments() { - local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache" - if [ -f "$f" ]; then - sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f" - fi -} diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix index ccaceabd4e98..a3aa18b058a2 100644 --- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ dmd pkg-config which ]; + nativeBuildInputs = [ ldc pkg-config which ]; propagatedBuildInputs = [ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4 libgda libpeas librsvg pango vte diff --git a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix index d7cca43841e4..ddab0046b660 100644 --- a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 4a31acd2ff66..950e1a976a62 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.2"; + version = "3.24.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd"; + sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja python3 ]; buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index 2d469c191e03..9ead894e0d25 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,14 +1,14 @@ -{ 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 }: stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880"; + sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; }; propagatedBuildInputs = [ @@ -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/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix index 2dad33949f3f..09fae015b503 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,8 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch -, autoreconfHook , pkg-config +, meson +, ninja , gettext , gobject-introspection , gtk-doc @@ -15,26 +15,19 @@ stdenv.mkDerivation rec { pname = "gupnp-igd"; - version = "0.2.5"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; + sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E="; }; - patches = [ - # Add gupnp-1.2 compatibility - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch"; - sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2"; - }) - ]; - nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja gettext gobject-introspection gtk-doc @@ -47,8 +40,8 @@ stdenv.mkDerivation rec { gupnp ]; - configureFlags = [ - "--enable-gtk-doc" + mesonFlags = [ + "-Dgtk_doc=true" ]; doCheck = true; @@ -62,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/nixpkgs/pkgs/development/libraries/gupnp/default.nix index fe3463eeff20..d6465d71c50f 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -20,36 +19,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.2.0"; + version = "1.2.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x"; + sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E="; }; - patches = [ - # Nix’s pkg-config ignores Requires.private - # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d - # We are essentialy reverting the following patch for now - # https://bugzilla.gnome.org/show_bug.cgi?id=685477 - # at least until Requires.internal or something is implemented - # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7 - ./fix-requires.patch - - # fix deadlock in gupnp-igd tests - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch"; - sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f"; - }) - # fix breakage in gupnp-igd tests - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch"; - sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch b/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch deleted file mode 100644 index ffe9b68fd043..000000000000 --- a/nixpkgs/pkgs/development/libraries/gupnp/fix-requires.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libgupnp/meson.build -+++ b/libgupnp/meson.build -@@ -110,6 +110,7 @@ pkg.generate( - libraries : libgupnp, - subdirs: 'gupnp-1.2', - name : 'gupnp-1.2', -+ requires: requires, - description : 'GObject-based UPnP library', - version : meson.project_version(), - filebase : 'gupnp-1.2' ---- a/meson.build -+++ a/meson.build -@@ -18,6 +18,13 @@ add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c') - - guul = subproject('guul', default_options : ['default_library=static']) - -+requires = [ -+ dependency('glib-2.0', version : '>= 2.44'), -+ dependency('gssdp-1.2', version : '>= 1.1'), -+ dependency('libsoup-2.4', version : '>= 2.48.0'), -+ dependency('libxml-2.0') -+] -+ - dependencies = [ - dependency('glib-2.0', version : '>= 2.44'), - dependency('gio-2.0', version : '>= 2.44'), diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index b3615893b532..d2287526278b 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.2"; + version = "2.8.0"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm"; + sha256 = "sha256-JnvOFGK2HWIpzuwgZtyt0IfKfnoXD1LMeVb3RzMmyY4="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/hawknl/default.nix b/nixpkgs/pkgs/development/libraries/hawknl/default.nix index 0525fcd0eba6..aacdf0ee933e 100644 --- a/nixpkgs/pkgs/development/libraries/hawknl/default.nix +++ b/nixpkgs/pkgs/development/libraries/hawknl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; makefile = "makefile.linux"; diff --git a/nixpkgs/pkgs/development/libraries/herqq/default.nix b/nixpkgs/pkgs/development/libraries/herqq/default.nix index 265289f06f38..f35d7528f4e8 100644 --- a/nixpkgs/pkgs/development/libraries/herqq/default.nix +++ b/nixpkgs/pkgs/development/libraries/herqq/default.nix @@ -4,8 +4,8 @@ mkDerivation rec { version = "unstable-20-06-26"; pname = "herqq"; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase unzip qtmultimedia ]; + nativeBuildInputs = [ qmake unzip ]; + buildInputs = [ qtbase qtmultimedia ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/hpx/default.nix b/nixpkgs/pkgs/development/libraries/hpx/default.nix index 329fa99fa1cd..73d1eea988de 100644 --- a/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python3 }: stdenv.mkDerivation rec { pname = "hpx"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9"; + sha256 = "sha256-Fkntfk5AaWtS1x0fXfLSWW/9tvKcCBi1COqgNxurPmk="; }; buildInputs = [ boost hwloc gperftools ]; - nativeBuildInputs = [ cmake pkg-config python ]; + nativeBuildInputs = [ cmake pkg-config python3 ]; + + strictDeps = true; meta = { description = "C++ standard library for concurrency and parallelism"; diff --git a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix index 286834112f27..d9072e46e407 100644 --- a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; + buildInputs = [ libiconv ]; patches = [ ./ptrdiff.patch ]; meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 00d0933bdd70..37b567896359 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,7 +45,8 @@ let platforms = platforms.all; }; phases = "unpackPhase patchPhase buildPhase installPhase"; - buildInputs = [ bash coreutils unzip which zip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ bash coreutils which zip ]; patchPhase = '' substituteInPlace ortograf/herramientas/make_dict.sh \ --replace /bin/bash bash \ @@ -86,7 +87,7 @@ let license = licenses.lgpl3; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' @@ -126,7 +127,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' @@ -155,7 +156,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' @@ -182,7 +183,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = "unpackPhase patchPhase installPhase"; sourceRoot = "."; prePatch = '' diff --git a/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix b/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix index 34c3d26c55ec..4ae177232751 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { name = (appendToName "with-dicts" hunspell).name; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} ''; diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index 6a939835cf56..a6fb316d659f 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null; with lib; let - version = "2.4.0"; + version = "2.4.1"; versmm = versions.major version + "." + versions.minor version; name = "hwloc-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "1s9q70mrr4igbjw4m26din81i68f4wbfpv6wdc4i2aalvd51n7rb"; + sha256 = "sha256-OSQh5p8mEgyKuV0VH+mJ8rS2nas8dzV0HE4KbX3l3mM="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/icu/68.nix b/nixpkgs/pkgs/development/libraries/icu/68.nix new file mode 100644 index 000000000000..5aeba0f2628c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/icu/68.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "68.2"; + sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"; +} diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index b98588eb410f..bcd0fcee92c3 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 666fcab989b7..23550bbc8072 100644 --- a/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0zdk4afdrrr1539f2q15zja19j4wwfmpswzws2ffgflcnhywlxhr"; + sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/inchi/default.nix b/nixpkgs/pkgs/development/libraries/inchi/default.nix index 256e0d702434..f74cfdec9305 100644 --- a/nixpkgs/pkgs/development/libraries/inchi/default.nix +++ b/nixpkgs/pkgs/development/libraries/inchi/default.nix @@ -1,69 +1,74 @@ -{ pkgs -, fetchurl +{ fetchurl , lib , stdenv , unzip , fixDarwinDylibNames }: -stdenv.mkDerivation { - pname = "inchi"; - version = "1.05"; - src = fetchurl { - url = "http://www.inchi-trust.org/download/105/INCHI-1-SRC.zip"; - sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c"; - }; +let + versionMajor = "1"; + versionMinor = "0.6"; + version = versionMajor + "." + versionMinor; + removeDots = lib.replaceStrings [ "." ] [ "" ]; + src-doc = fetchurl { + url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-DOC.zip"; + sha256 = "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f"; + }; +in + stdenv.mkDerivation rec { + pname = "inchi"; + inherit version; - nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - outputs = [ "out" "doc" ]; + src = fetchurl { + url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-SRC.zip"; + sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"; + }; - enableParallelBuilding = true; + nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + outputs = [ "out" "doc" ]; - preConfigure = '' - cd ./INCHI_API/libinchi/gcc - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace makefile \ - --replace ",--version-script=libinchi.map" "" \ - --replace "LINUX_Z_RELRO = ,-z,relro" "" \ - --replace "-soname" "-install_name" \ - --replace "gcc" $CC - ''; - installPhase = '' - runHook preInstall + enableParallelBuilding = true; - cd ../../.. - mkdir -p $out/lib - mkdir -p $out/include/inchi - mkdir -p $doc/share/ + preConfigure = '' + cd ./INCHI_API/libinchi/gcc + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace makefile \ + --replace ",--version-script=libinchi.map" "" \ + --replace "LINUX_Z_RELRO = ,-z,relro" "" \ + --replace "-soname" "-install_name" \ + --replace "gcc" $CC + ''; + installPhase = let + versionOneDot = versionMajor + "." + removeDots versionMinor; + in '' + runHook preInstall + + cd ../../.. + mkdir -p $out/lib + mkdir -p $out/include/inchi + mkdir -p $doc/share/ - install -m 755 INCHI_API/bin/Linux/libinchi.so.1.05.00 $out/lib - ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so.1 - ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so - install -m 644 INCHI_BASE/src/*.h $out/include/inchi + install -m 755 INCHI_API/bin/Linux/libinchi.so.${versionOneDot}.00 $out/lib + ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so.1 + ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so + install -m 644 INCHI_BASE/src/*.h $out/include/inchi - runHook postInstall - ''; + runHook postInstall + ''; - preFixup = lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames $(find "$out" -name "*.so.*") - ''; + preFixup = lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames $(find "$out" -name "*.so.*") + ''; - postInstall = - let - src-doc = fetchurl { - url = "http://www.inchi-trust.org/download/105/INCHI-1-DOC.zip"; - sha1 = "2f54y0san34v01c215kk0cigzsn76js5"; - }; - in - '' + postInstall = '' unzip '${src-doc}' install -m 644 INCHI-1-DOC/*.pdf $doc/share ''; - meta = with lib; { - homepage = "https://www.inchi-trust.org/"; - description = "IUPAC International Chemical Identifier library"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ rmcgibbo ]; - }; -} + meta = with lib; { + homepage = "https://www.inchi-trust.org/"; + description = "IUPAC International Chemical Identifier library"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ rmcgibbo ]; + }; + } diff --git a/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch b/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch deleted file mode 100644 index 701680012914..000000000000 --- a/nixpkgs/pkgs/development/libraries/indilib/udev-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- indi-1.8.6/CMakeLists.txt 2020-08-21 05:56:59.000000000 -0500 -+++ CMakeLists.txt 2020-11-01 12:50:57.621293870 -0600 -@@ -77,7 +77,7 @@ - ## the following are directories where stuff will be installed to - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") - set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") --set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") -+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") - - set(PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - diff --git a/nixpkgs/pkgs/development/libraries/iniparser/default.nix b/nixpkgs/pkgs/development/libraries/iniparser/default.nix index 8c7fdfd04d6b..62deaeb1c281 100644 --- a/nixpkgs/pkgs/development/libraries/iniparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/iniparser/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { cp libiniparser.a $out/lib cp libiniparser.so.1 $out/lib ln -s libiniparser.so.1 $out/lib/libiniparser.so + + mkdir -p $out/lib/pkgconfig + substituteAll ${./iniparser.pc.in} $out/lib/pkgconfig/iniparser.pc ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in b/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in new file mode 100644 index 000000000000..fb94188fff71 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/iniparser/iniparser.pc.in @@ -0,0 +1,12 @@ +prefix=@out@ +exec_prefix=@out@ +libdir=${exec_prefix}/lib +includedir=${prefix}/include +datarootdir=${prefix}/share +datadir=${datarootdir} + +Name: libiniparser +Description: Iniparser library +Version: @version@ +Libs: -L${libdir} -liniparser +Cflags: -I${includedir} diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 28138f103b9d..fa100f34607b 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.4.1"; + version = "21.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6"; + sha256 = "0cdyrfyn05fadva8k02kp4nk14k274xfmhzwc0v7jijm1dw8v8rf"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 01c6ef002e50..c60b00552b57 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.1.1"; + version = "21.1.3"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1cgmpy2wqhv8zljz73wm4rggpk9w1prpmab5qphfp7ljajfv7k8r"; + sha256 = "1y6y6dia2y3b798f668q26pzwb1xai5d5jpmllpcxs9qikhkkx8p"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index e283a2909474..633108459713 100644 --- a/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { homepage = "http://irrlicht.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix b/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix index b41486ce9dd6..1235941b2dc3 100644 --- a/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix +++ b/nixpkgs/pkgs/development/libraries/irrlicht/mac.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { "-DIRRLICHT_BUILD_TOOLS=OFF" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ unzip OpenGL Cocoa IOKit ]; + nativeBuildInputs = [ cmake unzip ]; + buildInputs = [ OpenGL Cocoa IOKit ]; meta = { homepage = "http://irrlicht.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix index 6d770430ce56..75ace8097c9b 100644 --- a/nixpkgs/pkgs/development/libraries/iso-codes/default.nix +++ b/nixpkgs/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2"; - sha256 = "17nnyx07q8vbyqsxbvp4m5s2nrc4fxl3dvgbgmkqww2wl4x1fv9y"; + sha256 = "sha256-Ivd5538QpTFXP2r6ca/g12IZ0ZW1nduu0z4kiSb9Mxs="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/jama/default.nix b/nixpkgs/pkgs/development/libraries/jama/default.nix index 02dd4a5635b5..30044eb2cc05 100644 --- a/nixpkgs/pkgs/development/libraries/jama/default.nix +++ b/nixpkgs/pkgs/development/libraries/jama/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; propagatedBuildInputs = [ tnt ]; unpackPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/jasper/default.nix b/nixpkgs/pkgs/development/libraries/jasper/default.nix new file mode 100644 index 000000000000..fa4421b9413d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/jasper/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "jasper"; + version = "2.0.26"; + + src = fetchFromGitHub { + owner = "jasper-software"; + repo = pname; + rev = "version-${version}"; + hash = "sha256-zmoC8nIsQm2u2cSzu2prdyofo3JFNzJ1bjbIZ3YaAn4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + meta = with lib; { + homepage = "https://jasper-software.github.io/jasper/"; + description = "Image processing/coding toolkit"; + longDescription = '' + JasPer is a software toolkit for the handling of image data. The software + provides a means for representing images, and facilitates the manipulation + of image data, as well as the import/export of such data in numerous + formats (e.g., JPEG-2000 JP2, JPEG, PNM, BMP, Sun Rasterfile, and + PGX). The import functionality supports the auto-detection (i.e., + automatic determination) of the image format, eliminating the need to + explicitly identify the format of coded input data. A simple color + management engine is also provided in order to allow the accurate + representation of color. Partial support is included for the ICC color + profile file format, an industry standard for specifying color. + + The JasPer software consists of a library and several application + programs. The code is written in the C programming language. This language + was chosen primarily due to the availability of C development environments + for most computing platforms when JasPer was first developed, circa 1999. + ''; + license = licenses.free; # MIT-like + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index 5009fe6cac7f..974f7bf9a1cc 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.11"; + version = "3.12.0"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "08w7zg9v48rlaq0n17dnph8jydz9srh1pl3ffs3xdfsg9a7axjm4"; + sha256 = "sha256-MwEkZd/Lf3kKyjM+CevxBeKl+5XCxjiz33kNPvqQjig="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix index 4d9902cbbe9a..0e5b1084b49c 100644 --- a/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; - buildInputs = [ jdk unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jdk ]; buildPhase = '' cd source diff --git a/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix index 7a7d6a933bc0..0484f4c59ba6 100644 --- a/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/junixsocket/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) - ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] + ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ] ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index ddf95ead249a..5519a1fb7665 100644 --- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; outputs = [ "out" "bin" ]; diff --git a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix index d34787d8b1f0..bc50f0206598 100644 --- a/nixpkgs/pkgs/development/libraries/java/rhino/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/rhino/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation { ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" ''; - buildInputs = [ unzip ant javac jvm ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant javac jvm ]; buildPhase = "ant jar"; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix index a820d947b7f8..ed086dac90fb 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, fetchurl, glib, meson, ninja, pkg-config, gettext -, gobject-introspection, fixDarwinDylibNames, gnome3 +{ lib +, stdenv +, fetchurl +, glib +, meson +, ninja +, pkg-config +, gettext +, gobject-introspection +, fixDarwinDylibNames +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gnome3 }: -let +stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.4.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.6.2"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; }; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + glib + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames + ]; - outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ + glib + ]; doCheck = true; @@ -30,8 +54,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; homepage = "https://wiki.gnome.org/Projects/JsonGlib"; - license = licenses.lgpl2; - maintainers = with maintainers; [ lethalman ]; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index b7754a186d1e..90d3f1da6e63 100644 --- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, validatePkgConfig, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - nativeBuildInputs = [ cmake python validatePkgConfig ]; + nativeBuildInputs = [ cmake python3 validatePkgConfig ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/nixpkgs/pkgs/development/libraries/jxrlib/default.nix index 78cc48d82097..b2cc4ab08b45 100644 --- a/nixpkgs/pkgs/development/libraries/jxrlib/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix index 0766a589a2e0..4cb2e8e958aa 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/attica.nix @@ -4,7 +4,7 @@ mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index 5c6ea732b690..3ce0ca063ca1 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.76/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.79/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix index ca5e773a45b9..4395f3cd0dd7 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, extra-cmake-modules, python }: +{ mkDerivation, lib, extra-cmake-modules, python3 }: mkDerivation { name = "kapidox"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules python ]; + nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ]; postFixup = '' moveToOutput bin $bin ''; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix index 8c55f8da6a0c..7a9ea86bbb53 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, extra-cmake-modules, - bzip2, lzma, qtbase, zlib, + bzip2, xz, qtbase, zlib, }: mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ bzip2 lzma zlib ]; + buildInputs = [ bzip2 xz zlib ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 978db644a56f..357c0e1d11cb 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -4,7 +4,7 @@ mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix index 2650843aa55d..94f4cb04807b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -4,7 +4,7 @@ mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index d5a407ee16f2..6f2e3f923871 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index c94167d5d76d..b497ebe1c80e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index f82bf828e8e9..07da70092dc6 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -17,14 +17,14 @@ index 44fbacd..6b5abf5 100644 static QString findDaemon() { -- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); +- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { - qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers -+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); ++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 9e2f827eff59..b4dabba624a0 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch index 732f7b69c828..daeaf222b630 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch @@ -6,7 +6,7 @@ Index: kfilemetadata-5.18.0/src/CMakeLists.txt install(EXPORT KF5FileMetaDataTargets NAMESPACE KF5:: -- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData +- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData + DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData FILE KF5FileMetaDataTargets.cmake) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 66cd8ddf64f6..6c7365fd27e0 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,17 +1,19 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - qtbase, qtx11extras, +{ mkDerivation, lib +, extra-cmake-modules +, qtbase, qtx11extras, wayland }: mkDerivation { name = "kguiaddons"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; - }; + nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + buildInputs = [ qtx11extras wayland ]; propagatedBuildInputs = [ qtbase ]; + outputs = [ "out" "dev" ]; + + meta = with lib; { + maintainers = [ maintainers.ttuegel ]; + broken = versionOlder qtbase.version "5.14.0"; + }; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix index 69ad2fbc737e..0733abc86920 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -8,7 +8,7 @@ mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix index a1e53bb408bd..883ef2862e49 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch index 21477394c915..a3e4014df509 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch @@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644 - // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 - // - so we try hacking it in ourselves - QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/"); - QString orig_libpath = libpath; - libpath = install_lib_dir + libpath; - l.setFileName(libpath); diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch index bf25b98d6c56..3728c3c58b83 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch @@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644 #include <string.h> #include <unistd.h> --#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +#define EXECUTE "/run/wrappers/bin/start_kdeinit" #if KDEINIT_OOM_PROTECT diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch index 9df8505b2929..499c975a9e2d 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch @@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644 -// Completely unrelated to plugins. -static QString findSharedLib(const QString &lib) -{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; +- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib; - if (QFile::exists(path)) { - return path; - } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 434496c7b9a9..f4d771ab75f8 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -24,5 +24,5 @@ mkDerivation { patches = [ ./samba-search-path.patch ./kio-debug-module-loader.patch - ]; + ]; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 751e3d7b73f1..60cef704865c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -3,7 +3,7 @@ mkDerivation { name = "kirigami2"; meta = { - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 91bc3e2b98d4..c3266a21c064 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 004d1ac77a6d..eeed5c703a29 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix index 1774b044b165..f1c99e0c93bb 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -6,7 +6,7 @@ mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix index 36e0ddc3f94c..5b73cc7fceab 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 63a95bc217c8..821c703a5899 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -8,7 +8,7 @@ mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index ab93966c0ac9..c418ca39433e 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -9,7 +9,7 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = lib.versionOlder qtbase.version "5.7.0"; + broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix index d1beb03fa620..f769f76854af 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid.nix @@ -8,7 +8,7 @@ mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix index 5659aaf69607..431e4b810580 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -7,7 +7,7 @@ mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index dbc74b831125..871c15d6c1a3 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,670 +1,670 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks { fetchurl, mirror }: { attica = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/attica-5.76.0.tar.xz"; - sha256 = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22"; - name = "attica-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/attica-5.79.0.tar.xz"; + sha256 = "1p6rcpfq3ifz8c8ws5k085mzg7fya2dpv7ryd6iqwi083ys49wla"; + name = "attica-5.79.0.tar.xz"; }; }; baloo = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/baloo-5.76.0.tar.xz"; - sha256 = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9"; - name = "baloo-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/baloo-5.79.0.tar.xz"; + sha256 = "0l7z7260pjw6gmcnzp0v57dsypl2yxnm8dxfcdiln8gw2fisryc0"; + name = "baloo-5.79.0.tar.xz"; }; }; bluez-qt = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz"; - sha256 = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835"; - name = "bluez-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz"; + sha256 = "0snips4ak77zpz6x9bzr5lmal712lz64xns1bwlz80svzcikznpj"; + name = "bluez-qt-5.79.0.tar.xz"; }; }; breeze-icons = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz"; - sha256 = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b"; - name = "breeze-icons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz"; + sha256 = "06sd7grh7r6wnx8p8mhp7vfhsg3bnyafy94fj6jz6gg9m0308cn6"; + name = "breeze-icons-5.79.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz"; - sha256 = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32"; - name = "extra-cmake-modules-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz"; + sha256 = "1n5yd3ggz5pq4qs7f86aqvzvfmxx2khsn1i1m67xhrn5k7dh55mj"; + name = "extra-cmake-modules-5.79.0.tar.xz"; }; }; frameworkintegration = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz"; - sha256 = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb"; - name = "frameworkintegration-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz"; + sha256 = "0c0i8hqqvi65bh1ghb6ql1a8vqihxck6xhpki4g0ryipilvqmj21"; + name = "frameworkintegration-5.79.0.tar.xz"; }; }; kactivities = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kactivities-5.76.0.tar.xz"; - sha256 = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422"; - name = "kactivities-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kactivities-5.79.0.tar.xz"; + sha256 = "0d3ds43iqqlbii9xwp7f20nz338xqmq70a4v84zb5ks1mnhkz47l"; + name = "kactivities-5.79.0.tar.xz"; }; }; kactivities-stats = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz"; - sha256 = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14"; - name = "kactivities-stats-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz"; + sha256 = "0s5r8891flkmrwga15ihqrmj4i12khxwp97kaa84j4mqva6zdx93"; + name = "kactivities-stats-5.79.0.tar.xz"; }; }; kapidox = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kapidox-5.76.0.tar.xz"; - sha256 = "8c6c9401059d34fa2d7f052e21387d803a1131a60fcd1305ddf5d5dfe22c6d97"; - name = "kapidox-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kapidox-5.79.0.tar.xz"; + sha256 = "0qk4ksxdaiphlpd51mgwdddxq5vq8n55dd80s2a5q93jkcywhli7"; + name = "kapidox-5.79.0.tar.xz"; }; }; karchive = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/karchive-5.76.0.tar.xz"; - sha256 = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a"; - name = "karchive-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/karchive-5.79.0.tar.xz"; + sha256 = "01qf46k7gp11fh53afcpmbfx0w5bi0k8jflb2db8nss7ri3bzlhc"; + name = "karchive-5.79.0.tar.xz"; }; }; kauth = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kauth-5.76.0.tar.xz"; - sha256 = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89"; - name = "kauth-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kauth-5.79.0.tar.xz"; + sha256 = "18bqfn47iyhf1zfkw3mgdxz154f9gqbkn41c3ca94qjm91mb40da"; + name = "kauth-5.79.0.tar.xz"; }; }; kbookmarks = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz"; - sha256 = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af"; - name = "kbookmarks-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz"; + sha256 = "109rjikqxv7mbhv22p41rbfz43510y6k7p0ahggynv0x5y5xzkqd"; + name = "kbookmarks-5.79.0.tar.xz"; }; }; kcalendarcore = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz"; - sha256 = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae"; - name = "kcalendarcore-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz"; + sha256 = "19vc1ji0jlk899rmr6i53l51diadn67mh6z6j787bp29jlcmnciv"; + name = "kcalendarcore-5.79.0.tar.xz"; }; }; kcmutils = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz"; - sha256 = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009"; - name = "kcmutils-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz"; + sha256 = "1wry88rikj7mz460m3c7gr6fwcdpdlx9jrxna2ikybnk9aw8dlkk"; + name = "kcmutils-5.79.0.tar.xz"; }; }; kcodecs = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz"; - sha256 = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1"; - name = "kcodecs-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz"; + sha256 = "1ab4dz6nvmd6fzsl7wbrvjlz0c0fk0bjb0jcklrj205pkhiaf7y8"; + name = "kcodecs-5.79.0.tar.xz"; }; }; kcompletion = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz"; - sha256 = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a"; - name = "kcompletion-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz"; + sha256 = "1znp6h4pggkl1hcbbw47vjkgmpc1rj6mx01p05x0ad143mwqpzwv"; + name = "kcompletion-5.79.0.tar.xz"; }; }; kconfig = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kconfig-5.76.0.tar.xz"; - sha256 = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686"; - name = "kconfig-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kconfig-5.79.0.tar.xz"; + sha256 = "02jirbphrg6dyxd444ghzhy053s85pq4lgpppca3nmvzr2572j7r"; + name = "kconfig-5.79.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz"; - sha256 = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4"; - name = "kconfigwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz"; + sha256 = "1lrh2dis3invj9vclpa1mca8hrks1b82c5hkf0g0lilg69lir83y"; + name = "kconfigwidgets-5.79.0.tar.xz"; }; }; kcontacts = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz"; - sha256 = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5"; - name = "kcontacts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz"; + sha256 = "0jflvfkyd7llv54dxyd1a4h1l4xgrqggxadiqv0c6ijn4dvlsmy9"; + name = "kcontacts-5.79.0.tar.xz"; }; }; kcoreaddons = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz"; - sha256 = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6"; - name = "kcoreaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz"; + sha256 = "0n9nh4vkk19crp30dac3x9mzgzl4kv38jw6dcg4fwfp77gcin8kg"; + name = "kcoreaddons-5.79.0.tar.xz"; }; }; kcrash = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcrash-5.76.0.tar.xz"; - sha256 = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993"; - name = "kcrash-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kcrash-5.79.0.tar.xz"; + sha256 = "0w74d0j1ckbcd8q8lc57g3y7g50v222mgsvli77ql29imzx79apc"; + name = "kcrash-5.79.0.tar.xz"; }; }; kdav = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdav-5.76.0.tar.xz"; - sha256 = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72"; - name = "kdav-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdav-5.79.0.tar.xz"; + sha256 = "1573qan4xz8k33zfghwdmlr7pgbd4sfj0pshwv6bkx78kprd3xfl"; + name = "kdav-5.79.0.tar.xz"; }; }; kdbusaddons = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz"; - sha256 = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a"; - name = "kdbusaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz"; + sha256 = "17sklakn9nsrjajb3nwg8ibhx64c4m86pr6ln567rdr6cahcaw90"; + name = "kdbusaddons-5.79.0.tar.xz"; }; }; kdeclarative = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz"; - sha256 = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3"; - name = "kdeclarative-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz"; + sha256 = "05b1apviqy3dn2isqxf0bxj86r9q40pjlcqq8y15s36d6ykijyzh"; + name = "kdeclarative-5.79.0.tar.xz"; }; }; kded = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kded-5.76.0.tar.xz"; - sha256 = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516"; - name = "kded-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kded-5.79.0.tar.xz"; + sha256 = "1gyb864rqbdi64mjc165fhcvnsw06z2zi8dg728428nzmw0dysbm"; + name = "kded-5.79.0.tar.xz"; }; }; kdelibs4support = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz"; - sha256 = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d"; - name = "kdelibs4support-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz"; + sha256 = "049l0mlf71xan8ls4hkp8s6lrnhn2i22jcnki1d5wci01dgffhm5"; + name = "kdelibs4support-5.79.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz"; - sha256 = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71"; - name = "kdesignerplugin-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kdesignerplugin-5.79.0.tar.xz"; + sha256 = "1jgqr76sx6d3jmqc350k49lqym5jkixnl3dq66430pvlrfv47w2n"; + name = "kdesignerplugin-5.79.0.tar.xz"; }; }; kdesu = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdesu-5.76.0.tar.xz"; - sha256 = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642"; - name = "kdesu-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdesu-5.79.0.tar.xz"; + sha256 = "1hlz5pr72qk64gwp30qx92jhlszri5qjsisvl4cxs01ylnrqy0c1"; + name = "kdesu-5.79.0.tar.xz"; }; }; kdewebkit = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz"; - sha256 = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba"; - name = "kdewebkit-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kdewebkit-5.79.0.tar.xz"; + sha256 = "0d81p49n2ryig9xp5id1dx4rpjjd2spl78m0xlq6rczyk7yf73pz"; + name = "kdewebkit-5.79.0.tar.xz"; }; }; kdnssd = { - version = "5.76.0"; + version = "5.79.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz"; - sha256 = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753"; - name = "kdnssd-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdnssd-5.79.1.tar.xz"; + sha256 = "160qyll887wblrw0lhax749lzwhlp92sckj4g259955p8gnsw5lp"; + name = "kdnssd-5.79.1.tar.xz"; }; }; kdoctools = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz"; - sha256 = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4"; - name = "kdoctools-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz"; + sha256 = "03bvj3grjw6a56shdy8c3mdp11pwmc72ccp3ia00bz310ahpphzb"; + name = "kdoctools-5.79.0.tar.xz"; }; }; kemoticons = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz"; - sha256 = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99"; - name = "kemoticons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz"; + sha256 = "04x1yfdcyvx3x4aqha69rsaa78j4iw6qam3hp5a4di0yf653mphp"; + name = "kemoticons-5.79.0.tar.xz"; }; }; kfilemetadata = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz"; - sha256 = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68"; - name = "kfilemetadata-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz"; + sha256 = "0yxjapq88pfcma82mc9gz03x1bb81xl6xzrinr6jgz09206ra395"; + name = "kfilemetadata-5.79.0.tar.xz"; }; }; kglobalaccel = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz"; - sha256 = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4"; - name = "kglobalaccel-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz"; + sha256 = "0qqxvv3m7b44makgdcsxdhzamm4ahm1pn94rn6cpsrqsyci8axy8"; + name = "kglobalaccel-5.79.0.tar.xz"; }; }; kguiaddons = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz"; - sha256 = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125"; - name = "kguiaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz"; + sha256 = "118wiy3pbmbazfivmh0w2g5l10qcp10b34r3d02pj7rs2a74h05w"; + name = "kguiaddons-5.79.0.tar.xz"; }; }; kholidays = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kholidays-5.76.0.tar.xz"; - sha256 = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b"; - name = "kholidays-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kholidays-5.79.0.tar.xz"; + sha256 = "1lbbq6y1xkffh9qma7hr5hi712kl85kv51gij0mj69ssv1iq2a8n"; + name = "kholidays-5.79.0.tar.xz"; }; }; khtml = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz"; - sha256 = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4"; - name = "khtml-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz"; + sha256 = "1916kpb3kr0d7lbf0b65lrwkxnlgickm7vrmlc3qwlmf3fyqvkhy"; + name = "khtml-5.79.0.tar.xz"; }; }; ki18n = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ki18n-5.76.0.tar.xz"; - sha256 = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a"; - name = "ki18n-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/ki18n-5.79.0.tar.xz"; + sha256 = "12sa7ycxc7m7nrsm6x7f822c8p586hy0syny5ya8vpmhwk1j3gik"; + name = "ki18n-5.79.0.tar.xz"; }; }; kiconthemes = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz"; - sha256 = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3"; - name = "kiconthemes-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz"; + sha256 = "0bbs8q0dpz4qyxsd1qk5jxazn600m5j2axzccxyrr21r9plbs4nx"; + name = "kiconthemes-5.79.0.tar.xz"; }; }; kidletime = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kidletime-5.76.0.tar.xz"; - sha256 = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62"; - name = "kidletime-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kidletime-5.79.0.tar.xz"; + sha256 = "0pp2ii4cvxygz40ai0b3rpqdjgpq4nya2hrms9c3yxb5hizrrrak"; + name = "kidletime-5.79.0.tar.xz"; }; }; kimageformats = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz"; - sha256 = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d"; - name = "kimageformats-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz"; + sha256 = "09ffc44vzcin2ikyhm0awba7ag7pbnam4cilvfr3lwnj022y7j7c"; + name = "kimageformats-5.79.0.tar.xz"; }; }; kinit = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kinit-5.76.0.tar.xz"; - sha256 = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546"; - name = "kinit-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kinit-5.79.0.tar.xz"; + sha256 = "0ppri3gaiwawydjfw8ji6accrpwc8ms0sb1s5pn59wqiyv52f5rv"; + name = "kinit-5.79.0.tar.xz"; }; }; kio = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kio-5.76.0.tar.xz"; - sha256 = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b"; - name = "kio-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kio-5.79.0.tar.xz"; + sha256 = "1ri5dv8lc4ywc7jknlszri812y91mgggjx5z5qfkv971njm6fz3n"; + name = "kio-5.79.0.tar.xz"; }; }; kirigami2 = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz"; - sha256 = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a"; - name = "kirigami2-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz"; + sha256 = "01rb678qz1avzi7393wylwnc13ndzx2pgqnz3bd0zki0pjfrrlzp"; + name = "kirigami2-5.79.0.tar.xz"; }; }; kitemmodels = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz"; - sha256 = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0"; - name = "kitemmodels-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz"; + sha256 = "1g9xa0h3kq0m5v1yvwgr8f6lrq8n2x1qzqqjbbbbyg8ayavv4abs"; + name = "kitemmodels-5.79.0.tar.xz"; }; }; kitemviews = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz"; - sha256 = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001"; - name = "kitemviews-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz"; + sha256 = "0p21hyxhain2mr19lzfml23ilpgqwr2i27p1qg39jnwyb74jw0nl"; + name = "kitemviews-5.79.0.tar.xz"; }; }; kjobwidgets = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz"; - sha256 = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf"; - name = "kjobwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz"; + sha256 = "059a58hp0npip07w7idjrl5sjjgl4i3bdqzv1k22hlvzdsyibggr"; + name = "kjobwidgets-5.79.0.tar.xz"; }; }; kjs = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz"; - sha256 = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a"; - name = "kjs-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz"; + sha256 = "1v51xjmwxi1x85b4hlj8m12zxl5w0d160kjjbrrxqfn64i4302ga"; + name = "kjs-5.79.0.tar.xz"; }; }; kjsembed = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz"; - sha256 = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88"; - name = "kjsembed-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kjsembed-5.79.0.tar.xz"; + sha256 = "18kjq5mim7b1a5mlhkwpwvnszjqxilhi4laqladh97wkmvsr85py"; + name = "kjsembed-5.79.0.tar.xz"; }; }; kmediaplayer = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz"; - sha256 = "3185da877c2529c6e209cb382593bbb4778f80aee1b1a29b384b3f05ff99ed89"; - name = "kmediaplayer-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kmediaplayer-5.79.0.tar.xz"; + sha256 = "1lgrcib9acbzgs1kv44bqfisrayiir2r1iygrrncp117fj9cqx8b"; + name = "kmediaplayer-5.79.0.tar.xz"; }; }; knewstuff = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz"; - sha256 = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b"; - name = "knewstuff-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz"; + sha256 = "0bsg0r0s12ck2cafkvnmjldr32ykivcpqjs1zfzqqbvy5w05a81y"; + name = "knewstuff-5.79.0.tar.xz"; }; }; knotifications = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knotifications-5.76.0.tar.xz"; - sha256 = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2"; - name = "knotifications-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/knotifications-5.79.0.tar.xz"; + sha256 = "11g4xsa0z9680k4blxb1axn874p6s2vd5p9h376ln3blhjmy17hj"; + name = "knotifications-5.79.0.tar.xz"; }; }; knotifyconfig = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz"; - sha256 = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e"; - name = "knotifyconfig-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz"; + sha256 = "0c6d95bf8876czjd39cla7pd3li8sm684h04f77czf6sh1mil49d"; + name = "knotifyconfig-5.79.0.tar.xz"; }; }; kpackage = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpackage-5.76.0.tar.xz"; - sha256 = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772"; - name = "kpackage-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kpackage-5.79.0.tar.xz"; + sha256 = "1xkkw4lk9hx2irni5d2k7873bffgd2w41qvvp25d786dz612fy27"; + name = "kpackage-5.79.0.tar.xz"; }; }; kparts = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kparts-5.76.0.tar.xz"; - sha256 = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d"; - name = "kparts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kparts-5.79.0.tar.xz"; + sha256 = "0d9dsgf6q44gqril6h9w5jfsavk0m5gclbmjdxjkcvrz3xfbjhd9"; + name = "kparts-5.79.0.tar.xz"; }; }; kpeople = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpeople-5.76.0.tar.xz"; - sha256 = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545"; - name = "kpeople-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kpeople-5.79.0.tar.xz"; + sha256 = "0dj8hcjl0r673j7m2k83mxy2787jfi9pz6cvmfqfczbzpw20ycf4"; + name = "kpeople-5.79.0.tar.xz"; }; }; kplotting = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kplotting-5.76.0.tar.xz"; - sha256 = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e"; - name = "kplotting-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kplotting-5.79.0.tar.xz"; + sha256 = "0lawpg7i36wppm95jxhhc7ghc88kb1s34px6w8p7n6cm2gxkhwn6"; + name = "kplotting-5.79.0.tar.xz"; }; }; kpty = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpty-5.76.0.tar.xz"; - sha256 = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7"; - name = "kpty-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kpty-5.79.0.tar.xz"; + sha256 = "1qd09r17nmsnqxggmsdw0j6l0620f11ya6mx7bc9zs2y08mgvjka"; + name = "kpty-5.79.0.tar.xz"; }; }; kquickcharts = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz"; - sha256 = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2"; - name = "kquickcharts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz"; + sha256 = "1p9a3mq7xxyavzmgjmz47vrv0hm1h9g8fsligi3r3n5az7klra6f"; + name = "kquickcharts-5.79.0.tar.xz"; }; }; kross = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz"; - sha256 = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291"; - name = "kross-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz"; + sha256 = "00hpyxcn2fwaz32gggqjcmx4blbcdxj3yvhldnmmkmi3k0r68dfc"; + name = "kross-5.79.0.tar.xz"; }; }; krunner = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/krunner-5.76.0.tar.xz"; - sha256 = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda"; - name = "krunner-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/krunner-5.79.0.tar.xz"; + sha256 = "0v7faai6ar06cw7gikhccsa92aii085dk81g4xpyskmxlpvrraci"; + name = "krunner-5.79.0.tar.xz"; }; }; kservice = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kservice-5.76.0.tar.xz"; - sha256 = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf"; - name = "kservice-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kservice-5.79.0.tar.xz"; + sha256 = "1drzj4s1zbh5pffnh3r1wjsk7g1vr0np2h28mlfm4hy3bywxzrnp"; + name = "kservice-5.79.0.tar.xz"; }; }; ktexteditor = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz"; - sha256 = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2"; - name = "ktexteditor-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz"; + sha256 = "1csms6cl8pp9slzwzdgsxhah1b218maakkxmiqk0ngx2sf4lbfc3"; + name = "ktexteditor-5.79.0.tar.xz"; }; }; ktextwidgets = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz"; - sha256 = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84"; - name = "ktextwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz"; + sha256 = "1bnhq4jpybckdlw5518n2hbfilbpadafvchnxigg9p7671pkp85l"; + name = "ktextwidgets-5.79.0.tar.xz"; }; }; kunitconversion = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz"; - sha256 = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c"; - name = "kunitconversion-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz"; + sha256 = "19snm2mvvbs2aqpq7k9b3g1fbg40kpmbjmqn38g6m065mpw3372l"; + name = "kunitconversion-5.79.0.tar.xz"; }; }; kwallet = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwallet-5.76.0.tar.xz"; - sha256 = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc"; - name = "kwallet-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwallet-5.79.0.tar.xz"; + sha256 = "1qickn20ry8qccirdc7rvdf40dxgb13y4n0wi80qz87xzmps3f3p"; + name = "kwallet-5.79.0.tar.xz"; }; }; kwayland = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwayland-5.76.0.tar.xz"; - sha256 = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7"; - name = "kwayland-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwayland-5.79.0.tar.xz"; + sha256 = "14grhcav772zfdjmwnjms819by2djm8dnv71cj4ps45iq0gba6ck"; + name = "kwayland-5.79.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz"; - sha256 = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6"; - name = "kwidgetsaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz"; + sha256 = "0jpfwxa397cvqr1q92b2nva7wy2ngv08kz5l94xrz0wzkagxfixc"; + name = "kwidgetsaddons-5.79.0.tar.xz"; }; }; kwindowsystem = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz"; - sha256 = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7"; - name = "kwindowsystem-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz"; + sha256 = "15pi2vnvdchj9f3yp1p7hqxmnwd606a6fwq4h7li4pvb4w3gibmq"; + name = "kwindowsystem-5.79.0.tar.xz"; }; }; kxmlgui = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz"; - sha256 = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82"; - name = "kxmlgui-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz"; + sha256 = "1j8fb5i1v7pqs5as1h43nc0s2pm3i9cwks2h5388yld325ysx0v9"; + name = "kxmlgui-5.79.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz"; - sha256 = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de"; - name = "kxmlrpcclient-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/portingAids/kxmlrpcclient-5.79.0.tar.xz"; + sha256 = "1cwvglsfv5m3mb5bjl7rfas1samyw703qjfiz1pf6vxgmpxdcr4a"; + name = "kxmlrpcclient-5.79.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz"; - sha256 = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1"; - name = "modemmanager-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz"; + sha256 = "0xfbchyaaqxjj66zb19k4vxi9azijf0llbql6fzxln687s3z65wd"; + name = "modemmanager-qt-5.79.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz"; - sha256 = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90"; - name = "networkmanager-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz"; + sha256 = "04iaqa2q73zvscx300bah6mnl79dai9yrmq11d1vyil99af36m6s"; + name = "networkmanager-qt-5.79.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz"; - sha256 = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1"; - name = "oxygen-icons5-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz"; + sha256 = "1j6l9r4l82gp5qcpn3xw4dzfbhsawbpk8mypnfckk73x1bjcaqss"; + name = "oxygen-icons5-5.79.0.tar.xz"; }; }; plasma-framework = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz"; - sha256 = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a"; - name = "plasma-framework-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz"; + sha256 = "15hbfqdyas27kj6rd24n6d80r1dcsiiv0zgjkp12x8dnjyd3vz4x"; + name = "plasma-framework-5.79.0.tar.xz"; }; }; prison = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/prison-5.76.0.tar.xz"; - sha256 = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78"; - name = "prison-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/prison-5.79.0.tar.xz"; + sha256 = "1rn66n67g914w1klgsirqff62qv4p2l64ahzsxnbixfwy1dwlpa2"; + name = "prison-5.79.0.tar.xz"; }; }; purpose = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/purpose-5.76.0.tar.xz"; - sha256 = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d"; - name = "purpose-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/purpose-5.79.0.tar.xz"; + sha256 = "1mlph5mzwfqwlkvm3df3in3r3airnx4hxhy0p56ri3k3m9k2rqpz"; + name = "purpose-5.79.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz"; - sha256 = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3"; - name = "qqc2-desktop-style-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz"; + sha256 = "1cykbdbzxkblwp0dmgc4r3csml9l81zhfsqcjamfai6srl10vbij"; + name = "qqc2-desktop-style-5.79.0.tar.xz"; }; }; solid = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/solid-5.76.0.tar.xz"; - sha256 = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d"; - name = "solid-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/solid-5.79.0.tar.xz"; + sha256 = "033ss326q450phf918a5py3z6ajnjj6f1nws8ngp05zi028nkhrl"; + name = "solid-5.79.0.tar.xz"; }; }; sonnet = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/sonnet-5.76.0.tar.xz"; - sha256 = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b"; - name = "sonnet-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/sonnet-5.79.0.tar.xz"; + sha256 = "09b1rb88ck50g67nmki06ixxsfnz3x3jd0f334qaz147h2jklvyq"; + name = "sonnet-5.79.0.tar.xz"; }; }; syndication = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/syndication-5.76.0.tar.xz"; - sha256 = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292"; - name = "syndication-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/syndication-5.79.0.tar.xz"; + sha256 = "1jyz0c67zscgspvisn43wrdgk4pxs4i3r9pyknm8nvxwiff2p1ji"; + name = "syndication-5.79.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.76.0"; + version = "5.79.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz"; - sha256 = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3"; - name = "syntax-highlighting-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/syntax-highlighting-5.79.1.tar.xz"; + sha256 = "143ra8j0x1biijclnjhp6b69v04m65avp2nic9jzj9y5wjz5x0mj"; + name = "syntax-highlighting-5.79.1.tar.xz"; }; }; threadweaver = { - version = "5.76.0"; + version = "5.79.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz"; - sha256 = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039"; - name = "threadweaver-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz"; + sha256 = "062r9nhggw3dlvgpb2l6fqyyzqv35a9lgvikh2pjdicx9r2s8z19"; + name = "threadweaver-5.79.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index ceb8200d4c63..4b3f8440c568 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -6,7 +6,7 @@ mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix index b95f70dd6743..70e948afda94 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -8,7 +8,7 @@ mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kdiagram/default.nix b/nixpkgs/pkgs/development/libraries/kdiagram/default.nix index b9f16d3cfaef..3cebc05f3d8b 100644 --- a/nixpkgs/pkgs/development/libraries/kdiagram/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index 50ba2c300b3f..93aa169737bb 100644 --- a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index 804749bbdb53..b9d970520316 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, bison, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam , CoreFoundation, Security, SystemConfiguration @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./heimdal-make-missing-headers.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ] + nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ] ++ (with perlPackages; [ JSON ]); buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] diff --git a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index 5ef9e496b94d..ebec5936b541 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds +{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils # Extra Arguments @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config perl ] - ++ optional (!libOnly) yacc + ++ optional (!libOnly) bison # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; diff --git a/nixpkgs/pkgs/development/libraries/kissfft/default.nix b/nixpkgs/pkgs/development/libraries/kissfft/default.nix index 5395ac4ab9c1..fe52adfa20d7 100644 --- a/nixpkgs/pkgs/development/libraries/kissfft/default.nix +++ b/nixpkgs/pkgs/development/libraries/kissfft/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ar" "${stdenv.cc.targetPrefix}ar" + ''; makeFlags = [ "PREFIX=${placeholder "out"}" "DATATYPE=double" @@ -40,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix index 65dce915f144..c88dde7e4450 100644 --- a/nixpkgs/pkgs/development/libraries/kmsxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/kmsxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libdrm -, withPython ? false, python }: +, withPython ? false, python ? null }: stdenv.mkDerivation { pname = "kmsxx"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cmakeFlags = lib.optional (!withPython) "-DKMSXX_ENABLE_PYTHON=OFF"; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libdrm python ]; + buildInputs = [ libdrm ] ++ lib.optionals withPython [ python ]; meta = with lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = licenses.mpl20; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; + broken = true; # marked broken 2021-03-26 }; } diff --git a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix index 837333407b29..c3621d375870 100644 --- a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix @@ -1,32 +1,50 @@ -{ stdenv, lib, fetchurl, extra-cmake-modules -, qtbase, kio -, libatasmart, parted -, util-linux }: +{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules +, qca-qt5, kauth, kio, polkit-qt, qtbase +, util-linux +}: stdenv.mkDerivation rec { pname = "kpmcore"; - version = "3.3.0"; + # NOTE: When changing this version, also change the version of `partition-manager`. + version = "4.2.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; + hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54="; }; - buildInputs = [ - qtbase - libatasmart - parted # we only need the library + patches = [ + # Fix build with `kcoreaddons` >= 5.77.0 + (fetchpatch { + url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch"; + sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s="; + }) + # Fix crash when `fstab` omits mount options. + (fetchpatch { + url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch"; + sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0="; + }) + ]; + buildInputs = [ + qca-qt5 + kauth kio + polkit-qt - util-linux # needs blkid (note that this is not provided by util-linux-compat) + util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) ]; nativeBuildInputs = [ extra-cmake-modules ]; + dontWrapQtApps = true; + meta = with lib; { - maintainers = with lib.maintainers; [ peterhoeg ]; + description = "KDE Partition Manager core library"; + homepage = "https://invent.kde.org/system/kpmcore"; + license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ]; + maintainers = with maintainers; [ peterhoeg oxalica ]; # The build requires at least Qt 5.14: - broken = lib.versionOlder qtbase.version "5.14"; + broken = versionOlder qtbase.version "5.14"; }; } diff --git a/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/nixpkgs/pkgs/development/libraries/lcms2/default.nix index 129b57851989..66bdcc03b966 100644 --- a/nixpkgs/pkgs/development/libraries/lcms2/default.nix +++ b/nixpkgs/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.11"; + name = "lcms2-2.12"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "0bkpf315925lhmd9i4mzjnkq5dh255r1lms0c0vzzkfpwk4bjjfw"; + sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index ba035eed05bc..961760753abd 100644 --- a/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0pxxb3sn9lignkf80kndd84shxqk9m2qwimz62gzb6khd4bvajqk"; + sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 8a9c80a61754..61d87211e0a5 100644 --- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { - sha256 = "1mhj29n40z7bvn1ns61wf8812ikm2mpc0d5ip0ha920z0anzqhwr"; + sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/nixpkgs/pkgs/development/libraries/leveldb/default.nix index 0a1dabef328c..2a7fb196ea68 100644 --- a/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/levmar/default.nix b/nixpkgs/pkgs/development/libraries/levmar/default.nix index c5d6877a8446..ed945d9e5a08 100644 --- a/nixpkgs/pkgs/development/libraries/levmar/default.nix +++ b/nixpkgs/pkgs/development/libraries/levmar/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h + substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK" sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" ''; installPhase = '' @@ -23,6 +24,6 @@ stdenv.mkDerivation rec { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/lib3ds/default.nix b/nixpkgs/pkgs/development/libraries/lib3ds/default.nix index db0bd26f4d29..6e926dfb421c 100644 --- a/nixpkgs/pkgs/development/libraries/lib3ds/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib3ds/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; diff --git a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index fec910bd5952..b75b1b833d73 100644 --- a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -1,26 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, automaticcomponenttoolkit +, pkg-config, libzip, gtest, openssl, libuuid, libossp_uuid }: stdenv.mkDerivation rec { pname = "lib3mf"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19"; + sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]; + outputs = [ "out" "dev" ]; - postPatch = '' - rmdir Tests/googletest - ln -s ${gtest.src} Tests/googletest + cmakeFlags = [ + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf" + "-DUSE_INCLUDED_ZLIB=OFF" + "-DUSE_INCLUDED_LIBZIP=OFF" + "-DUSE_INCLUDED_GTEST=OFF" + "-DUSE_INCLUDED_SSL=OFF" + ]; + + buildInputs = [ + libzip gtest openssl + ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); + postPatch = '' # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in + sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in + + # replace bundled binaries + for i in AutomaticComponentToolkit/bin/act.*; do + ln -sf ${automaticcomponenttoolkit}/bin/act $i + done ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/nixpkgs/pkgs/development/libraries/libaacs/default.nix index c3934db5b3fb..c291c07abad3 100644 --- a/nixpkgs/pkgs/development/libraries/libaacs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaacs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }: +{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, bison, flex }: # library that allows libbluray to play AACS protected bluray disks # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libgpgerror ]; - nativeBuildInputs = [ yacc flex ]; + nativeBuildInputs = [ bison flex ]; meta = with lib; { homepage = "https://www.videolan.org/developers/libaacs.html"; diff --git a/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/nixpkgs/pkgs/development/libraries/libabigail/default.nix index 7543c6ddff73..49d84c1b5c79 100644 --- a/nixpkgs/pkgs/development/libraries/libabigail/default.nix +++ b/nixpkgs/pkgs/development/libraries/libabigail/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libabigail"; - version = "1.8"; + version = "1.8.2"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw"; + sha256 = "sha256-hjR8nwqGZvJj/WP4w/5MT5yxvbPsQmDsuvEX0Tfol4c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix b/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix index d51eac7bdb6e..6cbf1d204376 100644 --- a/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index e35f83859159..5483909689d2 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "2.0.0"; + version = "2.0.2"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy"; + sha256 = "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0"; }; patches = [ ./outputs.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libav/default.nix b/nixpkgs/pkgs/development/libraries/libav/default.nix index ad95edb68cb2..a3de9225d1ce 100644 --- a/nixpkgs/pkgs/development/libraries/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libav/default.nix @@ -61,7 +61,7 @@ let "--enable-avplay" "--enable-shared" "--enable-runtime-cpudetect" - "--cc=cc" + "--cc=${stdenv.cc.targetPrefix}cc" (enableFeature enableGPL "gpl") (enableFeature enableGPL "swscale") (enableFeature mp3Support "libmp3lame") diff --git a/nixpkgs/pkgs/development/libraries/libavif/default.nix b/nixpkgs/pkgs/development/libraries/libavif/default.nix index 8c33e6f1b6dd..173422fa71e0 100644 --- a/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"; + sha256 = "sha256-7p0w94Od33vjTI5wGLxmDC5P2hebAl7OwJPl1lANhKs="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix index ef9823130f43..53b0dca09127 100644 --- a/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/nixpkgs/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -4,13 +4,15 @@ , gtkVersion ? "3" , gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2 , gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3 -, dbus-glib, python2, python2Packages +, dbus-glib, }: stdenv.mkDerivation rec { pname = "libayatana-appindicator-gtk${gtkVersion}"; version = "0.5.5"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; @@ -18,12 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk"; }; - prePatch = '' - substituteInPlace configure.ac \ - --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0" - ''; - - nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ]; + nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ]; buildInputs = lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 diff --git a/nixpkgs/pkgs/development/libraries/libb64/default.nix b/nixpkgs/pkgs/development/libraries/libb64/default.nix index f524e9321f9d..41d07d58cba2 100644 --- a/nixpkgs/pkgs/development/libraries/libb64/default.nix +++ b/nixpkgs/pkgs/development/libraries/libb64/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out $out/lib $out/bin $out/include diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix index 7c458bae19ce..c15de88f6a76 100644 --- a/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -3,15 +3,20 @@ stdenv.mkDerivation { pname = "libbap"; - version = "master-2019-11-15"; + version = "master-2020-11-25"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "1a30dd3e1df18c432a83a7038b555662d6982ae3"; - sha256 = "140gmak2kymh3r0fagb6ms66lmvwhhqj8pcd3qxc1p4ar330fwrh"; + rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d"; + sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; }; + postPatch = '' + substituteInPlace Makefile.in \ + --replace "-linkpkg" "-thread -linkpkg" + ''; + nativeBuildInputs = [ autoreconfHook which ]; buildInputs = [ ocaml bap findlib ctypes ]; diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 11a65006422f..584ea93293ef 100644 --- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "1gzwlwdv0jyb3lh2n016limy2ngfdsa05x7jvg9llf2ls672nq89"; + sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libbtbb/default.nix b/nixpkgs/pkgs/development/libraries/libbtbb/default.nix new file mode 100644 index 000000000000..15047f6e8f2f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libbtbb/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libbtbb"; + version = "2020-12-R1"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = pname; + rev = version; + sha256 = "1byv8174xam7siakr1p0523x97wkh0fmwmq341sd3g70qr2g767d"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Bluetooth baseband decoding library"; + homepage = "https://github.com/greatscottgadgets/libbtbb"; + license = licenses.gpl2; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix index 02e73b0c04cf..f9b6538027d6 100644 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.2.pl01"; + version = "1.5.4"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; + sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index a84f010b9e67..7ce8d6e7f83a 100644 --- a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.4"; + version = "2.5"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1kq0hnw2yxjdmcrwvgp0x4j1arkka23k8vp2l6nqcw9lc15x18fp"; + sha256 = "sha256-F8Ur8gtNYp4PYfBQ9sDJGBgW7KohJYNEU9SI2SbNuvM="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libcdr/default.nix b/nixpkgs/pkgs/development/libraries/libcdr/default.nix index 087c928b79ce..b987c3dbb25a 100644 --- a/nixpkgs/pkgs/development/libraries/libcdr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { name = "libcdr-0.1.6"; @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81"; }; + patches = [ + # Fix build with icu 68 + # Remove in next release + (fetchpatch { + name = "libcdr-fix-icu-68"; + url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894"; + sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k"; + }) + ]; + buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libcec/default.nix b/nixpkgs/pkgs/development/libraries/libcec/default.nix index 341754376aae..cb494f69fd11 100644 --- a/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.7"; in +let version = "6.0.2"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; + sha256 = "0xrkrcgfgr5r8r0854bw3i9jbq4jmf8nzc5vrrx2sxzvlkbrc1h9"; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/nixpkgs/pkgs/development/libraries/libcec/platform.nix index 15972272a187..61eccf1f40ea 100644 --- a/nixpkgs/pkgs/development/libraries/libcec/platform.nix +++ b/nixpkgs/pkgs/development/libraries/libcec/platform.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = lib.licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.titanous ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcint/default.nix b/nixpkgs/pkgs/development/libraries/libcint/default.nix index bd8e8bd4aaf0..d0fc8c3c4a27 100644 --- a/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -4,18 +4,18 @@ , cmake , blas # Check Inputs -, python +, python3 }: stdenv.mkDerivation rec { pname = "libcint"; - version = "4.0.7"; + version = "4.1.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s="; + sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g="; }; nativeBuildInputs = [ cmake ]; @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_PREFIX=" # ends up double-adding /nix/store/... prefix, this avoids issue ]; + strictDeps = true; + doCheck = true; - checkInputs = [ python.pkgs.numpy ]; + checkInputs = [ python3.pkgs.numpy ]; meta = with lib; { description = "General GTO integrals for quantum chemistry"; diff --git a/nixpkgs/pkgs/development/libraries/libck/default.nix b/nixpkgs/pkgs/development/libraries/libck/default.nix index accb6556011d..a46a7b33900a 100644 --- a/nixpkgs/pkgs/development/libraries/libck/default.nix +++ b/nixpkgs/pkgs/development/libraries/libck/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 bsd2 ]; homepage = "http://concurrencykit.org/"; platforms = platforms.unix; - maintainers = with maintainers; [ chessai ]; + maintainers = with maintainers; [ chessai thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libclc/default.nix b/nixpkgs/pkgs/development/libraries/libclc/default.nix index a6334bf9998c..7be5f8b4000f 100644 --- a/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libclc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }: let llvm = llvmPackages.llvm; @@ -16,8 +16,9 @@ stdenv.mkDerivation { sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7"; }; - nativeBuildInputs = [ python ]; - buildInputs = [ llvm clang clang-unwrapped ]; + nativeBuildInputs = [ python3 llvm ]; + + strictDeps = true; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py @@ -25,7 +26,7 @@ stdenv.mkDerivation { ''; configurePhase = '' - ${python.interpreter} ./configure.py --prefix=$out + ${python3.interpreter} ./configure.py --prefix=$out ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libcli/default.nix b/nixpkgs/pkgs/development/libraries/libcli/default.nix index ceb0338e5cc1..8aa06bfb19bc 100644 --- a/nixpkgs/pkgs/development/libraries/libcli/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcli/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ]; meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix index 0b0cc325a356..532c91a0edab 100644 --- a/nixpkgs/pkgs/development/libraries/libcommuni/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcommuni/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ]; + dontWrapQtApps = true; + preConfigure = '' sed -i -e 's|/bin/pwd|pwd|g' configure ''; diff --git a/nixpkgs/pkgs/development/libraries/libcredis/default.nix b/nixpkgs/pkgs/development/libraries/libcredis/default.nix index 902f5a6ee26f..247d341bce97 100644 --- a/nixpkgs/pkgs/development/libraries/libcredis/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcredis/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "C client library for Redis (key-value database)"; homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix index e30165054aa0..a8f33deda36c 100644 --- a/nixpkgs/pkgs/development/libraries/libcsptr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcsptr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Smart pointer constructs for the (GNU) C programming language"; homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.all; maintainers = [ maintainers.fragamus ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcutl/default.nix b/nixpkgs/pkgs/development/libraries/libcutl/default.nix index 7a5c39849291..ed6aae0f3083 100644 --- a/nixpkgs/pkgs/development/libraries/libcutl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcutl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { license = licenses.mit; }; - majmin = builtins.head ( builtins.match "([[:digit:]]\.[[:digit:]]+)\.*" "${version}" ); + majmin = builtins.head ( builtins.match "([[:digit:]]\\.[[:digit:]]+).*" "${version}" ); src = fetchurl { url = "https://codesynthesis.com/download/${pname}/${majmin}/${pname}-${version}.tar.bz2"; sha256 = "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j"; diff --git a/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/nixpkgs/pkgs/development/libraries/libdatrie/default.nix index f4e2df36d917..257673b1a96d 100644 --- a/nixpkgs/pkgs/development/libraries/libdatrie/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatrie/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation rec { pname = "libdatrie"; version = "2019-12-20"; + outputs = [ "bin" "out" "lib" "dev" ]; + src = fetchFromGitHub { owner = "tlwg"; repo = "libdatrie"; diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix index e44f3e37d200..75d4f76b31ff 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_DOC=OFF" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 5ce811e9fea2..7219bcbdeb5a 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; diff --git a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index f0bf60cdfb88..d7a4aa91fb54 100644 --- a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libdeflate"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local $out ''; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + configurePhase = '' make programs/config.h ''; diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index f7170fa7f103..5b2914c141f3 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.4"; + version = "3.14.5"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; + sha256 = "sha256-PSrYoz5ID88pYs/4rP2kz0NpI0pK6wcnx62HokE0g20="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix b/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix new file mode 100644 index 000000000000..c9759d76246e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, lib +, fetchFromGitLab +, autoconf +, automake +, libtool +, which +, pkg-config +, python3 +, vala +, avahi +, gdk-pixbuf +, gst_all_1 +, glib +, gtk3 +, libgee +, check +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gobject-introspection +, libsoup +}: + +stdenv.mkDerivation rec { + pname = "libdmapsharing"; + version = "3.9.10"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g"; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + which + pkg-config + python3 + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + avahi + gdk-pixbuf + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + propagatedBuildInputs = [ + glib + libsoup + ]; + + checkInputs = [ + libgee + check + gtk3 + ]; + + configureFlags = [ + "--enable-gtk-doc" + ]; + + # Cannot disable tests here or `check` from checkInputs would not be included. + # Cannot disable building the tests or docs will not build: + # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49 + doCheck = true; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + # Tests require mDNS server. + checkPhase = ":"; + + meta = with lib; { + homepage = "https://www.flyn.org/projects/libdmapsharing/"; + description = "Library that implements the DMAP family of protocols"; + maintainers = teams.gnome.members; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libdmtx/default.nix b/nixpkgs/pkgs/development/libraries/libdmtx/default.nix index 994f010252fd..c26ccc347f9a 100644 --- a/nixpkgs/pkgs/development/libraries/libdmtx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdmtx/default.nix @@ -1,18 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +}: stdenv.mkDerivation rec { - name = "libdmtx-0.7.4"; + pname = "libdmtx"; + version = "0.7.5"; - src = fetchurl { - url = "mirror://sourceforge/libdmtx/${name}.tar.bz2"; - sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; + src = fetchFromGitHub { + owner = "dmtx"; + repo = "libdmtx"; + rev = "v${version}"; + sha256 = "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; - homepage = "http://libdmtx.org"; + homepage = "https://github.com/dmtx/libdmtx"; + changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog"; platforms = lib.platforms.all; maintainers = [ ]; license = lib.licenses.bsd2; diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index e575624f8152..b4ba311165a2 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "-Dtegra=true" "-Detnaviv=true" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"; + ]; meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; diff --git a/nixpkgs/pkgs/development/libraries/libebml/default.nix b/nixpkgs/pkgs/development/libraries/libebml/default.nix index e7a877962ccd..6a042012132e 100644 --- a/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im"; + sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25"; }; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" + "-DCMAKE_INSTALL_PREFIX=" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix index 92f3eeb79957..dc5a384569cb 100644 --- a/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ b/nixpkgs/pkgs/development/libraries/libedit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libedit"; - version = "20191231-3.1"; + version = "20210216-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v"; + sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix index c3a4986c8321..d4a8b8f6f219 100644 --- a/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, gnum4, tet }: +{ lib, fetchsvn, stdenv, gnum4, tet }: stdenv.mkDerivation (rec { version = "3258"; @@ -8,6 +8,7 @@ stdenv.mkDerivation (rec { url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; rev = (lib.strings.toInt version); name = "elftoolchain-${version}"; + sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz"; }; buildInputs = [ gnum4 tet ]; diff --git a/nixpkgs/pkgs/development/libraries/libetpan/default.nix b/nixpkgs/pkgs/development/libraries/libetpan/default.nix index b4b48dcb777d..572c90b27b47 100644 --- a/nixpkgs/pkgs/development/libraries/libetpan/default.nix +++ b/nixpkgs/pkgs/development/libraries/libetpan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, fetchpatch , autoconf, automake, libtool, openssl, pkg-config }: @@ -13,6 +13,28 @@ stdenv.mkDerivation rec { sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; }; + patches = [ + # The following two patches are fixing CVE-2020-15953, as reported in the + # issue tracker: https://github.com/dinhvh/libetpan/issues/386 + # They might be removed for the next version bump. + + # CVE-2020-15953: Detect extra data after STARTTLS response and exit + # https://github.com/dinhvh/libetpan/pull/387 + (fetchpatch { + name = "cve-2020-15953-imap.patch"; + url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch"; + sha256 = "1h9ds2z4jii40a0i3z6hsnzx1ldmd2jqidsxp2y2ksyp1ijcgabn"; + }) + + # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit + # https://github.com/dinhvh/libetpan/pull/388 + (fetchpatch { + name = "cve-2020-15953-pop3-smtp.patch"; + url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch"; + sha256 = "0lq829djar7nb3fai3vdzirmks3w2lfagzqc809lx2lln6y213a0"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/nixpkgs/pkgs/development/libraries/libevdev/default.nix index daae6984ab25..33b3f0b32e1d 100644 --- a/nixpkgs/pkgs/development/libraries/libevdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0jidjv78lay8kl3yigwhx9fii908sk7gn9nfd2ny12ql5ipc48im"; + sha256 = "sha256-Y/TqFImFihCQgOC0C9Q+TgkDoeEuqIjVgduMSVdHwtA="; }; nativeBuildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch new file mode 100644 index 000000000000..134c64441d36 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch @@ -0,0 +1,44 @@ +--- Makefile.orig ++++ Makefile +@@ -23,24 +23,25 @@ + # SUCH DAMAGE. + # + # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ ++# ++# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04 + +-LIB= execinfo ++CC=cc ++AR=ar ++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -c ++EXECINFO_LDFLAGS=$(LDFLAGS) + +-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h ++all: static dynamic + +-INCS= execinfo.h ++static: ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c ++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o + +-SHLIB_MAJOR= 1 +-SHLIB_MINOR= 0 ++dynamic: ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So ++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So + +-NOPROFILE= yes +- +-DPADD= ${LIBM} +-LDADD= -lm +- +-#WARNS?= 4 +- +-#stacktraverse.c: gen.py +-# ./gen.py > stacktraverse.c +- +-.include <bsd.lib.mk> ++clean: ++ rm -rf *.o *.So *.a *.so diff --git a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix index f3f89209707a..36f956e77724 100644 --- a/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix @@ -23,14 +23,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; }) - (fetchpatch { - name = "30-linux-makefile.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; - sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; - }) + ./30-linux-makefile.patch ]; makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; + hardeningEnable = [ "stackprotector" ]; buildFlags = lib.optional enableStatic "static" diff --git a/nixpkgs/pkgs/development/libraries/libf2c/default.nix b/nixpkgs/pkgs/development/libraries/libf2c/default.nix index 85ff493ca04e..ce1c35c7ec60 100644 --- a/nixpkgs/pkgs/development/libraries/libf2c/default.nix +++ b/nixpkgs/pkgs/development/libraries/libf2c/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp f2c.h $out/include ''; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch index 84ee18084c29..7dfad4978005 100644 --- a/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch +++ b/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch @@ -1,25 +1,13 @@ -From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001 -From: Christian Kampka <christian@kampka.net> -Date: Wed, 25 Nov 2020 20:09:50 +0100 -Subject: [PATCH] Remove unsupported clang flags - ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/Makefile b/src/Makefile -index f13a6bb..b305150 100644 +index 2af4804..bcff809 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -69,7 +69,7 @@ PREFIX ?= /usr/local +@@ -80,7 +80,7 @@ PREFIX ?= /usr/local LIBDIRNAME ?= /lib/faketime PLATFORM ?=$(shell uname) --CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) -+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ifeq ($(PLATFORM),SunOS) CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 endif --- -2.28.0 - diff --git a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index 170bb116a8a8..ced1c3e7bb9f 100644 --- a/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl, coreutils }: stdenv.mkDerivation rec { pname = "libfaketime"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://github.com/wolfcw/libfaketime/archive/v${version}.tar.gz"; - sha256 = "18s2hjm4sbrlg6sby944z87yslnq9s85p7j892hyr42qrlvq4a06"; + sha256 = "sha256-V9AYEVA2HAqbXI7vBbETkvYTStosLZmOkuY9rtY5ZHw="; }; patches = [ ./no-date-in-gzip-man-page.patch + ./nix-store-date.patch ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $a \ --replace /bin/bash ${stdenv.shell} done + substituteInPlace src/faketime.c --replace @DATE_CMD@ ${coreutils}/bin/date ''; PREFIX = placeholder "out"; diff --git a/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch b/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch new file mode 100644 index 000000000000..b88245dfe8fb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfaketime/nix-store-date.patch @@ -0,0 +1,29 @@ +From abd7dd05b440e3dc9621a1579e4afb0267897d9c Mon Sep 17 00:00:00 2001 +From: Finn Behrens <me@kloenk.de> +Date: Fri, 5 Mar 2021 21:58:57 +0100 +Subject: [PATCH] use nix date path + +--- + src/faketime.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/faketime.c b/src/faketime.c +index af618f2..48e47da 100644 +--- a/src/faketime.c ++++ b/src/faketime.c +@@ -50,11 +50,7 @@ + + const char version[] = "0.9.9"; + +-#ifdef __APPLE__ +-static const char *date_cmd = "gdate"; +-#else +-static const char *date_cmd = "date"; +-#endif ++static const char *date_cmd = "@DATE_CMD@"; + + #define PATH_BUFSIZE 4096 + +-- +2.24.3 (Apple Git-128) + diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index daacf325e973..c7d84d9d8af6 100644 --- a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-F+0iZZPo5GbOPD+M5YOzbHnxYxierVTWMWE8w9pcgL0="; + sha256 = "sha256-c3ClGHyrNgqhubLA2njRrebjupN1tIKniF3OBNZJqXs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix new file mode 100644 index 000000000000..3fa683539698 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchgit, libfprint-tod }: +stdenv.mkDerivation { + pname = "libfprint-2-tod1-goodix"; + version = "0.0.6"; + + src = fetchgit { + url = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix"; + rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4"; # droped-lp1880058 on 20202-11-25 + sha256 = "sha256-Uv+Rr4V31DyaZFOj79Lpyfl3G6zVWShh20roI0AvMPU="; + }; + + buildPhase = '' + patchelf \ + --set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \ + usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so + + ldd usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so + ''; + + installPhase = '' + mkdir -p "$out/usr/lib/libfprint-2/tod-1/" + mkdir -p "$out/usr/lib/udev/rules.d/" + + cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so "$out/usr/lib/libfprint-2/tod-1/" + cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/usr/lib/udev/rules.d/" + ''; + + meta = with lib; { + description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; + homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix b/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix new file mode 100644 index 000000000000..8d7df57896d4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfprint-tod/default.nix @@ -0,0 +1,40 @@ +{ lib +, libfprint +, fetchFromGitLab +}: + +# for the curious, "tod" means "Touch OEM Drivers" meaning it can load +# external .so's. +libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let + version = "1.90.7+git20210222+tod1"; +in { + pname = "libfprint-tod"; + inherit version; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "3v1n0"; + repo = "libfprint"; + rev = "v${version}"; + sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; + }; + + mesonFlags = mesonFlags ++ [ + "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" + ]; + + + postPatch = '' + ${postPatch} + patchShebangs ./tests/*.py ./tests/*.sh + ''; + + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint"; + description = "A library designed to make it easy to add support for consumer fingerprint readers, with support for loaded drivers"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ grahamc ]; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index f3f7313accbb..979ba7eea539 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -2,6 +2,7 @@ , fetchFromGitLab , pkg-config , meson +, python3 , ninja , gusb , pixman @@ -10,13 +11,13 @@ , gobject-introspection , coreutils , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.5"; + version = "1.90.7"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j"; + sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI="; }; nativeBuildInputs = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { meson ninja gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; @@ -44,16 +45,29 @@ stdenv.mkDerivation rec { nss ]; - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + checkInputs = [ + python3 + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" + # Include virtual drivers for fprintd tests + "-Ddrivers=all" ]; + doCheck = true; + + postPatch = '' + patchShebangs \ + tests/test-runner.sh \ + tests/unittest_inspector.py \ + tests/virtual-image.py + ''; + meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix b/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix index ae599a97529b..30c9e294ecc8 100644 --- a/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix +++ b/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix @@ -1,47 +1,73 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, libusb1, libconfuse -, cppSupport ? true, boost ? null -, pythonSupport ? true, python3 ? null, swig ? null -, docSupport ? true, doxygen ? null +{ lib +, stdenv +, fetchgit +, cmake +, pkg-config +, libusb1 +, libconfuse +, cppSupport ? true +, boost +, pythonSupport ? true +, python3 +, swig +, docSupport ? true +, doxygen +, graphviz }: -assert cppSupport -> boost != null; -assert pythonSupport -> python3 != null && swig != null; -assert docSupport -> doxygen != null; - +let + inherit (lib) optionals optionalString; + onOff = a: if a then "ON" else "OFF"; +in stdenv.mkDerivation rec { - name = "libftdi1-1.4"; + pname = "libftdi"; + version = "1.5"; - src = fetchurl { - url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; + src = fetchgit { + url = "git://developer.intra2net.com/libftdi"; + rev = "v${version}"; + sha256 = "0vipg3y0kbbzjhxky6hfyxy42mpqhvwn1r010zr5givcfp8ghq26"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = with lib; [ libconfuse ] + nativeBuildInputs = [ cmake pkg-config ] + ++ optionals docSupport [ doxygen graphviz ] + ++ optionals pythonSupport [ swig ]; + + buildInputs = [ libconfuse ] ++ optionals cppSupport [ boost ] - ++ optionals pythonSupport [ python3 swig ] - ++ optionals docSupport [ doxygen ]; + ++ optionals pythonSupport [ python3 ]; - preBuild = lib.optionalString docSupport '' - make doc_i - ''; + cmakeFlags = [ + "-DFTDIPP=${onOff cppSupport}" + "-DBUILD_TESTS=${onOff cppSupport}" + "-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}" + "-DPYTHON_BINDINGS=${onOff pythonSupport}" + "-DDOCUMENTATION=${onOff docSupport}" + ]; propagatedBuildInputs = [ libusb1 ]; postInstall = '' mkdir -p "$out/etc/udev/rules.d/" cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/" + '' + optionalString docSupport '' cp -r doc/man "$out/share/" - '' + lib.optionalString docSupport '' - mkdir -p "$out/share/libftdi/doc/" - cp -r doc/html "$out/share/libftdi/doc/" + cp -r doc/html "$out/share/doc/libftdi1/" + ''; + + postFixup = optionalString cppSupport '' + # This gets misassigned to the C++ version's path for some reason + for fileToFix in $out/{bin/libftdi1-config,lib/pkgconfig/libftdi1.pc}; do + substituteInPlace $fileToFix \ + --replace "$out/include/libftdipp1" "$out/include/libftdi1" + done ''; meta = with lib; { description = "A library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; - license = with licenses; [ lgpl2 gpl2 ]; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.bjornfor ]; + license = with licenses; [ lgpl2Only gpl2Only ]; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix index 69b7bdc7d1e1..dfb540b0bd29 100644 --- a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl, gnum4 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.5.7"; + version = "0.7"; - src = fetchurl { - url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz"; - sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j"; + src = fetchFromGitHub { + owner = "pantoniou"; + repo = pname; + rev = "v${version}"; + sha256 = "10w1n4zzgw33j755pkv73fxdn93kwbzg486b5m9i0bh5d76jp4ax"; }; - nativeBuildInputs = [ gnum4 ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + doCheck = true; + + preCheck = '' + patchShebangs test + ''; meta = with lib; { homepage = "https://github.com/pantoniou/libfyaml"; diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 6c6d73740f20..6b761d2170c3 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap -, buildPackages -}: +{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }: assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.7"; + version = "1.9.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3"; + sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; }; outputs = [ "out" "dev" "info" ]; @@ -27,8 +25,10 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin gettext ++ lib.optional enableCapabilities libcap; + strictDeps = true; + configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; + ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 # Necessary to generate correct assembly when compiling for aarch32 on # aarch64 diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix index 2cd7da0784ac..fdaace2dc4f0 100644 --- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.18.0"; + version = "0.18.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA="; + sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index 88ba7dacc22f..31a9579a8928 100644 --- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -1,11 +1,15 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkg-config, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitLab +, autoreconfHook, pkg-config, python3, addOpenGLRunpath +, libX11, libXext, xorgproto +}: stdenv.mkDerivation rec { pname = "libglvnd"; version = "1.3.2"; - src = fetchFromGitHub { - owner = "NVIDIA"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; sha256 = "10x7fgb114r4gikdg6flszl3kwzcb9y5qa7sj9936mk0zxhjaylz"; @@ -31,8 +35,11 @@ stdenv.mkDerivation rec { "-Wno-error=array-bounds" ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); - # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; + configureFlags = [] + # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-tls" + # Remove when aarch64-darwin asm support is upstream: https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/216 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-asm"; outputs = [ "out" "dev" ]; @@ -47,8 +54,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The GL Vendor-Neutral Dispatch library"; - homepage = "https://github.com/NVIDIA/libglvnd"; - license = licenses.bsd2; + longDescription = '' + libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API + calls between multiple vendors. It allows multiple drivers from different + vendors to coexist on the same filesystem, and determines which vendor to + dispatch each API call to at runtime. + Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES. + ''; + inherit (src.meta) homepage; + # https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd: + license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index 39d0b185660f..da53a9916d05 100644 --- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.38"; + version = "1.41"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q"; + sha256 = "0hi7jbcs1l9kxzhiqcs2iivsb048642mwaimgqyh1hy3bas7ic34"; }; postPatch = '' @@ -66,7 +66,8 @@ in stdenv.mkDerivation (rec { doCheck = true; # not cross meta = with lib; { - homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; + homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; description = "A small library that defines common error values for all GnuPG components"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index 4dec3151a7cd..3e3fa1a725bf 100644 --- a/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.26"; + version = "2.5.27"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "0lnlxflj04ng9a0hm2nb2067kqs4kp9kx1z4gg395cgbfd7lx6j6"; + sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg="; }; patches = []; diff --git a/nixpkgs/pkgs/development/libraries/libgssglue/default.nix b/nixpkgs/pkgs/development/libraries/libgssglue/default.nix index 678af459a30d..d4bf3ff1c2bb 100644 --- a/nixpkgs/pkgs/development/libraries/libgssglue/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgssglue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kerberos }: +{ lib, stdenv, fetchurl, libkrb5 }: stdenv.mkDerivation rec { name = "libgssglue-0.4"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/etc cat <<EOF > $out/etc/gssapi_mech.conf - ${kerberos}/lib/libgssapi_krb5.so mechglue_internal_krb5_init + ${libkrb5}/lib/libgssapi_krb5.so mechglue_internal_krb5_init EOF ''; diff --git a/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/nixpkgs/pkgs/development/libraries/libgxps/default.nix index f7392ffb7dd5..be088496f2e1 100644 --- a/nixpkgs/pkgs/development/libraries/libgxps/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgxps/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgxps"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; + sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw="; }; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 5ab6dde09d78..4532edfd884b 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -9,7 +9,6 @@ , docbook_xsl , docbook_xml_dtd_43 , gtk3 -, gnome3 , glade , dbus , xvfb_run @@ -23,14 +22,14 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.0.3"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o="; + sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index b0872b9da1e4..71dfca5e6430 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libde265, x265, libpng, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, dav1d, rav1e, libde265, x265, libpng, libjpeg, libaom }: stdenv.mkDerivation rec { pname = "libheif"; - version = "1.9.1"; + version = "1.11.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -11,21 +11,19 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0hjs1i076jmy4ryj8y2zs293wx53kzg38y8i42cbcsqydvsdp6hz"; + sha256 = "sha256-xT0sfYPp5atYXnVpP8TYu2TC9/Z/ClyEP1OTSfcw1gw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libde265 x265 libpng libjpeg libaom ]; - # TODO: enable dav1d and rav1e codecs when libheif can find them via pkg-config + buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ]; enableParallelBuilding = true; meta = { homepage = "http://www.libheif.org/"; description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gebner ]; }; - } diff --git a/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/nixpkgs/pkgs/development/libraries/libhsts/default.nix new file mode 100644 index 000000000000..df53e7d294f2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libhsts/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitLab, fetchurl, autoconf-archive, autoreconfHook, pkg-config, python3 }: +let + chromium_version = "90.0.4417.1"; + + hsts_list = fetchurl { + url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json"; + sha256 = "09f24n30x5dmqk8zk7k2glcilgr27832a3304wj1yp97158sqsfx"; + }; + +in +stdenv.mkDerivation rec { + pname = "libhsts"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "rockdaboot"; + repo = pname; + rev = "libhsts-${version}"; + sha256 = "0gbchzf0f4xzb6zjc56dk74hqrmdgyirmgxvvsqp9vqn9wb5kkx4"; + }; + + postPatch = '' + pushd tests + cp ${hsts_list} transport_security_state_static.json + sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json + popd + patchShebangs src/hsts-make-dafsa + ''; + + nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config python3 ]; + + outputs = [ "out" "dev" ]; + + meta = with lib; { + description = "Library to easily check a domain against the Chromium HSTS Preload list"; + homepage = "https://gitlab.com/rockdaboot/libhsts"; + license = with licenses; [ mit bsd3 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libhsts/update.sh b/nixpkgs/pkgs/development/libraries/libhsts/update.sh new file mode 100755 index 000000000000..f80966e08c9a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libhsts/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq + +set -euo pipefail -x + +cd "$(dirname "$0")" + +chromium_version=$(curl -s "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') +sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json") + +sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \ + -e "0,/sha256/s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + --in-place ./default.nix diff --git a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix index f54929c5378b..648eb89a514a 100644 --- a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: +, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; - buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; + buildInputs = [ glib libgee json-glib libsoup libarchive ]; # Fixes build with vala >=0.42 patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix index 7f5e739a99cd..fa396e966506 100644 --- a/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPackages , cmake , glib @@ -22,7 +21,7 @@ assert introspectionSupport -> gobject-introspection != null && vala != null; stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.8"; + version = "3.0.9"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68"; + sha256 = "sha256-efdiGktLGITaQ6VinnfYG52fMhO0Av+JKROt2kTvS1U="; }; nativeBuildInputs = [ @@ -68,19 +67,13 @@ stdenv.mkDerivation rec { "-DGOBJECT_INTROSPECTION=True" "-DICAL_GLIB_VAPI=True" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DIMPORT_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/GlibSrcGenerator.cmake" + "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" ]; patches = [ # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch - # Export src-generator binary for use while cross-compiling - # https://github.com/libical/libical/pull/439 - (fetchpatch { - url = "https://github.com/libical/libical/commit/1197d84b63dce179b55a6293cfd6d0523607baf1.patch"; - sha256 = "18i1khnwmw488s7g5a1kf05sladf8dbyhfc69mbcf6dkc4nnc3dg"; - }) ]; # Using install check so we do not have to manually set diff --git a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 83a5a462ee00..ad1df00c2509 100644 --- a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.13.1"; + version = "2.14.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "1543h1i59k2hbj2g8shcl8fvhz2silipacynwjgw412r38hkr33j"; + sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o="; }; preConfigure = '' patchShebangs ./configure ''; + configureFlags = lib.optionals stdenv.isAarch64 [ "--disable-sse" ]; + meta = with lib; { homepage = "https://pngquant.org/lib/"; description = "Image quantization library"; diff --git a/nixpkgs/pkgs/development/libraries/libinjection/default.nix b/nixpkgs/pkgs/development/libraries/libinjection/default.nix index f678136637ae..81a1398147ba 100644 --- a/nixpkgs/pkgs/development/libraries/libinjection/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinjection/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, python +, python2 }: stdenv.mkDerivation rec { @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g"; }; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python2 ]; + + strictDeps = true; patchPhase = '' patchShebangs src diff --git a/nixpkgs/pkgs/development/libraries/libipt/default.nix b/nixpkgs/pkgs/development/libraries/libipt/default.nix index 272c61c47a5e..15a677b3188c 100644 --- a/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "1i6jmv345rqd88qmap6iqbaph4pkd6wbjgkixf22a80pj7cfm1s4"; + sha256 = "sha256-KhRmRoIHvpx5rV7roCnUH+a7JtPb6UqD41Wi4wHSR1c="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix index 1e2ae41f3f22..44367aad1f93 100644 --- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisoburn"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc"; + sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI="; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/nixpkgs/pkgs/development/libraries/libisofs/default.nix b/nixpkgs/pkgs/development/libraries/libisofs/default.nix index a291410941c6..d80614609c38 100644 --- a/nixpkgs/pkgs/development/libraries/libisofs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisofs"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg"; + sha256 = "sha256-qqDtgKdQGXkxb1BbCwF/Kcug6lRjt1EUO60sNgIVqI4="; }; buildInputs = [ attr zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix index 489f526248aa..77df340a55f8 100644 --- a/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk ''; - buildInputs = [ unzip txt2tags ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ txt2tags ]; meta = { homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 2426dfebe8a2..f2d4e00d1aad 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, nasm +, openjdk +, enableJava ? false # whether to build the java wrapper , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -26,11 +28,18 @@ stdenv.mkDerivation rec { moveToOutput include/transupp.h $dev_private ''; - nativeBuildInputs = [ cmake nasm ]; + nativeBuildInputs = [ + cmake + nasm + ] ++ lib.optionals enableJava [ + openjdk + ]; cmakeFlags = [ "-DENABLE_STATIC=${if enableStatic then "1" else "0"}" "-DENABLE_SHARED=${if enableShared then "1" else "0"}" + ] ++ lib.optionals enableJava [ + "-DWITH_JAVA=1" ]; doInstallCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libjson/default.nix b/nixpkgs/pkgs/development/libraries/libjson/default.nix index 42d723b3b1b4..16a69f6da653 100644 --- a/nixpkgs/pkgs/development/libraries/libjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjson/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; }; patches = [ ./install-fix.patch ]; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; diff --git a/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/nixpkgs/pkgs/development/libraries/libjwt/default.nix new file mode 100644 index 000000000000..9c7d624e7f6e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libjwt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, jansson, openssl }: + +stdenv.mkDerivation rec { + pname = "libjwt"; + version = "1.12.1"; + + src = fetchFromGitHub { + owner = "benmcollins"; + repo = "libjwt"; + rev = "v${version}"; + sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2"; + }; + + buildInputs = [ jansson openssl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + homepage = "https://github.com/benmcollins/libjwt"; + description = "JWT C Library"; + license = licenses.mpl20; + maintainers = with maintainers; [ pnotequalnp ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libktorrent/default.nix b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix index 610efa7ed4f4..825fe87fe2fe 100644 --- a/nixpkgs/pkgs/development/libraries/libktorrent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix @@ -27,6 +27,8 @@ in stdenv.mkDerivation rec { inherit mainVersion; }; + dontWrapQtApps = true; + meta = with lib; { description = "A BitTorrent library used by KTorrent"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; diff --git a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix index 5a7f2fe4b36f..5c31197ebff2 100644 --- a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" ]; - buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common - unzip ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ]; + buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; meta = { inherit version; diff --git a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix index 10cdb3014791..5183c47bc061 100644 --- a/nixpkgs/pkgs/development/libraries/liblastfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblastfm/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; diff --git a/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/nixpkgs/pkgs/development/libraries/liblcf/default.nix index 2c7f09892820..1e6f57368b78 100644 --- a/nixpkgs/pkgs/development/libraries/liblcf/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblcf/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/liblinear/default.nix b/nixpkgs/pkgs/development/libraries/liblinear/default.nix index 3989cc59e4d8..aa2dcd648b81 100644 --- a/nixpkgs/pkgs/development/libraries/liblinear/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinear/default.nix @@ -4,15 +4,21 @@ let soVersion = "4"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.42"; + version = "2.43"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj"; + sha256 = "sha256-qcSMuWHJgsapWs1xgxv3fKSXcx18q8cwyIn3E4RCGKA="; }; + postPatch = '' + substituteInPlace blas/Makefile \ + --replace "ar rcv" "${stdenv.cc.targetPrefix}ar rcv" \ + --replace "ranlib" "${stdenv.cc.targetPrefix}ranlib" + ''; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 647fb6825afb..3ef64823a024 100644 --- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -10,10 +10,8 @@ , cyrus_sasl , doxygen , fetchFromGitLab -, fetchurl , ffmpeg_3 , gdk-pixbuf -, git , glib , graphviz , gtk2 @@ -30,12 +28,11 @@ , makeWrapper , mbedtls , mediastreamer -, mediastreamer-openh264 , openldap , ortp , pango , pkg-config -, python +, python3 , readline , soci , speex @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.21"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +54,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; + sha256 = "05ybbxq2yqzy3f3vzq8c3szs3qr0zl64la53icpqnmfakwnps5gs"; }; # Do not build static libraries @@ -67,7 +64,7 @@ stdenv.mkDerivation rec { # defined when liblinphone and linphone-desktop weren't separated yet, so some # of them might not be needed for liblinphone alone. buildInputs = [ - (python.withPackages (ps: [ ps.pystache ps.six ])) + (python3.withPackages (ps: [ ps.pystache ps.six ])) bcg729 bctoolbox belcard @@ -114,6 +111,8 @@ stdenv.mkDerivation rec { pkg-config ]; + strictDeps = true; + # Some grammar files needed to be copied too from some dependencies. I suppose # if one define a dependency in such a way that its share directory is found, # then this copying would be unnecessary. Instead of actually copying these diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index 1dec830566f8..2208606a8133 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5"; + sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix index 1d3cf4032dda..a89bf9fc4ab9 100644 --- a/nixpkgs/pkgs/development/libraries/libmatroska/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; + sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" + "-DCMAKE_INSTALL_PREFIX=" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index 078865198a45..05ae1af2e257 100644 --- a/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo="; + sha256 = "sha256-UjcHbSUKX3wpfjMcNaQz7qrw3CBeBw5Ns1PJuhDzQKI="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 850c7aa1df0c..9695b221cb97 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.4"; + version = "1.24.6"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "11djb1d8w9ms07aklfm3pskjw9rnff4p4n3snanschv22zk8wj6x"; + sha256 = "sha256-dgRlyqoczWmcFCkOl5HaRW1TAN0R6/TBSGFRAz6HXf0="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index d78ccbc50aba..3541d3d466f7 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "20.09"; + version = "21.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; + sha256 = "1jm4mk539wf3crgpcddgwdixshwdzm37mkb5441lifhcz2mykdsn"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/nixpkgs/pkgs/development/libraries/libmpc/default.nix index 66e38fbfbc04..bd28f490ecb7 100644 --- a/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -8,7 +8,7 @@ # files. let - version = "1.2.0"; + version = "1.2.1"; in stdenv.mkDerivation { pname = "libmpc"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9"; + sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; }; buildInputs = [ gmp mpfr ]; diff --git a/nixpkgs/pkgs/development/libraries/libmspack/default.nix b/nixpkgs/pkgs/development/libraries/libmspack/default.nix index 4ad60bcfb181..a26f0c3f3a48 100644 --- a/nixpkgs/pkgs/development/libraries/libmspack/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index dd902c0021dd..11b8d66b4a8f 100644 --- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ar" "${stdenv.cc.targetPrefix}ar" + ''; + makeFlags = [ "INSTALLPREFIX=$(out)" ]; meta = with lib; { @@ -17,6 +23,6 @@ stdenv.mkDerivation rec { description = "NAT-PMP client"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/nixpkgs/pkgs/development/libraries/libnbd/default.nix new file mode 100644 index 000000000000..6afced2d6d17 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libnbd/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchurl +, bash-completion +, pkg-config +, perl +, libxml2 +, fuse +, gnutls +}: + +stdenv.mkDerivation rec { + pname = "libnbd"; + version = "1.7.4"; + + src = fetchurl { + url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; + sha256 = "0d586c8mbk50hjslq32n70sdp2a7lbsjv9zhky4w6jy950rrdfqh"; + }; + + nativeBuildInputs = [ + bash-completion + pkg-config + perl + ]; + buildInputs = [ + fuse + gnutls + libxml2 + ]; + + installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ]; + + meta = with lib; { + homepage = "https://gitlab.com/nbdkit/libnbd"; + description = "Network Block Device client library in userspace"; + longDescription = '' + NBD — Network Block Device — is a protocol for accessing Block Devices + (hard disks and disk-like things) over a Network. This is the NBD client + library in userspace, a simple library for writing NBD clients. + + The key features are: + - Synchronous API for ease of use. + - Asynchronous API for writing non-blocking, multithreaded clients. You + can mix both APIs freely. + - High performance. + - Minimal dependencies for the basic library. + - Well-documented, stable API. + - Bindings in several programming languages. + - Shell (nbdsh) for command line and scripting. + ''; + license = with licenses; lgpl21Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; + }; +} +# TODO: NBD URI support apparently is not enabled +# TODO: package the 1.6-stable version too +# TODO: git version needs ocaml +# TODO: bindings for go, ocaml and python + diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index b7e082f2b9ba..91a2c378c03c 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libndctl"; - version = "70.1"; + version = "71.1"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq"; + sha256 = "sha256-osux3DiKRh8ftHwyfFI+WSFx20+yJsg1nVx5nuoKJu4="; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libnest2d/default.nix b/nixpkgs/pkgs/development/libraries/libnest2d/default.nix index 567598500d61..1e666758f816 100644 --- a/nixpkgs/pkgs/development/libraries/libnest2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnest2d/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { "2D irregular bin packaging and nesting library written in modern C++"; homepage = "https://github.com/Ultimaker/libnest2d"; license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix index 025ddf8e7b1d..44f0f8d62ec7 100644 --- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.1.8"; + version = "1.1.9"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4"; + sha256 = "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/nixpkgs/pkgs/development/libraries/libnixxml/default.nix index abbffcf0f942..40459dbca22a 100644 --- a/nixpkgs/pkgs/development/libraries/libnixxml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnixxml/default.nix @@ -1,25 +1,31 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: stdenv.mkDerivation { - name = "libnixxml"; + pname = "libnixxml"; + version = "unstable-2020-06-25"; + src = fetchFromGitHub { owner = "svanderburg"; repo = "libnixxml"; rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; + + preConfigure = '' + ./bootstrap + ''; + configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + doCheck = false; - postPatch = '' - ./bootstrap - ''; meta = with lib; { description = "XML-based Nix-friendly data integration library"; - homepage = https://github.com/svanderburg/libnixxml; + homepage = "https://github.com/svanderburg/libnixxml"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/liboauth/default.nix b/nixpkgs/pkgs/development/libraries/liboauth/default.nix index caab0a83fcf6..5fe5ba86bea3 100644 --- a/nixpkgs/pkgs/development/libraries/liboauth/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboauth/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.all; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; repositories.git = "https://github.com/x42/liboauth.git"; diff --git a/nixpkgs/pkgs/development/libraries/libofx/default.nix b/nixpkgs/pkgs/development/libraries/libofx/default.nix index 10197bd8db09..dc40086ad0a7 100644 --- a/nixpkgs/pkgs/development/libraries/libofx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.9.15"; + version = "0.10.1"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy"; + sha256 = "sha256-QIasZKwSD9YCidHCxT/HOThxE5HEQWD0I2/loDP6mlU="; }; preConfigure = "./autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix b/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix deleted file mode 100644 index 1cbfe44ef4e5..000000000000 --- a/nixpkgs/pkgs/development/libraries/libosmpbf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, protobuf}: - -stdenv.mkDerivation { - name = "libosmpbf-1.3.3"; - - src = fetchurl { - url = "https://github.com/scrosby/OSM-binary/archive/v1.3.3.tar.gz"; - sha256 = "a109f338ce6a8438a8faae4627cd08599d0403b8977c185499de5c17b92d0798"; - }; - - buildInputs = [ protobuf ]; - - sourceRoot = "OSM-binary-1.3.3/src"; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = { - homepage = "https://github.com/scrosby/OSM-binary"; - description = "C library to read and write OpenStreetMap PBF files"; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libosmscout/default.nix b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix new file mode 100644 index 000000000000..2f83963d205f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libosmscout/default.nix @@ -0,0 +1,24 @@ +{ lib, mkDerivation, fetchgit, cmake, pkg-config +, marisa, qtlocation }: + +mkDerivation rec { + pname = "libosmscout"; + version = "2017.06.30"; + + src = fetchgit { + url = "git://git.code.sf.net/p/libosmscout/code"; + rev = "0c0fde4d9803539c99911389bc918377a93f350c"; + sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ marisa qtlocation ]; + + meta = with lib; { + description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; + homepage = "http://libosmscout.sourceforge.net/"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix new file mode 100644 index 000000000000..e024874eabe8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix @@ -0,0 +1,27 @@ +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "libowlevelzs"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "zseri"; + repo = "libowlevelzs"; + rev = "v${version}"; + sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Zscheile Lowlevel (utility) library"; + homepage = "https://github.com/zseri/libowlevelzs"; + license = licenses.mit; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix index 0b30bf6c2b0d..c04d4a001a17 100644 --- a/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "libpcap"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { url = "https://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"; + sha256 = "sha256-jRK0JiPu7+6HLxI70NyF1TWwDfTULoZfmTxA97/JKx4="; }; nativeBuildInputs = [ flex bison ] @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { linux = "linux"; darwin = "bpf"; }.${stdenv.hostPlatform.parsed.kernel.name}) + ] ++ optionals stdenv.isDarwin [ + "--disable-universal" ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; - prePatch = optionalString stdenv.isDarwin '' - substituteInPlace configure --replace " -arch i386" "" - ''; - postInstall = '' if [ "$dontDisableStatic" -ne "1" ]; then rm -f $out/lib/libpcap.a diff --git a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix new file mode 100644 index 000000000000..711cfe14e156 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, which }: + +stdenv.mkDerivation rec { + pname = "libpg_query"; + version = "13-2.0.4"; + + src = fetchFromGitHub { + owner = "pganalyze"; + repo = "libpg_query"; + rev = version; + sha256 = "0d88fh613kh1izb6w288bfh7s3db4nz8cxyhmhq3lb7gl4axs2pv"; + }; + + nativeBuildInputs = [ which ]; + + makeFlags = [ "build" ]; + + installPhase = '' + install -Dm644 -t $out/lib libpg_query.a + install -Dm644 -t $out/include pg_query.h + ''; + + meta = with lib; { + homepage = "https://github.com/pganalyze/libpg_query"; + description = "C library for accessing the PostgreSQL parser outside of the server environment"; + changelog = "https://github.com/pganalyze/libpg_query/raw/${version}/CHANGELOG.md"; + license = licenses.bsd3; + platforms = platforms.x86_64; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix index 2ff59e055f98..f36b5436d69c 100644 --- a/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix +++ b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gmock, boost, pkg-config, protobuf, icu }: +{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu }: stdenv.mkDerivation rec { pname = "phonenumber"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - gmock + gtest pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 94301b34fbce..210542e0c981 100644 --- a/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -17,22 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.104.0"; - - patches = [ - (fetchpatch { - # support glslang>=11.0.0; Upstream MR: https://code.videolan.org/videolan/libplacebo/-/merge_requests/131 - url = "https://code.videolan.org/videolan/libplacebo/-/commit/affd15a2faa1340d40dcf277a8acffe2987f517c.patch"; - sha256 = "1nm27mdm9rn3wsbjdif46pici6mbzmfb6521ijl8ah4mxn9p1ikc"; - }) - ]; + version = "3.120.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb"; + sha256 = "0x7jyzsdf884jrky4yci151pk4nzsz1w88wz8sk0cqing7bpaq16"; }; nativeBuildInputs = [ @@ -55,6 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" + "-Ddemos=false" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/nixpkgs/pkgs/development/libraries/libplctag/default.nix new file mode 100644 index 000000000000..41283ed7ccd0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "libplctag"; + version = "2.3.6"; + + src = fetchFromGitHub { + owner = "libplctag"; + repo = "libplctag"; + rev = "v${version}"; + sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/libplctag/libplctag"; + description = "Library that uses EtherNet/IP or Modbus TCP to read and write tags in PLCs"; + license = with licenses; [ lgpl2Plus mpl20 ]; + maintainers = with maintainers; [ petterstorvik ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix index c8e9ddb82c5f..cac4299f2890 100644 --- a/nixpkgs/pkgs/development/libraries/libplist/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python, glib }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, enablePython ? false, python ? null, glib }: stdenv.mkDerivation rec { pname = "libplist"; diff --git a/nixpkgs/pkgs/development/libraries/libpostal/default.nix b/nixpkgs/pkgs/development/libraries/libpostal/default.nix new file mode 100644 index 000000000000..d32cb2731a11 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpostal/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "libpostal"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "openvenues"; + repo = "libpostal"; + rev = "v${version}"; + sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ + "--disable-data-download" + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ]; + + meta = with lib; { + description = "A C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; + homepage = "https://github.com/openvenues/libpostal"; + license = licenses.mit; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix index afd1a6365b45..afe5b8dde132 100644 --- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -3,10 +3,9 @@ , pkg-config , cmake , zlib -, fetchpatch , dbus , networkmanager -, spidermonkey_60 +, spidermonkey_68 , pcre , gsettings-desktop-schemas , glib @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libproxy"; - version = "0.4.15"; + version = "0.4.17"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; + sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r"; }; outputs = [ "out" "dev" "py3" ]; @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { JavaScriptCore ] else [ glib - spidermonkey_60 + spidermonkey_68 dbus networkmanager ]); @@ -57,38 +56,6 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = [ - # Make build with spidermonkey_60 - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/86.patch"; - sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs"; - }) - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/87.patch"; - sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc"; - }) - (fetchpatch { - url = "https://github.com/libproxy/libproxy/pull/95.patch"; - sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; - }) - (fetchpatch { - name = "CVE-2020-25219.patch"; - url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch"; - sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k"; - }) - (fetchpatch { - name = "CVE-2020-26154.patch"; - url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch"; - sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8"; - }) - - ] ++ lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; - sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; - }) - ]; - postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" diff --git a/nixpkgs/pkgs/development/libraries/libpst/default.nix b/nixpkgs/pkgs/development/libraries/libpst/default.nix index 40f6b3b1aee1..f27b58a02bb6 100644 --- a/nixpkgs/pkgs/development/libraries/libpst/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index a5b6e3b117ea..e55cda51748a 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,20 +3,19 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-mTxxiyN4t84BD4bBysvsrvP7L+DNbP6sMlcNFg4eMF8="; + sha256 = "sha256-VlKJrGZOMmnWFmdwV3SchBfyRsHM78eNV+uWONLZbJI="; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; - configureFlags = ["--with-readline=${readline.dev}"]; propagatedBuildInputs = [ libxml2 mpfr icu ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libqb/default.nix b/nixpkgs/pkgs/development/libraries/libqb/default.nix index f5f255b111f1..73938bd8f973 100644 --- a/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "1gpfcz84igqncky09hdibxmzapzl37y8914avgq89rsizynj1wsm"; + sha256 = "sha256-a9CnqfrQUL0DdPPOJjfh9tQ0O8iRHPP3iBmy3MKvt/0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix index 4fc50f207309..65d7a83a8384 100644 --- a/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqglviewer/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase libGLU ] ++ lib.optional stdenv.isDarwin AGL; + dontWrapQtApps = true; + postPatch = '' cd QGLViewer ''; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 7bd3fa97029a..8a3179b03427 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -1,33 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +, python3 +, libgudev +, libmbim +, libqrtr-glib +}: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.8"; + version = "1.28.2"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA="; + sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M="; }; - outputs = [ "out" "dev" "devdoc" ]; - - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-introspection" - ]; - nativeBuildInputs = [ pkg-config gobject-introspection python3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - glib libgudev libmbim ]; + propagatedBuildInputs = [ + glib + libqrtr-glib + ]; + + configureFlags = [ + "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--enable-gtk-doc" + "--enable-introspection" + ]; + enableParallelBuilding = true; doCheck = true; @@ -35,7 +56,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; + maintainers = teams.freedesktop.members; platforms = platforms.linux; - license = licenses.gpl2; + license = with licenses; [ + # Library + lgpl2Plus + # Tools + gpl2Plus + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix b/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix new file mode 100644 index 000000000000..29097710a697 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libqrtr-glib"; + version = "1.0.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4="; + }; + + nativeBuildInputs = [ + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + ]; + + configureFlags = [ + "--enable-gtk-doc" + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"; + description = "Qualcomm IPC Router protocol helper library"; + maintainers = teams.freedesktop.members; + platforms = platforms.linux; + license = licenses.lgpl2Plus; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 10b2451e7c85..5405391a1e61 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ="; + sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index 217a83bcebc3..d4d69ed6afff 100644 --- a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2020-11-30"; + version = "unstable-2021-03-17"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11"; - sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7"; + rev = "3fd8527eefd8790b4e8393458efc5f94eb21a615"; + sha256 = "099qxh4bjzwd431ffpdhzx0gzlrkdyf66wplgkwg2rrfrc9zlv5a"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 82761dc3d009..7d9aa52e5961 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.41.0"; + version = "2.42.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0ngv9fgja72vg7hq1aiwpa7x4dhniawhpd8mqm85pqkjxiph8s1k"; + sha256 = "sha256-8r8j0g7EaSUWujX+BNdkIJhzaLITMLsozjhOtQBriTA="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 5fca199acb0a..e5123fa61af3 100644 --- a/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2 -, enablePython ? false, python, swig, libxml2, ncurses +, enablePython ? false, python ? null, swig, libxml2, ncurses }: let isPython3 = enablePython && python.pythonAtLeast "3"; diff --git a/nixpkgs/pkgs/development/libraries/librep/default.nix b/nixpkgs/pkgs/development/libraries/librep/default.nix index 74c45f00adcf..cd007c5fe57a 100644 --- a/nixpkgs/pkgs/development/libraries/librep/default.nix +++ b/nixpkgs/pkgs/development/libraries/librep/default.nix @@ -1,37 +1,49 @@ -{ lib, stdenv, fetchurl -, pkg-config, autoreconfHook -, readline, texinfo -, gdbm, gmp, libffi }: - -with lib; +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gdbm +, gmp +, libffi +, pkg-config +, readline +, texinfo +}: stdenv.mkDerivation rec { pname = "librep"; version = "0.92.7"; - sourceName = "librep_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/${pname}/${pname}_${version}.tar.xz"; sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ readline texinfo ]; - propagatedBuildInputs = [ gdbm gmp libffi ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + texinfo + ]; + buildInputs = [ + gdbm + gmp + libffi + readline + ]; setupHook = ./setup-hook.sh; - meta = { + meta = with lib;{ + homepage = "http://sawfish.tuxfamily.org/"; description = "Fast, lightweight, and versatile Lisp environment"; longDescription = '' - librep is a Lisp system for UNIX, comprising an - interpreter, a byte-code compiler, and a virtual - machine. It can serve as an application extension language - but is also suitable for standalone scripts. - ''; - homepage = "http://sawfish.wikia.com"; - license = licenses.gpl2; + librep is a Lisp system for UNIX, comprising an interpreter, a byte-code + compiler, and a virtual machine. It can serve as an application extension + language but is also suitable for standalone scripts. + ''; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } # TODO: investigate fetchFromGithub diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index d67342eebc11..3dffccf5f41d 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -63,13 +63,13 @@ let }; in { - libressl_3_0 = generic { - version = "3.0.2"; - sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz"; + libressl_3_1 = generic { + version = "3.1.5"; + sha256 = "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc"; }; - libressl_3_1 = generic { - version = "3.1.4"; - sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21"; + libressl_3_2 = generic { + version = "3.2.5"; + sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr"; }; } diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix index b6db462f3c34..e430a447336b 100644 --- a/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - libyamlcpp, gmock }: + libyamlcpp, gtest }: stdenv.mkDerivation rec { pname = "librime"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gmock ]; + buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest ]; meta = with lib; { homepage = "https://rime.im/"; diff --git a/nixpkgs/pkgs/development/libraries/librsb/default.nix b/nixpkgs/pkgs/development/libraries/librsb/default.nix new file mode 100644 index 000000000000..ef8b9ee441d3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/librsb/default.nix @@ -0,0 +1,86 @@ +{ lib, stdenv, fetchurl +, gfortran +, pkg-config, libtool +, m4, gnum4 +, file +# Memory Hierarchy (End-user can provide this.) +, memHierarchy ? "" +# Headers/Libraries +, blas, zlib +# RPC headers (rpc/xdr.h) +, openmpi +, help2man +, doxygen +, octave +}: + +stdenv.mkDerivation rec { + pname = "librsb"; + version = "1.2.0.9"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl"; + }; + + # The default configure flags are still present when building + # --disable-static --disable-dependency-tracking + # Along with the --prefix=... flag (but we want that one). + configureFlags = [ + "--enable-static" + "--enable-doc-build" + "--enable-octave-testing" + "--enable-sparse-blas-interface" + "--enable-fortran-module-install" + "--enable-pkg-config-install" + "--enable-matrix-types=all" + "--with-zlib=${zlib}/lib/libz.so" + "--with-memhinfo=${memHierarchy}" + ]; + + # Ensure C/Fortran code is position-independent. + NIX_CFLAGS_COMPILE = [ "-fPIC" "-Ofast" ]; + FCFLAGS = [ "-fPIC" "-Ofast" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + gfortran + pkg-config libtool + m4 gnum4 + file + blas zlib + openmpi + octave + help2man # Turn "--help" into a man-page + doxygen # Build documentation + ]; + + # Need to run cleanall target to remove any previously-generated files. + preBuild = '' + make cleanall + ''; + + checkInputs = [ + octave + ]; + checkTarget = "tests"; + + meta = with lib; { + homepage = "http://librsb.sourceforge.net/"; + description = "Shared memory parallel sparse matrix and sparse BLAS library"; + longDescription = '' + Library for sparse matrix computations featuring the Recursive Sparse + Blocks (RSB) matrix format. This format allows cache efficient and + multi-threaded (that is, shared memory parallel) operations on large + sparse matrices. + librsb implements the Sparse BLAS standard, as specified in the BLAS + Forum documents. + Contains libraries and header files for developing applications that + want to make use of librsb. + ''; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ KarlJoad ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/librseq/default.nix b/nixpkgs/pkgs/development/libraries/librseq/default.nix index 12b9b4109c70..82e6c54bb2c8 100644 --- a/nixpkgs/pkgs/development/libraries/librseq/default.nix +++ b/nixpkgs/pkgs/development/libraries/librseq/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Userspace library for the Linux Restartable Sequence API"; homepage = "https://github.com/compudj/librseq"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libseat/default.nix b/nixpkgs/pkgs/development/libraries/libseat/default.nix new file mode 100644 index 000000000000..bdefb51b50f4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libseat/default.nix @@ -0,0 +1,37 @@ +{ fetchFromSourcehut +, lib +, meson +, ninja +, pkg-config +, stdenv +, systemd +}: + +stdenv.mkDerivation rec { + pname = "libseat"; + version = "0.5.0"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = "seatd"; + rev = version; + sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ + systemd + ]; + + mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"]; + + meta = with lib; { + description = "A universal seat management library"; + changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}"; + homepage = "https://sr.ht/~kennylevinsen/seatd/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ emantor ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libshout/default.nix b/nixpkgs/pkgs/development/libraries/libshout/default.nix index c810034f8478..1e5cdb389483 100644 --- a/nixpkgs/pkgs/development/libraries/libshout/default.nix +++ b/nixpkgs/pkgs/development/libraries/libshout/default.nix @@ -4,11 +4,11 @@ # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.4"; + name = "libshout-2.4.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"; + sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index eac383fae0d9..c933d92f3255 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix b/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix index 20cb80b1ff85..4189ba9c6fae 100644 --- a/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsigsegv/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libsigsegv-2.12"; + name = "libsigsegv-2.13"; src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; - sha256 = "1dlhqf4igzpqayms25lkhycjq1ccavisx8cnb3y4zapbkqsszq9s"; + sha256 = "sha256-vnjuQXawX3x1/wMpjYSHTbkPS2ydVQPw2hIms6PEgRk="; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix index db2cd044592b..64ae1713fd45 100644 --- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; + hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; + + # FIXME: the hardeingDisable attr above does not seems effective, so + # the need to disable stackprotector via configureFlags + configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libspectrum/default.nix b/nixpkgs/pkgs/development/libraries/libspectrum/default.nix index 8922bedccdc8..011531b1a23e 100644 --- a/nixpkgs/pkgs/development/libraries/libspectrum/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspectrum/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { - name = "libspectrum-1.4.4"; + name = "libspectrum-1.5.0"; src = fetchurl { url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz"; - sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx"; + sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw="; }; nativeBuildInputs = [ perl pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/nixpkgs/pkgs/development/libraries/libspnav/default.nix new file mode 100644 index 000000000000..fb2a2744d6ad --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libspnav/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, libX11}: + +stdenv.mkDerivation rec { + version = "0.2.3"; + pname = "libspnav"; + + src = fetchFromGitHub { + owner = "FreeSpacenav"; + repo = "libspnav"; + rev = "${pname}-${version}"; + sha256 = "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"; + }; + + buildInputs = [ libX11 ]; + + configureFlags = [ "--disable-debug"]; + + preInstall = '' + mkdir -p $out/{lib,include} + ''; + + meta = with lib; { + homepage = "http://spacenav.sourceforge.net/"; + description = "Device driver and SDK for 3Dconnexion 3D input devices"; + longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libspotify/default.nix b/nixpkgs/pkgs/development/libraries/libspotify/default.nix index b39944d13dca..004460abe312 100644 --- a/nixpkgs/pkgs/development/libraries/libspotify/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspotify/default.nix @@ -47,7 +47,7 @@ else stdenv.mkDerivation { # darwin-specific - buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; # linux-specific installFlags = lib.optional isLinux diff --git a/nixpkgs/pkgs/development/libraries/libthai/default.nix b/nixpkgs/pkgs/development/libraries/libthai/default.nix index ad00906bb8cc..97745813ef26 100644 --- a/nixpkgs/pkgs/development/libraries/libthai/default.nix +++ b/nixpkgs/pkgs/development/libraries/libthai/default.nix @@ -4,12 +4,16 @@ stdenv.mkDerivation rec { pname = "libthai"; version = "0.1.28"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz"; sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z"; }; - nativeBuildInputs = [ installShellFiles pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ installShellFiles (lib.getBin libdatrie) pkg-config ]; buildInputs = [ libdatrie ]; diff --git a/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix b/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix index 6eb013a7ffd7..2488a5bbb0b4 100644 --- a/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libticalcs2/default.nix @@ -7,7 +7,7 @@ , libticonv , libtifiles2 , libticables2 -, lzma +, xz , bzip2 , acl , libobjc @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { libticonv libtifiles2 libticables2 - lzma + xz bzip2 ] ++ lib.optionals stdenv.isLinux [ acl diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index 2fad29888982..46c13bbe4a9d 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -4,18 +4,19 @@ , pkg-config , cmake -, zlib +, libdeflate , libjpeg , xz +, zlib }: stdenv.mkDerivation rec { - version = "4.1.0"; pname = "libtiff"; + version = "4.2.0"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; + sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; }; cmakeFlags = if stdenv.isDarwin then [ @@ -35,7 +36,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) + propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) + + buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ad3a47f99ce3..d17303bbb0ef 100644 --- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.1"; + version = "2.0.3"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c"; + sha256 = "0c5g2chylhkwwssfab9gw0b7bm3raj08yzgia7j4d044lp8gflnd"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix index d108bf4e6df4..6eb1bb93f6b8 100644 --- a/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 6a94f37181d4..10554cb528ea 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.7"; + version = "2.0"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3"; + sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn"; }; separateDebugInfo = true; diff --git a/nixpkgs/pkgs/development/libraries/libusb1/default.nix b/nixpkgs/pkgs/development/libraries/libusb1/default.nix index d69c8d670c4a..69410cf2b986 100644 --- a/nixpkgs/pkgs/development/libraries/libusb1/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusb1/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isMusl @@ -22,6 +23,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ (fetchpatch { + # https://bugs.archlinux.org/task/69121 + url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch"; + sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq"; + excludes = [ "libusb/version_nano.h" ]; + }) ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = lib.optional enableUdev udev ++ diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix index a4447ed33789..6b1a0120e49e 100644 --- a/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.40.0"; + version = "1.41.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1hd0x6i80ca3j0c3a7laygzab5qkgxjkz692jwzrsinsfhvbq0pg"; + sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; }; postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent + "tcp_connect_timeout" # tries to reach out to 8.8.8.8 "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines diff --git a/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix index c11d698079b0..c8ad0e7e6030 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , pkg-config, makeWrapper, libtool, autoconf, automake, fetchpatch , coreutils, libxml2, gnutls, perl, python2, attr -, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, iproute2, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib, rpcsvc-proto, libtirpc @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { postInstall = let - binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 100f79ae4e83..ea4b40c3c891 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchgit , makeWrapper, autoreconfHook, fetchpatch -, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils -, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext +, coreutils, libxml2, gnutls, perl, python3, attr, glib, docutils +, iproute2, readline, lvm2, util-linux, systemd, libpciaccess, gettext , libtasn1, iptables, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { buildInputs = [ bash-completion pkg-config - libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl + libxml2 gnutls perl python3 readline gettext libtasn1 libgcrypt yajl libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus ] ++ optionals stdenv.isLinux [ audit libpciaccess lvm2 util-linux systemd libnl numad zfs @@ -85,12 +85,12 @@ in stdenv.mkDerivation rec { sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables ebtables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - patchShebangs . # fixes /usr/bin/python references + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { postInstall = let # Keep the legacy iptables binary for now for backwards compatibility (comment on #109332) - binPath = [ iptables ebtables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; + binPath = [ iptables ebtables-compat iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index f4418ec1bc4d..c17b8be592aa 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.7"; + version = "1.9"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-kF4Q3ACiVlUbEjS2YqwHA42QknKMLqX9US31PmXtS/I="; + sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 33c1cecfbc81..c62aa77c61a9 100644 --- a/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -20,7 +20,7 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" - ]; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; @@ -35,6 +35,7 @@ let # Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation # is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE license = with licenses; [ mit publicDomain bsd3 asl20 ]; + maintainers = with maintainers; [ mindavi ]; platforms = platforms.all; }; }; diff --git a/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/nixpkgs/pkgs/development/libraries/libwnck/default.nix index c0019ee268af..fd7d80574a7d 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -23,5 +23,8 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libwnck"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ johnazoidberg ]; + # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found + # #include <gdk/gdkx.h> + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 0a93babb4599..f78cd09c0ae0 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.0"; + version = "5.1.2"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7"; + sha256 = "1bcj7x0kaal62m41v9hxb4h1d2cxs2ynvsfqqg7c5yi7829nvapb"; }; buildInputs = [ gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix new file mode 100644 index 000000000000..4df5bde22871 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }: + +stdenv.mkDerivation rec { + pname = "libxcrypt"; + version = "4.4.18"; + + src = fetchFromGitHub { + owner = "besser82"; + repo = "libxcrypt"; + rev = "v${version}"; + sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; + }; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool pkg-config perl ]; + + doCheck = true; + + meta = with lib; { + description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; + homepage = "https://github.com/besser82/libxcrypt/"; + platforms = platforms.all; + maintainers = with maintainers; [ dottedmag ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index c0785b34e891..d6e8b3958e40 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,30 +1,37 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, bison, doxygen , xkeyboard_config, libxcb, libxml2 , python3 , libX11 +# To enable the "interactive-wayland" subcommand of xkbcli: +, withWaylandSupport ? false, wayland, wayland-protocols }: stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852"; + sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21"; }; + patches = [ + ./fix-cross-compilation.patch + ]; + outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]; - buildInputs = [ xkeyboard_config libxcb libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] + ++ lib.optional withWaylandSupport wayland; + buildInputs = [ xkeyboard_config libxcb libxml2 ] + ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; checkInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dx-locale-root=${libX11.out}/share/X11/locale" - "-Denable-wayland=false" - "-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output) + "-Denable-wayland=${lib.boolToString withWaylandSupport}" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch new file mode 100644 index 000000000000..55730554a90f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index 47c436f..536c60b 100644 +--- a/meson.build ++++ b/meson.build +@@ -440,13 +440,12 @@ if build_tools + if get_option('enable-wayland') + wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) + wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) +- wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) +- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() ++ if not wayland_client_dep.found() or not wayland_protocols_dep.found() + error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. + You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') + endif + +- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner = find_program('wayland-scanner', native: true) + wayland_scanner_code_gen = generator( + wayland_scanner, + output: '@BASENAME@-protocol.c', diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index cf5f6e320c0b..9f374c22c1e6 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }: +{ lib, stdenv, fetchurl, pkg-config, bison, flex, xkeyboard_config, libxcb, libX11 }: stdenv.mkDerivation rec { name = "libxkbcommon-0.7.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ yacc flex xkeyboard_config libxcb ]; + buildInputs = [ bison flex xkeyboard_config libxcb ]; configureFlags = [ "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/nixpkgs/pkgs/development/libraries/libxl/default.nix b/nixpkgs/pkgs/development/libraries/libxl/default.nix index 600e94d0a757..601c27c98eed 100644 --- a/nixpkgs/pkgs/development/libraries/libxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxl"; - version = "3.8.8"; + version = "3.9.4.3"; src = fetchurl { url = "https://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "08jarfcl8l5mrmkx6bcifi3ghkaja9isz77zgggl84yl66js5pc3"; + sha256 = "sha256-U8hXoqBzjSGigOXc29LZQk3KrGiYvBPBJPg5qihcAsY="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/development/libraries/libxmi/default.nix b/nixpkgs/pkgs/development/libraries/libxmi/default.nix index 037e7036f499..b9a2b6de3cc3 100644 --- a/nixpkgs/pkgs/development/libraries/libxmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = "https://www.gnu.org/software/libxmi/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index b958f018b604..161833a928cd 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.2.1"; + version = "0.3.0"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "XD66YfD8fjaqp5pkcR8qNh7Srjh+atAIC2qkDTF7KdM="; + sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libxmp/default.nix b/nixpkgs/pkgs/development/libraries/libxmp/default.nix index 0b953f95d7eb..31a14ff6ae43 100644 --- a/nixpkgs/pkgs/development/libraries/libxmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; }; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/nixpkgs/pkgs/development/libraries/libxslt/default.nix index eff9f2b2b792..650e17d3179d 100644 --- a/nixpkgs/pkgs/development/libraries/libxslt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt +{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2.dev ] ++ lib.optional stdenv.isDarwin gettext - ++ lib.optionals pythonSupport [ libxml2.py python ] + ++ lib.optionals pythonSupport [ libxml2.py python3 ] ++ lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ lib.optional pythonSupport "--with-python=${python}" + ] ++ lib.optional pythonSupport "--with-python=${python3}" ++ lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python.libPrefix} "$py" + moveToOutput ${python3.libPrefix} "$py" ''; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix index 2d19ca4b22be..1c7aa8c54b72 100644 --- a/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.38"; + version = "0.4.39"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"; + sha256 = "1rwaxmid9iv65n0y6xlcyxxydsvihjni9ldxpg6pbqz43amp49xx"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libzip/default.nix b/nixpkgs/pkgs/development/libraries/libzip/default.nix index c65a9b6f583a..ddefa16c2c1d 100644 --- a/nixpkgs/pkgs/development/libraries/libzip/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzip/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchurl, cmake, perl, zlib }: +{ lib, stdenv +, cmake +, fetchpatch +, fetchurl +, perl +, zlib +}: stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.1"; + version = "1.7.3"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; + sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf"; }; - # Fix pkg-config file paths - postPatch = '' - sed -i CMakeLists.txt \ - -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ - -e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#' - ''; + # Remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch"; + sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a"; + }) + ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/lightning/default.nix b/nixpkgs/pkgs/development/libraries/lightning/default.nix index 5fdc06bce012..5f8c71fa6aa3 100644 --- a/nixpkgs/pkgs/development/libraries/lightning/default.nix +++ b/nixpkgs/pkgs/development/libraries/lightning/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.lgpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index d47c7b50abef..8ef4513a18dd 100644 --- a/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/lime/default.nix b/nixpkgs/pkgs/development/libraries/lime/default.nix index 3a16b5202c47..741f05bea6f9 100644 --- a/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/nixpkgs/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.0"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; + sha256 = "1fsldk7gxagxkbkzksz6dz8a8dmix1lxfy8nvvp0m355pzgqj6lb"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "End-to-end encryption library for instant messaging"; homepage = "http://www.linphone.org/technical-corner/lime"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix index a59b460734d0..229e82c323aa 100644 --- a/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/log4cplus/default.nix b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix index 1e16ee96ae7f..e9ef841b65d7 100644 --- a/nixpkgs/pkgs/development/libraries/log4cplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - name = "log4cplus-2.0.5"; + name = "log4cplus-2.0.6"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "05gb0crf440da3vcaxavglzvsldw8hsvxq3xvvj73mzniv3bz3dk"; + sha256 = "sha256-GpY6/Q+IPWLelGsYkn0jgFH9R5NuQV6r7/4rE5fxbso="; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix index 0245417bbf9b..a8d9b23cc84c 100644 --- a/nixpkgs/pkgs/development/libraries/loudmouth/default.nix +++ b/nixpkgs/pkgs/development/libraries/loudmouth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight C library for the Jabber protocol"; - platforms = platforms.linux; + platforms = platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; updateWalker = true; diff --git a/nixpkgs/pkgs/development/libraries/lrdf/default.nix b/nixpkgs/pkgs/development/libraries/lrdf/default.nix index 51b2635b89e0..bd78a4329a59 100644 --- a/nixpkgs/pkgs/development/libraries/lrdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/lrdf/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lrdf/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/lyra/default.nix b/nixpkgs/pkgs/development/libraries/lyra/default.nix index 9f5fd1d3a342..ed02af56f784 100644 --- a/nixpkgs/pkgs/development/libraries/lyra/default.nix +++ b/nixpkgs/pkgs/development/libraries/lyra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bfgroup/Lyra"; description = "A simple to use, composable, command line parser for C++ 11 and beyond"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.boost; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix b/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix new file mode 100644 index 000000000000..c71bf17a3c77 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -0,0 +1,57 @@ +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config +, qtbase, curl, libuv, glfw3, rapidjson }: + +mkDerivation rec { + pname = "mapbox-gl-native"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = "mapbox-gl-native"; + rev = "maps-v${version}"; + sha256 = "027rw23yvd5a6nl9b5hsanddc44nyb17l2whdcq9fxb9n6vcda4c"; + fetchSubmodules = true; + }; + + patches = [ + # https://github.com/mapbox/mapbox-gl-native/pull/16591 + (fetchpatch { + name = "add-support-for-qmapboxgl-installation.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/e18467d755f470b26f61f6893eddd76ecf0816e6.patch"; + sha256 = "0gs7wmkvyhf2db4cwbsq31sprsh1avi70ggvi32bk0wn3cw4d79b"; + }) + (fetchpatch { + name = "add-support-for-using-qmapboxgl-as-a-proper-cmake-dependency.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/ab27b9b8207754ef731b588d187c470ffb084455.patch"; + sha256 = "1lr5p1g4qaizs57vjqry9aq8k1ki59ks0y975chlnrm2sffp140r"; + }) + (fetchpatch { + name = "skip-license-check.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; + sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; + }) + ]; + + postPatch = '' + # don't use vendored rapidjson + rm -r vendor/mapbox-base/extras/rapidjson + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl libuv glfw3 qtbase rapidjson ]; + + cmakeFlags = [ + "-DMBGL_WITH_QT=ON" + "-DMBGL_WITH_QT_LIB_ONLY=ON" + "-DMBGL_WITH_QT_HEADLESS=OFF" + ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; + + meta = with lib; { + description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; + homepage = "https://mapbox.com/mobile"; + license = licenses.bsd2; + maintainers = with maintainers; [ Thra11 dotlambda ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix new file mode 100644 index 000000000000..87e765766227 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, curl +, qtbase +, qtlocation +, mapbox-gl-native +}: + +mkDerivation rec { + pname = "mapbox-gl-qml"; + version = "1.7.6"; + + src = fetchFromGitHub { + owner = "rinigus"; + repo = "mapbox-gl-qml"; + rev = version; + sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl qtlocation mapbox-gl-native ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}" + ''; + + # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path + NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5"; + + meta = with lib; { + description = "Unofficial Mapbox GL Native bindings for Qt QML"; + homepage = "https://github.com/rinigus/mapbox-gl-qml"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ Thra11 dotlambda ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mauikit/default.nix b/nixpkgs/pkgs/development/libraries/mauikit/default.nix new file mode 100644 index 000000000000..38e938080ba3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mauikit/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kio +, qtbase +, qtquickcontrols2 +, syntax-highlighting +}: + +mkDerivation rec { + pname = "mauikit"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit"; + rev = "v${version}"; + sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kio + qtquickcontrols2 + syntax-highlighting + ]; + + meta = with lib; { + homepage = "https://mauikit.org/"; + description = "Free and modular front-end framework for developing fast and compelling user experiences"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + broken = versionOlder qtbase.version "5.14.0"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/maxflow/default.nix b/nixpkgs/pkgs/development/libraries/maxflow/default.nix new file mode 100644 index 000000000000..9c53a16d3724 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/maxflow/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "maxflow"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "gerddie"; + repo = pname; + rev = version; + hash = "sha256-a84SxGMnfBEaoMEeeIFffTOtErSN5yzZBrAUDjkalGY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Software for computing mincut/maxflow in a graph"; + homepage = "https://github.com/gerddie/maxflow"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.tadfisher ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 38a9b78b6d10..2e25399d9797 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -4,7 +4,7 @@ , cmake , ninja , perl # Project uses Perl for scripting and testing -, python +, python3 , enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading }: @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf"; }; - nativeBuildInputs = [ cmake ninja perl python ]; + nativeBuildInputs = [ cmake ninja perl python3 ]; + + strictDeps = true; postConfigure = lib.optionals enableThreading '' perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer diff --git a/nixpkgs/pkgs/development/libraries/md4c/default.nix b/nixpkgs/pkgs/development/libraries/md4c/default.nix new file mode 100644 index 000000000000..a711ecb7c768 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/md4c/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "md4c"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "mity"; + repo = pname; + rev = "release-${version}"; + hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + meta = with lib; { + homepage = "https://github.com/mity/md4c"; + description = "Markdown parser made in C"; + longDescription = '' + MD4C is Markdown parser implementation in C, with the following features: + + - Compliance: Generally, MD4C aims to be compliant to the latest version + of CommonMark specification. Currently, we are fully compliant to + CommonMark 0.29. + - Extensions: MD4C supports some commonly requested and accepted + extensions. See below. + - Performance: MD4C is very fast. + - Compactness: MD4C parser is implemented in one source file and one + header file. There are no dependencies other than standard C library. + - Embedding: MD4C parser is easy to reuse in other projects, its API is + very straightforward: There is actually just one function, md_parse(). + - Push model: MD4C parses the complete document and calls few callback + functions provided by the application to inform it about a start/end of + every block, a start/end of every span, and with any textual contents. + - Portability: MD4C builds and works on Windows and POSIX-compliant + OSes. (It should be simple to make it run also on most other platforms, + at least as long as the platform provides C standard library, including + a heap memory management.) + - Encoding: MD4C by default expects UTF-8 encoding of the input + document. But it can be compiled to recognize ASCII-only control + characters (i.e. to disable all Unicode-specific code), or (on Windows) + to expect UTF-16 (i.e. what is on Windows commonly called just + "Unicode"). See more details below. + - Permissive license: MD4C is available under the MIT license. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; + }; +} +# TODO: enable tests (needs Python) diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 3cda9ff3006d..aaa31b29e9ea 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -4,11 +4,11 @@ , cmake , doxygen , fetchFromGitLab -, fetchpatch , ffmpeg_3 , glew , gsm , intltool +, lib , libGL , libGLU , libX11 @@ -24,16 +24,16 @@ , libvpx , ortp , pkg-config -, python +, python3 , SDL , speex , srtp -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.13"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0w84v1ajhyysr41qaj7x4njwdak84cc10lq33hl8lq68a52fc2vw"; + sha256 = "0aqma9834lzy1593qb9qwmzvzn50y6fzhmmg493jznf8977b0gsw"; }; patches = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doxygen intltool pkg-config - python + python3 ]; propagatedBuildInputs = [ @@ -87,6 +87,8 @@ stdenv.mkDerivation rec { srtp ]; + strictDeps = true; + # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; @@ -102,7 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch b/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch new file mode 100644 index 000000000000..e60a4ffa308a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch @@ -0,0 +1,33 @@ +From 8ac29b952e638ec1ea8c3734a3b91253e50c336d Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Sun, 24 Jan 2021 21:10:29 -0800 +Subject: [PATCH 4/4] Hack to address build failure when using newer macOS SDKs + with older deployment targets + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +--- + include/c11/threads_posix.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h +index 45cb6075e6e..355d725f7da 100644 +--- a/include/c11/threads_posix.h ++++ b/include/c11/threads_posix.h +@@ -382,7 +382,13 @@ tss_set(tss_t key, void *val) + + /*-------------------- 7.25.7 Time functions --------------------*/ + // 7.25.6.1 +-#ifndef HAVE_TIMESPEC_GET ++#if !defined(HAVE_TIMESPEC_GET) || defined(__APPLE__) ++ ++#ifdef __APPLE__ ++#include <time.h> ++#define timespec_get(ts, b) mesa_timespec_get(ts, b) ++#endif ++ + static inline int + timespec_get(struct timespec *ts, int base) + { +-- +2.29.2 (Apple Git-129) + diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 11d6cdd1b2a5..e7c87bbc2c72 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.3.3"; + version = "20.3.4"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0mnic7mfv5lgnn3swj7lbif8bl8pi2czlgr01jhq5s9q90nj2kpp"; + sha256 = "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"; }; prePatch = "patchShebangs ."; @@ -65,6 +65,10 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) + ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. + # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 + ./aarch64-darwin.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/metal/default.nix b/nixpkgs/pkgs/development/libraries/metal/default.nix index b98ae8e217c7..2f43485e05e0 100644 --- a/nixpkgs/pkgs/development/libraries/metal/default.nix +++ b/nixpkgs/pkgs/development/libraries/metal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/brunocodutra/metal"; license = licenses.mit; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 2ac2087054fe..36abc9f3276e 100644 --- a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.7"; + version = "2.0.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1ymffs3ixc4vkhpr09ph6xhyknm2cx8ij8j5l70cq6119mwilnwa"; + sha256 = "sha256-BMDCreY41CxJaPo9BdSRZlqh/YjtPC9aI/Zxt501e+0="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/minixml/default.nix b/nixpkgs/pkgs/development/libraries/minixml/default.nix index 93c03b31a8a7..9bf5235db824 100644 --- a/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A small XML library"; homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/minizip2/default.nix b/nixpkgs/pkgs/development/libraries/minizip2/default.nix index 16bb2b8d44e6..591bb8c8dc3a 100644 --- a/nixpkgs/pkgs/development/libraries/minizip2/default.nix +++ b/nixpkgs/pkgs/development/libraries/minizip2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minizip"; - version = "2.10.4"; + version = "2.10.6"; src = fetchFromGitHub { owner = "nmoinvaz"; repo = pname; rev = version; - sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x"; + sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/msgpuck/default.nix b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix index 53fb3bec908c..cc7b056bb988 100644 --- a/nixpkgs/pkgs/development/libraries/msgpuck/default.nix +++ b/nixpkgs/pkgs/development/libraries/msgpuck/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/muparser/default.nix b/nixpkgs/pkgs/development/libraries/muparser/default.nix index 85c9f781cc60..f213f39c06d3 100644 --- a/nixpkgs/pkgs/development/libraries/muparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/muparser/default.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z"; }; - buildInputs = [ - unzip - ] ++ lib.optionals stdenv.isDarwin [setfile]; + nativeBuildInputs = [ unzip ]; + buildInputs = lib.optionals stdenv.isDarwin [setfile]; meta = { homepage = "http://muparser.sourceforge.net"; diff --git a/nixpkgs/pkgs/development/libraries/muparserx/default.nix b/nixpkgs/pkgs/development/libraries/muparserx/default.nix index ef6b254b8a37..4d3036d4cfbb 100644 --- a/nixpkgs/pkgs/development/libraries/muparserx/default.nix +++ b/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + # selftest fails + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix b/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix new file mode 100644 index 000000000000..373f232a9866 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mustache-hpp/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "mustache"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "kainjow"; + repo = "Mustache"; + rev = "v${version}"; + sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/include + cp ../mustache.hpp $out/include + ''; + + meta = with lib; { + description = "Mustache text templates for modern C++"; + homepage = "https://github.com/kainjow/Mustache"; + license = licenses.boost; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/mygui/default.nix b/nixpkgs/pkgs/development/libraries/mygui/default.nix index 4260e30561b4..8e63cb681203 100644 --- a/nixpkgs/pkgs/development/libraries/mygui/default.nix +++ b/nixpkgs/pkgs/development/libraries/mygui/default.nix @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 unzip ois freetype libuuid boost ] + nativeBuildInputs = [ cmake pkg-config unzip ]; + buildInputs = [ libX11 ois freetype libuuid boost ] ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); # Tools are disabled due to compilation failures. diff --git a/nixpkgs/pkgs/development/libraries/mysocketw/default.nix b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix index 3b5da68a59d7..52d294525a0c 100644 --- a/nixpkgs/pkgs/development/libraries/mysocketw/default.nix +++ b/nixpkgs/pkgs/development/libraries/mysocketw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - makeFlags = [ "PREFIX=$(out)" "CXX=c++" ]; + makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix index e8053ce27023..958be905f835 100644 --- a/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/neardal/default.nix b/nixpkgs/pkgs/development/libraries/neardal/default.nix index 5e02a9fd5222..43f63d91a618 100644 --- a/nixpkgs/pkgs/development/libraries/neardal/default.nix +++ b/nixpkgs/pkgs/development/libraries/neardal/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { sha256 = "12qwg7qiw2wfpaxfg2fjkmj5lls0g33xp6w433g8bnkvwlq4s29g"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool glib readline makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ autoconf automake libtool glib readline ]; preConfigure = '' substituteInPlace "ncl/Makefile.am" --replace "noinst_PROGRAMS" "bin_PROGRAMS" diff --git a/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix new file mode 100644 index 000000000000..a07a692f295e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qmake, qtbase }: + +mkDerivation rec { + pname = "nemo-qml-plugin-dbus"; + version = "2.1.24"; + + src = fetchFromGitLab { + domain = "git.sailfishos.org"; + owner = "mer-core"; + repo = "nemo-qml-plugin-dbus"; + rev = version; + sha256 = "1ilg929456d3k0xkvxa5r4k7i4kkw9i8kgah5xx1yq0d9wka0l77"; + }; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + substituteInPlace dbus.pro --replace ' tests' "" + substituteInPlace src/nemo-dbus/nemo-dbus.pro \ + --replace /usr $out \ + --replace '$$[QT_INSTALL_LIBS]' $out'/lib' + substituteInPlace src/plugin/plugin.pro \ + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + ''; + + meta = with lib; { + description = "Nemo DBus plugin for qml"; + homepage = "https://git.sailfishos.org/mer-core/nemo-qml-plugin-dbus/"; + license = licenses.lgpl2Only; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/nettle/default.nix b/nixpkgs/pkgs/development/libraries/nettle/default.nix index 7c0c6476bd05..3eec9c97ff10 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/default.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl }: -callPackage ./generic.nix (args // rec { - version = "3.6"; +callPackage ./generic.nix rec { + version = "3.7.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j"; + sha256 = "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald"; }; -}) +} diff --git a/nixpkgs/pkgs/development/libraries/nettle/generic.nix b/nixpkgs/pkgs/development/libraries/nettle/generic.nix index 735fe373533d..348faf56b56a 100644 --- a/nixpkgs/pkgs/development/libraries/nettle/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nettle/generic.nix @@ -2,9 +2,9 @@ # Version specific args , version, src -, ...}: +}: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "nettle-${version}"; inherit src; @@ -16,7 +16,14 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; - configureFlags = [ "--enable-fat" ]; # runtime selection of HW-accelerated code + configureFlags = + # runtime selection of HW-accelerated code; it's default since 3.7 + [ "--enable-fat" ] + # Make sure the right <gmp.h> is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> + # for details. + ++ lib.optional stdenv.isSunOS "--with-include-path=${gmp.dev}/include"; doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin); @@ -53,18 +60,9 @@ stdenv.mkDerivation ({ license = licenses.gpl2Plus; - homepage = "http://www.lysator.liu.se/~nisse/nettle/"; + homepage = "https://www.lysator.liu.se/~nisse/nettle/"; platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; } - -// - -lib.optionalAttrs stdenv.isSunOS { - # Make sure the right <gmp.h> is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> - # for details. - configureFlags = [ "--with-include-path=${gmp.dev}/include" ]; -}) diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 742135345328..41a967a5b709 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs="; }; + patches = [ + # https://github.com/nlohmann/json/pull/2690 + (fetchpatch { + url = "https://github.com/nlohmann/json/commit/53a9850eebb88c6ff95f6042d08d5c0cc9d18097.patch"; + sha256 = "k+Og00nXNg5IsFQY5fWD3xVQQXUFFTie44UXole0S1M="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/nixpkgs/pkgs/development/libraries/notcurses/default.nix index 7b9bffb9bc95..9b5043a1e234 100644 --- a/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -1,9 +1,9 @@ -{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, +{ stdenv, cmake, pkg-config, pandoc, libunistring, ncurses, ffmpeg, readline, fetchFromGitHub, lib, multimediaSupport ? true }: let - version = "2.1.0"; + version = "2.2.3"; in stdenv.mkDerivation { pname = "notcurses"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config pandoc ]; - buildInputs = [ libunistring ncurses ] + buildInputs = [ libunistring ncurses readline ] ++ lib.optional multimediaSupport ffmpeg; cmakeFlags = @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "0jvngg40c1sqf85kqy6ya0vflpxsj7j4g6cw609992rifaghxiny"; + sha256 = "sha256-O6bu/tEotsxHAx6rCi0xRaklmF0l6neYwwscF2w0HJg="; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix index 8c98d7ae9bbd..81a51c7beaea 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib +, sqlite, ninja +, darwin, fixDarwinDylibNames, buildPackages +, useP11kit ? true, p11-kit , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -15,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.60"; + version = "3.62"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -24,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4"; + sha256 = "0y2ld90bncjjggrn64c7g7mq9i03z6dc3r2kz978snz2xiydzml6"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -139,6 +142,11 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; + postInstall = lib.optionalString useP11kit '' + # Replace built-in trust with p11-kit connection + ln -sf ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi.so + ''; + postFixup = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; diff --git a/nixpkgs/pkgs/development/libraries/ntl/default.nix b/nixpkgs/pkgs/development/libraries/ntl/default.nix index 23d82d4ba2fa..6e41639d48e5 100644 --- a/nixpkgs/pkgs/development/libraries/ntl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntl/default.nix @@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { pname = "ntl"; - version = "11.4.3"; + version = "11.4.4"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp"; + sha256 = "sha256-nX9uguEaQJ8VHA3i3rCMDXY7r5g0/d/UMr89IY+AIds="; }; buildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { else "generic" # "chooses options that should be OK for most platforms" }" - "CXX=c++" + "CXX=${stdenv.cc.targetPrefix}c++" ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" diff --git a/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/nixpkgs/pkgs/development/libraries/nuraft/default.nix index 58e5e4013590..f9ae9d5ffe64 100644 --- a/nixpkgs/pkgs/development/libraries/nuraft/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-l6rG8f+JAWfAJxEZPKRHZo2k8x9WbtSJC3gGCSMHYfs="; + sha256 = "sha256-1k+AWmpAiHcQVEB5kUaMtNWhOnTBnmJiNU8zL1J/PEk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix b/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix index 4386542ff20e..ab09931579c7 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation { name = (appendToName "with-dicts" nuspell).name; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} ''; diff --git a/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix index 3a63bad03dcb..22161e3dc1d6 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; # We only need the header files. The library files are # in the nvidia_x11 driver. diff --git a/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/nixpkgs/pkgs/development/libraries/oatpp/default.nix index 084f3c4a935b..e9f92a31f2c5 100644 --- a/nixpkgs/pkgs/development/libraries/oatpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/oatpp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "oatpp"; - version = "1.2.0"; + version = "1.2.5"; src = fetchFromGitHub { owner = "oatpp"; repo = "oatpp"; rev = version; - sha256 = "05rm0m5zf1b5ky8prf6yni2074bz6yjjbrc2qk96fb48fc1198gw"; + sha256 = "sha256-Vtdz03scx0hvY1yeM7yfSxCVKzi84OQ1Oh9b922movE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix index b79de9278d46..251a3f9f55b8 100644 --- a/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; - makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"]; postFixup = '' ${lib.optionalString (stdenv.isLinux) '' diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index 4fbc34bcce63..ca3a081aee00 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.1"; + version = "3.2.2"; - src = fetchurl { - url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr"; + src = fetchFromGitLab { + domain = "gitlab.matrix.org"; + owner = "matrix-org"; + repo = pname; + rev = version; + sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy"; }; nativeBuildInputs = [ cmake ]; doCheck = true; - meta = { + meta = with lib; { description = "Implements double cryptographic ratchet and Megolm ratchet"; - license = lib.licenses.asl20; homepage = "https://gitlab.matrix.org/matrix-org/olm"; - platforms = with lib.platforms; darwin ++ linux; + license = licenses.asl20; + maintainers = with maintainers; [ tilpner oxzi ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 2b399e9ebc29..93da285e824b 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.0"; + version = "2.1.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq"; + sha256 = "sha256-xByu0HWeyDg5WV/zVO4HO/uwZ2RPrud0FlZHPfFom1E="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix index ec40bc393d51..b6aa71491680 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix index 1ef27bf58316..d7a8b4497f7f 100644 --- a/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencl-headers/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Khronos OpenCL headers version ${version}"; homepage = "https://www.khronos.org/registry/cl/"; - license = licenses.mit; + license = licenses.asl20; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/nixpkgs/pkgs/development/libraries/opencsg/default.nix index 53adbdf414f7..7625db9a5953 100644 --- a/nixpkgs/pkgs/development/libraries/opencsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencsg/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { rmdir $out/bin || true ''; + dontWrapQtApps = true; + postFixup = lib.optionalString stdenv.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 11872cd47cc3..a65e978f9816 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix index ce35aa1c655e..1e3ee9896447 100644 --- a/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation { -I${openfx.dev}/include/OpenFX ''; - buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/openfx/default.nix b/nixpkgs/pkgs/development/libraries/openfx/default.nix index 0d8afe53df8b..a26e97798aef 100644 --- a/nixpkgs/pkgs/development/libraries/openfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/openfx/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; outputs = [ "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix index a71b2a61910e..39831a3baf08 100644 --- a/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: +{ lib, stdenv, fetchurl, openssl, db, groff, libtool +, withCyrusSasl ? true +, cyrus_sasl +}: stdenv.mkDerivation rec { pname = "openldap"; - version = "2.4.57"; + version = "2.4.58"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - sha256 = "sha256-x7pH4ebstbQ289Qygd9Xq+/6mSYhQa7IImKLwiD2tFo="; + sha256 = "sha256-V7WSVL4V0L9qmrPVFMHAV3ewISMpFTMTSofJRGj49Hs="; }; # TODO: separate "out" and "bin" @@ -37,8 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" "ac_cv_func_memcmp_working=yes" - ] ++ lib.optional (openssl == null) "--without-tls" - ++ lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ] ++ lib.optional (!withCyrusSasl) "--without-cyrus-sasl" ++ lib.optional stdenv.isFreeBSD "--with-pic"; postBuild = '' @@ -54,19 +56,21 @@ stdenv.mkDerivation rec { "moduledir=$(out)/lib/modules" ]; - # 1. Fixup broken libtool - # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` + # 1. Libraries left in the build location confuse `patchelf --shrink-rpath` # Delete these to let patchelf discover the right path instead. # FIXME: that one can be removed when https://github.com/NixOS/patchelf/pull/98 # is in Nixpkgs patchelf. + # 2. Fixup broken libtool for openssl and cyrus_sasl (if it is not disabled) preFixup = '' - sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \ - -e 's,-lssl,-L${openssl.out}/lib -lssl,' \ - -i $out/lib/libldap.la -i $out/lib/libldap_r.la - - rm -rf $out/var + rm -r $out/var rm -r libraries/*/.libs rm -r contrib/slapd-modules/passwd/*/.libs + for f in $out/lib/libldap.la $out/lib/libldap_r.la; do + substituteInPlace "$f" --replace '-lssl' '-L${openssl.out}/lib -lssl' + '' + lib.optionalString withCyrusSasl '' + substituteInPlace "$f" --replace '-lsasl2' '-L${cyrus_sasl.out}/lib -lsasl2' + '' + '' + done ''; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 802685970ace..46b2748cad98 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.5"; + version = "4.1.0"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; + sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/openpa/default.nix b/nixpkgs/pkgs/development/libraries/openpa/default.nix index bc8efdc857eb..23f025e2aa63 100644 --- a/nixpkgs/pkgs/development/libraries/openpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/openpa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://trac.mpich.org/projects/openpa"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ leenaars ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.unix; longDescription = '' OPA (or sometimes OpenPA or Open Portable Atomics) is an open source library intended to provide a consistent C API for performing diff --git a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index 8eeff3de9435..da7e9c755a03 100644 --- a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "openscenegraph"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "openscenegraph"; repo = "OpenSceneGraph"; rev = "OpenSceneGraph-${version}"; - sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"; + sha256 = "00i14h82qg3xzcyd8p02wrarnmby3aiwmz0z43l50byc9f8i05n1"; }; nativeBuildInputs = [ pkg-config cmake doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 49ac7954169f..fda0c71655a6 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -3,8 +3,17 @@ , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic +# Used to avoid cross compiling perl, for example, in darwin bootstrap tools. +# This will cause c_rehash to refer to perl via the environment, but otherwise +# will produce a perfectly functional openssl binary and library. +, withPerl ? true }: +assert ( + lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) + "withPerl should not be disabled unless cross compiling" +); + # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as @@ -46,7 +55,10 @@ let separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; - buildInputs = lib.optional withCryptodev cryptodev; + buildInputs = lib.optional withCryptodev cryptodev + # perl is included to allow the interpreter path fixup hook to set the + # correct interpreter in c_rehash. + ++ lib.optional withPerl perl; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -108,12 +120,20 @@ let rm "$out/lib/"*.a fi - '' + - '' mkdir -p $bin '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + # Fix bin/c_rehash's perl interpreter line + # + # - openssl 1_0_2: embeds a reference to buildPackages.perl + # - openssl 1_1: emits "#!/usr/bin/env perl" + # + # In the case of openssl_1_0_2, reset the invalid reference and let the + # interpreter hook take care of it. + # + # In both cases, if withPerl = false, the intepreter line is expected be + # "#!/usr/bin/env perl" '' - substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} + substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl}/bin/perl "/usr/bin/env perl" '' + '' mv $out/bin $bin/ diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 9228424797e2..83eb77b603c5 100644 --- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0zpnpg2zzyavv9r3jakv3j2gn603b62rbczrflc6qmg6qvpgz0kr"; + sha256 = "sha256-ejxQ5mGIIrEa/rAfkTrRbIRerrAvEPoWn7e0lIqS1JQ="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index 5f3a03a3f5bf..b5317ce9aae8 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec outputs = [ "out" ]; - buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; setSourceRoot = '' sourceRoot=$(echo */openvdb) diff --git a/nixpkgs/pkgs/development/libraries/orcania/default.nix b/nixpkgs/pkgs/development/libraries/orcania/default.nix index 5c9c2c8da7f2..157769c7772f 100644 --- a/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "0l035zbzyv623h5186rk6iq1097rxx64iwnk4s2c7l9gzv9wyapp"; + sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ortp/default.nix b/nixpkgs/pkgs/development/libraries/ortp/default.nix index 196cac4bcafc..af924ad80d26 100644 --- a/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.9"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0igiw863gnf9f626v0igg1pj3fv4anvlvlk6xx3bk2zdi52a9kcc"; + sha256 = "1lc1j7wvkyp5lhcflq3h5y7n8aiwgwj84ffm81ggbsmavamgwkk7"; }; # Do not build static libraries diff --git a/nixpkgs/pkgs/development/libraries/osip/default.nix b/nixpkgs/pkgs/development/libraries/osip/default.nix index 322ed30a8476..b7cfc5da9d3b 100644 --- a/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/osip/"; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; inherit version; }; } diff --git a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix index 17a3af68a808..9ba581e3a401 100644 --- a/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix +++ b/nixpkgs/pkgs/development/libraries/osm-gps-map/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osm-gps-map"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; - sha256 = "0fal3mqcf3yypir4f7njz0dm5wr7lqwpimjx28wz9imh48cqx9n9"; + sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index 68511003215c..0369cedebf4c 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,57 +1,91 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, cairo, harfbuzz -, libintl, libthai, gobject-introspection, darwin, fribidi, gnome3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf -, meson, ninja, glib +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, cairo +, harfbuzz +, libintl +, libthai +, gobject-introspection +, darwin +, fribidi +, gnome3 +, gi-docgen +, makeFontsConf +, freefont_ttf +, meson +, ninja +, glib , x11Support? !stdenv.isDarwin, libXft }: -with lib; - -let +stdenv.mkDerivation rec { pname = "pango"; - version = "1.47.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.48.3"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"; }; - # FIXME: docs fail on darwin - outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; + patches = [ + # Install developer documentation. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch"; + sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ="; + }) + ]; nativeBuildInputs = [ meson ninja glib # for glib-mkenum - pkg-config gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + pkg-config + gobject-introspection + gi-docgen ]; + buildInputs = [ fribidi libthai - ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++ - optional x11Support libXft; - mesonFlags = [ - "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" - ] ++ lib.optionals stdenv.isDarwin [ - "-Dxft=disabled" # only works with x11 + propagatedBuildInputs = [ + cairo + glib + libintl + harfbuzz + ] ++ lib.optionals x11Support [ + libXft ]; - enableParallelBuilding = true; + mesonFlags = [ + "-Dgtk_doc=true" + ] ++ lib.optionals (!x11Support) [ + "-Dxft=disabled" # only works with x11 + ]; # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - doCheck = false; # /layout/valid-1.markup: FAIL + doCheck = false; # test-font: FAIL + + postInstall = '' + # So that devhelp can find this. + # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 + mkdir -p "$devdoc/share/devhelp" + mv "$out/share/doc/pango/reference" "$devdoc/share/devhelp/books" + rmdir -p --ignore-fail-on-non-empty "$out/share/doc/pango" + ''; passthru = { updateScript = gnome3.updateScript { @@ -73,7 +107,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.pango.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/nixpkgs/pkgs/development/libraries/pangomm/default.nix index 0ff0d9a7d4e9..3eb5f39c3825 100644 --- a/nixpkgs/pkgs/development/libraries/pangomm/default.nix +++ b/nixpkgs/pkgs/development/libraries/pangomm/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3 , ApplicationServices }: stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.1"; + version= "2.42.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; + sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ pango glibmm cairomm ]; diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix index 0247d12715f6..d4af69532b39 100644 --- a/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index 436e0f85e162..b8cdff1f48c8 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -1,22 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, qhull, flann, boost, vtk, eigen, pkg-config, qtbase -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, OpenGL +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, qhull +, flann +, boost +, vtk +, eigen +, pkg-config +, qtbase +, libusb1 +, libpcap +, libXt +, libpng +, Cocoa +, AGL +, OpenGL }: stdenv.mkDerivation rec { - name = "pcl-1.11.1"; + pname = "pcl"; + version = "1.11.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ qhull flann boost eigen libusb1 libpcap - libpng vtk qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; + buildInputs = [ + qhull + flann + boost + eigen + libusb1 + libpcap + libpng + vtk + qtbase + libXt + ] + ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" @@ -24,10 +51,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://pointclouds.org/"; - broken = lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index 249ce4e3629a..3e21415b4c77 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { # on system paths being set. patches = [ ./gst-plugin-paths.patch ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE = let gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 07e6ccf1f346..b874c2e1d01d 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { extra-cmake-modules ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix index 88a6af658dd4..877bf973194a 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + dontWrapQtApps = true; + preConfigure = '' cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" diff --git a/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix index 916303f00cec..87e2ae9631c5 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: +{ lib +, stdenv +, fetchurl +, boost +, fastjet +, gfortran +, lhapdf +, python2 +, root +, yoda +, zlib +}: stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; @@ -9,8 +20,19 @@ stdenv.mkDerivation rec { sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; - buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ]; - propagatedBuildInputs = [ zlib ]; + buildInputs = [ + boost + fastjet + gfortran + gfortran.cc.lib + lhapdf + python2 + root + yoda + ]; + propagatedBuildInputs = [ + zlib + ]; preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ @@ -23,11 +45,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { - description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; - license = lib.licenses.gpl3; - homepage = "http://fastnlo.hepforge.org"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + meta = with lib; { + homepage = "http://fastnlo.hepforge.org"; + description = "Fast pQCD calculations for hadron-induced processes"; + longDescription = '' + The fastNLO project provides computer code to create and evaluate fast + interpolation tables of pre-computed coefficients in perturbation theory + for observables in hadron-induced processes. + + This allows fast theory predictions of these observables for arbitrary + parton distribution functions (of regular shape), renormalization or + factorization scale choices, and/or values of alpha_s(Mz) as e.g. needed + in PDF fits or in systematic studies. Very time consuming complete + recalculations are thus avoided. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index 5646f4e02bac..4c6906c9c2e3 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -70,8 +70,8 @@ in { name = "G4PARTICLEXS"; - version = "3.1"; - sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0"; + version = "3.1.1"; + sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6"; envvar = "PARTICLEXS"; } diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 159c746fecd8..8d2f2f1ef55d 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -21,6 +21,7 @@ # For enableQT. , qtbase +, wrapQtAppsHook # For enableXM. , motif @@ -48,12 +49,12 @@ let in stdenv.mkDerivation rec { - version = "10.7.0"; + version = "10.7.1"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz"; - sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz"; + sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; @@ -87,7 +88,13 @@ stdenv.mkDerivation rec { "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals enableQT [ + wrapQtAppsHook + ]; + + dontWrapQtApps = !enableQT; buildInputs = [ libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] @@ -101,6 +108,8 @@ stdenv.mkDerivation rec { postFixup = '' # Don't try to export invalid environment variables. sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh + '' + lib.optionalString enableQT '' + wrapQtAppsHook ''; setupHook = ./geant4-hook.sh; diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index d3f6bcb74747..0a7e9b4d948e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "11m6xvardnk0i8x8b3dpwg4c4ncq0xmlfg2n5r5qmh6544pz7zyl"; + sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; }; nativeBuildInputs = [ autoconf automake libtool ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh index 94bf252ec10a..92c225f90ccd 100755 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -1,10 +1,12 @@ #!/bin/bash -set -e +set -xe -BASE_URL="https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/" +: ${SED:="$(nix-build '<nixpkgs>' -A gnused --no-out-link)/bin/sed"} -for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"[^\"]*\/\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | gsed -e "s/%2B/+/g" | sort -u`; do +BASE_URL="https://lhapdfsets.web.cern.ch/lhapdfsets/current/" + +for pdf_set in `curl -L $BASE_URL 2>/dev/null | "$SED" -e "s/.*<a href=\"\([^\"/]*.tar.gz\)\".*/\1/;tx;d;:x" | sort -u`; do echo -n " \"${pdf_set%.tar.gz}\" = \"" nix-prefetch-url "${BASE_URL}${pdf_set}" 2>/dev/null | tr -d '\n' echo "\";" diff --git a/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 7fb3e640c7d6..694164f5af2e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/nixpkgs/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -6,7 +6,7 @@ let inherit name; src = fetchurl { - url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz"; + url = "https://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz"; inherit sha256; }; @@ -189,6 +189,134 @@ in "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0"; "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k"; "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7"; + "CT18ANLO" = "16lbhgkbiym3njiffxdcm3hf7kkm33hyj2w1hwgb3mvxx2sja31c"; + "CT18ANLO_as_0110" = "08hwxc99l645a9craimgawwynxcs5cmapgxgk0fy9ihvjvqs6jg2"; + "CT18ANLO_as_0111" = "02ff3s127svdjzawbhzry04rcsw5waggmf3iwpqndzxhqpm0py8a"; + "CT18ANLO_as_0112" = "063g7sqii0gf2rdjg9k9x95kzwg62w8lfq9cgyv3bnkpapnbqhia"; + "CT18ANLO_as_0113" = "01zh34dg4cc8955ipg2i0k6s13h77jg8yaa4v2f4aw0020js9dn2"; + "CT18ANLO_as_0114" = "061lvglsg4889q6qya83f7ngyzi2ibar1c9w6xyl462x5i4frx2x"; + "CT18ANLO_as_0115" = "0a35axfjxywy4yh8pk4w4f57rfljvd593bx7a8wnix0cifnngg4j"; + "CT18ANLO_as_0116" = "1cm3m3m6l93qlr9fxbc0d21gq3x0wn09qi8cxbx7lj0yqhjf2zh8"; + "CT18ANLO_as_0117" = "1nrzrlp7i42z7pv550ggga0fk356i9rqbj60mdxvlw3xl6v4kkf4"; + "CT18ANLO_as_0118" = "19p7x6q9flsz1s82scakgnsfsrjf8ym6ix3gp195fjgfdkannh9i"; + "CT18ANLO_as_0119" = "1jz27f39dpg0g46p834vgvaajxspyqwd8f7zlpv44lfb43va6dgy"; + "CT18ANLO_as_0120" = "0rp9hrvs44d8pbagmc3vipnh5d9amam3prkm2k7spvxahr6dp8dp"; + "CT18ANLO_as_0121" = "15abhrjmmhyka9dxjmwz7103i0bpa605yhy6kisgzf7km5ca14h9"; + "CT18ANLO_as_0122" = "15mxybppydzsxx308hqljahnmrw0islw2zl45kjlhxjxsmaai2nc"; + "CT18ANLO_as_0123" = "19zlyapm5cp1hwvfqcjm3v6mgwdaa6f5d0mvnh68c05sn39xjhz2"; + "CT18ANLO_as_0124" = "1fwzcs50bj6d6cjkvi4qj44mwrwxhjh25lxmk2q82wdmddgpaz0c"; + "CT18ANNLO" = "1kbsbvvkkchhwwjdrj4d91lbykid4dcy4ghanpdd9x0nfm5b4sgk"; + "CT18ANNLO_as_0110" = "1a60p22r292hjjcrdkgis6d81hgihnjzyzlbcqrvx9bkbq447kjq"; + "CT18ANNLO_as_0111" = "1gyl4h92xs4s64dm7cwrfqk2zrs1cbzp76dqckf7z44k4pm460m9"; + "CT18ANNLO_as_0112" = "1bsn5q12bgkhyl1d6wkq32m3l7i0wqxpnjxh790xcd3ympbfx16h"; + "CT18ANNLO_as_0113" = "1dri54s71ygnd1pdnmvr9vqbyfllwzr9x39zg01rpj02zy7kidb0"; + "CT18ANNLO_as_0114" = "0f731ryn1031053zv40mak9m7mxmn6dvnhn6ik6kyag9d3az6lvx"; + "CT18ANNLO_as_0115" = "107569wrkjic6xjp574i6r6n8wj2x9cx4h7dqh77wxl8g4aajkh6"; + "CT18ANNLO_as_0116" = "0r951p0a4pan71lkhf701ysw6kyq1wvf15rbjdjr4j7khjfaykcp"; + "CT18ANNLO_as_0117" = "0xsgzga5bya0ng6i7nvk33nrf792vzbd1rs174cix4v406g99xm8"; + "CT18ANNLO_as_0118" = "049534355lxhppw2l85i677ysb2gwzccs0b5afm719sh06rv6jkn"; + "CT18ANNLO_as_0119" = "034kd7pg103ldc3nmgsylv0ffl8v0sp9jkf9073ny11s7b3pb5wa"; + "CT18ANNLO_as_0120" = "1ph23xpirkahpr9x1k2qm9pp3a1hc3i15bhc6xprpc29k53m4wsi"; + "CT18ANNLO_as_0121" = "12qrg3jb1kar46b8lai56lb7wxjr950dzaixfncxvy38hrny6mxh"; + "CT18ANNLO_as_0122" = "1wmkl2rlhkwzxi1yln0m9i6lvpbqkp3bxdnyzz7hp3hy1sa5f60s"; + "CT18ANNLO_as_0123" = "1caz4rfmcmabfdw5b8xg2307bs1bjclgdcxq2k6gf73z3pqbjs8w"; + "CT18ANNLO_as_0124" = "0mx8h8vdhlklgvysmhllkzga3g65zkmzpz7bmyvaqmvbvr6x5q0w"; + "CT18NLO" = "04y2p6vz484l3yv6381pfavqs3xh78h3jn6bg7ncp5vywwqp44n9"; + "CT18NLO_as_0110" = "0ncaacfw8dh45vaf84kkj93hwxgwz744qqd6llpy73zdilnl62a8"; + "CT18NLO_as_0111" = "1cib3ggy0wajvvw908wr4bfymcw62iy5abwdadhq69crcg01619r"; + "CT18NLO_as_0112" = "1x242x4y0vykfypm02g02qxpwmsq2p45bxqrqgfy29qagxz6j66d"; + "CT18NLO_as_0113" = "0fkis7l0s1lb2k7qyfwnn5axbpiv9yky4j5qc8g3fa068czijmhi"; + "CT18NLO_as_0114" = "1r6ih2gqiwm7z24iw9xgn2n35659v5nwl2d02f07j1k3d33j175n"; + "CT18NLO_as_0115" = "0z4vm73l16mpjf3wcrv5q659f2mwkx85wpmnq8j1fnk0vhms59dx"; + "CT18NLO_as_0116" = "0g4lxxc9g09alpsff9wr7w0jgi26h3klx8rk6nb71j9yzrwv12vv"; + "CT18NLO_as_0117" = "0hmn5vkgi5981q0s5lyp9mq9jjrzhgr1f9w8np3i2nwcgn1awis5"; + "CT18NLO_as_0118" = "1z6is1f3064wq56lfxrmqckk3yi6wsl42s2xigx87p8zqg3r4nkz"; + "CT18NLO_as_0119" = "0p3r7w5v3pq2dgaq96r3khx1wwjq6i33l0bbf63dxs88gk5cx1s4"; + "CT18NLO_as_0120" = "1h0rcra68yypf1yqwlzql385ks1agxc9njdpyx60j3yg3whk4h63"; + "CT18NLO_as_0121" = "1by1iiy7qby73m8s3qmnrf0dyca3k4z00fclbrm651f79nz8scz7"; + "CT18NLO_as_0122" = "1r8h2cw874dh1mj4r545wp9msr1358qw1lzznwvgkmgwjclndjg4"; + "CT18NLO_as_0123" = "1d8c3bk6bvy3azbv9yqi45cwkcmjbxxw7qaxn6xnc5jfcf6wbsp1"; + "CT18NLO_as_0124" = "1haqxq1jbcz9qbhnw4pxsvlr37908fkdlzyn7c1csrlr8a51s3z4"; + "CT18NNLO" = "1shkah5ma0hp101aklkz2p8n9y4i4sv6zwa5ifzyj3bgz1020l5f"; + "CT18NNLO_as_0110" = "1smilnmhw8zjd0hl03v7wflbbia5qxqfmvyikbgwc29g212xbq71"; + "CT18NNLO_as_0111" = "0mj77vshb9fmlvc1pp3m701nl574p0k013lg0l25r4nhvlfiiriz"; + "CT18NNLO_as_0112" = "0a87crw7dygf9q28v95h9j02yq5f9rr5fdrxvqj5ggw839nazgmk"; + "CT18NNLO_as_0113" = "011269haxlh2grq60qbmwrilgnkz6hlacd8x56iizl6ify7hcs2c"; + "CT18NNLO_as_0114" = "0im03f2vr9pfd223skadmcfrypxlpka4pqizjcbqq75fddhljivq"; + "CT18NNLO_as_0115" = "0pppdh2vq86iiar18c5wi2qbm6viv0hpyfah8pn1p6bcg1k99srs"; + "CT18NNLO_as_0116" = "17wsn6jxp25klk3x3yfa5abxjjdl5j9vdwxqb51zg6ic3a7is764"; + "CT18NNLO_as_0117" = "0nkdmqyqzzg19m98mqm9n2dcaiy4i97zrxmy7x1c3rxc0n7igkzh"; + "CT18NNLO_as_0118" = "0v931kw5dzqq95940mxmkj1r6a75w525j99yf47pyf55vg22ybkb"; + "CT18NNLO_as_0119" = "1z4kg4na0m2vrflnizxhjdxa9rdzp66mq66bxcjlvqiraf4ygkd4"; + "CT18NNLO_as_0120" = "07bz7q5h0rfxf5989sarchsv2mcn4093b6x5094725p74sw41sq5"; + "CT18NNLO_as_0121" = "0slw6m1scnajlfhxswd05if782k32gcyx9zz50gaiwqimrz188fa"; + "CT18NNLO_as_0122" = "1jrzxq7mqhkfj96whqfr3ny2g1kggc047cvzb7ladlirmi05injg"; + "CT18NNLO_as_0123" = "1zdmvp9pxjjs96yw05l5s0c0ym1hyj7d3an5siy3i20lvyxcgyz7"; + "CT18NNLO_as_0124" = "1lb88y4c68n669c2g2q2zwjp92d9hgbxgpl0b7dxny9a7zdmw0mx"; + "CT18XNLO" = "1k0cli4j0z5hj24pk9f78flhlvsdfya51hgh90jv4myniapk616l"; + "CT18XNLO_as_0110" = "0yahahfmzzwzxiqanm7029z05f3nx9cs2yjdvyvhazvicsq3ibid"; + "CT18XNLO_as_0111" = "1n0q8d0j8smq2z6n9l091r2q8v319zcf896nk2m0s7n9g9a0vcjq"; + "CT18XNLO_as_0112" = "1wj968g1vb58gz6vslzfmihvqg5f9f2cqgq8inlgdhai1y8vk1lz"; + "CT18XNLO_as_0113" = "1gi939mxv99q2r1m8a6d4ky5nrp24xv16xw6d9h7ly27jrw8kzm5"; + "CT18XNLO_as_0114" = "06gf4m01yr89xklch6ack012in2i1bifyzvp793x9w8m56dx12ms"; + "CT18XNLO_as_0115" = "1g4705l0qb0immd4la2vrj9v4kw7r7i1wz1vn4knbqjwig5kcfws"; + "CT18XNLO_as_0116" = "0vaxwg3ixf4x92vssh8gqrszbfa5zgzbsd5p81j14nlksshrs6bf"; + "CT18XNLO_as_0117" = "10qg2yr63csg4nd62a8h0s1z08cmgbkwvcsh0wp7zkzpw70r7x78"; + "CT18XNLO_as_0118" = "0kxhg2pn7ki4nxcs5jhxvx4fs6c414mq0d0qm3vldv0hsayqsbnd"; + "CT18XNLO_as_0119" = "1xd4ib2fqzhg9c6z2zyc8h3il4msm7rv9kkaaapll4h0gpjdda6x"; + "CT18XNLO_as_0120" = "0jyb8gs0avvlhiwwvrv09p47vs3jim3y315hg7wcy31xab90b91i"; + "CT18XNLO_as_0121" = "1afizsl9phvvdjbyrifx3ii10gpxl51rvx311imz30l51i3fzl7v"; + "CT18XNLO_as_0122" = "0wkpicsv9357lh96vjnrxzddaaaiaagyfph2jcyp97mjhixx2hlg"; + "CT18XNLO_as_0123" = "0hr9m422shvp5yzjdd7lqansim7qcx3iv1p017fp1a4ihj661sra"; + "CT18XNLO_as_0124" = "03zf75f6gx41g3fxrdc6sqkfcyzz03izchwfvabwfxr06yq94jxc"; + "CT18XNNLO" = "0j7bwzkhax4cm3wnbhqdv48j4wha9zdd7v77ihlgcvcmk79rx1fa"; + "CT18XNNLO_as_0110" = "1vwaz00jwpyd1nafpfw0mw309v10zqxcsygdjsdd9mn5p1j6z3hv"; + "CT18XNNLO_as_0111" = "0g6w519dc13mzgb2wpyy7chnl5wkl0ndrdiw7nymad0csg20yss2"; + "CT18XNNLO_as_0112" = "06wlzpx9b83gblg4rvqv22k60pvjikqs5m5gp2kvrwmc2wxp73d2"; + "CT18XNNLO_as_0113" = "0ybm5v0dprid7vvsnsihkd3vn5gqsqsmib63sh3xl45i58h1szzz"; + "CT18XNNLO_as_0114" = "0hpznnkarzjmf5447jp9za1w52lqpysprnf14v31mda9k7a6kdkn"; + "CT18XNNLO_as_0115" = "0lj637cwm726hqilrnfa064apdsqdav142dy3scz2gxzpzqpya7c"; + "CT18XNNLO_as_0116" = "0m1zh15f975g628npifyqmlj578lpdlc67sdrxgdg97jfvxrq7s2"; + "CT18XNNLO_as_0117" = "1r5kwl333ipq3g78cmn7h5yxk2gl3rfszm1ijzyf8hrjqz9m2p35"; + "CT18XNNLO_as_0118" = "070jcd7y5w0h65ssk359w4kf2j7164pgdkg78mjwifi2garrlv0s"; + "CT18XNNLO_as_0119" = "12nzzjyllr4vs422dxdccjy0qffg9gy8p2wa828cr3a26wjlipfr"; + "CT18XNNLO_as_0120" = "1b9k3wd212nrhhncckj6fml58jzjagiskgmc6h248mcc8mcc2gyz"; + "CT18XNNLO_as_0121" = "1wkgmkw5djzxc5g4iyr4h2cz08jv1clmp8x8xcidg5532zclavmd"; + "CT18XNNLO_as_0122" = "1w7jhlk432qni1kn1big44yk16bxghbzrjb1g1rdxpibzy2jdkw3"; + "CT18XNNLO_as_0123" = "15hqb1c4jx41119h2ahx6zacbigs9xw92jw7c4xsww9dkzr1qsr5"; + "CT18XNNLO_as_0124" = "0fx7am4dv4d09hdk0yxvxzbdlhzc03y3q2x1hfx9wk07kcxw1mj5"; + "CT18ZNLO" = "0iv8laks2ymn5fygk6k9lxm3s7fld5g292n9bfkhn3nmcfxczi03"; + "CT18ZNLO_as_0110" = "0q90c9nx0b3fbqq317qr0j13cc9m3zcgpk3pcn8s2sd6aaksa66i"; + "CT18ZNLO_as_0111" = "0wnxj323k29xvcrrf68mfyhflfnblvvnx63p070l5x52qqbfjl7y"; + "CT18ZNLO_as_0112" = "03qjvv004g99lbi022l9bvr82gvv6gzk651r8x5hwwyr0mar4j0v"; + "CT18ZNLO_as_0113" = "0hw6w7x3bnx2fy03jj5yvbjjab9mj0fzca8bc46phjsmx3nqxq5k"; + "CT18ZNLO_as_0114" = "0gnhqhxcsaslcldhyh69lxdx1misjz5qiwry57n31j6mqjrggqbi"; + "CT18ZNLO_as_0115" = "1dn32bwarggnfq2s9drmdjikcrn0nm0mqih4f5wxr3zbmq70xw4q"; + "CT18ZNLO_as_0116" = "17q8ysl7ar1n7wym55k8vzrx963rip9l9b0kxw2bqkha5ipwmnv3"; + "CT18ZNLO_as_0117" = "1afaqy8afzib6fmyy7ysnfk8w5f92893nvh4fn1sx9ink7i2zqal"; + "CT18ZNLO_as_0118" = "0sbhjzjsjd8m6sgz66vky3w7ymhwpss0dr2p603dxgm84fig1kzx"; + "CT18ZNLO_as_0119" = "0fxplpy2l1fdh5p4csdlabg36xgbpdg8pcdfcnws2cfj3g0941as"; + "CT18ZNLO_as_0120" = "05dk8bvwkn5y5j4rk18an25rg1f1am9vlddal84rbp8m15qnms65"; + "CT18ZNLO_as_0121" = "0ymql1wjxng5i887lx2q6p8gryw29zs0d2hzkfxl4f0zzn2wlwpi"; + "CT18ZNLO_as_0122" = "0gnl23n4ljlry340pwwfs0xs22bl2qp2b8p3f73gpp9xn42nwz1g"; + "CT18ZNLO_as_0123" = "1wfx59iadvn85raa1bq81ipxpjbxli58hs8wpzm1vz10ilifn9d5"; + "CT18ZNLO_as_0124" = "0jm0gnp8g1drz6a10wrdxkj2s8gws80ias1ixdnr5fdmnghf1wl7"; + "CT18ZNNLO" = "0zsqrpab6vgcinsxjq3rqdadig5flxzk61wc1aa9rwnkbpm1paa5"; + "CT18ZNNLO_as_0110" = "09ypj0yydkiw82bq3ymsp19i4iz82fm2z2xfplb3iasa86y377in"; + "CT18ZNNLO_as_0111" = "00h0zd5indm57xhn467qffpx7aadzb73vyfazq09pl5vdqq9fn8x"; + "CT18ZNNLO_as_0112" = "19vlb1bvp7r9jnknd2dvblggim1xqf4yjqyf5h04r90b89pyzxn8"; + "CT18ZNNLO_as_0113" = "0h8i68dligavf051dpil2bqvlxm19156v1951n340pcncaxxi5d1"; + "CT18ZNNLO_as_0114" = "1n2drxdd6f36njq0lcfm7s6cyignqdqvirh03ixvvar2pgj02yay"; + "CT18ZNNLO_as_0115" = "0cv633f5gg6hcyhwfh22h5n4irnk1pxsk7949wiax7qkl84mcm1j"; + "CT18ZNNLO_as_0116" = "17z25cky2ysrcplsxblrzka667npnnp42k6n8jsm73pagscsj91n"; + "CT18ZNNLO_as_0117" = "1yrbrzbg5r2pvwhbnvfwcp9d9rvfmqqxwph0rd0sdfix9agwy2yd"; + "CT18ZNNLO_as_0118" = "019lbvb8pjfbwz8hz8h2xw76nf1ly9mgnbz6pzi3v9msk0qbmlp1"; + "CT18ZNNLO_as_0119" = "1x08wg3y3fqa8ah6m0c6x2fckjjyylkhnmry6vg93rp3n7qlvynw"; + "CT18ZNNLO_as_0120" = "0m9mfr8553yrysbcksx17nz1gm1vi2zvs5bp8d3v82phsv5alhf5"; + "CT18ZNNLO_as_0121" = "0snzl818ag926n0i67hdwkjclfvykx546vfnvsx7n2z5pabakd1j"; + "CT18ZNNLO_as_0122" = "10i7dk1bllyk6f3l92kbiqdib8l2zvqf91g9c20k12sim6n6x2g5"; + "CT18ZNNLO_as_0123" = "0v2h2fjkdsnyssb6ralw32c23l0nmdxbg3sx38vxh2y2s2nycz5h"; + "CT18ZNNLO_as_0124" = "0w29hn728p8yip40mr27kqmv5wndfkq6nx0vnl53x41pwczkhkdl"; "EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg"; "EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8"; "EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i"; @@ -290,12 +418,20 @@ in "HERAPDF20_NNLO_ALPHAS_130" = "1g2q3438bivd20i685jmx565cq108yv72vhxmpmhysh4qwvwpqqw"; "HERAPDF20_NNLO_EIG" = "12zn49jx7qjr8apgpbhknzll4vwlz3x9y1ai908ix2h86pgap2ml"; "HERAPDF20_NNLO_VAR" = "152h21khvkhxwx87c5lqwzpakmahcpj1ixw6kgl0wrrwjknvfgxn"; + "JAM19FF_kaon_nlo" = "05mcahzr0k5w0hqfbn902lmkwxlkbf8wrk6akpqnfsyqpbmhja5k"; + "JAM19FF_pion_nlo" = "06krcf0c9jbbpwf1rk1xd5z7rz904ji984xz05kv9p1j1vgk0ha0"; + "JAM19PDF_proton_nlo" = "1zrcijik60rci6km5d8pn8ivww8w3v8pb1m5dshqjs51lhf56ayp"; + "JAM20-SIDIS_FF_hadron_nlo" = "11g4syy0r46m1wvzq0pb84s4kk2aihjmhx16mr8gzv5b11520a6d"; + "JAM20-SIDIS_FF_kaon_nlo" = "1b2rz6k0g6ck3m28vdqjnnfc025ql5alhjmgn1l84cflf4fvkkgp"; + "JAM20-SIDIS_FF_pion_nlo" = "15l98gmzsqxw615802si94dmj8ihsz6n1mraxkkwjl86hm8nalzi"; + "JAM20-SIDIS_PDF_proton_nlo" = "07xwp9as0nscm4whl5x9bry1p54yl5qmj2r3hqh6vjsz6mxksdjp"; "JR14NLO08FF" = "16azkqxf1yw1j32ay6j01gf8n9n7qm56jh4yzgjag0zdhm01lbip"; "JR14NLO08VF" = "1ilw38pp4vy8c8v1glfi4ixca73wjkdg3di1wh9p8xqrifdb096p"; "JR14NNLO08FF" = "1w0pywmjb4xi7bsvv1mdd4q2adf1g7khspfbkphmlh8zipx29nxx"; "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r"; "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq"; "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn"; + "LUXlep-NNPDF31_nlo_as_0118_luxqed" = "09ch6mjfn6rjsd31jfb59j92ngqiy0x19qamyxh0jwk0sbyr1dpw"; "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c"; "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n"; "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; @@ -344,11 +480,23 @@ in "MMHT2014nnlo_mcrange_nf3" = "0zskxladqr40v6wqafbl1pl04vq43babqf437c4xxg4sz9435l3l"; "MMHT2014nnlo_mcrange_nf4" = "0sny8r9zap8gnjh9id1klr59d9hs0bb40pf8hpy8q5pg6052vx3q"; "MMHT2014nnlo_mcrange_nf5" = "1l340c1x4fz647bhybrvbb6z00mla81b78jfqpnwd4vwfxnqmq9y"; + "MMHT2015qed_nlo" = "130fmxnaashvwwaaiz5b787ldz8l78ar5h2h038xvisdjkxvdqni"; + "MMHT2015qed_nlo_elastic" = "1whplgg2s55wjii1hd32hzd5wsqbgvjjbnfw4fzjmnx4vwn63n2j"; + "MMHT2015qed_nlo_inelastic" = "1b24flby6n9q2cg4haldmjs8ql35lhlw0bgynwja1v2n0fbf550y"; + "MMHT2015qed_nnlo" = "1ypqiz0yz6hnxfml7ym83k4qqvqsbl39abbr38galns8xzzpi03m"; + "MMHT2015qed_nnlo_elastic" = "17in1cz5j7mm9qjk8i27fif6x276lcqmccl7kfz8a5yn73xxzja4"; + "MMHT2015qed_nnlo_inelastic" = "1ngk4p7w8l8b8sfg6hlm8ypxz97i1iwzlrc48szy7bi99kn8rmy1"; "MRST2004qed" = "1kdrzk2arvs36lnpkbc94w06hx3nh8nixh2qjhb271c2blwgahzh"; "MRST2004qed_neutron" = "12vna0ic6gh313k22b44b0k9kd939v7zjl2hj65k1075j23mq425"; "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc"; "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6"; "MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq"; + "MSHT20lo_as130" = "0ivjvqabk9jnrlrczjlqywmijx5ql8wy579j77qkl1vhv7sqccm1"; + "MSHT20nlo_as118" = "1qwbwcq8p4hrprz4ib18mp5142b0lbyyzc1bf5a4iq5jjvi5qm93"; + "MSHT20nlo_as120" = "10y1a6iryahrafzdqskypjrnad6xxq08gm72pa9yc61xdy6andc6"; + "MSHT20nlo_as_smallrange" = "1rygvj33g84whl24kgpqa47g11c48l93jlnpzqq8f5zr1ijqcq7i"; + "MSHT20nnlo_as118" = "1yz0003ixjg97974648qba5d37vb4fhzzmq4k9xh4c37pnc3kgyn"; + "MSHT20nnlo_as_smallrange" = "1bv7cbdynp6dm5c9v7r32gqy1lch4428apw426pr0d7xpm0abnxv"; "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51"; "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3"; "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l"; @@ -360,16 +508,16 @@ in "MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym"; "MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp"; "MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q"; - "MSTW2008nlo68cl_asmz+68cl" = "1zbvbpfy30612ygr9rz7ickdrbdsg0gd6p8xs7ylzj5h06sckq84"; - "MSTW2008nlo68cl_asmz+68clhalf" = "174spwhpl6cvj8bw8wns0jiznnsjrv3i7cvd4x9vi0fa5z4sb5d3"; + "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn"; + "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d"; "MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy"; "MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263"; "MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk"; "MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n"; "MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9"; "MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r"; - "MSTW2008nlo90cl_asmz+90cl" = "1g4gwmriyl71xd2k49jc391vfr02dic0q73lc2wphm1y8qmbphdd"; - "MSTW2008nlo90cl_asmz+90clhalf" = "0743kimz3ljlb921pacw2lii104j0yfvv073wddz89r877np6mi5"; + "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p"; + "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp"; "MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6"; "MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5"; "MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9"; @@ -383,16 +531,16 @@ in "MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq"; "MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g"; "MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv"; - "MSTW2008nnlo68cl_asmz+68cl" = "0ik5c4vcv1ki5cnvnyk381lw36bsqp8mjkzh8ghqjz6z8fr2hb97"; - "MSTW2008nnlo68cl_asmz+68clhalf" = "1d8c0rr3lscin28622f82s79xgbam4qhqkpvvjgynhyn0wy46b4j"; + "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz"; + "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8"; "MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q"; "MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c"; "MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97"; "MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds"; "MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj"; "MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3"; - "MSTW2008nnlo90cl_asmz+90cl" = "03p1af5962smr5794322gj3s4f0fvnvmfizsabch03ivyaqpr1nq"; - "MSTW2008nnlo90cl_asmz+90clhalf" = "0v99vr5kkgkscqvs8b3ahnvg5yl9rfzgf7hams1j12vjg2b9kd4z"; + "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0"; + "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v"; "MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9"; "MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap"; "MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n"; @@ -628,96 +776,129 @@ in "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg"; "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq"; "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk"; - "NNPDF31_lo_as_0118" = "1n3n3irw0lb1vmcr9qxgcd6xj8prdz6xbrrfbx1815avqs1pyb94"; - "NNPDF31_lo_as_0130" = "1amkzj0jcx35zrcwl067zf3sz7h2kanj8q49661ayl8yw2c1ncib"; - "NNPDF31_lo_pch_as_0118" = "02f294h655vn85vqx32hipnmfifal28pn6f18an821jrb72plnzp"; - "NNPDF31_lo_pch_as_0130" = "0qmjfr147zx9hp3znjxd44rx3hz2zwyvs5lbbbd0y0y1argc25dx"; - "NNPDF31_nlo_as_0116" = "0px6id1q66pdn47ja09shn0cbwxzw6sj4r3qfzz30w3srr93i4jd"; - "NNPDF31_nlo_as_0118" = "17avv0qpn7k7lg26rxmcpcrv127w30d20n286vd523b9x6qknkds"; - "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq"; - "NNPDF31_nlo_as_0118_C1p6" = "10y6fb4fmsv7mvsj7zrv6g7x80yxglaq2d0ir4hsn3vs3yqq7r0d"; - "NNPDF31_nlo_as_0118_hessian" = "1jlqbq9wb97l9jhm2r4mkvnhb3vfp0bdhz6lhxnd0a9ipsgmc1wi"; - "NNPDF31_nlo_as_0118_luxqed" = "0zsyp7g93d1z7fpdd5a43i8wd9jfriw2pkligdy78xxlv9zngbkl"; - "NNPDF31_nlo_as_0118_mc" = "0iqk4fq0g4v0khymzab6cxhly7ybxw6f010b5x6ybgw2vzizvmq4"; - "NNPDF31_nlo_as_0118_nf_4" = "0swfqsn68n60r4n3m5szzds8a5pz6p1ad2kkvwawhkgmp2ww0yf7"; - "NNPDF31_nlo_as_0118_nf_6" = "1b44sygil9ngxmdn0273nvh3pzry2k03mkdibf3kfxn5s0ymkl4h"; - "NNPDF31_nlo_as_0120" = "0114g1y2h090137wnhjmycrd67nb8s2gg9byx0j7hm1vy7sajj1j"; - "NNPDF31_nlo_hessian_pdfas" = "0hhm5k3i9ls6fsncfn5cxsx6b1fhb1x581d2cz2balabvby9kf8h"; - "NNPDF31_nlo_pch_as_0116" = "1q037ai33p0p9s9x5vr0p2v3jy0ghrg9djkyimy1lw00cmkj28xc"; - "NNPDF31_nlo_pch_as_0118" = "1sym62b0n1rln2fybpppl8sz555wb6cymr20djrwvs45wdkmbbyz"; - "NNPDF31_nlo_pch_as_0118_1000" = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; - "NNPDF31_nlo_pch_as_0118_hessian" = "0fqkq9jq6l6mfl73ykkn9f6w52wpfys4vqh97ngkm331qkm9y6z8"; - "NNPDF31_nlo_pch_as_0118_mc" = "1q5ihiwzm9vm5v8k47b691cccv0ikvzqahi2vxigqdvhnlq8nrq5"; - "NNPDF31_nlo_pch_as_0118_nf_3" = "040kfq43a1hb5z4inhw1pzqhk62yr0sf1kq32jv1wkbc1524j5gf"; - "NNPDF31_nlo_pch_as_0118_nf_4" = "18vj61dv179ypq3l8wgvc5m0ksc1i6mm3r1jj45bk0dxszlrsrv6"; - "NNPDF31_nlo_pch_as_0118_nf_6" = "02zmby2c6adp1q0kcjx4f3qvabn5qif82q942xnxflgpnpk9qafq"; - "NNPDF31_nlo_pch_as_0120" = "0kgslc183vaxj1fxcwfabs6ah4lx787gi98q02nci010w2zmx7zm"; - "NNPDF31_nlo_pch_hessian_pdfas" = "1bmja7lqdwakqfhf7q72snyjg3qg84xdkwjwmz6lvy75r1810dhl"; - "NNPDF31_nlo_pch_pdfas" = "027prs00nc8laqpjvz20ij5ipzcp291szdpz02aiinf2a5sy2f0j"; - "NNPDF31_nlo_pdfas" = "0d8krd9akg486k8gp1kj4qn4zwy4pjd4j3xz2527a8hkiv99v8bi"; - "NNPDF31_nnlo_as_0108" = "16hhkvmk2cpmqx7jgkh7ckdzas9c6v23l04z7mlnvvc4682n5zvz"; - "NNPDF31_nnlo_as_0110" = "1hznzg01dvpa77nxr11dmqdhwbrj310hhw1h088bz5svfh15ga2r"; - "NNPDF31_nnlo_as_0112" = "0cdjiiniwikkda593sv1lk1wywdxgzfqg5fvhczgwq588xmac2wa"; - "NNPDF31_nnlo_as_0114" = "1q6phbv3w4dsyw0jasbpzid8r39mr8icw4av85dyim4n1ncqag9a"; - "NNPDF31_nnlo_as_0116" = "1fz1h7vd910vm8li56j0w1b5jqalym0zkqv8msr01zyq6dwr1hfj"; - "NNPDF31_nnlo_as_0117" = "181xc88i392rbfwqg1p7imkh71ilbcxdibi1mh0zk4kmnx6sskfp"; - "NNPDF31_nnlo_as_0118" = "1p4idzrg8i67h8anzanizas7a1hkxbhrw7ch6x6d1swbigw40ajf"; - "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23"; - "NNPDF31_nnlo_as_0118_CMSW1" = "0ibgi8jbick51fh3pdnc7zrjsdpjyc3gg2hnm0jmxw3hck7rp2x2"; - "NNPDF31_nnlo_as_0118_CMSW2" = "1h49ygmp58zs0ml1lza6clykhylw4bgvsi6nadwmc2bqs4hqqp8a"; - "NNPDF31_nnlo_as_0118_CMSW3" = "0z4djd7nrkqd55dvswr85l4sphjbrgsh5bslgypbf2axizlscdyc"; - "NNPDF31_nnlo_as_0118_CMSW4" = "13wkx8a4zkivk832f0ng6zq4m9ahka2lm3l6230yicl2fwb9znsx"; - "NNPDF31_nnlo_as_0118_collider" = "00fgz6m8qbhgmvkli8pyh1gsazajqz8cqbad117z1ijvidhdkxs0"; - "NNPDF31_nnlo_as_0118_hessian" = "0rzfcmwadff2p7qk19dj2skd4dpv9z59jmnv51c44yis07fmsjbb"; - "NNPDF31_nnlo_as_0118_luxqed" = "0smmsn2b2lxwzpr4wr5wg4rg8kjy3lz0xhjdwlimv5gmf24dswds"; - "NNPDF31_nnlo_as_0118_mc" = "1nmwb3v0aiqjhhlzlrf9qkydgfhk6lp48ydbvy4w5fnhs4rqas4j"; - "NNPDF31_nnlo_as_0118_mc_138" = "1bv63m9lxxy3mrbmkjbn3jjansghlphxwmqywkcynk6z42krpgdn"; - "NNPDF31_nnlo_as_0118_mc_164" = "1dkj741r29lh1011c8v2d8ax41a9pxvj8ksvz12y18ipf5p0jrnb"; + "NNPDF31_lo_as_0118" = "1jq8ad68kym717qinwdldvrjnry9sfsfq7lvfv6ipm1sdzixqm96"; + "NNPDF31_lo_as_0130" = "1lg49cbg43yrpb7fgqfk0d55m28rrw781mks3zn9m24fv0hiyzqp"; + "NNPDF31_lo_pch_as_0118" = "0xm3fyvrm77hd2layrfwc74vncc470gvf7hx8nzd2sw3ai1g9h7x"; + "NNPDF31_lo_pch_as_0130" = "18fip94c0ywzj543qq154z2wnllbn8jw61nx6l8v9wmg2sdzi6zi"; + "NNPDF31_nlo_as_0116" = "0i6bpa2wf52vsc6x5nlsmncal1ghqpsyz7pya2a2zg0k7z6dfcsp"; + "NNPDF31_nlo_as_0118" = "0vwbgaxs5gj5cnyncmc7m3650pd6bplwdga3fnyy1vrrh3mpsngh"; + "NNPDF31_nlo_as_0118_1000" = "0ql0phs563ck7bx7cm5x242icfb2jrlsxhsv80m0hxyr3fhyc06h"; + "NNPDF31_nlo_as_0118_C1p6" = "0nn6krh6vk8rxiwhpnn3nbxian8hw8d1vq31ywh9560hbi3vpcrl"; + "NNPDF31_nlo_as_0118_hessian" = "10v2ayms2mhm9zi7k0fw9rshawc7njdlbjs8rfg5hiqn1adss4w3"; + "NNPDF31_nlo_as_0118_luxqed" = "19fdqxfmx8kzcgq13dk4k1nhkgqpnm5xgahp13hwz1i2vcp6xq87"; + "NNPDF31_nlo_as_0118_mc" = "1yw21cs6p85ij8lm9k0cvlm651a3x9f73f23ysxjgh1r5kqnhz9y"; + "NNPDF31_nlo_as_0118_nf_4" = "0qywlyd34yqb2r8ch9wjimyfi1jr3rdhxliwrmns0558hbd47a3z"; + "NNPDF31_nlo_as_0118_nf_6" = "1pb22z2s0ir130dk5pkxwyid37i6mf8jpr7k7nlfi45gl9zy5ldd"; + "NNPDF31_nlo_as_0120" = "1b5wsab66karm1ay5vxpjw21g2ywhnzqnlahxnvnaf80izha35hl"; + "NNPDF31_nlo_hessian_pdfas" = "0sxka18qp99gjj9abml2ba4877zavijmjfzg6m0qczx9m8v9m3xg"; + "NNPDF31_nlo_pch_as_0116" = "1wqpq2qj5czvcj754nd6c7rrss8skjx58vp2gj2bc5n95jv1qazn"; + "NNPDF31_nlo_pch_as_0118" = "113xpp3xvpfpivlj6p7av4czfbfnh6bk2kd4d2635ddvy0clqkpf"; + "NNPDF31_nlo_pch_as_0118_1000" = "1sbjqkwq7iy7fnk3r9ga1rzadzy8x3ld933vcih87is09bzg5rfl"; + "NNPDF31_nlo_pch_as_0118_hessian" = "0xmz2hc3n8alhf210axv3amf7klhbyl1dd1z2yyx6c3pcvcrf80m"; + "NNPDF31_nlo_pch_as_0118_mc" = "1w1jifp5f7ypf5xqdw1mkx1d6shknryhqzk8rk8naf37bms68mfn"; + "NNPDF31_nlo_pch_as_0118_nf_3" = "0m7rq7k8x6bsakkw3kmcicq04c39flrw1axv72dqaf9xci9w3pii"; + "NNPDF31_nlo_pch_as_0118_nf_4" = "0k77chw866shjkc0ml6kb4az75sdcvdd897r8d56jl72d2lkxp3m"; + "NNPDF31_nlo_pch_as_0118_nf_6" = "0bdc60dxj7jmqacbbaxp2m9qzg82r6pgn7h9pi2k15d07qm6fc4d"; + "NNPDF31_nlo_pch_as_0120" = "15s1b5w52c3q1nfzckdxmdwrnxw08pprmphc1p33am9v7cwwq2jk"; + "NNPDF31_nlo_pch_hessian_pdfas" = "0qdswml17bg68y67yw2zbwwp233nxpd1qpc23rqjwyzk2r7qk9bg"; + "NNPDF31_nlo_pch_pdfas" = "196pcdwsi5p9g88g1c8958qkdj6qmzvl7rsg3j8zll6274m42s4c"; + "NNPDF31_nlo_pdfas" = "1as7bkp56pwpn2vinxdnhzlnvnxx5ng0mlpmwzz5n7gsinyaz1x9"; + "NNPDF31_nnlo_as_0108" = "03kg0i43wxf794c4xhvismks6c7nw9hq9ihn58sz628lqcjmsccq"; + "NNPDF31_nnlo_as_0110" = "04a5gf6nyd58h9sad8zv46vmb074dx7j19r23lbc9w1di23sk104"; + "NNPDF31_nnlo_as_0112" = "1xkjjm49nlm72f4l3ynrm4g2ayzask22saaf6p1p61lx0jv1hjyd"; + "NNPDF31_nnlo_as_0114" = "1j4q47qscyw52swmnn0a3lr0avfsjvy20ca50xfhjsvla6wd9lpg"; + "NNPDF31_nnlo_as_0116" = "1k2d4jzg5jfs6f2mscpvalmh7i5fypx98lnb5wjycprlwd3nr3i9"; + "NNPDF31_nnlo_as_0117" = "0b6d1xlq4qwjalvrc7ppavw44w5zf0fn3rbsvh3k4qy9r19wk5fb"; + "NNPDF31_nnlo_as_0118" = "1bw2ksmxdfbwdcimc0ld87hanbqy514sridrcarqwgqh9yv5n0qp"; + "NNPDF31_nnlo_as_0118_1000" = "026d0xygh046y10jxsfc91hr4qxgark12m393r0afip69dzdsrx0"; + "NNPDF31_nnlo_as_0118_CMSW1" = "0vqjyziilfzi0gz3a2rv0i6hk3ri3krc2zcdjwfa61z1mg5syi4a"; + "NNPDF31_nnlo_as_0118_CMSW1_hessian_100" = "1jc8k64pj1mfcw8v9qq9v8m222d09bgfkla7viqzzzbdhy5f6yy1"; + "NNPDF31_nnlo_as_0118_CMSW2" = "14acp7w3sx5v4ly5wa32vpsk8xw2rh8g5gl7x3f72c0s5jcs4n81"; + "NNPDF31_nnlo_as_0118_CMSW2_hessian_100" = "0ykaw8x0i6k8vlbms2inm9zm860apsi5mf4wkxha416v4chrpd04"; + "NNPDF31_nnlo_as_0118_CMSW3" = "1snkandx6apar3sp0c182n770rxn2s64pc07h5k18627cnvpzing"; + "NNPDF31_nnlo_as_0118_CMSW3_hessian_100" = "03n59yvpgciipkv3k0yr0ab3myhx263n90ah3q3h8hdszkf80ri1"; + "NNPDF31_nnlo_as_0118_CMSW4" = "1zpnvawdj20izx0mx9a3xz0d0an6i65axbzg5z7fkiq0p09rfx70"; + "NNPDF31_nnlo_as_0118_CMSW4_hessian_100" = "1qczy2935iq2h4mfq0mv53v2vlfsyvhkff36c5dkdlkrzfkvpl8x"; + "NNPDF31_nnlo_as_0118_collider" = "1y2axnkjwx7yg301mj1yx1x937j7mhsnbbdpip94pl3vm5hz10dk"; + "NNPDF31_nnlo_as_0118_hessian" = "0jvzl1bs0mh9c7ypkdgw0s06qn9jkww1d124lc7aq48w1g4n0zyy"; + "NNPDF31_nnlo_as_0118_luxqed" = "10fwxncr1y7hnja5nxywldpkzrijxz5ayldqjc21jamyhyj3qsh7"; + "NNPDF31_nnlo_as_0118_mc" = "0sg939j6xn7d5g46547np3123srgz44h9clh29ybl5cnmccv23cl"; + "NNPDF31_nnlo_as_0118_mc_138" = "1kbxhjzrr4802kcpi7m2g2dx4ywvs9rqjispjwbjc60rqkqispyv"; + "NNPDF31_nnlo_as_0118_mc_164" = "0i9yxnbps63nz6ala4jk6qmpxlg6p46w6jja8qn73hp0n69w2acz"; "NNPDF31_nnlo_as_0118_mc_hessian_pdfas" = "1b9ijn595qfq32yz9rlnn2br7lssbk8ka39ripfcfyf33v9sv460"; - "NNPDF31_nnlo_as_0118_nf_4" = "11dl3c2anh2v140vn6v4mx9lj65844svsd0f84wng0sngrn6dli9"; - "NNPDF31_nnlo_as_0118_nf_6" = "0s102m1gf8r30g7zy4c91imn26ksj4q600711rgmw2ada1xn87f8"; - "NNPDF31_nnlo_as_0118_noLHC" = "1ypim2zfa2i3r1hcw0j6w9abmxx67g1rhdacsajfp479s68kmi3c"; - "NNPDF31_nnlo_as_0118_noZpt" = "1dx3hlcf8c1a40iyccw84v6f2h5jfyw1pp3n01q2rls9i5b12r15"; - "NNPDF31_nnlo_as_0118_nojets" = "05rkknl44j0pm7kb1l6ihy6rlvwxrkram4sn9zm0za1pv0r9dr6k"; - "NNPDF31_nnlo_as_0118_notop" = "16prpxwn081v63a0pkgjvcizvn33ng5cafv6664yp44j7vbpwi4n"; - "NNPDF31_nnlo_as_0118_proton" = "0xjfambqz14vvg506kj8mqkb37q1bq7m3wgh089fjzq0acrmh9kl"; - "NNPDF31_nnlo_as_0118_wEMC" = "0hkpr14cxgz2r47bfh7k706l22pl6nlhbdqxd7wmrlyrk19vgar3"; - "NNPDF31_nnlo_as_0119" = "13ys6fkvna2i0ifzw2dz3g4jn1zsacslffylrkmj6zxmkc0qganp"; - "NNPDF31_nnlo_as_0120" = "19gszb3kxgwdskabdsk183bdn9b0zyphkk8v1r8s372fg52c8jgg"; - "NNPDF31_nnlo_as_0122" = "1mg40xkp5sb7mpwz420b1mv8cqxldi9rsddnmgdhc5pal5wpgaf6"; - "NNPDF31_nnlo_as_0124" = "1lag0smkh7pjbl449wipn3rq59yi48313xrma531i9ldh68a4ssg"; - "NNPDF31_nnlo_hessian_pdfas" = "0yirp5jhns652a4f2jvhxhvd4y117z3mc5vcd2vsvqyjijx6q0gi"; - "NNPDF31_nnlo_pch_as_0116" = "144bgqmxci7ibwp84kg8a6mw3mwmsilq2ay14y48vsx1ydp56w5q"; - "NNPDF31_nnlo_pch_as_0118" = "1vkpr9js1xwr0g6fz66j2a22b3k5003adf34x0nb6pjm2nxh0njf"; - "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq"; - "NNPDF31_nnlo_pch_as_0118_hessian" = "18pjqnjkz6jgia5jb4a59s9568yf3b7cp6iqb6fk3xmqlwx5vdd9"; - "NNPDF31_nnlo_pch_as_0118_mc" = "0wyccq58w705ayy5r9fcfnybb9rw43nl46rrnfysi65myqgcfjnc"; - "NNPDF31_nnlo_pch_as_0118_mc_138" = "1rzbff1dmdybkgc5ky7qqcvm5g7npiq4nwjjsq714zajlm0r4y1f"; - "NNPDF31_nnlo_pch_as_0118_mc_164" = "0ymnwm3n45jsxz6dl8ys0p7zswf6w21q3m016lsrcrmyy756c6a5"; - "NNPDF31_nnlo_pch_as_0118_nf_3" = "1hhz6h8mcj6n8309sw5b3w6dinm54hgbxc7c07xjzkb9xmliqwa6"; - "NNPDF31_nnlo_pch_as_0118_nf_4" = "0jldm9dlcngdqcy05y8kjszm8g6s3dvamkz8wh70d260ifh2jb23"; - "NNPDF31_nnlo_pch_as_0118_nf_6" = "0kpnhryf8g0s2ykvbwxiiczycrknbrfsnbs08h1zg0cpq8whljqd"; - "NNPDF31_nnlo_pch_as_0120" = "0bgr66vrjm749pzif53yqq15023yva03x32wkn5gynq083gfdw37"; - "NNPDF31_nnlo_pch_hessian_pdfas" = "1004frva4k0s59naxys505fjc83wkz1andzz5gll6v5flfscfch0"; - "NNPDF31_nnlo_pch_pdfas" = "1p26cb6h1czrdlzk166668900ilzr7r93dmksvc3pqafq2mi80jb"; - "NNPDF31_nnlo_pdfas" = "0d2cv8y23w30cgxs5090ygb614fwrdj0vwh6pjshqv9403maykr8"; + "NNPDF31_nnlo_as_0118_nf_4" = "0l796ns5xm0biyl0jra5z6y7vddv52v48wlbdywsq54082scfpl0"; + "NNPDF31_nnlo_as_0118_nf_4_mc_hessian" = "1bw0x75pah1kp387s8m0rv2qc54k5pbncbv507d5278hhfsn68qa"; + "NNPDF31_nnlo_as_0118_nf_6" = "0dbxxk0p001sk6sb9nf5ipzi39w65vf4c4g8cbhll7p4fqi8f8dy"; + "NNPDF31_nnlo_as_0118_noLHC" = "18y9mnp1gmvdbikgfdybw8wz2w5x60wk8lya13g7z6nhbfs08qa4"; + "NNPDF31_nnlo_as_0118_noZpt" = "1jwhkz8b1x6a2qi62jvprcp1rmcq5aq7s31qhw0skcpx8r6r6gnb"; + "NNPDF31_nnlo_as_0118_nojets" = "1bg714agc25p7zw2yydvl340sns7fhszpbphzap6fc0jsg511zh5"; + "NNPDF31_nnlo_as_0118_notop" = "1v675r4qk0wz1hg000fw79nmf1zjqi2ghvgjgs7hyzzbh5g4l3ds"; + "NNPDF31_nnlo_as_0118_proton" = "0ipsp8kk59fb3w9d1y4pq85f4fl6789rypjfbpp44gcy8hzshbm7"; + "NNPDF31_nnlo_as_0118_wEMC" = "0savd87jahlac4ag3qfamhnpa7mpnm00j104f3ci17gdax1sds50"; + "NNPDF31_nnlo_as_0119" = "1s7ildlffbh6cpmzlmafxzbbrlgggfqxsv4qic99yvgqvdgqar8w"; + "NNPDF31_nnlo_as_0120" = "1z6lqcq1dgvqnpwlfymlf9yhcaqc2p8ny7wv4xs57639dsp5xarb"; + "NNPDF31_nnlo_as_0122" = "0482r1hip6c4kpq24xzi8nw8awky0669k4plgpgv0av12l4bh9c9"; + "NNPDF31_nnlo_as_0124" = "0cf3djgs4gayzwy8p0qvynripz3hxd3866m8ldlhxnjmcsgcps11"; + "NNPDF31_nnlo_hessian_pdfas" = "1m5wdnj7hvg2a51w1qmhm934glhjf9db0x5nry5blp90y5x0v185"; + "NNPDF31_nnlo_pch_as_0116" = "1i8yzqywg4hcf53vcp25fg8llybis3pz6xbp5ajpyjvrvsgii1pc"; + "NNPDF31_nnlo_pch_as_0118" = "01rsx0ss67772b20dnnw463328pgbd57d8zcj3lqymlb4a6fq8f7"; + "NNPDF31_nnlo_pch_as_0118_1000" = "187xkvp7y1wssgpb21r1w4yxn6m1280jac9nmiavrma06jfd57c1"; + "NNPDF31_nnlo_pch_as_0118_hessian" = "0fs5d450hc15hqs6xv9nxfsnhwszmg9ybjypgwa9kn4s4kkaz1wl"; + "NNPDF31_nnlo_pch_as_0118_mc" = "06vgb01l1yigln7cn9y3lslg35grwvydpd8g04xn4pj4pj2vjrs0"; + "NNPDF31_nnlo_pch_as_0118_mc_138" = "0za3v1mg8gb631039kg5mkr9zhn390dkyim9p663srpk85j7h5g5"; + "NNPDF31_nnlo_pch_as_0118_mc_164" = "1xc02sbmhyjr4gjwim4p0gg90zh26zdmnz89395pxzbq2navcraz"; + "NNPDF31_nnlo_pch_as_0118_nf_3" = "14xb6m1wqc5f7xjiklwnshn7ljrlg6kmbzr2rib44pgbj6pnl2xn"; + "NNPDF31_nnlo_pch_as_0118_nf_4" = "1sg823n82j9ijqx4ldysh0g53pjzn4sysvag837ywfyns4p5qy9k"; + "NNPDF31_nnlo_pch_as_0118_nf_6" = "14ls2yd1n2pqvdvq18qmhizms3a8pwqvksdkvwn0m1379lkss106"; + "NNPDF31_nnlo_pch_as_0120" = "09zc56cmpj9iw0qp2bm9a8d86r0mdagg1vrpf2xqza4fr841r5km"; + "NNPDF31_nnlo_pch_hessian_pdfas" = "08baysni2lhbpr1scx7h0zf64gyncj2ahcv4y86142gl4zqrafvp"; + "NNPDF31_nnlo_pch_pdfas" = "09mw3gr7dz0vwdnralaplvlz2c464lmdizf673xsb0wlm12pqf6g"; + "NNPDF31_nnlo_pdfas" = "0l92q3xhdk5nrnhkmrirxnvplj531rdpnblnacd759cl4hgxcs2q"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; - "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; - "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4"; "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7"; "PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp"; + "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; + "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4"; "PDF4LHC15_nlo_asvar" = "14hdgj5g8ia7y6hi40zbh925dacrk7hd6cli6lkhlqzxl755nbs3"; "PDF4LHC15_nlo_mc" = "09p7y0z04r6wdkf8gi3yj85qk5hmp0mmhab8c7a7lly4731fyf42"; "PDF4LHC15_nlo_mc_pdfas" = "0sds9rkvbjkk7pardwq959qqbrvgwswxmsqcfppky2p0qmdsjs0s"; "PDF4LHC15_nlo_nf4_30" = "1ysy6dqlacg4bwb2f16p1aza5gwm9qnhmc0g0mhsdw4d2i4ml5yg"; - "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph"; - "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj"; "PDF4LHC15_nnlo_100" = "1gcq3qrf39dhq2pmpjrj3z0i0ycrk76mjdwmgfvzdxysp530ax54"; "PDF4LHC15_nnlo_100_pdfas" = "16r8far43ymsd64a4bbqlj56qvbjmcyxbawv4lkfxysjvbydxj4w"; + "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph"; + "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj"; "PDF4LHC15_nnlo_asvar" = "03fh1jcbmvla7n2jj3zq4ibwvq66h0rniply7h93d94zawcgsy4v"; "PDF4LHC15_nnlo_mc" = "0c6nfkv3x1p5iw514knjvqcs1dcaryf74qqg1za8x234yr5ndi3p"; "PDF4LHC15_nnlo_mc_pdfas" = "0l8hlcz69cdii7mpgargi9nsx7iy746nad5pnn7pvycrc40marij"; + "TUJU19_nlo_119_50" = "1q1dhsxz1kq75rpzv6gg6p6bzvvv0d44pc4y3wsiy9g14aff85vq"; + "TUJU19_nlo_12_6" = "006j6y4xbjss9apzagjcc3r1z6s61a1hzafhcyriiffqhn8bg50k"; + "TUJU19_nlo_131_54" = "0ymf35alyar6fwagmdny2zz2aag576f38kail7gh2lvqpmjmv6np"; + "TUJU19_nlo_197_79" = "0rq57sjcwljz8fz2m5bz0hm1670jp080zawmavmagmzvmyxbpnpj"; + "TUJU19_nlo_1_1" = "0fp4syfjgl0y58hrr3g515j96yp7ncbrnzj1h7i5h3fphxzayhcz"; + "TUJU19_nlo_208_82" = "16g5fjpa1r6pml6jnmzikwafdc0vgj8j3b0ivjz0bsqxms66msg9"; + "TUJU19_nlo_27_13" = "1ffipy7g22mjbhy7wpjipfka84k4iw52bni4gw2a6aan5qljlcii"; + "TUJU19_nlo_2_1" = "1l17drwy3vv8s7g9fdivxs2z6m88h7fpamnr5y0y6nbkh6bja2s6"; + "TUJU19_nlo_3_2" = "1qm010yjnj9amj2j89v6s5s42q18q8b6md35c9mbv88ibqbsdnvn"; + "TUJU19_nlo_40_20" = "0xylrincss1ijkfxnk7hl72c1rzpzm14hcarddh9pd57z7i1gv4c"; + "TUJU19_nlo_4_2" = "0adqxh47pnhgmq9r89wcqaldfrqll5gpjzqncqd5ba8301i3d98m"; + "TUJU19_nlo_56_26" = "04q8c3gkbxib5fz20f7rwn33sqapcmsj6fwwihi6ca8n1rl6hw6h"; + "TUJU19_nlo_64_29" = "1yyl70v8s16s2v630wamyfk8lwdw53cbp5hipgwdw1sfs33pj1mj"; + "TUJU19_nlo_7_3" = "17qfnf8bv6c5q6xkl68c6n1gxp81gang5w71gvn9m5d6pn2wiicj"; + "TUJU19_nnlo_119_50" = "186fja2z84csh6zsp0lpy5mch5swmwaf7mvq8kf073jxlrkrws42"; + "TUJU19_nnlo_12_6" = "0k5q6a8jidhmnjgll1l71dxx85lzd7w4v9bsmi42qladkd71vblv"; + "TUJU19_nnlo_131_54" = "0inwqb1v390xkjzhc7gy4hng07jzbbhpq99f4zpkzx115xs57l74"; + "TUJU19_nnlo_197_79" = "09c9b1kqzw28rqgxfxq2mvwna8yb6f2y90332f05jpvfk3mmr7n2"; + "TUJU19_nnlo_1_1" = "0qmvcbsyi333b9dd42xjdq62a7dfa3hvfcbk48fg4m179mzhp588"; + "TUJU19_nnlo_208_82" = "1xpwnl342g8ahhp3lm7p2xhzlx5qzhjvz6g1w1nqrd818w3994zn"; + "TUJU19_nnlo_27_13" = "18fsbp1nh4zx2wgg9r7ian0mvhvf4y8ssqv33vqvn0vwk7gqw7jf"; + "TUJU19_nnlo_2_1" = "1p0b74w1a9906lqbxbc8dkk5bcdhnbqc82lnhsr4qfi8sxih2l9i"; + "TUJU19_nnlo_3_2" = "132w4cv8r7958sad6jakfppsywifwzzacsfyn81qvv76xzc2hm3w"; + "TUJU19_nnlo_40_20" = "0fkbwxh0smj1icjfn58fsfh52ny35pmqjs7cs3qnw6dk5p95qx6k"; + "TUJU19_nnlo_4_2" = "12vm0dl8ylz38zzi6rsyy24h3yg30nq6l464nl5fr6jdkvkbz2f0"; + "TUJU19_nnlo_56_26" = "1kqc6v6qq6wl3nls31gn5nrzwfl9kshm2bbak771c3xvjsgvjpdy"; + "TUJU19_nnlo_64_29" = "166k8swsysr7x5rgivi6k04q4p8njb2ny7xj7xjqhkgxrznc8jzq"; + "TUJU19_nnlo_7_3" = "0q9vswr0s3k15abghx3cccf1ays0601n1438pwqgd5xz8981ngm5"; "abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs"; "abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i"; "abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4"; @@ -736,6 +917,7 @@ in "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; + "cteq61" = "14hbc855b3wsjk7ypg86md46cjm1bj7n4hins9nr8kgzs69i6vss"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf"; @@ -830,4 +1012,56 @@ in "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1"; "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s"; "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0"; + "nNNPDF10_nlo_as_0118_Ag108" = "1xqhzgvkicxd9wy4lnhqw6brsksxqsq429r6bb0ghn1ll5ln4qzx"; + "nNNPDF10_nlo_as_0118_Al27" = "0z836h7a5abbwq988zdvvf8yhr92krzzmys6lkkgkcffdf2pc0zq"; + "nNNPDF10_nlo_as_0118_Au197" = "1f6vn6n0zz8wml8zn7n2n6wj5y41yanw9b9av51m5kiq4n1r9lrk"; + "nNNPDF10_nlo_as_0118_Be9" = "1jy2cix4gkx648dypdqfj7xi8gdlflh20xlasmwl78av5j7s7rs5"; + "nNNPDF10_nlo_as_0118_C12" = "1c6fvp82cs3464akqf0skrqpcvyp75yqp39zxafzgbqd4wc3pv9f"; + "nNNPDF10_nlo_as_0118_Ca40" = "0r903a01085yhfagnljvjaqfn190r3q0ggvx87kh54xsbv1wkvbl"; + "nNNPDF10_nlo_as_0118_Cu64" = "1vq8a6drcp606fkx8mml2qq37if59cakmcq73y4n7c7swp6q51r3"; + "nNNPDF10_nlo_as_0118_D2" = "07kjzhyh6n6723h2fylgwm7w7ljxz4m6fs9bgwjxp987i00msrra"; + "nNNPDF10_nlo_as_0118_Fe56" = "1smkjmymykhlp0vvlpsp6p6p44pw5aa705sw9lcyxmg8ccy9kmpj"; + "nNNPDF10_nlo_as_0118_He4" = "0mdxsh41m0vzcdq4axvz81m9ra0p6dff88k09gjb4adx9vv52mjc"; + "nNNPDF10_nlo_as_0118_Li6" = "1hrryxhhg9xxg817brrd39k5wz6iq1fv6z8sdabrpxn0nwr1bj7r"; + "nNNPDF10_nlo_as_0118_N1" = "01h7g4w3nc09jyi7g8j5yx2yzqair3ysbx9rx244k1rjx6jppian"; + "nNNPDF10_nlo_as_0118_N14" = "1ny3znivkkl7xhdw8pxkdadwc957236rh60wviiyw4cdqjb6a3iq"; + "nNNPDF10_nlo_as_0118_Pb208" = "066w59xm6lkwrm3glssc6n3qyvv38mx47mkx39p8z9r2spb8igks"; + "nNNPDF10_nlo_as_0118_Sn119" = "1mqx7wj095v0799wxbvfxvb6bl1qh5wdkf14a8gqsj0f5qjnpmyw"; + "nNNPDF10_nlo_as_0118_Xe131" = "0mz9fgxfyx1asi2vxs1xfwn8z51z08naiq1ycl77f4yp6wim6s54"; + "nNNPDF10_nnlo_as_0118_Ag108" = "08vy16fskrvc62y3h0hsikmi6q86njwfm2msmajxbd7vzcv5wkkn"; + "nNNPDF10_nnlo_as_0118_Al27" = "0vm95lawgsncsx10ypy99746sz34y6shblkj9pgn6si2cy8gpcwp"; + "nNNPDF10_nnlo_as_0118_Au197" = "0b3ld033f2hwjaqp5p5pzmmzfid8hl416a1q8fc0zmd2lfiamsac"; + "nNNPDF10_nnlo_as_0118_Be9" = "10skffir8hqfv2wj01ghc14lfs516kmh59q3v48nw3a724kxr93a"; + "nNNPDF10_nnlo_as_0118_C12" = "12rrpcq9bvwcncj1hk28wkym5zzdjkf0d0pdj1nx9asm6vpbjsdv"; + "nNNPDF10_nnlo_as_0118_Ca40" = "0k914fnqsv45f16s6zmdwbnbnhj5lxnrk9pbnnaap4vk7vx7101j"; + "nNNPDF10_nnlo_as_0118_Cu64" = "137n1nsq75g0n4hmbqfl1gihngfrz0rqd2gwj24m5byhbylwlg83"; + "nNNPDF10_nnlo_as_0118_D2" = "0xa17gjjh0mphg1h711vb6p2pjln0lqy7401lamnib2z7p7mss0m"; + "nNNPDF10_nnlo_as_0118_Fe56" = "0h0qwbckdcppqgbhfy3kyy9p4nryh3p45sjmlxhm94mlznipjwrd"; + "nNNPDF10_nnlo_as_0118_He4" = "022h44i8k2ybvm9lkgc4lkcv4z7r0xzlrq2bxyqkfmpp5fpp7gkw"; + "nNNPDF10_nnlo_as_0118_Li6" = "11bci8mnv57a583ayrpvvnz4lsxz43z23iqgqjc3b3rychgiz57a"; + "nNNPDF10_nnlo_as_0118_N1" = "174gscxa2acqpgf2mks5xpim1jcpb0vg76pggxazm376vyyjk883"; + "nNNPDF10_nnlo_as_0118_N14" = "1g2gwnbfzlfa094px1rnjgk8py8qzwq7bi68n7p49bqjj88km3av"; + "nNNPDF10_nnlo_as_0118_Pb208" = "0bdi3z36ckf788v3ld3ngvchyxzsxcfl9fj7rzs2lwkg80rclgd9"; + "nNNPDF10_nnlo_as_0118_Sn119" = "0k7lnr1ils38sqybipmf13n582wb0cf9rr288ibrbmx15rkk5c3w"; + "nNNPDF10_nnlo_as_0118_Xe131" = "17k1afk6j53nl83ixyy6nyds3wy5agacdyn62bwp7ykfs8x97s4n"; + "nNNPDF20_nlo_as_0118_Ag108" = "1fb2h6752vn0v66h12dhhk2izxjs4b10mdqx17djrvpkzl97hf8d"; + "nNNPDF20_nlo_as_0118_Al27" = "1lfkg84hf0chgk0qzp45ch23pzjixkzxxh3x7xphcmnpri4cgl3r"; + "nNNPDF20_nlo_as_0118_Au197" = "08ll61b96iggm1qnr9q2qdzyxasxn9mlshnxz7kzigfsnqqnkfbw"; + "nNNPDF20_nlo_as_0118_Be9" = "1g4vlr9p6i6n87bx6w2i5d4qkhymldkyxj1i2qnl8v467vhsz6la"; + "nNNPDF20_nlo_as_0118_C12" = "15366p04rh31nnd6zxcmcs9ki5fwzn8d8cvzms45apnw928k6pqn"; + "nNNPDF20_nlo_as_0118_Ca40" = "1abxkr4r5psi6n8rrsbf97gwwkh1dg9jqfd46hn2725r22c6k8l4"; + "nNNPDF20_nlo_as_0118_Cu64" = "1nkkiwx22b649pmyfykn2ggdq99y985mnkv3fnkm8i43scwbswvb"; + "nNNPDF20_nlo_as_0118_D2" = "0gvf9qqgr4ixm9cf2654xyvkc624k5ijqwdds61frljlhd49yqm1"; + "nNNPDF20_nlo_as_0118_Fe56" = "1ci132hc8mpsj0zjr9fichnkapagjs6q9pqli0yzgnnv6l2aih3a"; + "nNNPDF20_nlo_as_0118_He4" = "1phq7m6lbx87s4whs2xygigq7fz1qhzj3nd9anx5r67w7q99rcad"; + "nNNPDF20_nlo_as_0118_Li6" = "0pwdqrmivpm0j7hrg6h2qqshpna2vjlslxnz0sd100kc3lfq7xab"; + "nNNPDF20_nlo_as_0118_N1" = "09y7pd3nnys49w25gb4524x5xkahillvaypjgncbn8n5x1a11nsr"; + "nNNPDF20_nlo_as_0118_N14" = "0nb3kcmhbyncp9frs27ww550mjl3f7yiahyyrm3aik93ycpm16n7"; + "nNNPDF20_nlo_as_0118_O16" = "12kfhldvg8gqxjaian14dng6qqc6nikydwcj5jz2i2d1da3dyhgg"; + "nNNPDF20_nlo_as_0118_Pb208" = "1rwb7vca0y1aj38mz8m3wg07q9hq66qd5j3y6hs9bh0jz6hkifzh"; + "nNNPDF20_nlo_as_0118_Sn119" = "1dan86ckd5padipp4x12x8msfg5p97b8hwxm78gfyf88kq725m6z"; + "nNNPDF20_nlo_as_0118_W184" = "1g0br4gdrb2vzwmqhgj5778a6vl0lykc4ymylibxlqbqrhf8j89b"; + "nNNPDF20_nlo_as_0118_Xe131" = "1a62qi3qy5kli9q80p2w80mj5v3ps2g6p40zxlgm65q5mphkx1qi"; + "xFitterPI_NLO_EIG" = "1v6mfhmcrmdvica0wlc2ilfca1srxc7vjyli113wjvpd7wfpnvj5"; + "xFitterPI_NLO_VAR" = "09mlsww89hhm2s96rlkqbkfwwf9qkblw7n3nnrgas6l1kn2hxq1i"; } diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index ce905bff17c5..44065904d991 100644 --- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/nixpkgs/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) @@ -22,6 +54,7 @@ stdenv.mkDerivation rec { mathastext pgf relsize + sansmath sfmath siunitx xcolor diff --git a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix index d5a272955f40..ed92889b5b21 100644 --- a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "13x5gssv22mpa2w6i0vaalwcr57170vh3b4xrw8mrm3abqhwgav3"; + sha256 = "0gif4vb9lw2px2qdywqm7x0frbv0h5gq9lq36c50f2hv77a5bgwp"; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index bf53cfcb62c9..3b9057ad31a5 100644 --- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1z9jmabsaddhs003zzq73fpq2absd12rnc2sa5qn45zwf62nnbjc"; + sha256 = "1x7xi6w7lb92x8202kbaxgqg1sly534wana4f38l3gpbzw9dwmcs"; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; @@ -39,7 +39,5 @@ stdenv.mkDerivation rec { homepage = "https://yoda.hepforge.org"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; - # https://gitlab.com/hepcedar/yoda/-/issues/24 - broken = withRootSupport; }; } diff --git a/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch b/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch index c657d12f7d0c..c657d12f7d0c 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch diff --git a/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch index 6ac86b111eef..4a6b21dd4312 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch @@ -1,24 +1,27 @@ diff --git a/meson_options.txt b/meson_options.txt -index 4b9e46b8..9d73ed06 100644 +index ce364d93..a6c8af72 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -147,3 +147,6 @@ option('pw-cat', +@@ -152,6 +152,9 @@ option('udev', option('udevrulesdir', type : 'string', description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') +option('pipewire_pulse_prefix', + type : 'string', -+ description : 'Install directory for the pipewire-pulse daemon') ++ description: 'Install directory for the pipewire-pulse daemon') + option('systemd-user-unit-dir', + type : 'string', + description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 29fc93d4..f78946f2 100644 +index 0a5e5042..4a70b0b0 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build -@@ -6,7 +6,7 @@ install_data( +@@ -9,7 +9,7 @@ install_data( systemd_config = configuration_data() systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) -systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse')) +systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) + systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session')) configure_file(input : 'pipewire.service.in', - output : 'pipewire.service', diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch new file mode 100644 index 000000000000..a4fb8b41e7a1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -0,0 +1,27 @@ +diff --git a/meson_options.txt b/meson_options.txt +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: '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: 'feature', +diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build +index 5c4d1af0..7296220f 100644 +--- a/src/daemon/systemd/user/meson.build ++++ b/src/daemon/systemd/user/meson.build +@@ -10,7 +10,7 @@ install_data( + systemd_config = configuration_data() + systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) + systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) +-systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session')) ++systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(get_option('media-session-prefix'), 'bin/pipewire-media-session')) + + configure_file(input : 'pipewire.service.in', + output : 'pipewire.service', diff --git a/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 2a92711626bf..cb695fa398ca 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch b/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch index ad1ae93684b1..ad1ae93684b1 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/pipewire-config-dir.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index fdd45b4bb0d9..47a85c36c23a 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , removeReferencesTo , meson , ninja @@ -17,15 +16,19 @@ , udev , libva , libsndfile +, SDL2 , vulkan-headers , vulkan-loader +, ncurses , makeFontsConf , callPackage , nixosTests +, withMediaSession ? true , gstreamerSupport ? true, gst_all_1 ? null , ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null +, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null, fdk_aac ? null , nativeHspSupport ? true +, nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true }: @@ -35,112 +38,147 @@ let fontDirectories = []; }; - mesonBool = b: if b then "true" else "false"; -in -stdenv.mkDerivation rec { - pname = "pipewire"; - version = "0.3.18"; - - outputs = [ - "out" - "lib" - "pulse" - "jack" - "dev" - "doc" - "installedTests" - ]; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "pipewire"; - repo = "pipewire"; - rev = version; - sha256 = "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g"; - }; + mesonEnable = b: if b then "enabled" else "disabled"; + + self = stdenv.mkDerivation rec { + pname = "pipewire"; + version = "0.3.25"; + + outputs = [ + "out" + "lib" + "pulse" + "jack" + "dev" + "doc" + "mediaSession" + "installedTests" + ]; - patches = [ - # Break up a dependency cycle between outputs. - ./alsa-profiles-use-libdir.patch - # Move installed tests into their own output. - ./installed-tests-path.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./pipewire-pulse-path.patch - # Add flag to specify configuration directory (different from the installation directory). - ./pipewire-config-dir.patch - ]; - - nativeBuildInputs = [ - doxygen - graphviz - meson - ninja - pkg-config - ]; - - buildInputs = [ - alsaLib - dbus - glib - libjack2 - libsndfile - udev - vulkan-headers - vulkan-loader - valgrind - systemd - ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] - ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dman=false" # we don't have xmltoman - "-Dexamples=true" # only needed for `pipewire-media-session` - "-Dudevrulesdir=lib/udev/rules.d" - "-Dinstalled_tests=true" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" - "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dgstreamer=${mesonBool gstreamerSupport}" - "-Dffmpeg=${mesonBool ffmpegSupport}" - "-Dbluez5=${mesonBool bluezSupport}" - "-Dbluez5-backend-native=${mesonBool nativeHspSupport}" - "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" - "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" - "-Dpipewire_config_dir=/etc/pipewire" - ]; - - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - - doCheck = true; - - postInstall = '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "bin/pipewire-pulse" "$pulse" - ''; - - passthru.tests = { - installedTests = nixosTests.installed-tests.pipewire; - - # This ensures that all the paths used by the NixOS module are found. - test-paths = callPackage ./test-paths.nix { - paths-out = [ - "share/alsa/alsa.conf.d/50-pipewire.conf" - ]; - paths-lib = [ - "lib/alsa-lib/libasound_module_pcm_pipewire.so" - "share/alsa-card-profile/mixer" - ]; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "pipewire"; + rev = version; + hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U="; }; - }; - meta = with lib; { - description = "Server and user space API to deal with multimedia pipelines"; - homepage = "https://pipewire.org/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar ]; + patches = [ + # Break up a dependency cycle between outputs. + ./0040-alsa-profiles-use-libdir.patch + # Change the path of the pipewire-pulse binary in the service definition. + ./0050-pipewire-pulse-path.patch + # Change the path of the pipewire-media-session binary in the service definition. + ./0055-pipewire-media-session-path.patch + # Move installed tests into their own output. + ./0070-installed-tests-path.patch + # Add flag to specify configuration directory (different from the installation directory). + ./0080-pipewire-config-dir.patch + ]; + + nativeBuildInputs = [ + doxygen + graphviz + meson + ninja + pkg-config + ]; + + buildInputs = [ + alsaLib + dbus + glib + libjack2 + libsndfile + ncurses + udev + vulkan-headers + vulkan-loader + valgrind + SDL2 + systemd + ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; + + mesonFlags = [ + "-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=enabled" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dpipewire_pulse_prefix=${placeholder "pulse"}" + "-Dmedia-session-prefix=${placeholder "mediaSession"}" + "-Dlibjack-path=${placeholder "jack"}/lib" + "-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" + ]; + + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + doCheck = true; + + postInstall = '' + pushd . + cd $out + mkdir -p $out/nix-support/etc/pipewire + for f in etc/pipewire/*.conf; do bin/spa-json-dump "$f" > "$out/nix-support/$f.json"; done + + mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d + for f in etc/pipewire/media-session.d/*.conf; do bin/spa-json-dump "$f" > "$mediaSession/nix-support/$f.json"; done + popd + + moveToOutput "etc/pipewire/media-session.d/*.conf" "$mediaSession" + moveToOutput "share/systemd/user/pipewire-media-session.*" "$mediaSession" + moveToOutput "lib/systemd/user/pipewire-media-session.*" "$mediaSession" + moveToOutput "bin/pipewire-media-session" "$mediaSession" + + moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "bin/pipewire-pulse" "$pulse" + ''; + + passthru.tests = { + installedTests = nixosTests.installed-tests.pipewire; + + # This ensures that all the paths used by the NixOS module are found. + test-paths = callPackage ./test-paths.nix { + paths-out = [ + "share/alsa/alsa.conf.d/50-pipewire.conf" + "nix-support/etc/pipewire/client.conf.json" + "nix-support/etc/pipewire/client-rt.conf.json" + "nix-support/etc/pipewire/jack.conf.json" + "nix-support/etc/pipewire/pipewire.conf.json" + "nix-support/etc/pipewire/pipewire-pulse.conf.json" + ]; + paths-out-media-session = [ + "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json" + "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json" + "nix-support/etc/pipewire/media-session.d/media-session.conf.json" + "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json" + ]; + paths-lib = [ + "lib/alsa-lib/libasound_module_pcm_pipewire.so" + "share/alsa-card-profile/mixer" + ]; + }; + }; + + meta = with lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = "https://pipewire.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; + }; }; -} + +in self diff --git a/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix b/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix index 0ae693741946..11d00e7c2ca1 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix @@ -14,6 +14,7 @@ let in runCommand "pipewire-test-paths" { } '' touch $out + ${check-output pipewire.mediaSession paths-out-media-session} ${check-output pipewire.lib paths-lib} ${check-output pipewire paths-out} diff --git a/nixpkgs/pkgs/development/libraries/pmix/default.nix b/nixpkgs/pkgs/development/libraries/pmix/default.nix index bb8debbce916..b7adc3d2a423 100644 --- a/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -3,7 +3,7 @@ } : let - version = "3.2.2"; + version = "3.2.3"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "1rf82z7h76366qknkmralmslsfmihv0r3ymhbgk1axq97ic3g4d7"; + sha256 = "sha256-w3j4zgEAn6RxIHAvy0B3MPFTV46ocCvc0Z36tN1T+rc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix new file mode 100644 index 000000000000..86ef2af96e7c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/polkit-qt-1/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, mkDerivation +, fetchurl +, cmake +, pkg-config +, polkit +, glib +, pcre +, libselinux +, libsepol +, util-linux +}: + +mkDerivation rec { + pname = "polkit-qt-1"; + version = "0.113.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + glib + pcre + polkit + ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; + + meta = with lib; { + description = "A Qt wrapper around PolKit"; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix deleted file mode 100644 index 0da6e15eb274..000000000000 --- a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, automoc4, glib, qt4 }: - -with lib; - -stdenv.mkDerivation { - name = "polkit-qt-1-qt4-0.112.0"; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake pkg-config automoc4 ]; - - propagatedBuildInputs = [ polkit glib qt4 ]; - - postFixup = - '' - for i in $dev/lib/cmake/*/*.cmake; do - echo "fixing $i" - substituteInPlace $i \ - --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib - done - ''; - - meta = with lib; { - description = "A Qt wrapper around PolKit"; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix deleted file mode 100644 index be425b394019..000000000000 --- a/nixpkgs/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, polkit, glib, qtbase }: - -with lib; - -stdenv.mkDerivation { - name = "polkit-qt-1-qt5-0.112.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; - sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - propagatedBuildInputs = [ polkit glib qtbase ]; - - postFixup = '' - # Fix library location in CMake module - sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \ - -e "s,\\(set_and_check.POLKITQT-1_LIB_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," - ''; - - meta = { - description = "A Qt wrapper around PolKit"; - maintainers = with lib.maintainers; [ ttuegel ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/poppler/0.61.nix b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix index a49bfad7ab31..9b89283972dd 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/0.61.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/0.61.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index 3f2b8453d7f0..fd2a8ab92cfa 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "20.12.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0dbv1y9i5ahg6namz6gw2d0njnmrigr4a80dbxvnqad4q232banh"; + sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw="; }; outputs = [ "out" "dev" ]; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + dontWrapQtApps = true; + cmakeFlags = [ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") diff --git a/nixpkgs/pkgs/development/libraries/popt/default.nix b/nixpkgs/pkgs/development/libraries/popt/default.nix index 393ef2c2c33a..92c143f24176 100644 --- a/nixpkgs/pkgs/development/libraries/popt/default.nix +++ b/nixpkgs/pkgs/development/libraries/popt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "popt"; - version = "1.16"; + version = "1.18"; src = fetchurl { url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz"; - sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; + sha256 = "1lf5zlj5rbg6s4bww7hbhpca97prgprnarx978vcwa0bl81vqnai"; }; patches = lib.optionals stdenv.isCygwin [ diff --git a/nixpkgs/pkgs/development/libraries/prime-server/default.nix b/nixpkgs/pkgs/development/libraries/prime-server/default.nix new file mode 100644 index 000000000000..4f30a9f005c9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/prime-server/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +, curl, zeromq, czmq, libsodium }: + +stdenv.mkDerivation rec { + pname = "prime-server"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "kevinkreiser"; + repo = "prime_server"; + rev = version; + sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl zeromq czmq libsodium ]; + + # https://github.com/kevinkreiser/prime_server/issues/95 + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-variable" ]; + + meta = with lib; { + description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq"; + homepage = "https://github.com/kevinkreiser/prime_server"; + license = licenses.bsd2; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix new file mode 100644 index 000000000000..63e175d98038 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.15.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.15.5"; + sha256 = "1znxzy4illsr4a08642h6s83jawzrq40m6pzkp05q0cpm8hcpvda"; +} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix index f31a7868d5ec..6867940d1f23 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, buildPackages +, autoreconfHook, zlib, gtest, buildPackages , version, sha256 , ... }: @@ -20,8 +20,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { postPatch = '' rm -rf gmock - cp -r ${gmock.src}/googlemock gmock - cp -r ${gmock.src}/googletest googletest + cp -r ${gtest.src}/googlemock gmock + cp -r ${gtest.src}/googletest googletest chmod -R a+w gmock chmod -R a+w googletest ln -s ../googletest gmock/gtest diff --git a/nixpkgs/pkgs/development/libraries/protolock/default.nix b/nixpkgs/pkgs/development/libraries/protolock/default.nix index ef1fa6efec7b..7d423ac03470 100644 --- a/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/nixpkgs/pkgs/development/libraries/protolock/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protolock"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "nilslice"; repo = "protolock"; rev = "v${version}"; - sha256 = "sha256-rnsHVJHFE/8JIOfMWqGBfIbIuOFyHtT54Vu/DaRY9js="; + sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0="; }; vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So="; diff --git a/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/nixpkgs/pkgs/development/libraries/pupnp/default.nix index 150005646379..de62bde18771 100644 --- a/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/nixpkgs/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.4"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6"; + sha256 = "sha256-4VuTbcEjr9Ffrowb3eOtXFU8zPNu1NXS531EOZpI07A="; }; - 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/nixpkgs/pkgs/development/libraries/pxlib/default.nix b/nixpkgs/pkgs/development/libraries/pxlib/default.nix index 3acaf8bac157..4b6b9ada7ab7 100644 --- a/nixpkgs/pkgs/development/libraries/pxlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/pxlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Library to read and write Paradox files"; homepage = "http://pxlib.sourceforge.net/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.winpat ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix index 58d38651a760..da327ae13fac 100644 --- a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix +++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { python3 qtbase qtquickcontrols qtsvg ncurses ]; + dontWrapQtApps = true; + patches = [ ./qml-path.patch ]; installTargets = [ "sub-src-install_subtargets" ]; diff --git a/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix index bd778f1a945d..2be89b3b7534 100644 --- a/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -13,15 +13,17 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; - nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ]; - buildInputs = [ python unzip ]; + buildInputs = [ python ]; qmakeFlags = [ "PythonQt.pro" "INCLUDEPATH+=${python}/include/python3.6" "PYTHON_PATH=${python}/bin" "PYTHON_LIB=${python}/lib"]; + dontWrapQtApps = true; + unpackCmd = "unzip $src"; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index d1b545884b53..e53404557fba 100644 --- a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; + dontWrapQtApps = true; + # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin patches = lib.optional stdenv.isDarwin ./move-project.patch ; diff --git a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix index 88c945430451..f5257ad0e8ef 100644 --- a/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmlbox2d/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ qmake ]; buildInputs = [ qtdeclarative ]; diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index 75f95a53800a..7914af08df6d 100644 --- a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; diff --git a/nixpkgs/pkgs/development/libraries/qoauth/default.nix b/nixpkgs/pkgs/development/libraries/qoauth/default.nix index 8afa19c229fa..2b0be6f0b3dd 100644 --- a/nixpkgs/pkgs/development/libraries/qoauth/default.nix +++ b/nixpkgs/pkgs/development/libraries/qoauth/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; + dontWrapQtApps = true; + meta = with lib; { description = "Qt library for OAuth authentication"; inherit (qtbase.meta) platforms; diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 4d9e91157243..e00694958f5a 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.1.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "sha256-abPT1u/ceBrE1U+omOHiU3UjLrmcpdSpe1vgar0wUGk="; + sha256 = "sha256-iZUJjr9e+d90XA8YEFFwyRR0HjgPgBi6V5gIpVQMcV8="; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index 26a3c2e36d3b..314bdabdb558 100644 --- a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + dontWrapQtApps = true; postPatch = '' substituteInPlace qscintilla.pro \ diff --git a/nixpkgs/pkgs/development/libraries/qt-3/builder.sh b/nixpkgs/pkgs/development/libraries/qt-3/builder.sh deleted file mode 100644 index 460ae17766af..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - - -preConfigure() { - - # Patch some of the configure files a bit to get of global paths. - # (Buildings using stuff in those paths will fail anyway, but it - # will cause ./configure misdetections). - for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do - echo "patching $i..." - substituteInPlace "$i" \ - --replace " /lib" " /FOO" \ - --replace "/usr" "/FOO" - done -} - - -# !!! TODO: -system-libmng -configureFlags="-prefix $out $configureFlags" -dontAddPrefix=1 - -configureScript=configureScript -configureScript() { - echo yes | ./configure $configureFlags - export LD_LIBRARY_PATH=$(pwd)/lib -} - - -postInstall() { - # Qt's `make install' is broken; it copies ./bin/qmake, which - # is a symlink to ./qmake/qmake. So we end up with a dangling - # symlink. - rm $out/bin/qmake - cp -p qmake/qmake $out/bin -} - - -genericBuild diff --git a/nixpkgs/pkgs/development/libraries/qt-3/default.nix b/nixpkgs/pkgs/development/libraries/qt-3/default.nix deleted file mode 100644 index b2d818a2972d..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, fetchurl -, xftSupport ? true, libXft ? null -, xrenderSupport ? true, libXrender ? null -, xrandrSupport ? true, libXrandr ? null -, xineramaSupport ? true, libXinerama ? null -, cursorSupport ? true, libXcursor ? null -, threadSupport ? true -, mysqlSupport ? false, libmysqlclient ? null -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, openglSupport ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGL ? null, libGLU ? null, libXmu ? null -, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which -}: - -assert xftSupport -> libXft != null; -assert xrenderSupport -> xftSupport && libXrender != null; -assert xrandrSupport -> libXrandr != null; -assert cursorSupport -> libXcursor != null; -assert mysqlSupport -> libmysqlclient != null; -assert openglSupport -> libGL != null && libGLU != null && libXmu != null; - -stdenv.mkDerivation { - name = "qt-3.3.8"; - - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2"; - sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; - }; - - nativeBuildInputs = [ which ]; - propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg]; - - hardeningDisable = [ "format" ]; - - configureFlags = let - mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; - in [ - "-v" - "-system-zlib" "-system-libpng" "-system-libjpeg" - "-qt-gif" - "-I${xorgproto}/include" - (mk threadSupport "thread") - (mk xrenderSupport "xrender") - (mk xrandrSupport "xrandr") - (mk xineramaSupport "xinerama") - (mk xrandrSupport "xrandr") - (mk xftSupport "xft") - ] ++ lib.optionals openglSupport [ - "-dlopen-opengl" - "-L${libGL}/lib" "-I${libGLU}/include" - "-L${libXmu.out}/lib" "-I${libXmu.dev}/include" - ] ++ lib.optionals xrenderSupport [ - "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" - ] ++ lib.optionals xrandrSupport [ - "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - ] ++ lib.optionals xineramaSupport [ - "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" - ] ++ lib.optionals cursorSupport [ - "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" - ] ++ lib.optionals mysqlSupport [ - "-qt-sql-mysql" "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" - ] ++ lib.optionals xftSupport [ - "-L${libXft.out}/lib" "-I${libXft.dev}/include" - "-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include" - "-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include" - ]; - - patches = [ - # Don't strip everything so we can get useful backtraces. - ./strip.patch - - # Build on NixOS. - ./qt-pwd.patch - - # randr.h and Xrandr.h need not be in the same prefix. - ./xrandr.patch - - # Make it build with gcc 4.6.0 - ./qt3-gcc4.6.0.patch - ]; - - passthru = {inherit mysqlSupport;}; - - meta = with lib; { - license = with licenses; [ gpl2 qpl ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch b/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch deleted file mode 100644 index 763f785726b7..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/qt-pwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN qt-x11-free-3.3.3/configure qt-x11-free-3.3.3.new/configure ---- qt-x11-free-3.3.3/configure 2004-06-14 11:18:55.000000000 +0200 -+++ qt-x11-free-3.3.3.new/configure 2005-11-12 19:39:43.000000000 +0100 -@@ -16,9 +16,9 @@ - relconf=`basename $0` - # the directory of this script is the "source tree" - relpath=`dirname $0` --relpath=`(cd $relpath; /bin/pwd)` -+relpath=`(cd $relpath; pwd)` - # the current directory is the "build tree" or "object tree" --outpath=`/bin/pwd` -+outpath=`pwd` - - # later cache the command line in config.status - OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"` diff --git a/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch b/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch deleted file mode 100644 index c1a903c130c7..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/qt3-gcc4.6.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -I picked it here: -https://bugs.archlinux.org/task/23915 - ---- qt-x11-free-3.3.8b/src/tools/qmap.h~ 2008-01-15 19:09:13.000000000 +0000 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-04-11 00:16:04.000000000 +0100 -@@ -50,6 +50,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include <cstddef> - #include <iterator> - #include <map> - #endif ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h~ 2008-01-15 19:09:13.000000000 +0000 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-04-11 00:16:49.000000000 +0100 -@@ -48,6 +48,7 @@ - #endif // QT_H - - #ifndef QT_NO_STL -+#include <cstddef> - #include <iterator> - #include <list> - #endif diff --git a/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh deleted file mode 100644 index db1a2529ff54..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export QTDIR=@out@ diff --git a/nixpkgs/pkgs/development/libraries/qt-3/strip.patch b/nixpkgs/pkgs/development/libraries/qt-3/strip.patch deleted file mode 100644 index a0c9fa738898..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/strip.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rc qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf -*** qt-x11-free-3.3.3-orig/mkspecs/linux-g++/qmake.conf 2004-08-05 16:42:57.000000000 +0200 ---- qt-x11-free-3.3.3/mkspecs/linux-g++/qmake.conf 2005-03-02 12:25:55.000000000 +0100 -*************** -*** 85,90 **** - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_STRIP = strip -! QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- 85,90 ---- - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir - QMAKE_STRIP = strip -! QMAKE_STRIPFLAGS_LIB += --strip-debug - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch b/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch deleted file mode 100644 index 0389c7fdd068..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-3/xrandr.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rc qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test qt-x11-free-3.3.6/config.tests/x11/xrandr.test -*** qt-x11-free-3.3.6-orig/config.tests/x11/xrandr.test 2006-09-14 14:00:08.000000000 +0200 ---- qt-x11-free-3.3.6/config.tests/x11/xrandr.test 2006-09-14 14:10:39.000000000 +0200 -*************** -*** 52,69 **** - INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include" - F= - for INCDIR in $INCDIRS; do -! if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then - F=yes -! XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 -! [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" - break - fi - done - if [ -z "$F" ] - then - XRANDR=no -! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" - fi - fi - ---- 52,69 ---- - INCDIRS="$IN_INCDIRS $XDIRS /FOO/include /include" - F= - for INCDIR in $INCDIRS; do -! if [ -f $INCDIR/$INC2 ]; then - F=yes -! # XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 -! [ "$VERBOSE" = "yes" ] && echo " Found $INC2 in $INCDIR" - break - fi - done - if [ -z "$F" ] - then - XRANDR=no -! [ "$VERBOSE" = "yes" ] && echo " Could not find $INC2 anywhere in $INCDIRS" - fi - fi - diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index 261374b7d93e..63e893ea69ff 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -99,6 +99,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch + ./qtwebkit-icu68.patch ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch @@ -136,7 +137,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -188,6 +189,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch new file mode 100644 index 000000000000..73463d7567a3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebkit-icu68.patch @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 14b99fab4e27..45cf6209ea08 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -112,6 +112,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch + ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch @@ -149,7 +150,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -199,6 +200,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch new file mode 100644 index 000000000000..73463d7567a3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/qtwebkit-icu68.patch @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 6333f889b684..f969254b5952 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/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,42 @@ 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 7 rev}"; + + src = fetchgit { + url = "https://github.com/qt/qtwebengine.git"; + sha256 = "1vdgxfbmx4z4qrm2g61dl64gqn3fv5f83jwpp7h1gyfx5z2qvfmv"; + inherit rev branchName; + fetchSubmodules = true; + leaveDotGit = true; + name = "qtwebengine-${substring 0 7 rev}.tar.gz"; + postFetch = '' + # remove submodule .git directory + rm -rf $out/src/3rdparty/.git + + # compress to not exceed the 2GB output limit + mv $out source + # try to make a deterministic tarball + tar -I 'gzip -n' \ + --sort name \ + --mtime 1970-01-01 \ + --owner=root --group=root \ + --numeric-owner --mode=go=rX,u+rw,a-s \ + -cf $out source + ''; + }; + }; }; patches = { @@ -83,11 +119,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"; @@ -95,6 +136,7 @@ let sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) ./qtwebkit.patch + ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch ./qtwebkit-darwin-no-qos-classes.patch @@ -161,7 +203,9 @@ let qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; - qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix { + inherit (srcs.qtwebengine) version; + }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; @@ -182,6 +226,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch new file mode 100644 index 000000000000..73463d7567a3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 7f6ddb76ad57..741225a5aa81 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -3,6 +3,9 @@ qmakeFlags=( ${qmakeFlags-} ) qmakePrePhase() { + qmakeFlags_orig=( "${qmakeFlags[@]}" ) + + # These flags must be added _before_ the flags specified in the derivation. qmakeFlags=( \ "PREFIX=$out" \ "NIX_OUTPUT_OUT=$out" \ @@ -11,8 +14,15 @@ qmakePrePhase() { "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ - "${qmakeFlags[@]}" \ ) + + if [ -n "@debug@" ]; then + qmakeFlags+=( "CONFIG+=debug" ) + else + qmakeFlags+=( "CONFIG+=release" ) + fi + + qmakeFlags+=( "${qmakeFlags_orig[@]}" ) } prePhases+=" qmakePrePhase" diff --git a/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 9f2a9f06f1ab..1b57d676e1fc 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,3 +1,14 @@ +if [[ -n "${__nix_qtbase-}" ]]; then + # Throw an error if a different version of Qt was already set up. + if [[ "$__nix_qtbase" != "@dev@" ]]; then + echo >&2 "Error: detected mismatched Qt dependencies:" + echo >&2 " @dev@" + echo >&2 " $__nix_qtbase" + exit 1 + fi +else # Only set up Qt once. +__nix_qtbase="@dev@" + qtPluginPrefix=@qtPluginPrefix@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ @@ -5,6 +16,20 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ +# Disable debug symbols if qtbase was built without debugging. +# This stops -dev paths from leaking into other outputs. +if [ -z "@debug@" ]; then + NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" +fi + +# Integration with CMake: +# Set the CMake build type corresponding to how qtbase was built. +if [ -n "@debug@" ]; then + cmakeBuildType="Debug" +else + cmakeBuildType="Release" +fi + providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] } @@ -19,7 +44,12 @@ export QMAKEPATH QMAKEMODULES= export QMAKEMODULES +declare -Ag qmakePathSeen=() qmakePathHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qmakePathSeen[$1]-}" ]; then return; fi + qmakePathSeen[$1]=1 if [ -d "$1/mkspecs" ] then QMAKEMODULES="${QMAKEMODULES}${QMAKEMODULES:+:}/mkspecs" @@ -34,7 +64,12 @@ envBuildHostHooks+=(qmakePathHook) # package depending on the building package. (This is necessary in case # the building package does not provide runtime dependencies itself and so # would not be propagated to the user environment.) +declare -Ag qtEnvHostTargetSeen=() qtEnvHostTargetHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qtEnvHostTargetSeen[$1]-}" ]; then return; fi + qtEnvHostTargetSeen[$1]=1 if providesQtRuntime "$1" && [ "z${!outputBin}" != "z${!outputDev}" ] then propagatedBuildInputs+=" $1" @@ -64,3 +99,14 @@ postPatchMkspecs() { if [ -z "${dontPatchMkspecs-}" ]; then postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" fi + +qtPreHook() { + # Check that wrapQtAppsHook is used, or it is explicitly disabled. + if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then + echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + exit 1 + fi +} +prePhases+=" qtPreHook" + +fi diff --git a/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 7356c8ee3560..ce4d78fbb50f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -1,3 +1,6 @@ +if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then +__nix_wrapQtAppsHook=1 # Don't run this hook more than once. + # Inherit arguments given in mkDerivation qtWrapperArgs=( ${qtWrapperArgs-} ) @@ -100,3 +103,5 @@ wrapQtAppsHook() { } fixupOutputHooks+=(wrapQtAppsHook) + +fi diff --git a/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix index 2c6333cb0204..98f9a05fac7c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,21 +9,6 @@ args: let args_ = { - qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] - ++ (args.qmakeFlags or []); - - NIX_CFLAGS_COMPILE = toString ( - optional (!debug) "-DQT_NO_DEBUG" - ++ lib.toList (args.NIX_CFLAGS_COMPILE or [])); - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ - ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) - ]; - - enableParallelBuilding = args.enableParallelBuilding or true; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ wrapQtAppsHook ]; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 24f1d6f81a24..0d0bef342b02 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -22,6 +22,7 @@ libGL, buildExamples ? false, buildTests ? false, + debug ? false, developerBuild ? false, decryptSslTraffic ? false }: @@ -33,12 +34,14 @@ let compareVersion = v: builtins.compareVersions version v; qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; + debugSymbols = debug || developerBuild; in stdenv.mkDerivation { name = "qtbase-${version}"; inherit qtCompatVersion src version; + debug = debugSymbols; propagatedBuildInputs = [ @@ -241,6 +244,7 @@ stdenv.mkDerivation { "-I" "${icu.dev}/include" "-pch" ] + ++ lib.optional debugSymbols "-debug" ++ lib.optionals (compareVersion "5.11.0" < 0) [ "-qml-debug" @@ -397,6 +401,8 @@ stdenv.mkDerivation { -e "/^host_bins=/ c host_bins=$dev/bin" ''; + dontStrip = debugSymbols; + setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 7e5582cca481..cd3fa583303d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/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 @@ -16,6 +17,7 @@ , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null , lib, stdenv, fetchpatch +, version ? null , qtCompatVersion }: @@ -25,7 +27,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 +50,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` @@ -90,11 +108,7 @@ qtModule { '' else '' substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - '') - + '' - substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ - --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' - ''); + '')); NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit @@ -124,7 +138,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" @@ -190,6 +204,7 @@ qtModule { buildInputs = optionals stdenv.isDarwin (with darwin; [ cups + apple_sdk.libs.sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` # to get some information about the host platform. @@ -205,15 +220,8 @@ qtModule { shift done '') - - # For sandbox.h include - (runCommand "MacOS_SDK_sandbox.h" {} '' - install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h - '') ]); - __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib"; - dontUseNinjaBuild = true; dontUseNinjaInstall = true; dontUseXcbuild = true; @@ -223,12 +231,17 @@ qtModule { [Paths] Prefix = .. EOF + '' + lib.optionalString (lib.versions.majorMinor qtCompatVersion == "5.15") '' + # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3) + sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake ''; meta = with lib; { description = "A web engine based on the Chromium web browser"; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + # This build takes a long time; particularly on slow architectures + timeout = 24 * 3600; }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix b/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix index da56c07779b9..b4a201c08cc4 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 0481f000c6ce..930ed9d67baa 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -34,6 +34,8 @@ mkDerivation (args // { fixQtBuiltinPaths . '*.pr?' ''; + dontWrapQtApps = args.dontWrapQtApps or true; + postFixup = '' if [ -d "''${!outputDev}/lib/pkgconfig" ]; then find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do diff --git a/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix index 91f853711066..ce69c855ac23 100644 --- a/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtinstaller/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; enableParallelBuilding = true; NIX_QT_SUBMODULE = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/{bin,lib,share/qt-installer-framework} diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 6da4abb756e6..3da0587210d8 100644 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; + dontWrapQtApps = true; + patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; diff --git a/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix b/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix index 3558201015c6..9dbc2491ad95 100644 --- a/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase protobuf ]; + dontWrapQtApps = true; + postPatch = '' # Fix plugin dir substituteInPlace pbfplugin.pro \ diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index 4587bf461624..85468bd4f183 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,7 +1,8 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, gtk2 }: mkDerivation { - name = "qtstyleplugins-2017-03-11"; + pname = "qtstyleplugins"; + version = "unstable-2017-03-11"; src = fetchFromGitHub { owner = "qt"; @@ -10,7 +11,18 @@ mkDerivation { sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy"; }; - patches = [ ./fix-build-against-Qt-5.15.patch ]; + patches = [ + (fetchpatch rec { + name = "0001-fix-build-against-Qt-5.15.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins"; + sha256 = "j0CgfutqFawy11IqFnlrkfMsMD01NjX/MkfVEVxj1QM="; + }) + (fetchpatch rec { + name = "0002-fix-gtk2-background.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins"; + sha256 = "qUOkNckrSUEzXY1PUZKfbiCjhNyB5ZBw2IN/j32GKM4="; + }) + ]; nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ gtk2 ]; diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch b/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch deleted file mode 100644 index 7eb744158204..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fvogt@suse.de> -Date: Thu, 28 May 2020 12:35:42 +0200 -Subject: [PATCH] fix build against Qt 5.15 - -With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application -palette handling between QGuiApplication and QApplication") -QApplicationPrivate::setSystemPalette is no longer used and necessary. ---- - src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ - src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp -index 36169c9..2544593 100644 ---- a/src/plugins/styles/gtk2/qgtkstyle.cpp -+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp -@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app) - // not supported as these should be entirely determined by - // current Gtk settings - if (app->desktopSettingsAware() && d->isThemeAvailable()) { -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QApplicationPrivate::setSystemPalette(standardPalette()); -+#endif - QApplicationPrivate::setSystemFont(d->getThemeFont()); - d->applyCustomPaletteHash(); - if (!d->isKDE4Session()) -diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -index e57b3d8..e71beb0 100644 ---- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp -+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme() - if (oldTheme != QGtkStylePrivate::getThemeName()) { - oldTheme = QGtkStylePrivate::getThemeName(); - QPalette newPalette = qApp->style()->standardPalette(); -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QApplicationPrivate::setSystemPalette(newPalette); -+#endif - QApplication::setPalette(newPalette); - if (!QGtkStylePrivate::instances.isEmpty()) { - QGtkStylePrivate::instances.last()->initGtkWidgets(); --- -2.26.2 - diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 831c51fa234d..99cf50a7ba04 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -5,27 +5,28 @@ , qttools , qtbase , cmake -, pkg-config }: stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.3.0"; + version = "6.3.3"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vHx2JMPqioY8jUpBOIFdhhN1mIUV3LS8ayQOo3g7bY0="; + sha256 = "sha256-RoI1huVei4SmAUhuYruzgod0/qIlnrZSHEMceQc2jzc="; }; buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/Martchus/qtutilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix index 652c49aa6ca2..5bc30db059e7 100644 --- a/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { buildInputs = [ qtwebkit hunspell ]; + dontWrapQtApps = true; + postPatch = '' sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro diff --git a/nixpkgs/pkgs/development/libraries/quazip/default.nix b/nixpkgs/pkgs/development/libraries/quazip/default.nix index 3f186314d013..a12d6cafe4ae 100644 --- a/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + dontWrapQtApps = true; + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/qwt/6.nix b/nixpkgs/pkgs/development/libraries/qwt/6.nix index edfd3b4e24a3..1f2518fc7380 100644 --- a/nixpkgs/pkgs/development/libraries/qwt/6.nix +++ b/nixpkgs/pkgs/development/libraries/qwt/6.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { - name = "qwt-6.1.5"; + name = "qwt-6.1.6"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; + sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY="; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix index 94a9adcae877..3d8fa0f95d93 100644 --- a/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rabbitmq-c"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "1iv7aww4pam8497s524xjxbbxypyqd01qgrb0b429y3q9x06m4sw"; + sha256 = "sha256-u1uOrZRiQOU/6vlLdQHypBRSCo3zw7FC1AI9v3NlBVE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix index b649b1d9c113..e5657bcb3c30 100644 --- a/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/nixpkgs/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; }; - buildInputs = [ ant jdk python makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ant jdk python ]; buildPhase = "ant dist"; diff --git a/nixpkgs/pkgs/development/libraries/raylib/default.nix b/nixpkgs/pkgs/development/libraries/raylib/default.nix new file mode 100644 index 000000000000..47d8fdb040b2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, + mesa, libGLU, glfw, + libX11, libXi, libXcursor, libXrandr, libXinerama, + alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib, + pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, + includeEverything ? true +}: + +stdenv.mkDerivation rec { + pname = "raylib"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "raysan5"; + repo = pname; + rev = version; + sha256 = "0syvd5js1lbx3g4cddwwncqg95l6hb3fdz5nsh5pqy7fr6v84kwj"; + }; + + patches = [ + # fixes examples not compiling in 3.5.0 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/raysan5/raylib/pull/1470.patch"; + sha256 = "1ff5l839wl8dxwrs2bwky7kqa8kk9qmsflg31sk5vbil68dzbzg0"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama + ] ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseSupport libpulseaudio; + + # https://github.com/raysan5/raylib/wiki/CMake-Build-Options + cmakeFlags = [ + "-DUSE_EXTERNAL_GLFW=ON" + "-DSHARED=ON" + "-DBUILD_EXAMPLES=OFF" + ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"; + + # fix libasound.so/libpulse.so not being found + preFixup = '' + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} + ''; + + meta = with lib; { + description = "A simple and easy-to-use library to enjoy videogames programming"; + homepage = "http://www.raylib.com/"; + license = licenses.zlib; + maintainers = with maintainers; [ adamlwgriffiths ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index a42941cbb689..0d7483d3c2e3 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }: +{ lib, stdenv, fetchFromGitHub, zlib, pkg-config, python3, openssl }: stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-VCGR0Q8FcoDLr+CFTk/OLMI4zs87K/IdZS1ANmkeb4s="; + sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ zlib perl python openssl ]; + buildInputs = [ zlib openssl ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; diff --git a/nixpkgs/pkgs/development/libraries/redkite/default.nix b/nixpkgs/pkgs/development/libraries/redkite/default.nix index bc82e95be713..eb3d7629a4ea 100644 --- a/nixpkgs/pkgs/development/libraries/redkite/default.nix +++ b/nixpkgs/pkgs/development/libraries/redkite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y"; + sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix index 618c91421b6a..433da05d088f 100644 --- a/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rep-gtk/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, librep, gtk2 }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gtk2 +, librep +, pkg-config +}: -with lib; stdenv.mkDerivation rec { - pname = "rep-gtk"; version = "0.90.8.3"; - sourceName = "rep-gtk_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/${pname}/${pname}_${version}.tar.xz"; sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ]; - propagatedBuildInputs = [ librep gtk2 ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + gtk2 + librep + ]; patchPhase = '' sed -e 's|installdir=$(repexecdir)|installdir=$(libdir)/rep|g' -i Makefile.in ''; - meta = { + meta = with lib; { + homepage = "http://sawfish.tuxfamily.org"; description = "GTK bindings for librep"; - homepage = "http://sawfish.wikia.com"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } # TODO: investigate fetchFromGithub diff --git a/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix index 5b73bc41475d..69ec01747484 100644 --- a/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.6"; + name = "resolv_wrapper-1.1.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; + sha256 = "sha256-Rgrn/V5TSFvn3ZmlXFki8csWNrnoghmB1JrRZQfIoHQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/rinutils/default.nix b/nixpkgs/pkgs/development/libraries/rinutils/default.nix new file mode 100644 index 000000000000..35e48140fdd3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rinutils/default.nix @@ -0,0 +1,21 @@ +{ + stdenv, lib, fetchurl, + cmake, perl, +}: + +stdenv.mkDerivation rec { + pname = "rinutils"; + version = "0.8.0"; + + meta = with lib; { + homepage = "https://github.com/shlomif/rinutils"; + license = licenses.mit; + }; + + src = fetchurl { + url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "1q09aihm5m42xiq2prpa9mf0srwiirzgzblkp5nl74i7zg6pg5hx"; + }; + + nativeBuildInputs = [ cmake perl ]; +} diff --git a/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix index 4dec2f3cfcb7..ad587f0f5839 100644 --- a/nixpkgs/pkgs/development/libraries/rnnoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/rnnoise/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { pname = "rnnoise"; - version = "2020-06-28"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "xiph"; repo = "rnnoise"; - rev = "90ec41ef659fd82cfec2103e9bb7fc235e9ea66c"; - sha256 = "02z6qzjajhlpsb80lwl7cqqga9hm638psnqnppjkw84w4lrp15ny"; + rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd"; + sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix index 278fdecc1a67..c93ea5ba78ba 100644 --- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index e4ee3c473075..6ab2fe9f6cbf 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.5"; + version = "6.17.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; + sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index 96f7108e3fe0..b9a34b113ebd 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index 965d92179b67..e62d6f0076fc 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index ab0957474adc..d721cfece96a 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index beb0c61e683c..c63e8249cfc0 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index 5863e1f0a57c..1339e035ebfd 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/s2geometry/default.nix b/nixpkgs/pkgs/development/libraries/s2geometry/default.nix new file mode 100644 index 000000000000..afd5ffa0a0a2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/s2geometry/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, openssl, gtest }: + +stdenv.mkDerivation rec { + pname = "s2geometry"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "s2geometry"; + rev = "v${version}"; + sha256 = "1mx61bnn2f6bd281qlhn667q6yfg1pxzd2js88l5wpkqlfzzhfaz"; + }; + + patches = [ + # Fix build https://github.com/google/s2geometry/issues/165 + (fetchpatch { + url = "https://github.com/google/s2geometry/commit/a4dddf40647c68cd0104eafc31e9c8fb247a6308.patch"; + sha256 = "0fp3w4bg7pgf5vv4vacp9g06rbqzhxc2fg6i5appp93q6phiinvi"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl gtest ]; + + meta = with lib; { + description = "Computational geometry and spatial indexing on the sphere"; + homepage = "http://s2geometry.io/"; + license = licenses.asl20; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/s2n/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 3ec66ebf52d1..2d3ebc6cb414 100644 --- a/nixpkgs/pkgs/development/libraries/s2n/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { - pname = "s2n"; - version = "0.10.23"; + pname = "s2n-tls"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "awslabs"; + owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "063wqpszhfcbxm7a7s6d6kinqd6b6dxij85lk9jjkrslg5fgqbki"; + sha256 = "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 implementation of the TLS/SSL protocols"; - homepage = "https://github.com/awslabs/s2n"; + homepage = "https://github.com/aws/s2n-tls"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/development/libraries/safefile/default.nix b/nixpkgs/pkgs/development/libraries/safefile/default.nix index db18621d8e43..293a13dbddc4 100644 --- a/nixpkgs/pkgs/development/libraries/safefile/default.nix +++ b/nixpkgs/pkgs/development/libraries/safefile/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "File open routines to safely open a file when in the presence of an attack"; license = lib.licenses.asl20 ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; homepage = "https://research.cs.wisc.edu/mist/safefile/"; updateWalker = true; }; diff --git a/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch index af38abf329ea..af38abf329ea 100644 --- a/nixpkgs/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch diff --git a/nixpkgs/pkgs/development/libraries/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index a430bc317930..a3263f653b75 100644 --- a/nixpkgs/pkgs/development/libraries/cfitsio/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = "--with-bzip2=${bzip2.out}"; + configureFlags = [ "--with-bzip2=${bzip2.out}" ]; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/development/libraries/indilib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index 035356ac861a..f7966046fa87 100644 --- a/nixpkgs/pkgs/development/libraries/indilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , cmake , cfitsio @@ -14,19 +15,15 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU="; + sha256 = "sha256-W6LfrKL56K1B6srEfbNcq1MZwg7Oj8qoJkQ83ZhYhFs="; }; - patches = [ - ./udev-dir.patch - ]; - nativeBuildInputs = [ cmake ]; @@ -43,11 +40,17 @@ stdenv.mkDerivation rec { fftw ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + ]; + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; + changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix new file mode 100644 index 000000000000..34ef40887135 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, cfitsio +, libusb1 +, zlib +, boost +, libnova +, curl +, libjpeg +, gsl +, fftw +, indilib +, libgphoto2 +, libraw +, libftdi1 +, libdc1394 +, gpsd +, ffmpeg +}: + +stdenv.mkDerivation rec { + pname = "indi-3rdparty"; + version = "1.8.9"; + + src = fetchFromGitHub { + owner = "indilib"; + repo = pname; + rev = "v${version}"; + sha256 = "0klvknhp7l6y2ab4vyv4jq7znk1gjl5b3709kyplm7dsh4b8bppy"; + }; + + cmakeFlags = [ + "-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" + "-DRULES_INSTALL_DIR=lib/udev/rules.d" + "-DWITH_SX=off" + "-DWITH_SBIG=off" + "-DWITH_APOGEE=off" + "-DWITH_FISHCAMP=off" + "-DWITH_DSI=off" + "-DWITH_QHY=off" + "-DWITH_ARMADILLO=off" + "-DWITH_PENTAX=off" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd + libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw + ]; + + meta = with lib; { + homepage = "https://www.indilib.org/"; + description = "Third party drivers for the INDI astronomical software suite"; + changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix new file mode 100644 index 000000000000..e52da9f2eab1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -0,0 +1,11 @@ +{ callPackage, indilib, indi-3rdparty }: + +let + indi-with-drivers = ./indi-with-drivers.nix; +in +callPackage indi-with-drivers { + pkgName = "indi-full"; + extraDrivers = [ + indi-3rdparty + ]; +} diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix new file mode 100644 index 000000000000..27ac86ddbadf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -0,0 +1,10 @@ +{ buildEnv, indilib ? indilib, extraDrivers ? null , pkgName ? "indi-with-drivers" }: + +buildEnv { + name = pkgName; + paths = [ + indilib + ] + ++ extraDrivers; + inherit (indilib) meta; +} diff --git a/nixpkgs/pkgs/development/libraries/libnova/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix index f6a8d01ab845..f6a8d01ab845 100644 --- a/nixpkgs/pkgs/development/libraries/libnova/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix diff --git a/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index f55c72bd2095..f55c72bd2095 100644 --- a/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix new file mode 100644 index 000000000000..b16ba1117f4e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, flex }: + +stdenv.mkDerivation rec { + pname = "wcslib"; + version = "7.5"; + + src = fetchurl { + url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; + sha256 = "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw"; + }; + + buildInputs = [ flex ]; + + prePatch = '' + substituteInPlace GNUmakefile --replace 2775 0775 + substituteInPlace C/GNUmakefile --replace 2775 0775 + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; + description = "World Coordinate System library for astronomy"; + longDescription = '' + Library for world coordinate systems for spherical geometries + and their conversion to image coordinate systems. This is the + standard library for this purpose in astronomy. + ''; + maintainers = with maintainers; [ hjones2199 ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index cb3a543ad2af..3233a29449aa 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, lzma, curl, perl }: +{ lib, stdenv, fetchurl, zlib, bzip2, xz, curl, perl }: stdenv.mkDerivation rec { pname = "htslib"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # perl is only used during the check phase. nativeBuildInputs = [ perl ]; - buildInputs = [ zlib bzip2 lzma curl ]; + buildInputs = [ zlib bzip2 xz curl ]; configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended diff --git a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 254ce08dc60f..703a7f2e3441 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; meta = with lib; { homepage = "https://github.com/liuq/QuadProgpp"; @@ -22,6 +21,6 @@ stdenv.mkDerivation rec { Goldfarb-Idnani active-set dual method. ''; maintainers = with maintainers; [ ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix index 42c84b3ed610..1eea35a34e76 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix index ac35385f9835..f17124db47bb 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - sha256 = "1s8zvq6p843jb52lrbxra7vv0wzmifs4j36z9bp7wf3xr20a0zi5"; + hash = "sha256-jESae5NqANw90RBbIHH2oGEq5/mudc4IONv50P/AeQ0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 382f868a99ac..23e44bf28b06 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix index aca395001f96..fcb49d70a3b1 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix index d99149c0e965..b8aac46d9194 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }: +{ callPackage, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -6,35 +6,6 @@ let }; in rec { - cudnn_cudatoolkit_7 = generic rec { - # Old URL is v4 instead of v4.0 for some reason... - version = "4"; - cudatoolkit = cudatoolkit_7; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz"; - sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd"; - }; - - cudnn_cudatoolkit_7_5 = generic rec { - version = "6.0"; - cudatoolkit = cudatoolkit_7_5; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; - sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; - }; - - cudnn6_cudatoolkit_8 = generic rec { - version = "6.0"; - cudatoolkit = cudatoolkit_8; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; - sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; - }; - - cudnn_cudatoolkit_8 = generic rec { - version = "7.0.5"; - cudatoolkit = cudatoolkit_8; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; - }; - cudnn_cudatoolkit_9_0 = generic rec { version = "7.3.0"; cudatoolkit = cudatoolkit_9_0; @@ -82,11 +53,21 @@ in rec { cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; cudnn_cudatoolkit_11_0 = generic rec { - version = "8.0.2"; + version = "8.1.0"; cudatoolkit = cudatoolkit_11_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz"; - sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; + # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: + # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions + srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz"; + sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; + }; + + cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_1; + }; + + cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_2; }; - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index 59c0b7f44980..d9c19e6790c6 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -8,6 +8,14 @@ , cudatoolkit , fetchurl , addOpenGLRunpath +, # The distributed version of CUDNN includes both dynamically liked .so files, + # as well as statically linked .a files. However, CUDNN is quite large + # (multiple gigabytes), so you can save some space in your nix store by + # removing the statically linked libraries if you are not using them. + # + # Setting this to true removes the statically linked .a files. + # Setting this to false keeps these statically linked .a files. + removeStatic ? false }: stdenv.mkDerivation { @@ -23,28 +31,31 @@ stdenv.mkDerivation { nativeBuildInputs = [ addOpenGLRunpath ]; installPhase = '' + runHook preInstall + function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1 } - fixRunPath lib64/libcudnn.so + + for lib in lib64/lib*.so; do + fixRunPath $lib + done mkdir -p $out cp -a include $out/include cp -a lib64 $out/lib64 + '' + lib.optionalString removeStatic '' + rm -f $out/lib64/*.a + '' + '' + runHook postInstall ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. postFixup = '' for lib in $out/lib/lib*.so; do - # patchelf fails on libcudnn_cnn_infer due to it being too big. - # Most programs will still get the RPATH since they link to - # other things. - # (https://github.com/NixOS/patchelf/issues/222) - if [ "$(basename $lib)" != libcudnn_cnn_infer.so ]; then - addOpenGLRunpath $lib - fi + addOpenGLRunpath $lib done ''; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix new file mode 100644 index 000000000000..1b5895b02bb3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix @@ -0,0 +1,37 @@ +{ callPackage +, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: + +rec { + cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec { + version = "1.2.2.5"; + libPath = "lib/10.1"; + cudatoolkit = cudatoolkit_10_1; + # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2: + # ephemeral doc at https://developer.nvidia.com/cutensor/downloads + sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm"; + }; + + cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override { + libPath = "lib/10.2"; + cudatoolkit = cudatoolkit_10_2; + }; + + cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2; + + cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override { + libPath = "lib/11"; + cudatoolkit = cudatoolkit_11_0; + }; + + cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_1; + }; + + cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_2; + }; + + cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix new file mode 100644 index 000000000000..0b2bd31b2c30 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, libPath +, cudatoolkit +, fetchurl +, autoPatchelfHook +, addOpenGLRunpath + +, version +, sha256 +}: + +let + mostOfVersion = builtins.concatStringsSep "." + (lib.take 3 (lib.versions.splitVersion version)); +in + +stdenv.mkDerivation { + pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor"; + inherit version; + + src = fetchurl { + url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoPatchelfHook + addOpenGLRunpath + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + installPhase = '' + mkdir -p "$out" "$dev" + mv include "$dev" + mv ${libPath} "$out/lib" + + function finalRPathFixups { + for lib in $out/lib/lib*.so; do + addOpenGLRunpath $lib + done + } + postFixupHooks+=(finalRPathFixups) + ''; + + passthru = { + inherit cudatoolkit; + majorVersion = lib.versions.major version; + }; + + meta = with lib; { + description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; + homepage = "https://developer.nvidia.com/cutensor"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ obsidian-systems-maintenance ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index c742cc60b27f..50563f2745ab 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, gfortran, cmake, - python2, shared ? true }: let @@ -11,7 +10,7 @@ let version = "3.9.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "liblapack"; inherit version; @@ -22,17 +21,41 @@ stdenv.mkDerivation { sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb"; }; - nativeBuildInputs = [ gfortran python2 cmake ]; + nativeBuildInputs = [ gfortran cmake ]; + + # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10. + hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ]; cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" "-DLAPACKE=ON" "-DCBLAS=ON" + "-DBUILD_TESTING=ON" ] ++ optional shared "-DBUILD_SHARED_LIBS=ON"; doCheck = true; + # Some CBLAS related tests fail on Darwin: + # 14 - CBLAS-xscblat2 (Failed) + # 15 - CBLAS-xscblat3 (Failed) + # 17 - CBLAS-xdcblat2 (Failed) + # 18 - CBLAS-xdcblat3 (Failed) + # 20 - CBLAS-xccblat2 (Failed) + # 21 - CBLAS-xccblat3 (Failed) + # 23 - CBLAS-xzcblat2 (Failed) + # 24 - CBLAS-xzcblat3 (Failed) + # + # Upstream issue to track: + # * https://github.com/Reference-LAPACK/lapack/issues/440 + ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'"; + + checkPhase = '' + runHook preCheck + ctest ${ctestArgs} + runHook postCheck + ''; + meta = with lib; { inherit version; description = "Linear Algebra PACKage"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 9631f3931cab..481836a4e115 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -8,11 +8,17 @@ , fixDarwinDylibNames , cudaSupport -, nvidia_x11 +, cudatoolkit_11_1 +, cudnn_cudatoolkit_11_1 }: let - version = "1.7.1"; + # The binary libtorch distribution statically links the CUDA + # toolkit. This means that we do not need to provide CUDA to + # this derivation. However, we should ensure on version bumps + # that the CUDA toolkit for `passthru.tests` is still + # up-to-date. + version = "1.8.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; @@ -24,12 +30,7 @@ in stdenv.mkDerivation { nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] - else [ addOpenGLRunpath patchelf ] - ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; - - buildInputs = [ - stdenv.cc.cc - ] ++ lib.optionals cudaSupport [ nvidia_x11 ]; + else [ patchelf ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; dontBuild = true; dontConfigure = true; @@ -37,7 +38,7 @@ in stdenv.mkDerivation { installPhase = '' # Copy headers and CMake files. - install -Dm755 -t $dev/lib lib/*.a + mkdir -p $dev cp -r include $dev cp -r share $dev @@ -56,9 +57,7 @@ in stdenv.mkDerivation { ''; postFixup = let - libPaths = [ stdenv.cc.cc.lib ] - ++ lib.optionals cudaSupport [ nvidia_x11 ]; - rpath = lib.makeLibraryPath libPaths; + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; in lib.optionalString stdenv.isLinux '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting rpath for $lib..." @@ -108,12 +107,17 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - passthru.tests.cmake = callPackage ./test { }; + passthru.tests.cmake = callPackage ./test { + inherit cudaSupport; + cudatoolkit = cudatoolkit_11_1; + cudnn = cudnn_cudatoolkit_11_1; + }; meta = with lib; { description = "C++ API of the PyTorch machine learning framework"; homepage = "https://pytorch.org/"; license = licenses.unfree; # Includes CUDA and Intel MKL. + maintainers = with maintainers; [ danieldk ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 7f815a31a51e..208e0b7adab8 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,14 @@ version: { x86_64-darwin-cpu = { url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; - sha256 = "0n93r7bq6wjjxkczp8r5pjm1nvl75wns5higsvh7gsir0j6k7b5b"; + hash = "sha256-V1lbztMB09wyWjdiJrwVwJ00DT8Kihy/TC2cKmdBLIE="; }; x86_64-linux-cpu = { url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; - sha256 = "0gpcj90nxyc69p53jiqwamd4gi7wzssk29csxfsyxsrzg3h36s7z"; + hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc="; }; x86_64-linux-cuda = { - url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip"; - sha256 = "01z61ryrflq306x7ay97k2fqc2q2z9c4c1zcnjfzr6412vg4fjb8"; + url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip"; + hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00="; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix index e69807871f46..60f9b5ad8846 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -1,6 +1,28 @@ -{ stdenv, cmake, libtorch-bin, symlinkJoin }: +{ lib +, stdenv +, cmake +, libtorch-bin +, linkFarm +, symlinkJoin -stdenv.mkDerivation { +, cudaSupport +, cudatoolkit +, cudnn +}: +let + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + + # We do not have access to /run/opengl-driver/lib in the sandbox, + # so use a stub instead. + cudaStub = linkFarm "cuda-stub" [{ + name = "libcuda.so.1"; + path = "${cudatoolkit}/lib/stubs/libcuda.so"; + }]; + +in stdenv.mkDerivation { pname = "libtorch-test"; version = libtorch-bin.version; @@ -8,7 +30,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ libtorch-bin ]; + buildInputs = [ libtorch-bin ] ++ + lib.optionals cudaSupport [ cudnn ]; + + cmakeFlags = lib.optionals cudaSupport + [ "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit_joined}" ]; doCheck = true; @@ -17,6 +43,7 @@ stdenv.mkDerivation { ''; checkPhase = '' - ./test + LD_LIBRARY_PATH=${cudaStub}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH \ + ./test ''; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix index b8e3999ffe83..c5960dddf517 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/default.nix @@ -1,8 +1,40 @@ { lib, stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: -with lib; +assert let majorIs = lib.versions.major cudatoolkit.version; + in majorIs == "9" || majorIs == "10" || majorIs == "11"; -let version = "2.5.4"; +let + version = "2.5.4"; + + # We define a specific set of CUDA compute capabilities here, + # because CUDA 11 does not support compute capability 3.0. Also, + # we use it to enable newer capabilities that are not enabled + # by magma by default. The list of supported architectures + # can be found in magma's top-level CMakeLists.txt. + cudaCapabilities = rec { + cuda9 = [ + "Kepler" # 3.0, 3.5 + "Maxwell" # 5.0 + "Pascal" # 6.0 + "Volta" # 7.0 + ]; + + cuda10 = [ + "Turing" # 7.5 + ] ++ cuda9; + + cuda11 = [ + "sm_35" # sm_30 is not supported by CUDA 11 + "Maxwell" # 5.0 + "Pascal" # 6.0 + "Volta" # 7.0 + "Turing" # 7.5 + "Ampere" # 8.0 + ]; + }; + + capabilityString = lib.strings.concatStringsSep "," + cudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; in stdenv.mkDerivation { pname = "magma"; @@ -17,6 +49,8 @@ in stdenv.mkDerivation { buildInputs = [ cudatoolkit libpthreadstubs lapack blas ]; + cmakeFlags = [ "-DGPU_TARGET=${capabilityString}" ]; + doCheck = false; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 34fea3162a9c..1f60f4d95388 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -17,40 +17,57 @@ let # Release notes and download URLs are here: # https://registrationcenter.intel.com/en/products/ - version = "${year}.${spot}.${rel}"; + version = "${mklVersion}.${rel}"; # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "4"; - rel = if stdenvNoCC.isDarwin then "199" else "304"; + mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1"; + rel = if stdenvNoCC.isDarwin then "199" else "52"; - # Replace `openmpSpot` by `spot` after 2020. - openmpSpot = if stdenvNoCC.isDarwin then spot else "3"; + # Intel openmp uses its own versioning. + openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3"; + openmpRel = "189"; - rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; - - # Intel openmp uses its own versioning, but shares the spot release patch. - openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; - openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}"; + # Thread Building Blocks release. + tbbRel = "119"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; -in stdenvNoCC.mkDerivation { + oneapi-mkl = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; + hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA="; + }; + + oneapi-mkl-common = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; + hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc="; + }; + + oneapi-mkl-common-devel = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; + hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438="; + }; + + oneapi-mkl-devel = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; + hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s="; + }; + + oneapi-openmp = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; + hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU="; + }; + + oneapi-tbb = fetchurl { + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm"; + hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A="; + }; + +in stdenvNoCC.mkDerivation ({ pname = "mkl"; inherit version; - src = if stdenvNoCC.isDarwin - then - (fetchurl { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg"; - sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f"; - }) - else - (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz"; - hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU="; - }); + dontUnpack = stdenvNoCC.isLinux; nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then @@ -63,30 +80,15 @@ in stdenvNoCC.mkDerivation { tar xzvf $f done '' else '' - # Common stuff - rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm - rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm - - # Dynamic libraries - rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm - - # Intel OpenMP runtime - rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm - '' + (if enableStatic then '' - # Static libraries - rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm - '' else '' - # Take care of installing dynamic-only PkgConfig files during the installPhase - '' - ); + rpmextract ${oneapi-mkl} + rpmextract ${oneapi-mkl-common} + rpmextract ${oneapi-mkl-common-devel} + rpmextract ${oneapi-mkl-devel} + rpmextract ${oneapi-openmp} + rpmextract ${oneapi-tbb} + ''; - installPhase = '' + installPhase = if stdenvNoCC.isDarwin then '' for f in $(find . -name 'mkl*.pc') ; do bn=$(basename $f) substituteInPlace $f \ @@ -95,42 +97,54 @@ in stdenvNoCC.mkDerivation { --replace "lib/intel64_lin" "lib" \ --replace "lib/intel64" "lib" done - for f in $(find opt/intel -name 'mkl*iomp.pc') ; do substituteInPlace $f \ --replace "../compiler/lib" "lib" done - '' + - (if stdenvNoCC.isDarwin then '' - mkdir -p $out/lib - cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ + mkdir -p $out/lib + + cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ - cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ - cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ - cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ - cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ + cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/tbb/lib/* $out/lib/ - mkdir -p $out/lib/pkgconfig - cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig + mkdir -p $out/lib/pkgconfig + cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig '' else '' - mkdir -p $out/lib - cp license.txt $out/lib/ + for f in $(find . -name 'mkl*.pc') ; do + bn=$(basename $f) + substituteInPlace $f \ + --replace $\{MKLROOT} "$out" \ + --replace "lib/intel64" "lib" - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + sed -r -i "s|^prefix=.*|prefix=$out|g" $f + done - mkdir -p $out/lib/pkgconfig - '') + + for f in $(find opt/intel -name 'mkl*iomp.pc') ; do + substituteInPlace $f --replace "../compiler/lib" "lib" + done + + # License + install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt + + # Dynamic libraries + install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* + install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* + install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* + + # Headers + cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ + '' + (if enableStatic then '' - cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig + install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc '' else '' - cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig + cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc '') + '' - # Setup symlinks for blas / lapack ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} @@ -159,13 +173,18 @@ in stdenvNoCC.mkDerivation { dontStrip = true; dontPatchELF = true; - passthru.tests.pkg-config = callPackage ./test { }; + passthru.tests = { + pkg-config-dynamic-iomp = callPackage ./test { enableStatic = false; execution = "iomp"; }; + pkg-config-static-iomp = callPackage ./test { enableStatic = true; execution = "iomp"; }; + pkg-config-dynamic-seq = callPackage ./test { enableStatic = false; execution = "seq"; }; + pkg-config-static-seq = callPackage ./test { enableStatic = true; execution = "seq"; }; + }; meta = with lib; { - description = "Intel Math Kernel Library"; + description = "Intel OneAPI Math Kernel Library"; longDescription = '' - Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort - for future generations of Intel processors. It is compatible with your + Intel OneAPI Math Kernel Library (Intel oneMKL) optimizes code with minimal + effort for future generations of Intel processors. It is compatible with your choice of compilers, languages, operating systems, and linking and threading models. ''; @@ -174,4 +193,9 @@ in stdenvNoCC.mkDerivation { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; }; -} +} // lib.optionalAttrs stdenvNoCC.isDarwin { + src = fetchurl { + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg"; + sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix index 688c0ec7c399..cb3355260d12 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/test/default.nix @@ -1,6 +1,14 @@ -{ stdenv, pkg-config, mkl }: +{ stdenv +, pkg-config +, mkl -stdenv.mkDerivation { +, enableStatic ? false +, execution ? "seq" +}: + +let + linkType = if enableStatic then "static" else "dynamic"; +in stdenv.mkDerivation { pname = "mkl-test"; version = mkl.version; @@ -8,19 +16,19 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mkl ]; + buildInputs = [ (mkl.override { inherit enableStatic; }) ]; doCheck = true; buildPhase = '' # Check regular Nix build. - gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution}) # Clear flags to ensure that we are purely relying on options # provided by pkg-config. NIX_CFLAGS_COMPILE="" \ NIX_LDFLAGS="" \ - gcc $(pkg-config --cflags --libs mkl-dynamic-ilp64-seq) test.c -o test + gcc test.c -o test $(pkg-config --cflags --libs mkl-${linkType}-ilp64-${execution}) ''; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index bd7b739bd77f..23a82f483dc6 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -42,6 +42,14 @@ let USE_OPENMP = true; }; + aarch64-darwin = { + BINARY = 64; + TARGET = setTarget "VORTEX"; + DYNAMIC_ARCH = true; + USE_OPENMP = false; + MACOSX_DEPLOYMENT_TARGET = "11.0"; + }; + aarch64-linux = { BINARY = 64; TARGET = setTarget "ARMV8"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 5bfef9e8ba3b..34ebc36ebb92 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "sha256-61hSBNbJlWkeVUXqT/y4h8FZvwXMXuG7+Spvzd4vzK4="; + sha256 = "sha256-vpg7nh5A5pbou7frj2N208oK5nWubYKTZUA4Ww7uwVs="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 53c117233d20..2b6eb5705cd9 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,40 +1,84 @@ -{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which -, lsb-release, glog, protobuf, cbc, zlib -, ensureNewerSourcesForZipFilesHook, python, swig }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, abseil-cpp +, bzip2 +, zlib +, lsb-release +, which +, protobuf +, cbc +, ensureNewerSourcesForZipFilesHook +, python +, swig4 +}: stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.7"; + version = "8.1"; + disabled = python.pythonOlder "3.6"; # not supported upstream src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv"; + sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg"; }; + patches = [ + # This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect + # USE_SCIP=OFF and then failing to find scip/scip.h + (fetchpatch { + url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch"; + sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0"; + }) + ]; + # The original build system uses cmake which does things like pull # in dependencies through git and Makefile creation time. We # obviously don't want to do this so instead we provide the # dependencies straight from nixpkgs and use the make build method. + + # Cbc is linked against bzip2 and declares this in its pkgs-config file, + # but this makefile doesn't use pkgs-config, so we also have to add lbz2 configurePhase = '' + substituteInPlace makefiles/Makefile.third_party.unix.mk \ + --replace 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK)' \ + 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK) -lbz2' + cat <<EOF > Makefile.local - UNIX_ABSL_DIR=${abseil-cpp} - UNIX_GFLAGS_DIR=${gflags} - UNIX_GLOG_DIR=${glog} - UNIX_PROTOBUF_DIR=${protobuf} - UNIX_CBC_DIR=${cbc} + UNIX_ABSL_DIR=${abseil-cpp} + UNIX_PROTOBUF_DIR=${protobuf} + UNIX_CBC_DIR=${cbc} + USE_SCIP=OFF EOF ''; + # Many of these 'samples' (which are really the tests) require using SCIP, and or-tools 8.1 + # will just crash if SCIP is not found because it doesn't fall back to using one of + # the available solvers: https://github.com/google/or-tools/blob/b77bd3ac69b7f3bb02f55b7bab6cbb4bab3917f2/ortools/linear_solver/linear_solver.cc#L427 + # We don't compile with SCIP because it does not have an open source license. + # See https://github.com/google/or-tools/issues/2395 + preBuild = '' + for file in ortools/linear_solver/samples/*.cc; do + if grep -q SCIP_MIXED_INTEGER_PROGRAMMING $file; then + substituteInPlace $file --replace SCIP_MIXED_INTEGER_PROGRAMMING CBC_MIXED_INTEGER_PROGRAMMING + fi; + done + + substituteInPlace ortools/linear_solver/samples/simple_mip_program.cc \ + --replace 'SCIP' 'CBC' + ''; makeFlags = [ "prefix=${placeholder "out"}" "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py" ]; buildFlags = [ "cc" "pypi_archive" ]; - checkTarget = "test_cc"; doCheck = true; + checkTarget = "test_cc"; installTargets = [ "install_cc" ]; # The upstream install_python target installs to $HOME. @@ -43,14 +87,30 @@ stdenv.mkDerivation rec { (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python') ''; + enableParallelBuilding = true; + nativeBuildInputs = [ - cmake lsb-release swig which zlib python + cmake + lsb-release + swig4 + which ensureNewerSourcesForZipFilesHook - python.pkgs.setuptools python.pkgs.wheel + python.pkgs.setuptools + python.pkgs.wheel + ]; + buildInputs = [ + zlib + bzip2 + python ]; propagatedBuildInputs = [ - abseil-cpp gflags glog protobuf cbc - python.pkgs.protobuf python.pkgs.six + abseil-cpp + protobuf + + python.pkgs.protobuf + python.pkgs.six + python.pkgs.absl-py + python.pkgs.mypy-protobuf ]; outputs = [ "out" "python" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix index d99026bc5659..d4f16d230e60 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "7.5"; + version = "7.6"; nativeBuildInputs = [cmake]; src = fetchurl { url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; - sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v"; + sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix index 38c9444d0d31..c00d579702cc 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "rankwidth"; - version = "0.7"; + version = "0.9"; src = fetchurl { url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; - sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0"; + sha256 = "sha256-weA1Bv4lzfy0KMBR/Fay0q/7Wwb7o/LOdWYxRmvvtEE="; }; configureFlags = [ "--enable-executable=no" # no igraph dependency ]; - # check phase is empty for now (as of version 0.7) + # check phase is empty for now (as of version 0.9) doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index f0c82e7190f9..e053d5bcf342 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.8.1"; + version = "5.9.0"; outputs = [ "out" "dev" "doc" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c"; + sha256 = "sha256-tvwpSVgZrfYZHXHN8OQF0Y/aJM03JHGPFok7hUqPE/4="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: - # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368 + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.9.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" "LAPACK=-llapack" ] diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch new file mode 100644 index 000000000000..cbcf18b4cdb2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch @@ -0,0 +1,39 @@ +commit 433a8b99da9d71e96434bd421c2468cbda29d37c +Author: Mauricio Collares <mauricio@collares.org> +Date: Tue Mar 2 22:07:11 2021 -0300 + + trim logfile information from pari 2.13 output + + Pari (since commit 609fb01faf827d91dfa9136849a647a3bbfe8036) prints + extra logfile information such as + + [logfile is "/tmp/nix-shell.2BquN9/home/.sympow/datafiles/P02HM.txt"] + + which messes up sympow's parsing. This commit reuses the same trimming + mechanism already in sympow to trim this new message. + +diff --git a/Configure b/Configure +index 1ef9756..776bec2 100755 +--- a/Configure ++++ b/Configure +@@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE + echo " \$(MKDIR) -p datafiles" >> $FILE + echo " \$(TOUCH) datafiles/param_data" >> $FILE + echo " \$(SH) armd.sh" >> $FILE +-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE ++echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE + echo "sympow.1: sympow" >> $FILE + echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE + echo "clean:" >> $FILE +diff --git a/generate.c b/generate.c +index dbb811f..783320c 100644 +--- a/generate.c ++++ b/generate.c +@@ -148,6 +148,7 @@ static void trimit(char *A) + " -e '" + "/^\?/d" ";" + "/^(/d" ";" ++ "/logfile /d" ";" + "/Warning:/d" ";" + "/^About to find TOO_BIG/d" ";" + "/^Now working backwards/d" ";" diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix index 3c31ed8a361b..c31c705d39d0 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; + patches = [ ./clean-extra-logfile-output-from-pari.patch ]; + postUnpack = '' patchShebangs . ''; diff --git a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix index 0d1a331798cf..8f3e1aba350e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libbasename = "libzn_poly"; libext = stdenv.targetPlatform.extensions.sharedLibrary; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. diff --git a/nixpkgs/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix index 641a5120e8d9..b122a3121e4e 100644 --- a/nixpkgs/pkgs/development/libraries/serd/default.nix +++ b/nixpkgs/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.4"; + version = "0.30.10"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c"; + sha256 = "sha256-r/qA3ux4kh+GM15vw/GLgK7+z0JPaldV6fL6DrBxDt8="; }; nativeBuildInputs = [ pkg-config python3 wafHook ]; diff --git a/nixpkgs/pkgs/development/libraries/serf/default.nix b/nixpkgs/pkgs/development/libraries/serf/default.nix index dbdc9ce28714..2549704c1a8c 100644 --- a/nixpkgs/pkgs/development/libraries/serf/default.nix +++ b/nixpkgs/pkgs/development/libraries/serf/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos +{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5 , pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "serf-1.3.9"; + pname = "serf"; + version = "1.3.9"; src = fetchurl { - url = "https://www.apache.org/dist/serf/${name}.tar.bz2"; + url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2"; sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ apr openssl aprutil zlib libiconv ] - ++ lib.optional (!stdenv.isCygwin) kerberos; + ++ lib.optional (!stdenv.isCygwin) libkrb5; patches = [ ./scons.patch ]; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { sconsFlags+=" OPENSSL=${openssl}" sconsFlags+=" ZLIB=${zlib}" '' + lib.optionalString (!stdenv.isCygwin) '' - sconsFlags+=" GSSAPI=${kerberos.dev}" + sconsFlags+=" GSSAPI=${libkrb5.dev}" ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/serf/scons.patch b/nixpkgs/pkgs/development/libraries/serf/scons.patch index a7eefe7d5c1f..acfece7ef5fe 100644 --- a/nixpkgs/pkgs/development/libraries/serf/scons.patch +++ b/nixpkgs/pkgs/development/libraries/serf/scons.patch @@ -1,7 +1,16 @@ diff --git a/SConstruct b/SConstruct -index 4358a23..0d862e7 100644 +index 4358a23..6ce7776 100644 --- a/SConstruct +++ b/SConstruct +@@ -55,7 +55,7 @@ def RawListVariable(key, help, default): + # To be used to ensure a PREFIX directory is only created when installing. + def createPathIsDirCreateWithTarget(target): + def my_validator(key, val, env): +- build_targets = (map(str, BUILD_TARGETS)) ++ build_targets = (list(map(str, BUILD_TARGETS))) + if target in build_targets: + return PathVariable.PathIsDirCreate(key, val, env) + else: @@ -155,6 +155,7 @@ if sys.platform == 'win32': env = Environment(variables=opts, tools=('default', 'textfile',), @@ -10,3 +19,25 @@ index 4358a23..0d862e7 100644 ) env.Append(BUILDERS = { +@@ -163,9 +164,9 @@ env.Append(BUILDERS = { + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys()))) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/nixpkgs/pkgs/development/libraries/shhmsg/default.nix b/nixpkgs/pkgs/development/libraries/shhmsg/default.nix index 0c736e4cb911..704df3dc5eff 100644 --- a/nixpkgs/pkgs/development/libraries/shhmsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/shhmsg/default.nix @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { description = "A library for displaying messages"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; - platforms = platforms.linux; + platforms = platforms.all; }; } - diff --git a/nixpkgs/pkgs/development/libraries/shhopt/default.nix b/nixpkgs/pkgs/development/libraries/shhopt/default.nix index da1b820fcd54..0657b13e5579 100644 --- a/nixpkgs/pkgs/development/libraries/shhopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/shhopt/default.nix @@ -8,12 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { description = "A library for parsing command line options"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/default.nix b/nixpkgs/pkgs/development/libraries/silgraphite/default.nix deleted file mode 100644 index 06cf75876162..000000000000 --- a/nixpkgs/pkgs/development/libraries/silgraphite/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }: - -stdenv.mkDerivation rec { - version = "2.3.1"; - name = "silgraphite-2.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; - sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype libXft pango fontconfig]; - - NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; - - meta = { - description = "An advanced font engine"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index 166d0f2911d6..cd737a82a293 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 448270183a5f..efa007da902e 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "1x5f8b5s67kf9sjx04rp81q0f3dlnqfngn3h0lrfnphipald5fji"; + sha256 = "sha256-L/a/vTthh7XkiwuvlGk9q+uLEBf8vaPoV1x1fG44zeg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix index 2f1006404b7a..e67cb1736b75 100644 --- a/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/nixpkgs/pkgs/development/libraries/skalibs/default.nix index 1efac7fc5e48..3d90a8ebb21c 100644 --- a/nixpkgs/pkgs/development/libraries/skalibs/default.nix +++ b/nixpkgs/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.10.0.1"; - sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg"; + version = "2.10.0.2"; + sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb"; description = "A set of general-purpose C programming libraries"; diff --git a/nixpkgs/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix index 47f633f5096b..9973e04a670b 100644 --- a/nixpkgs/pkgs/development/libraries/slib/default.nix +++ b/nixpkgs/pkgs/development/libraries/slib/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { patches = [ ./catalog-in-library-vicinity.patch ]; - buildInputs = [ unzip scheme texinfo ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ scheme texinfo ]; postInstall = '' ln -s mklibcat{.scm,} diff --git a/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/nixpkgs/pkgs/development/libraries/smarty3/default.nix index 29f640dedfcb..c3c4f8610c70 100644 --- a/nixpkgs/pkgs/development/libraries/smarty3/default.nix +++ b/nixpkgs/pkgs/development/libraries/smarty3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.36"; + version = "3.1.39"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "0jljzw1xl2kjwf9cylp1ddnjhz7wbm499s03r479891max1m2mlf"; + sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/smooth/default.nix b/nixpkgs/pkgs/development/libraries/smooth/default.nix new file mode 100644 index 000000000000..f86862382112 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/smooth/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config + +, gtk3 +, curl +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "smooth"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "enzo1982"; + repo = "smooth"; + rev = "v${version}"; + sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + makeFlags = [ + "prefix=$(out)" + ]; + + buildInputs = [ + gtk3 + curl + libxml2 + ]; + + meta = with lib; { + description = "The smooth Class Library"; + license = licenses.artistic2; + homepage = "http://www.smooth-project.org/"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/soci/default.nix b/nixpkgs/pkgs/development/libraries/soci/default.nix index f561864a7502..2c87d421babe 100644 --- a/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index 1395f3e60cf8..593bd87a9829 100644 --- a/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn"; + sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas="; }; buildInputs = [ glib openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/sonic/default.nix b/nixpkgs/pkgs/development/libraries/sonic/default.nix index 38dcee84a928..ba3164db11aa 100644 --- a/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix index b24b0b9bcd4b..b956967ee88e 100644 --- a/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -1,5 +1,5 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 -, openldap, mysql, libmysqlclient, postgresql }: +, openldap, mariadb, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ gnustep.stdenv.mkDerivation rec { nativeBuildInputs = [ gnustep.make ]; buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ] ++ optional (openldap != null) openldap - ++ optionals (mysql != null) [ libmysqlclient mysql ] + ++ optionals (mariadb != null) [ libmysqlclient mariadb ] ++ optional (postgresql != null) postgresql); postPatch = '' @@ -31,7 +31,7 @@ gnustep.stdenv.mkDerivation rec { configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] ++ optional (openldap != null) "--enable-openldap" - ++ optional (mysql != null) "--enable-mysql" + ++ optional (mariadb != null) "--enable-mysql" ++ optional (postgresql != null) "--enable-postgresql"; # Yes, this is ugly. diff --git a/nixpkgs/pkgs/development/libraries/soqt/default.nix b/nixpkgs/pkgs/development/libraries/soqt/default.nix index 2be6c6621454..fe7901bddd58 100644 --- a/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/nixpkgs/pkgs/development/libraries/soqt/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/coin3d/soqt"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 7b6c98bebe80..0c75bdb9dd84 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -49,8 +49,8 @@ let in { spdlog_1 = generic { - version = "1.8.1"; - sha256 = "sha256-EyZhYgcdtZC+vsOUKShheY57L0tpXltduHWwaoy6G9k="; + version = "1.8.5"; + sha256 = "sha256-D29jvDZQhPscaOHlrzGN1s7/mXlcsovjbqYpXd7OM50="; }; spdlog_0 = generic { diff --git a/nixpkgs/pkgs/development/libraries/speechd/default.nix b/nixpkgs/pkgs/development/libraries/speechd/default.nix index e85b6d4cbf40..b6ec4842e077 100644 --- a/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -39,11 +39,11 @@ let throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309"; + sha256 = "sha256-sGMZ8gHhXlbGKWZTr1vPwwDLNI6XLVF9+LBurHfq4tw="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/spglib/default.nix b/nixpkgs/pkgs/development/libraries/spglib/default.nix index 12d696b65a8e..3d1236a03dbb 100644 --- a/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://atztogo.github.io/spglib/"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix index 07b670a2718f..1eaa3398e402 100644 --- a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bluescreen303 ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index bf1b8b7aa3b2..50b52b905a92 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -12,12 +12,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.34.1"; + version = "3.35.2"; # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "129ynp0qbxrfj1ys9hdi0jk8svds0cwfzl31af7bicqp25cclfra"; + sha256 = "1bfczv5006ycwr1vw7xbq7cmys0jvfr8awmx7wi1b40zyj0yss8j"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index b423e557a56e..d260c4211ec9 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,11 +4,11 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.34.1"; + version = "3.35.2"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0giklai05shqalj1wwadi9hg5dx6vff8nrblqh9xxljnrq701h00"; + sha256 = "00w7qggrdxpcrs4rfpqkjhcghi8pcx6zzjim9wlz6vsrxlr9dwva"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix index 3a3f5c79763e..01ec3a4fba29 100644 --- a/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix index f536442295ef..47cebd62df65 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99b2"; + version = "0.99b6"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; + sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l"; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon @@ -36,8 +36,11 @@ stdenv.mkDerivation rec { ''; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-64-thr" else if stdenv.hostPlatform.system == "i686-linux" then "linux-thr" else - if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm-thr" else - if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm-thr" else + # 2021-03-29: multithread (-DTHR -D_REENTRANT) was disabled on linux-arm + # because it caused Sage's 3D plotting tests to hang indefinitely. + # see https://github.com/NixOS/nixpkgs/pull/117465 + if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm" else + if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm" else if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx-thr" else if stdenv.hostPlatform.system == "i686-darwin" then "macosx-64-thr" else if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else diff --git a/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch b/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch index cf83f8c8c31c..ee81681e101f 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch +++ b/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch @@ -22,11 +22,11 @@ index 08afb85..dbeb691 100644 "RANLIB = ranlib" \ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" -+# Linux Arm using gcc, with threads -+linux-arm-thr: ++# Linux Arm using gcc ++linux-arm: + $(MAKE) all \ -+ "ARCH = linux-arm-thr" \ -+ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ ++ "ARCH = linux-arm" \ ++ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \ + "ARFLAGS = r" \ + "STRIP = strip" \ + "RANLIB = ranlib" \ diff --git a/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch index faa3810fb5c6..8ebc6560405b 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch +++ b/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch @@ -1,5 +1,4 @@ diff --git a/unix/Make-config b/unix/Make-config -index ee4f388..c1d51d4 100644 --- a/unix/Make-config +++ b/unix/Make-config @@ -18,7 +18,7 @@ @@ -11,7 +10,7 @@ index ee4f388..c1d51d4 100644 -@@ -30,7 +30,7 @@ SHELL=/bin/sh +@@ -30,7 +30,7 @@ # The following line should be set to -Ixxx where xxx is your X11 include path # Sun puts X11 in /usr/openwin/xxx @@ -20,16 +19,20 @@ index ee4f388..c1d51d4 100644 # Others typically use /usr/X11 or /usr/X11R6 #X11INC= -I/usr/X11 -@@ -57,7 +57,7 @@ X11LIB= -lX11 +@@ -105,9 +105,9 @@ ########################################################################## - - # Standard MPICH installation location + # Customize MPI directories and includes as-needed. + # A typical MPICH installation location: -MPIDIR=/usr/local/mpi +-MPIINC=$(MPIDIR)/include +-MPILIB=$(MPIDIR)/lib +# MPIDIR=/usr/local/mpi ++# MPIINC=$(MPIDIR)/include ++# MPILIB=$(MPIDIR)/lib - # UMR CS Dept - #MPIDIR=/software/all/mpi -@@ -108,9 +108,9 @@ MBOX= + # MPI defines and any flags needed by the local installation. + # Always list -DMPI at a minimum. +@@ -166,9 +166,9 @@ # http://www.ijg.org/files/ ########################################################################## # Uncomment the following lines to disable JPEG support @@ -42,7 +45,7 @@ index ee4f388..c1d51d4 100644 # Uncomment the following lines to enable JPEG support #USEJPEG= -DUSEJPEG -@@ -128,9 +128,9 @@ JPEGLIB= +@@ -186,9 +186,9 @@ # http://www.libpng.org/ ########################################################################## # Uncomment the following lines to disable PNG support diff --git a/nixpkgs/pkgs/development/libraries/talloc/default.nix b/nixpkgs/pkgs/development/libraries/talloc/default.nix index 553c42da7c4f..27705c578584 100644 --- a/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/tclap/default.nix b/nixpkgs/pkgs/development/libraries/tclap/default.nix index 451f17a2cd72..feb3825b3d4e 100644 --- a/nixpkgs/pkgs/development/libraries/tclap/default.nix +++ b/nixpkgs/pkgs/development/libraries/tclap/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.2"; + name = "tclap-1.2.3"; src = fetchurl { url = "mirror://sourceforge/tclap/${name}.tar.gz"; - sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; + sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/tecla/default.nix b/nixpkgs/pkgs/development/libraries/tecla/default.nix index 6d8a334ce3fb..a0a1ac0360e8 100644 --- a/nixpkgs/pkgs/development/libraries/tecla/default.nix +++ b/nixpkgs/pkgs/development/libraries/tecla/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj"; }; + postPatch = '' + substituteInPlace install-sh \ + --replace "stripprog=" "stripprog=\$STRIP # " + ''; + meta = { homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; diff --git a/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix index 8bb7522b1976..9ab269aaacfc 100644 --- a/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,24 +1,49 @@ -{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt -, gobject-introspection, vala, glibcLocales }: +{ lib +, stdenv +, fetchurl +, dbus-glib +, glib +, python3 +, pkg-config +, libxslt +, gobject-introspection +, vala +, glibcLocales +}: stdenv.mkDerivation rec { - name = "telepathy-glib-0.24.1"; + pname = "telepathy-glib"; + version = "0.24.2"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"; + url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz"; + sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; }; + nativeBuildInputs = [ + pkg-config + libxslt + gobject-introspection + vala + ]; + + buildInputs = [ + glibcLocales + python3 + ]; + + propagatedBuildInputs = [ + dbus-glib + glib + ]; + configureFlags = [ "--enable-vala-bindings" ]; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ dbus-glib glib ]; - nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ]; - buildInputs = [ glibcLocales python2 ]; + LC_ALL = "en_US.UTF-8"; enableParallelBuilding = true; @@ -26,8 +51,6 @@ stdenv.mkDerivation rec { substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires ''; - passthru.python = python2; - meta = with lib; { homepage = "https://telepathy.freedesktop.org"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix index b606c56445ed..dbbaca7e11a7 100644 --- a/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus -, telepathy-farstream, telepathy-glib, fetchpatch }: +, telepathy-farstream, telepathy-glib }: let inherit (python3Packages) python dbus-python; @@ -20,6 +20,8 @@ in stdenv.mkDerivation rec { # On 0.9.7, they do not even build with QT4 cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + dontWrapQtApps = true; + doCheck = false; # giving up for now meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix index d9d740817355..84d50faf54e2 100644 --- a/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "5.0.0"; + version = "5.0.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6"; + sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/termbox/default.nix b/nixpkgs/pkgs/development/libraries/termbox/default.nix index e809240bcd10..51c2ca1c8084 100644 --- a/nixpkgs/pkgs/development/libraries/termbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/termbox/default.nix @@ -1,31 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "termbox"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitHub { - owner = "nsf"; + owner = "termbox"; repo = "termbox"; rev = "v${version}"; - sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs"; + sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; }; - # patch which updates the `waf` version used to build - # to make the package buildable on Python 3.7 - patches = [ - (fetchpatch { - url = "https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch"; - sha256 = "1s5747v51sdwvpsg6k9y1j60yn9f63qnylkgy8zrsifjzzd5fzl6"; - }) - ]; - - nativeBuildInputs = [ python3 wafHook ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { description = "Library for writing text-based user interfaces"; license = licenses.mit; - homepage = "https://github.com/nsf/termbox#readme"; - downloadPage = "https://github.com/nsf/termbox/releases"; + homepage = "https://github.com/termbox/termbox#readme"; + downloadPage = "https://github.com/termbox/termbox/releases"; maintainers = with maintainers; [ fgaz ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/thrift/0.10.nix b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix index a735e146214a..d81912b07c61 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/0.10.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix @@ -35,5 +35,12 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; + knownVulnerabilities = [ + "CVE-2018-1320" + "CVE-2018-11798" + "CVE-2019-0205" + "CVE-2019-0210" + "CVE-2020-13949" + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index 669dff21147e..04d9280e7b36 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkg-config +{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config , bison, flex, twisted , static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "thrift"; - version = "0.13.0"; + version = "0.14.1"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "0yai9c3bdsrkkjshgim7zk0i7malwfprg00l9774dbrkh2w4ilvs"; + sha256 = "198c855mjy5byqfb941hiyq2j37baz63f0wcfy4vp8y8v4f5xnhk"; }; - patches = [ - # Fix a failing test on darwin - # https://issues.apache.org/jira/browse/THRIFT-4976 - (fetchpatch { - url = "https://github.com/apache/thrift/commit/6701dbb8e89f6550c7843e9b75b118998df471c3.diff"; - sha256 = "14rqma2b2zv3zxkkl5iv9kvyp3zihvad6fdc2gcdqv37nqnswx9d"; - }) - ]; - # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; @@ -32,6 +23,9 @@ stdenv.mkDerivation rec { preConfigure = "export PY_PREFIX=$out"; cmakeFlags = [ + "-DBUILD_JAVASCRIPT:BOOL=OFF" + "-DBUILD_NODEJS:BOOL=OFF" + # FIXME: Fails to link in static mode with undefined reference to # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" @@ -40,11 +34,32 @@ stdenv.mkDerivation rec { "-DOPENSSL_USE_STATIC_LIBS=ON" ]; + disabledTests = [ + "PythonTestSSLSocket" + ] ++ lib.optionals stdenv.isDarwin [ + # tests that hang up in the darwin sandbox + "SecurityTest" + "SecurityFromBufferTest" + "python_test" + + # tests that fail in the darwin sandbox when trying to use network + "UnitTests" + "TInterruptTest" + "TServerIntegrationTest" + "processor" + "TNonblockingServerTest" + "TNonblockingSSLServerTest" + "StressTest" + "StressTestConcurrent" + "StressTestNonBlocking" + "PythonThriftTNonblockingServer" + ]; + doCheck = !static; checkPhase = '' runHook preCheck - ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket + ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E "($(echo "$disabledTests" | tr " " "|"))" runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/libraries/tidyp/default.nix b/nixpkgs/pkgs/development/libraries/tidyp/default.nix index 5c0ad8463b4a..f4c24a126e5b 100644 --- a/nixpkgs/pkgs/development/libraries/tidyp/default.nix +++ b/nixpkgs/pkgs/development/libraries/tidyp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; homepage = "http://tidyp.com/"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ pSub ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 4e6e49d68c45..0fa1ea8bd392 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; + sha256 = "sha256-xzzWB20vhnneiqJqZAeSUjZouqhPPg2bGaot1IQDMEo="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix index c7939a6be255..ad4a999e45cd 100644 --- a/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix +++ b/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tiny but powerful single file wavefront obj loader"; license = licenses.mit; maintainers = [ maintainers.ivar ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/tllist/default.nix b/nixpkgs/pkgs/development/libraries/tllist/default.nix index 11e61e93a0c1..c84973919990 100644 --- a/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fionera AndersonTorres ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/tnt/default.nix b/nixpkgs/pkgs/development/libraries/tnt/default.nix index 932239a485fd..f4787271c039 100644 --- a/nixpkgs/pkgs/development/libraries/tnt/default.nix +++ b/nixpkgs/pkgs/development/libraries/tnt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; installPhase = '' mkdir -p $out/include diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index fa506733c16e..a272cf8b9340 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which +, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which }: stdenv.mkDerivation rec { @@ -20,14 +20,28 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute procps which + cmocka uthash ibm-sw-tpm2 iproute2 procps which ]; preAutoreconf = "./bootstrap"; enableParallelBuilding = true; - postPatch = "patchShebangs script"; + patches = [ + # Do not rely on dynamic loader path + # TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory + ./no-dynamic-loader-path.patch + ]; + + postPatch = '' + patchShebangs script + substituteInPlace src/tss2-tcti/tctildr-dl.c \ + --replace '@PREFIX@' $out/lib/ + substituteInPlace ./test/unit/tctildr-dl.c \ + --replace ', "libtss2' ", \"$out/lib/libtss2" \ + --replace ', "foo' ", \"$out/lib/foo" \ + --replace ', TEST_TCTI_NAME' ", \"$out/lib/\"TEST_TCTI_NAME" + ''; configureFlags = [ "--enable-unit" @@ -35,6 +49,14 @@ stdenv.mkDerivation rec { ]; doCheck = true; + preCheck = '' + # Since we rewrote the load path in the dynamic loader for the TCTI + # The various tcti implementation should be placed in their target directory + # before we could run tests + installPhase + # install already done, dont need another one + dontInstall=1 + ''; postInstall = '' # Do not install the upstream udev rules, they rely on specific diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch new file mode 100644 index 000000000000..86cdcd1541e6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch @@ -0,0 +1,39 @@ +diff --git a/src/tss2-tcti/tctildr-dl.c b/src/tss2-tcti/tctildr-dl.c +index b364695c..b13be3ef 100644 +--- a/src/tss2-tcti/tctildr-dl.c ++++ b/src/tss2-tcti/tctildr-dl.c +@@ -85,7 +85,15 @@ handle_from_name(const char *file, + if (handle == NULL) { + return TSS2_TCTI_RC_BAD_REFERENCE; + } +- *handle = dlopen(file, RTLD_NOW); ++ size = snprintf(file_xfrm, ++ sizeof (file_xfrm), ++ "@PREFIX@%s", ++ file); ++ if (size >= sizeof (file_xfrm)) { ++ LOG_ERROR("TCTI name truncated in transform."); ++ return TSS2_TCTI_RC_BAD_VALUE; ++ } ++ *handle = dlopen(file_xfrm, RTLD_NOW); + if (*handle != NULL) { + return TSS2_RC_SUCCESS; + } else { +@@ -94,7 +102,7 @@ handle_from_name(const char *file, + /* 'name' alone didn't work, try libtss2-tcti-<name>.so.0 */ + size = snprintf(file_xfrm, + sizeof (file_xfrm), +- TCTI_NAME_TEMPLATE_0, ++ "@PREFIX@" TCTI_NAME_TEMPLATE_0, + file); + if (size >= sizeof (file_xfrm)) { + LOG_ERROR("TCTI name truncated in transform."); +@@ -109,7 +117,7 @@ handle_from_name(const char *file, + /* libtss2-tcti-<name>.so.0 didn't work, try libtss2-tcti-<name>.so */ + size = snprintf(file_xfrm, + sizeof (file_xfrm), +- TCTI_NAME_TEMPLATE, ++ "@PREFIX@" TCTI_NAME_TEMPLATE, + file); + if (size >= sizeof (file_xfrm)) { + LOG_ERROR("TCTI name truncated in transform."); diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 2ca5dd6bd93a..5b4c1d195ece 100644 --- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6"; + sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index 38885048fcc5..fae10f2b1b4a 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , gettext , meson , ninja @@ -28,15 +27,15 @@ , substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "tracker"; - version = "3.0.1"; + version = "3.0.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; + sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM="; }; patches = [ @@ -44,13 +43,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) - - # Fix consistency error with sqlite 3.34 - # https://gitlab.gnome.org/GNOME/tracker/merge_requests/353 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/commit/040e22d005985a19a0dc435a7631f91700804ce4.patch"; - sha256 = "5OZj17XY8ZnXfMMim25HvGfFKUlsVlVHOUjZKfBKHcs="; - }) ]; nativeBuildInputs = [ @@ -90,7 +82,8 @@ stdenv.mkDerivation rec { "-Ddocs=true" ]; - doCheck = true; + # https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369 + doCheck = !stdenv.isi686; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge @@ -141,3 +134,8 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } + // lib.optionalAttrs stdenv.isi686 { + # TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory + enableParallelBuilding = false; + } +) diff --git a/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix index 800b35640111..062c441063c0 100644 --- a/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix +++ b/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "1053iw4isi7qsy94fqmh570wki999sg9n70jhqy8kfy1bniczh0l"; + sha256 = "sha256-q0iMM3Hb5Y21RUhhxFEd/q4OCJFJ12gozZd5jCDscro="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/nixpkgs/pkgs/development/libraries/tweeny/default.nix index 8340e47fbf9b..0afc82321d8c 100644 --- a/nixpkgs/pkgs/development/libraries/tweeny/default.nix +++ b/nixpkgs/pkgs/development/libraries/tweeny/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tweeny"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mobius3"; repo = "tweeny"; rev = "v${version}"; - sha256 = "0zk7p21i54hfz0l50617i3gxhxh0n9yy86n2fxg8m26cvf4yhsj7"; + sha256 = "sha256-VmvOMK+FjYZXKH9kPUT2L7pmJMPSr5eXptCcoGWK+qo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/udunits/default.nix b/nixpkgs/pkgs/development/libraries/udunits/default.nix index deed5b64d2c5..b8ea203ef176 100644 --- a/nixpkgs/pkgs/development/libraries/udunits/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix index 8b2558c08504..ef70f4b2c37f 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.7"; + version = "2.3.9"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; - sha256 = "0xry3sg497wly8f7715a7gwkn2k36bcap0mvzjw74jj53yx6kwa5"; + sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index faf74bcab477..14f41b015e9c 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mysql, sqlite, zlib, libxml2, dpkg, lib, openssl, kerberos, libuuid, patchelf, libiconv, fetchFromGitHub }: +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: # I haven't done any parameter tweaking.. So the defaults provided here might be bad @@ -79,7 +79,7 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mysql ]; + buildInputs = [ unixODBC mariadb ]; cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; @@ -157,7 +157,7 @@ ''; postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out kerberos libuuid stdenv.cc.cc ]} \ + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl.out libkrb5 libuuid stdenv.cc.cc ]} \ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; diff --git a/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/nixpkgs/pkgs/development/libraries/uriparser/default.nix index ad1719984807..db36e31ae874 100644 --- a/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest }: +{ lib, stdenv, fetchurl, cmake, gtest }: stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.4"; + version = "0.9.5"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "0yzqp1j6sglyrmwcasgn7zlwg841p3nbxy0h78ngq20lc7jspkdp"; + sha256 = "0v30qr5hl3xybl9nzwaw46kblwn94w5xpri22wanrrpjlzmn306x"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix index e627b97849a0..30129992c73d 100644 --- a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "UTF-8 with C++ in a Portable Way"; license = licenses.free; maintainers = with maintainers; [ jobojeha ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix index c79073f04e4c..d513e01b7a35 100644 --- a/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -11,23 +11,23 @@ let deps = { "base/trace_event/common" = fetchgit { url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; - sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; + rev = "dab187b372fc17e51f5b9fad8201813d0aed5129"; + sha256 = "0dmpj9hj4xv3xb0fl1kb9hm4bhpbs2s5csx3z8cgjd5vwvhdzig4"; }; build = fetchgit { url = "${git_url}/chromium/src/build.git"; - rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; - sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; + rev = "26e9d485d01d6e0eb9dadd21df767a63494c8fea"; + sha256 = "1jjvsgj0cs97d26i3ba531ic1f9gqan8x7z4aya8yl8jx02l342q"; }; "third_party/googletest/src" = fetchgit { url = "${git_url}/external/github.com/google/googletest.git"; - rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"; - sha256 = "0gmr10042c0xybxnn6g7ndj1na1mmd3l9w7449qlcv4s8gmfs7k6"; + rev = "e3f0319d89f4cbf32993de595d984183b1a9fc57"; + sha256 = "18xz71l2xjrqsc0q317whgw4xi1i5db24zcj7v04f5g6r1hyf1a5"; }; "third_party/icu" = fetchgit { url = "${git_url}/chromium/deps/icu.git"; - rev = "960f195aa87acaec46e6104ec93a596da7ae0843"; - sha256 = "073kh6gpcairgjxf3hlhpqljc13gwl2aj8fz91fv220xibwqs834"; + rev = "f2223961702f00a8833874b0560d615a2cc42738"; + sha256 = "0z5p53kbrjfkjn0i12dpk55cp8976j2zk7a4wk88423s2c5w87zl"; }; "third_party/jinja2" = fetchgit { url = "${git_url}/chromium/src/third_party/jinja2.git"; @@ -39,29 +39,31 @@ let rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; }; + "third_party/zlib" = fetchgit { + url = "${git_url}/chromium/src/third_party/zlib.git"; + rev = "156be8c52f80cde343088b4a69a80579101b6e67"; + sha256 = "0hxbkkzmlv714fjq2jlp5dd2jc339xyh6gkjx1sz3srwv33mlk92"; + }; }; in stdenv.mkDerivation rec { pname = "v8"; - version = "7.4.255"; + version = "8.4.255"; doCheck = true; patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/RPi-Distro/chromium-browser/master/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch"; - sha256 = "02hczcg43m36q8j1kv5j3hq9czj9niiil9w13w22vzv2f3c67dvn"; - }) ./darwin.patch + ./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149 ]; src = fetchFromGitHub { owner = "v8"; repo = "v8"; rev = version; - sha256 = "14i0c71hmffzqnq9n73dh9dnabdxhbjhzkhqpk5yv9y90bwrzi2n"; + sha256 = "07ymw4kqbz7kv311gpk5bs5q90wj73n2q7jkyfhqk4hvhs1q5bw7"; }; postUnpack = '' @@ -97,9 +99,7 @@ stdenv.mkDerivation rec { ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; - # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit - # to be exceeded - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; + NIX_CFLAGS_COMPILE = "-O2"; nativeBuildInputs = [ gn ninja pkg-config python ] ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; diff --git a/nixpkgs/pkgs/development/libraries/v8/gcc_arm.patch b/nixpkgs/pkgs/development/libraries/v8/gcc_arm.patch new file mode 100644 index 000000000000..09579561fd8d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/v8/gcc_arm.patch @@ -0,0 +1,31 @@ +diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h +index 1826601..d123305 100644 +--- a/third_party/zlib/contrib/optimizations/insert_string.h ++++ b/third_party/zlib/contrib/optimizations/insert_string.h +@@ -26,15 +26,23 @@ + #define _cpu_crc32_u32 _mm_crc32_u32 + + #elif defined(CRC32_ARMV8_CRC32) +- #if defined(__clang__) ++ #if defined(__GNUC__) || defined(__clang__) + #undef TARGET_CPU_WITH_CRC +- #define __crc32cw __builtin_arm_crc32cw ++ #if defined(__clang__) ++ #define __crc32cw __builtin_arm_crc32cw ++ #elif defined(__GNUC__) ++ #define __crc32cw __builtin_aarch64_crc32cw ++ #endif + #endif + + #define _cpu_crc32_u32 __crc32cw + + #if defined(__aarch64__) +- #define TARGET_CPU_WITH_CRC __attribute__((target("crc"))) ++ #if defined(__clang__) ++ #define TARGET_CPU_WITH_CRC __attribute__((target("crc"))) ++ #elif defined(__GNUC__) ++ #define TARGET_CPU_WITH_CRC __attribute__((target("+crc"))) ++ #endif + #else // !defined(__aarch64__) + #define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc"))) + #endif // defined(__aarch64__) diff --git a/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/nixpkgs/pkgs/development/libraries/valhalla/default.nix new file mode 100644 index 000000000000..6eac19bcb2cd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/valhalla/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +, zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite +, luajit, geos, python3, zeromq }: + +stdenv.mkDerivation rec { + pname = "valhalla"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "valhalla"; + repo = "valhalla"; + rev = version; + sha256 = "04vxvzy6hnhdvb9lh1p5vqzzi2drv0g4l2gnbdp44glipbzgd4dr"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + zlib curl protobuf prime-server boost sqlite libspatialite + luajit geos python3 zeromq + ]; + + cmakeFlags = [ + "-DENABLE_TESTS=OFF" + "-DENABLE_BENCHMARKS=OFF" + ]; + + meta = with lib; { + description = "Open Source Routing Engine for OpenStreetMap"; + homepage = "https://valhalla.readthedocs.io/"; + license = licenses.mit; + maintainers = [ maintainers.Thra11 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch new file mode 100644 index 000000000000..0937ac6e3084 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch @@ -0,0 +1,74 @@ +From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001 +From: Tadeo Kondrak <me@tadeo.ca> +Date: Mon, 25 Jan 2021 11:17:44 -0700 +Subject: [PATCH] Call weak function to allow adding preloaded plugins after + compile + +--- + src/core/vscore.cpp | 19 +++++++++++++++++++ + src/core/vscore.h | 5 +++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp +index 2d29844d..35c509ed 100644 +--- a/src/core/vscore.cpp ++++ b/src/core/vscore.cpp +@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { + freeDepth--; + } + ++extern "C" { ++void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data); ++ ++struct VSLoadPluginsNixCallbackData { ++ VSCore *core; ++ const char *filter; ++}; ++ ++static void VSLoadPluginsNixCallback(void *data, const char *path) { ++ auto callbackData = static_cast<VSLoadPluginsNixCallbackData *>(data); ++ callbackData->core->loadAllPluginsInPath(path, callbackData->filter); ++} ++} ++ + VSCore::VSCore(int threads) : + coreFreed(false), + numFilterInstances(1), +@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) : + } // If neither exists, an empty string will do. + #endif + ++ if (VSLoadPluginsNix != nullptr) { ++ VSLoadPluginsNixCallbackData data{this, filter.c_str()}; ++ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data); ++ } ++ + VSMap *settings = readSettings(configFile); + const char *error = vs_internal_vsapi.getError(settings); + if (error) { +diff --git a/src/core/vscore.h b/src/core/vscore.h +index 74df8a84..3efac811 100644 +--- a/src/core/vscore.h ++++ b/src/core/vscore.h +@@ -582,6 +582,9 @@ public: + VSFunction() : functionData(nullptr), func(nullptr) {} + }; + ++extern "C" { ++static void VSLoadPluginsNixCallback(void *data, const char *path); ++} + + struct VSPlugin { + private: +@@ -683,6 +686,8 @@ public: + + explicit VSCore(int threads); + void freeCore(); ++ ++ friend void VSLoadPluginsNixCallback(void *data, const char *path); + }; + + #endif // VSCORE_H +-- +2.30.0 + diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 93f8d3c5ae5f..8ef209fe8051 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper +, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , zimg, libass, python3, libiconv , ApplicationServices -, ocrSupport ? false, tesseract ? null -, imwriSupport? true, imagemagick7 ? null +, ocrSupport ? false, tesseract +, imwriSupport ? true, imagemagick }: -assert ocrSupport -> tesseract != null; -assert imwriSupport -> imagemagick7 != null; - with lib; stdenv.mkDerivation rec { @@ -21,13 +19,17 @@ stdenv.mkDerivation rec { sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; + patches = [ + ./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract - ++ optional imwriSupport imagemagick7; + ++ optional imwriSupport imagemagick; configureFlags = [ (optionalString (!ocrSupport) "--disable-ocr") @@ -36,12 +38,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { + passthru = rec { # If vapoursynth is added to the build inputs of mpv and then # used in the wrapping of it, we want to know once inside the # wrapper, what python3 version was used to build vapoursynth so # the right python3.sitePackages will be used there. inherit python3; + + withPlugins = import ./plugin-interface.nix { + inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand + vapoursynth makeWrapper withPlugins; + }; }; postInstall = '' @@ -54,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; - maintainers = with maintainers; [ rnhmjoj tadeokondrak ]; + maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix index f9ebed197522..5cd4b4608ecb 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,43 +1,59 @@ -{ lib, mkDerivation, fetchFromBitbucket +{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: -mkDerivation rec { - pname = "vapoursynth-editor"; - version = "R19"; - - src = fetchFromBitbucket { - owner = "mystery_keeper"; - repo = pname; - rev = lib.toLower version; - sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; +let + unwrapped = mkDerivation rec { + pname = "vapoursynth-editor"; + version = "R19"; + + src = fetchFromBitbucket { + owner = "mystery_keeper"; + repo = pname; + rev = lib.toLower version; + sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase vapoursynth qtwebsockets ]; + + dontWrapQtApps = true; + + preConfigure = "cd pro"; + + preFixup = '' + cd ../build/release* + mkdir -p $out/bin + for bin in vsedit{,-job-server{,-watcher}}; do + mv $bin $out/bin + wrapQtApp $out/bin/$bin + done + ''; + + passthru = { inherit withPlugins; }; + + meta = with lib; { + description = "Cross-platform editor for VapourSynth scripts"; + homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase vapoursynth qtwebsockets ]; - - dontWrapQtApps = true; - - preConfigure = "cd pro"; - - preFixup = '' - cd ../build/release* + withPlugins = plugins: let + vapoursynthWithPlugins = vapoursynth.withPlugins plugins; + in runCommand "${unwrapped.name}-with-plugins" { + buildInputs = [ makeWrapper ]; + passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); }; + } '' mkdir -p $out/bin for bin in vsedit{,-job-server{,-watcher}}; do - mv $bin $out/bin - - wrapQtApp $out/bin/$bin \ - --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \ - --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib + makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \ + --prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \ + --prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib done ''; - - meta = with lib; { - description = "Cross-platform editor for VapourSynth scripts"; - homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; - license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; - platforms = platforms.all; - }; -} +in + withPlugins [] diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix new file mode 100644 index 000000000000..55b2b03c893e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -0,0 +1,112 @@ +{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand +, vapoursynth, makeWrapper, withPlugins }: + +plugins: let + pythonEnvironment = python3.buildEnv.override { + extraLibs = plugins; + }; + + getRecursivePropagatedBuildInputs = pkgs: lib.flatten + (map + (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + pkgs); + + deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + + pluginsEnv = buildEnv { + name = "vapoursynth-plugins-env"; + pathsToLink = [ "/lib/vapoursynth" ]; + paths = deepPlugins; + }; + + pluginLoader = let + source = writeText "vapoursynth-nix-plugins.c" '' + void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) { + ${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins} + } + ''; + in + runCommandCC "vapoursynth-plugin-loader" { + executable = true; + preferLocalBuild = true; + allowSubstitutes = false; + } '' + mkdir -p $out/lib + $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" + ''; + + ext = stdenv.targetPlatform.extensions.sharedLibrary; +in +runCommand "${vapoursynth.name}-with-plugins" { + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit python3; + withPlugins = plugins': withPlugins (plugins ++ plugins'); + }; +} '' + mkdir -p \ + $out/bin \ + $out/lib/pkgconfig \ + $out/lib/vapoursynth \ + $out/${python3.sitePackages} + + for textFile in \ + lib/pkgconfig/vapoursynth{,-script}.pc \ + lib/libvapoursynth.la \ + lib/libvapoursynth-script.la \ + ${python3.sitePackages}/vapoursynth.la + do + substitute ${vapoursynth}/$textFile $out/$textFile \ + --replace "${vapoursynth}" "$out" + done + + for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do + ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"} + done + + for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do + ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"} + done + + for binaryFile in \ + lib/libvapoursynth${ext} \ + lib/libvapoursynth-script${ext}.0.0.0 + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="$old_rpath:$out/lib" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + patchelf \ + --add-needed libvapoursynth-nix-plugins${ext} \ + $out/$binaryFile + done + + for binaryFile in \ + ${python3.sitePackages}/vapoursynth${ext} \ + bin/.vspipe-wrapped + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + done + + ln -s \ + ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \ + $out/lib/libvapoursynth-nix-plugins${ext} + ln -s ${vapoursynth}/include $out/include + ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext} + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext}.0 + + makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \ + --prefix PYTHONPATH : $out/${python3.sitePackages} +'' diff --git a/nixpkgs/pkgs/development/libraries/vcg/default.nix b/nixpkgs/pkgs/development/libraries/vcg/default.nix index 380f533fe6f7..d8c83bf54a8a 100644 --- a/nixpkgs/pkgs/development/libraries/vcg/default.nix +++ b/nixpkgs/pkgs/development/libraries/vcg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix b/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix new file mode 100644 index 000000000000..fb8dd43fe032 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vo-aacenc/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "vo-aacenc"; + version = "0.1.3"; + + src = fetchurl { + url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz"; + sha256 = "sha256-5Rp0d6NZ8Y33xPgtGV2rThTnQUy9SM95zBlfxEaFDzY="; + }; + + meta = with lib; { + description = "VisualOn AAC encoder library"; + homepage = "https://sourceforge.net/projects/opencore-amr/"; + license = licenses.asl20; + maintainers = [ maintainers.baloo ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/volk/default.nix b/nixpkgs/pkgs/development/libraries/volk/default.nix new file mode 100644 index 000000000000..574a90d22724 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, cppunit +, python3 +, enableModTool ? true +, removeReferencesTo +}: + +stdenv.mkDerivation rec { + pname = "volk"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "gnuradio"; + repo = pname; + rev = "v${version}"; + sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY="; + fetchSubmodules = true; + }; + + patches = [ + # Fixes a failing test: https://github.com/gnuradio/volk/pull/434 + (fetchpatch { + url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch"; + sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI="; + }) + ]; + cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; + postInstall = '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) + ''; + + nativeBuildInputs = [ + cmake + python3 + python3.pkgs.Mako + ]; + + doCheck = true; + + meta = with lib; { + homepage = "http://libvolk.org/"; + description = "The Vector Optimized Library of Kernels"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index 9f2722a9ae8f..a17b164445f3 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.62.1"; + version = "0.62.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3"; + sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/nixpkgs/pkgs/development/libraries/vtk/generic.nix index 273bff8852ee..482e6be7bbcf 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { version = "${majorVersion}.${minorVersion}"; src = fetchurl { - url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz"; sha256 = sourceSha256; }; @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$(pwd)/lib"; ''; + dontWrapQtApps = true; + # Shared libraries don't work, because of rpath troubles with the current # nixpkgs cmake approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. @@ -91,5 +93,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; platforms = with platforms; unix; + # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope + broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8"); }; } diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix index 7ec8936267bb..fb7d1972c024 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -28,19 +28,14 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; + sha256 = "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"; }; patches = [ - # Fix documentation to be reproducible. - (fetchpatch { - url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch"; - sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2"; - }) (substituteAll { src = ./0001-add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; diff --git a/nixpkgs/pkgs/development/libraries/wcslib/default.nix b/nixpkgs/pkgs/development/libraries/wcslib/default.nix deleted file mode 100644 index c12118a99de4..000000000000 --- a/nixpkgs/pkgs/development/libraries/wcslib/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, lib, stdenv, flex }: - -stdenv.mkDerivation rec { - version = "7.3.1"; - pname = "wcslib"; - - buildInputs = [ flex ]; - - src = fetchurl { - url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c"; - }; - - prePatch = '' - substituteInPlace GNUmakefile --replace 2775 0775 - substituteInPlace C/GNUmakefile --replace 2775 0775 - ''; - - enableParallelBuilding = true; - - meta = { - description = "World Coordinate System Library for Astronomy"; - homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; - - longDescription = ''Library for world coordinate systems for - spherical geometries and their conversion to image coordinate - systems. This is the standard library for this purpose in - astronomy.''; - - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 9bf91da6cd90..84cf8d4833fe 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -37,6 +37,7 @@ , libGL , libGLU , libintl +, libmanette , openjpeg , enableGeoLocation ? true , geoclue2 @@ -59,7 +60,7 @@ with lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.30.3"; + version = "2.32.0"; outputs = [ "out" "dev" ]; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0zsy3say94d9bhaan0l6mfr59z03a5x4kngyy8b2i20n77q19skd"; + sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx"; }; patches = optionals stdenv.isLinux [ @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { libgcrypt libidn libintl + libmanette libnotify libpthreadstubs libsecret diff --git a/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix b/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix new file mode 100644 index 000000000000..66d4fab2bf98 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/wlroots/0.12.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland +, libGL, wayland-protocols, libinput, libxkbcommon, pixman +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa +, libpng, ffmpeg +}: + +# Fixed version derivation. +# nixpkgs-update: no auto update +stdenv.mkDerivation rec { + pname = "wlroots"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "wlroots"; + rev = version; + sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; + }; + + # $out for the library and $examples for the example programs (in examples): + outputs = [ "out" "examples" ]; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + + buildInputs = [ + libGL wayland wayland-protocols libinput libxkbcommon pixman + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa + libpng ffmpeg + ]; + + mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; + + postFixup = '' + # Install ALL example programs to $examples: + # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle + # screenshot output-layout multi-pointer rotation tablet touch pointer + # simple + mkdir -p $examples/bin + cd ./examples + for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do + cp "$binary" "$examples/bin/wlroots-$binary" + done + ''; + + meta = with lib; { + description = "A modular Wayland compositor library"; + longDescription = '' + Pluggable, composable, unopinionated modules for building a Wayland + compositor; or about 50,000 lines of code you were going to write anyway. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos synthetica ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index a21179e20259..a51de90d1967 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland , libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg +, libpng, ffmpeg, libuuid, xcbutilrenderutil, xwayland }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; + sha256 = "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy"; }; # $out for the library and $examples for the example programs (in examples): @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg + libpng ffmpeg libuuid xcbutilrenderutil xwayland ]; mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 48178e774093..4635a80152de 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,33 +2,22 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m"; + sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97"; }; - # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed - configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ]; + # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed + configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ]; outputs = [ "out" "dev" "doc" "lib" ]; nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' - # fix recursive cycle: - # build flags (including location of header files) are exposed in the - # public API of wolfssl, causing lib to depend on dev - substituteInPlace configure.ac \ - --replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' ' - substituteInPlace configure.ac \ - --replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' ' - ''; - - postInstall = '' # fix recursive cycle: # wolfssl-config points to dev, dev propagates bin @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; platforms = platforms.all; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ mcmtroffaes ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/wtk/default.nix b/nixpkgs/pkgs/development/libraries/wtk/default.nix index 9ddc95a9ccc7..0bded9d92ddd 100644 --- a/nixpkgs/pkgs/development/libraries/wtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/wtk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index a1c2820a5fdb..30e807cde057 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -4,41 +4,38 @@ , xorgproto, gst_all_1, setfile , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported -, libGLU ? null, libGL ? null +, libGLU, libGL , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk ? null -, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null +, withWebKit ? false, webkitgtk +, AGL, Carbon, Cocoa, Kernel, QTKit }: with lib; -assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> webkitgtk != null; - assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { - version = "3.0.4"; pname = "wxwidgets"; + version = "3.0.5"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; + sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 ] + ] ++ optional withGtk2 gtk2 ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = optional stdenv.isDarwin AGL; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index 93d0b42a889f..5b82c594b086 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, nasm }: +{ stdenv, lib, fetchurl, nasm +, enableShared ? !stdenv.hostPlatform.isStatic + }: stdenv.mkDerivation rec { pname = "x264"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { export AS=$CC ''; - configureFlags = [ "--enable-shared" ] + configureFlags = lib.optional enableShared "--enable-shared" ++ lib.optional (!stdenv.isi686) "--enable-pic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index cfca33a62d2e..e2d049cd7b3c 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm"; + xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c="; } diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 151c74f0b70d..da60f2b27fcc 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,20 +1,24 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, elogind, systemd, libdrm }: +, pipewire, wayland, systemd, libdrm }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "12k92h9dmn1fyn8nzxk69cyv0gnb7g9gj7a66mw5dcl5zqnl07nc"; + sha256 = "1vjz0y3ib1xw25z8hl679l2p6g4zcg7b8fcd502bhmnqgwgdcsfx"; }; nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; - buildInputs = [ pipewire wayland elogind systemd libdrm ]; + buildInputs = [ pipewire wayland systemd libdrm ]; + + mesonFlags = [ + "-Dsd-bus-provider=libsystemd" + ]; meta = with lib; { homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index cab358528311..2b425300b31e 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -7,7 +7,6 @@ , libxml2 , glib , pipewire -, fontconfig , flatpak , gsettings-desktop-schemas , acl @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.8.0"; + version = "1.8.1"; outputs = [ "out" "installedTests" ]; @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1f1f79hy259lm017zaq4rpvys8zkmjspqily4a3lbnm77zk3y079"; + sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8="; }; patches = [ @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib pipewire - fontconfig flatpak acl dbus diff --git a/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix index 7b6907a01627..3bcc40b5da32 100644 --- a/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.51.06"; + name = "xmlrpc-c-1.51.07"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "1l4zz22q10081vr06b8sii0l3krr64xyiywz6rcladw8kiyxip06"; + sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; }; buildInputs = [ curl libxml2 ]; diff --git a/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/nixpkgs/pkgs/development/libraries/zchunk/default.nix index a0d1378aa708..2037d815a81b 100644 --- a/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index a3c35d123b6a..b37dfbdd7077 100644 --- a/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd"; + sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; }; nativeBuildInputs = [ cmake asciidoc pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 6dc998cd0e27..76d54ed62563 100644 --- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimlib/default.nix @@ -1,23 +1,55 @@ -{ lib, stdenv, fetchurl, lzma }: +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config +, python3 +, icu +, libuuid +, xapian +, xz +, zstd +, gtest +}: stdenv.mkDerivation rec { pname = "zimlib"; - version = "1.4"; + version = "6.3.0"; - src = fetchurl { - url = "http://www.openzim.org/download/${pname}-${version}.tar.gz"; - sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq"; + src = fetchFromGitHub { + owner = "openzim"; + repo = "libzim"; + rev = version; + sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s"; }; - buildInputs = [ lzma ]; + nativeBuildInputs = [ + meson + pkg-config + ninja + python3 + ]; - enableParallelBuilding = true; + propagatedBuildInputs = [ + icu + libuuid + xapian + xz + zstd + ]; + + postPatch = '' + patchShebangs scripts + ''; + + checkInputs = [ + gtest + ]; + + doCheck = true; meta = with lib; { description = "Library for reading and writing ZIM files"; homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; - maintainers = with maintainers; [ robbinch ]; + maintainers = with maintainers; [ ajs124 ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix new file mode 100644 index 000000000000..7ba07cd92407 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config +, withZlibCompat ? false +}: + +stdenv.mkDerivation rec { + pname = "zlib-ng"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "zlib-ng"; + repo = "zlib-ng"; + rev = version; + sha256 = "1cl6asrav2512j7p02zcpibywjljws0m7aazvb3q2r9qiyvyswji"; + }; + + outputs = [ "out" "dev" "bin" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=/" + "-DBUILD_SHARED_LIBS=ON" + "-DINSTALL_UTILS=ON" + ] ++ lib.optionals withZlibCompat [ "-DZLIB_COMPAT=ON" ]; + + meta = with lib; { + description = "zlib data compression library for the next generation systems"; + homepage = "https://github.com/zlib-ng/zlib-ng"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix new file mode 100644 index 000000000000..aa7db78c4c32 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zxing-cpp"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "nu-book"; + repo = pname; + rev = "v${version}"; + hash = "sha256-N2FTzsjxm3EE5Wqz7xt+FS4zQ60Ow4WbdX6Eo08ktek="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + ]; + + meta = with lib; { + homepage = "https://github.com/nu-book/zxing-cpp"; + description = "C++ port of zxing (a Java barcode image processing library)"; + longDescription = '' + ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode + image processing library implemented in C++. + + It was originally ported from the Java ZXing Library but has been + developed further and now includes many improvements in terms of quality + and performance. It can both read and write barcodes in a number of + formats. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/nixpkgs/pkgs/development/libraries/zziplib/default.nix index 8cfec83af542..90758db16edd 100644 --- a/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/nixpkgs/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; }; } |