diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-06-04 10:19:13 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-06-04 22:45:31 +0000 |
commit | da8562f302a145605a3270114ea7063daa82a173 (patch) | |
tree | b27c6d509bad0ee5449f1fcf261a7ec3210df495 /nixpkgs/pkgs/development/libraries | |
parent | 17df60ef482ef52b2088e1913de9cd436320612a (diff) | |
parent | 467ce5a9f45aaf96110b41eb863a56866e1c2c3c (diff) | |
download | nixlib-da8562f302a145605a3270114ea7063daa82a173.tar nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.gz nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.bz2 nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.lz nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.xz nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.zst nixlib-da8562f302a145605a3270114ea7063daa82a173.zip |
Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
84 files changed, 757 insertions, 414 deletions
diff --git a/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix b/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix new file mode 100644 index 000000000000..241caf16d679 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/agda/cubical/default.nix @@ -0,0 +1,33 @@ +{ lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: + +mkDerivation rec { + + # Version 0.2 is meant to be used with the Agda 2.6.1 compiler. + pname = "cubical"; + version = "0.2"; + + src = fetchFromGitHub { + repo = pname; + owner = "agda"; + rev = "v${version}"; + sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2"; + }; + + LC_ALL = "en_US.UTF-8"; + + # The cubical library has several `Everything.agda` files, which are + # compiled through the make file they provide. + nativeBuildInputs = [ ghc glibcLocales ]; + buildPhase = '' + make + ''; + + meta = with lib; { + description = + "A cubical type theory library for use with the Agda compiler"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ alexarice ryanorendorff ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index b2323d62dfc5..7ea38b6472b8 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.14.5"; + version = "5.15.12"; src = fetchurl { - sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54"; + sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 9b32d46b3b2f..ece38b2cb038 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 = "9.870.2"; + version = "9.880.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0mpp1iq4ws9yhcv0bnn0czzyim7whcan34c7a052sh8w9kp5y6sl"; + sha256 = "17sb9hylrr7wl63whr39ypjg7xps32k9z5zdgchj5dyq6n6kw3wh"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 50de0c88a5be..b559ef96f439 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,24 +1,24 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost , brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl -, python, rapidjson, snappy, thrift, which, zlib, zstd +, python3, rapidjson, snappy, thrift, which, zlib, zstd , enableShared ? true }: let parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c"; - sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly"; + rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816"; + sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696"; + sha256 = "18lyvbibfdw3w77cy5whbq7c6mshn5fg2bhvgw7v226a7cs1rifb"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -28,19 +28,18 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/jemalloc/jemalloc/releases/download/5.2.0/jemalloc-5.2.0.tar.bz2"; - sha256 = "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl"; + "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; + sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; }; patches = [ # patch to fix python-test ./darwin.patch - # Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work. - # Remove this when updating to the next version. + + # fix musl build (fetchpatch { - name = "arrow-use-upstream-cmake-target-names.patch"; - url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch"; - sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1"; + url = "https://github.com/apache/arrow/commit/de4168786dfd8ab932f48801e0a7a6b8a370c19d.diff"; + sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; stripLen = 1; }) ] ++ lib.optionals (!enableShared) [ @@ -66,8 +65,9 @@ in stdenv.mkDerivation rec { thrift zlib zstd - python.pkgs.python - python.pkgs.numpy + ] ++ lib.optionals enableShared [ + python3.pkgs.python + python3.pkgs.numpy ]; preConfigure = '' @@ -92,8 +92,6 @@ in stdenv.mkDerivation rec { # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" - "-DTHRIFT_COMPILER=${thrift}/bin/thrift" - "-DTHRIFT_VERSION=${thrift.version}" ] ++ lib.optionals (!enableShared) [ "-DARROW_BUILD_SHARED=OFF" "-DARROW_BOOST_USE_SHARED=OFF" diff --git a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index f980d42cd7dc..0e49a6265120 100644 --- a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "vamp-plugin-sdk"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "c4dm"; repo = "vamp-plugin-sdk"; rev = "vamp-plugin-sdk-v${version}"; - sha256 = "1ay12gjqp2wzysg9k2qha3gd8sj5rjlfy4hsl923csi4ssiapsh1"; + sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/biblesync/default.nix b/nixpkgs/pkgs/development/libraries/biblesync/default.nix index 814ecf986e9b..27c6637d9fee 100644 --- a/nixpkgs/pkgs/development/libraries/biblesync/default.nix +++ b/nixpkgs/pkgs/development/libraries/biblesync/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "biblesync"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "karlkleinpaste"; repo = "biblesync"; rev = version; - sha256 = "1baq2fwf6132i514xrvq05p2gy98mkg1rn5whf9q5k475q81nrlr"; + sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ libuuid ]; meta = with stdenv.lib; { - homepage = "http://www.crosswire.org/wiki/BibleSync"; + homepage = "https://wiki.crosswire.org/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' BibleSync is a multicast protocol to support Bible software shared diff --git a/nixpkgs/pkgs/development/libraries/caf/default.nix b/nixpkgs/pkgs/development/libraries/caf/default.nix index c1a75e7753e5..605df2381016 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.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "04p3kgk1zadadl6n0prwc77nfxrbdasbwbqpws1y9y6f77lrcxdn"; + sha256 = "1w7sanxhh4sv4ap3ildqzlziazcy7ydx2pbjjrf3k60lcwq0lzn6"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/capstone/default.nix b/nixpkgs/pkgs/development/libraries/capstone/default.nix index b8d00984cd64..5140205ebc8a 100644 --- a/nixpkgs/pkgs/development/libraries/capstone/default.nix +++ b/nixpkgs/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; + sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw"; }; # replace faulty macos detection diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index 960c07e29df4..ec3c04856fe3 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="163198lizcr84ify34xjj1955rcgsqhwn87dwifiwyamnggn445f"; + sha256="17fr2k0jhdcrmmvvb9d8igmjbyads3hkdrakvmrpgc82srm78jcc"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix index 35f8f5e663ad..4092a9c9c5b8 100644 --- a/nixpkgs/pkgs/development/libraries/civetweb/default.nix +++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; + sha256 = "1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; }; makeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/nixpkgs/pkgs/development/libraries/comedilib/default.nix new file mode 100644 index 000000000000..f011c04d8856 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/comedilib/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, flex +, yacc +, xmlto +, docbook_xsl +, docbook_xml_dtd_44 +, swig +, perl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "comedilib"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Linux-Comedi"; + repo = "comedilib"; + rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "159sv4jdgmcaqz76vazkyxxb85ni7pg14p1qv7y94hib3kspc195"; + }; + + nativeBuildInputs = [ + autoreconfHook + flex + yacc + swig + xmlto + docbook_xml_dtd_44 + docbook_xsl + python3 + perl + ]; + + preConfigure = '' + patchShebangs --build doc/mkref doc/mkdr perl/Comedi.pm + ''; + + configureFlags = [ + "--with-udev-hotplug=${placeholder "out"}/lib" + "--sysconfdir=${placeholder "out"}/etc" + ]; + + outputs = [ "out" "dev" "man" "doc" ]; + + meta = with stdenv.lib; { + description = "The Linux Control and Measurement Device Interface Library"; + homepage = "https://github.com/Linux-Comedi/comedilib"; + license = licenses.lgpl21; + maintainers = [ maintainers.doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/cpputest/default.nix b/nixpkgs/pkgs/development/libraries/cpputest/default.nix index 52d6ce5214ea..d219a8e0bec1 100644 --- a/nixpkgs/pkgs/development/libraries/cpputest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpputest/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "3.8"; + version = "4.0"; pname = "cpputest"; src = fetchurl { url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0mk48xd3klyqi7wf3f4wn4zqxxzmvrhhl32r25jzrixzl72wq7f8"; + sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1"; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/nixpkgs/pkgs/development/libraries/cutelyst/default.nix index 65373547977e..94d9776b54d2 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.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1k8pbpwll19l3i3s34l9yhkxj4yqxbrf393nm29jqwlhvi9nz8qm"; + sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 6b238074fcab..799375ba44d5 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, fetchpatch +{ stdenv, fetchFromGitLab , meson, ninja, nasm, pkgconfig , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary @@ -9,23 +9,16 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "1gr859xzbqrsp892v9zzzgrg8smnnzgc1jmb68qzl54a4g6jrxm0"; + sha256 = "0zmn4ald518vgs3cc0ga227aimr38h16mkliq5j8mg6p9dn7nx1w"; }; - patches = [ - (fetchpatch { - url = "https://code.videolan.org/videolan/dav1d/-/commit/e04227c5f6729b460e0b8e5fb52eae2d5acd15ef.patch"; - sha256 = "18mpvwviqx0x9k6av98vgpjqlzcjd89g8496zsbf57bw5dadij3l"; - }) - ]; - nativeBuildInputs = [ meson ninja nasm pkgconfig ]; # TODO: doxygen (currently only HTML and not build by default). buildInputs = stdenv.lib.optional withExamples SDL2 diff --git a/nixpkgs/pkgs/development/libraries/doctest/default.nix b/nixpkgs/pkgs/development/libraries/doctest/default.nix index ae7eca92712c..f3ed36db31c9 100644 --- a/nixpkgs/pkgs/development/libraries/doctest/default.nix +++ b/nixpkgs/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq"; + sha256 = "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix new file mode 100644 index 000000000000..e37856abe2bd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "duckdb"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "cwida"; + repo = "duckdb"; + rev = "v${version}"; + sha256 = "1pz2q9c3803w8vbqiz9lag4g1kgl4ff9xca0kpcz72ap39pbp5jk"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cwida/duckdb"; + description = "DuckDB is an embeddable SQL OLAP Database Management System"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 4741a3d156a5..856553c6ded8 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fmt"; - version = "6.2.0"; + version = "6.2.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs"; + sha256 = "1i6nfxazq4d05r3sxyc3ziwkqq7s8rdbv9p16afv66aqmsbqqqic"; }; patches = [ @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M="; }) + + # Fix cmake config paths. + (fetchpatch { + url = "https://github.com/fmtlib/fmt/pull/1702.patch"; + sha256 = "18cadqi7nac37ymaz3ykxjqs46rvki396g6qkqwp4k00cmic23y3"; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/freenect/default.nix b/nixpkgs/pkgs/development/libraries/freenect/default.nix index 25a53f7601aa..9021e78a5b69 100644 --- a/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; + sha256 = "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr"; }; buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index 31ce6602963c..96ec3434b782 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.33"; + version = "1.1.39"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1gq972ngpdmpb63mc6myxsd0rf3qph95qx542021xh9f2791qffi"; + sha256 = "1p5ixc1hxh9mmhplndf1j87cw9989bp0fh0nsbx6l3p2wnqz9nyl"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 165fe3a25287..968ee3a09d08 100644 --- a/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, vtk, darwin }: +{ stdenv, fetchurl, cmake, vtk_7, darwin }: stdenv.mkDerivation rec { version = "3.0.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ cmake vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = [ ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index 20e2f6905ce8..684bad14dda5 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "1.3.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "04yrm3kg8m77kh6z0b9yw4h43fm0d54wnyrd8lp5ddn487kawm5g"; + sha256 = "1j6c6vmnip24pxafk29y312vif1xlryymv7aaxgqp9ca3s91nlrf"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 14b19bf5a09b..9b72ca3524cc 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.0"; + version = "0.12.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq"; + sha256 = "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla"; }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index f41fa73a6ef4..308a4db28006 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.46"; + version = "0.10.47"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9"; + sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 8549eeffde6d..ab497eadb6d6 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.28.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.29.0"; # 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 = "17p3xwz5izlqg5ijnim4asl40pr8yhg9wrrmws4g0dk37nkn1x6p"; + sha256 = "1n604grkf2amzrmwcz6am0rpbp3yfb062lpgmhv943hj8wk7xw27"; fetchSubmodules = true; }; patches = [ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { - url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch"; - sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq"; + url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; + sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; }) ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "-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" ]; diff --git a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix index 5f09f437f04f..cbba9c5fcea2 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchbzr, pkgconfig +{ stdenv, fetchFromGitLab, pkgconfig , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection +, genericUpdater, common-updater-scripts }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gsettings-qt"; - version = "0.1.20170824"; + version = "0.2"; - src = fetchbzr { - url = "http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk"; - rev = "85"; - sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; + src = fetchFromGitLab { + group = "ubports"; + owner = "core"; + repo = pname; + rev = "v${version}"; + sha256 = "14l8xphw4jd9ckqba13cyxq0i362x8lfsd0zlfawwi2z1q1vqm92"; }; nativeBuildInputs = [ @@ -52,9 +55,15 @@ stdenv.mkDerivation { done ''; + passthru.updateScript = genericUpdater { + inherit pname version; + rev-prefix = "v"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + meta = with stdenv.lib; { - description = "Qt/QML bindings for GSettings"; - homepage = "https://launchpad.net/gsettings-qt"; + description = "Library to access GSettings from Qt"; + homepage = "https://gitlab.com/ubports/core/gsettings-qt"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index d389b69087ba..6e0d351b8bc8 100644 --- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "hyperscan"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "intel"; repo = pname; - sha256 = "09dgvmjhdbrfgrsmjljl4wn06a8zlv9sd4d4l6h6bfbz57d35f95"; + sha256 = "0psfkzmyhqfrs750b10d0xv37rcz6nwsw1mnc7zagijckwis2wvj"; rev = "v${version}"; }; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 411cc227b304..03b3b936f261 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, autoPatchelfHook, cmake, pkgconfig, libdrm, libpciaccess -, libva , libX11, libXau, libXdmcp, libpthreadstubs -}: +{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +, libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; @@ -11,12 +10,19 @@ stdenv.mkDerivation rec { sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24"; }; - # patchelf is needed for binaries in $out/share/samples - nativeBuildInputs = [ autoPatchelfHook cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; + checkInputs = [ gtest ]; + cmakeFlags = [ + "-DBUILD_SAMPLES=OFF" + "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DUSE_SYSTEM_GTEST=ON" + ]; + + doCheck = true; enableParallelBuild = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/itk/4.x.nix b/nixpkgs/pkgs/development/libraries/itk/4.x.nix index 833723d4d2d2..cd8e70a99767 100644 --- a/nixpkgs/pkgs/development/libraries/itk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/itk/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk_7 }: stdenv.mkDerivation rec { name = "itk-4.13.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ]; + buildInputs = [ libX11 libuuid vtk_7 ]; meta = { description = "Insight Segmentation and Registration Toolkit"; diff --git a/nixpkgs/pkgs/development/libraries/itk/default.nix b/nixpkgs/pkgs/development/libraries/itk/default.nix index 6c0298c0f71c..84dedfa0b3b6 100644 --- a/nixpkgs/pkgs/development/libraries/itk/default.nix +++ b/nixpkgs/pkgs/development/libraries/itk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }: +, pkgconfig, libX11, libuuid, xz, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ libX11 libuuid vtk_7 ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index 702738fdfc04..33a9974211f6 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.1.2"; + version = "2.1.3"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0x6yr14znp42b92i7br4wxfjri6i689dsifzz9kbyzvn558a16b4"; + sha256 = "0xkps414ndb87abla7dlv44ndnfg5r5vwgmkm3ngcq9knbv1x6w7"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libcint/default.nix b/nixpkgs/pkgs/development/libraries/libcint/default.nix index 3191dc44467c..4a83175f66bf 100644 --- a/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "3.0.19"; + version = "3.0.20"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "0x613f2hiqi2vbhp20fcl7rhxb07f2714lplzd0vkvv07phagip9"; + sha256 = "0iqqq568q9sxppr08rvmpyjq0n82pm04x9rxhh3mf20x1ds7ngj5"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index 26616078b46b..25fa4db38f6b 100644 --- a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1v0y7998p8a8wpblnpdyk5zzvpj8pbrpzxwxmv0b0axrhaarxrf3"; + sha256 = "1rhichmalqz7p1hiwvn6y0isralpbf0w5nyjp4lg0asawkxy9cww"; }; postPatch = '' - substituteInPlace Makefile --replace /usr $out + substituteInPlace Makefile --replace /usr/local $out ''; configurePhase = '' diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 10f46a67e896..3bd549519943 100644 --- a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av"; + sha256 = "0ylgxw1lxdqvayy5285mlfrkr9cvsgasy2zci6g6mv9rng261xn5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index e886baa47976..e2552ba713e0 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -1,41 +1,31 @@ -{ thinkpad ? false -, stdenv -, fetchFromGitHub -, fetchurl +{ stdenv +, fetchFromGitLab , pkgconfig , meson , ninja -, libusb1 +, gusb , pixman , glib , nss -, gtk3 +, gobject-introspection , coreutils , gtk-doc , docbook_xsl , docbook_xml_dtd_43 -, openssl ? null }: -assert thinkpad -> openssl != null; - stdenv.mkDerivation rec { - pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; - version = "1.0"; - - src = { - libfprint-thinkpad = - fetchFromGitHub { - owner = "3v1n0"; - repo = "libfprint"; - rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c"; - sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b"; - }; - libfprint = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz"; - sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd"; - }; - }.${pname}; + pname = "libfprint"; + version = "1.90.1"; + outputs = [ "out" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = pname; + rev = "v${version}"; + sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"; + }; nativeBuildInputs = [ pkgconfig @@ -44,28 +34,20 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 + gobject-introspection ]; buildInputs = [ - libusb1 # drop in 2.0 for gusb + gusb pixman glib nss - gtk3 - ] - ++ stdenv.lib.optional thinkpad openssl - ; + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" - "-Dx11-examples=false" ]; - postPatch = '' - substituteInPlace libfprint/meson.build \ - --replace /bin/echo ${coreutils}/bin/echo - ''; - meta = with stdenv.lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; diff --git a/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix new file mode 100644 index 000000000000..5ce8cd6c6a1d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfyaml/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gnum4 }: + +stdenv.mkDerivation rec { + pname = "libfyaml"; + version = "0.5.7"; + + src = fetchurl { + url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz"; + sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j"; + }; + + nativeBuildInputs = [ gnum4 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/pantoniou/libfyaml"; + description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libmpack/default.nix b/nixpkgs/pkgs/development/libraries/libmpack/default.nix index cdc45956e7a3..736474d29a5f 100644 --- a/nixpkgs/pkgs/development/libraries/libmpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmpack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { - owner = "tarruda"; + owner = "libmpack"; repo = "libmpack"; rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; diff --git a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix index 5cb971f5db89..074e38429331 100644 --- a/nixpkgs/pkgs/development/libraries/libmypaint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.6.0"; + version = "1.6.1"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "1fdyywm915mmilfmzp7lz4rnmm05kkw0adrdqpqi4n8icp4d530g"; + sha256 = "1ppgpmnhph9h8ayx9776f79a0bxbdszfw9c6bw7c3ffy2yk40178"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index 79bd53ab03b3..39a3bf6b2c55 100644 --- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -68,10 +68,11 @@ stdenv.mkDerivation rec { "-Denable-gtk-doc=true" ]; - # FIXME: fails two new tests added in 1.7.1: - # libosinfo:symbols / check-symfile - # 3/24 libosinfo:symbols / check-symsorting - doCheck = false; + preCheck = '' + patchShebangs ../osinfo/check-symfile.pl ../osinfo/check-symsorting.pl + ''; + + doCheck = true; meta = with stdenv.lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; diff --git a/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix b/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix new file mode 100644 index 000000000000..f8359cded93a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpam-wrapper/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchgit +, cmake +, linux-pam +, enablePython ? false +, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + pname = "libpam-wrapper"; + version = "1.1.3"; + + src = fetchgit { + url = "git://git.samba.org/pam_wrapper.git"; + rev = "pam_wrapper-${version}"; + sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; + }; + + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional enablePython [ python ]; + + # We must use linux-pam, using openpam will result in broken fprintd. + buildInputs = [ linux-pam ]; + + meta = with stdenv.lib; { + description = "Wrapper for testing PAM modules"; + homepage = "https://cwrap.org/pam_wrapper.html"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.elyhaka ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/librsync/default.nix b/nixpkgs/pkgs/development/libraries/librsync/default.nix index d90106f89d81..9499be80f033 100644 --- a/nixpkgs/pkgs/development/libraries/librsync/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "18wwfbbggsjrd4w3dczxa2gv3zvx0fqp68b8h1zzvdbyn91f16mz"; + sha256 = "131cd4asmpm4nskidzgiy8xibbnpibvvbq857a0pcky77min5g4z"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 7b6a85cec07f..43fa300f1076 100644 --- a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uchardet"; - version = "0.0.6"; + version = "0.0.7"; outputs = [ "bin" "out" "man" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"; + sha256 = "1ca51sryhryqz82v4d0graaiqqq5w2f33a9gj83b910xmq499irz"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libversion/default.nix b/nixpkgs/pkgs/development/libraries/libversion/default.nix index e1dc591f8b5d..cee04fa79e43 100644 --- a/nixpkgs/pkgs/development/libraries/libversion/default.nix +++ b/nixpkgs/pkgs/development/libraries/libversion/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; preCheck = '' - export LD_LIBRARY_PATH=/build/source/build/libversion/:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix new file mode 100644 index 000000000000..25c85948608a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused +, python27, utillinux, which, bash +}: + +let + version = "1.15"; +in stdenv.mkDerivation { + pname = "libxsmm"; + inherit version; + + src = fetchFromGitHub { + owner = "hfp"; + repo = "libxsmm"; + rev = "refs/tags/${version}"; + sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + }; + + buildInputs = [ + coreutils + gfortran7 + gnused + python27 + utillinux + which + ]; + + prePatch = '' + patchShebangs . + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; + license = licenses.bsd3; + homepage = "https://github.com/hfp/libxsmm"; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ chessai ]; + inherit version; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/lyra/default.nix b/nixpkgs/pkgs/development/libraries/lyra/default.nix index e7227ac63885..c0220e6e21db 100644 --- a/nixpkgs/pkgs/development/libraries/lyra/default.nix +++ b/nixpkgs/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "0rpk1hadfcvjps5k307sddv23q73m2918wclfxfi6mj8l7gwkcn9"; + sha256 = "08g6kqaj079aq7i6c1pwj778lrr3yk188wn1byxdd6zqpwrsv71q"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 03a1e77e7bfb..bf6c5b1baf34 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.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c"; + sha256 = "0hk30adrm0s1g5flfaqfr3lc72y3hlmhqnyrqd7p0y91rsaw86b9"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix index e641b404a867..b2bdf5d04476 100644 --- a/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "iafonov"; repo = pname; rev = "772639cf10db6d9f5a655ee9b7eb20b815fab396"; - sha256 = "sha256:056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl"; + sha256 = "056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index ccbb1e3a6650..54b725c99555 100644 --- a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "onig"; - version = "6.9.4"; + version = "6.9.5_rev1"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "11imbhj4p5w8lvrmcczccm1zq014h9j85r51z2ibb8jhf5p3lslh"; + sha256 = "1sx683hbb58gbjvla69n5vxdzwqhjqisqbfkf9xi95wr7p9ycjhl"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { homepage = "https://github.com/kkos/oniguruma"; diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix index 82cfb5c3d068..a62138e8ccf4 100644 --- a/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr"; + sha256 = "10sbiwjljxi0a1q3xakmf6v02x3yf38ljvjpql70q4rqggqj9zhh"; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/development/libraries/openldap/default.nix b/nixpkgs/pkgs/development/libraries/openldap/default.nix index b5adc78c7ce0..a4274f064e56 100644 --- a/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { # Disable install stripping as it breaks cross-compiling. # We strip binaries anyway in fixupPhase. - makeFlags= [ "STRIP=" ]; + makeFlags= [ + "STRIP=" + "prefix=$(out)" + "moduledir=$(out)/lib/modules" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; configureFlags = [ "--enable-overlays" @@ -35,9 +39,18 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + postBuild = '' + make $makeFlags -C contrib/slapd-modules/passwd/sha2 + make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 + ''; + doCheck = false; # needs a running LDAP server - installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ]; + installFlags = [ + "sysconfdir=$(out)/etc" + "localstatedir=$(out)/var" + "moduledir=$(out)/lib/modules" + ]; # 1. Fixup broken libtool # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` @@ -51,9 +64,12 @@ stdenv.mkDerivation rec { rm -rf $out/var rm -r libraries/*/.libs + rm -r contrib/slapd-modules/passwd/*/.libs ''; postInstall = '' + make $installFlags install -C contrib/slapd-modules/passwd/sha2 + make $installFlags install -C contrib/slapd-modules/passwd/pbkdf2 chmod +x "$out"/lib/*.{so,dylib} ''; diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 627ac68d68d7..38041e6b5d80 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin +, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric # Enable CUDA support @@ -75,16 +75,16 @@ in stdenv.mkDerivation rec { # default compilers should be indentical to the # compilers at build time - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ $out/share/openmpi/mpicc-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ $out/share/openmpi/ortecc-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \ $out/share/openmpi/mpic++-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \ + sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \ $out/share/openmpi/mpifort-wrapper-data.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index 840da0461706..38e50fb367e1 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "6.2.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1ypkzdkgsbcczfvrqblnxfzm13w0mdkskgqmgvmbfi66vpaazdrf"; + sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl"; }; outputs = [ "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index 81da7332d0f4..506c78aca8a5 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.10.1"; + name = "pcl-1.11.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v"; + sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix index c6a9835d13b6..8c4d688b697e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnumake imake makedepend ]; sourceRoot = "."; - patches = [ ./patch ]; + patches = [ ./patch.patch ]; postPatch = '' substituteInPlace 2006/src/config/site.def \ diff --git a/nixpkgs/pkgs/development/libraries/physics/cernlib/patch b/nixpkgs/pkgs/development/libraries/physics/cernlib/patch.patch index 2d75b6bf0f88..2d75b6bf0f88 100644 --- a/nixpkgs/pkgs/development/libraries/physics/cernlib/patch +++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/patch.patch diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 3dfbaa96d31b..b854fa88cd67 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "0avkgn19plq593p872hirr0yj2vgjvsi88w68ngarbp55hla1c1h"; + sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3"; }; buildInputs = [ python2 ]; diff --git a/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix deleted file mode 100644 index 27d8197a4362..000000000000 --- a/nixpkgs/pkgs/development/libraries/physics/mcgrid/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }: - -stdenv.mkDerivation rec { - pname = "mcgrid"; - version = "2.0.2"; - - src = fetchurl { - url = "https://www.hepforge.org/archive/mcgrid/${pname}-${version}.tar.gz"; - sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; - }; - - buildInputs = [ fastnlo rivet ]; - propagatedNativeBuildInputs = [ pkgconfig ]; - - preConfigure = '' - substituteInPlace mcgrid.pc.in \ - --replace "Cflags:" "Cflags: -std=c++11" - ''; - - CXXFLAGS = "-std=c++11"; - enableParallelBuilding = true; - - meta = { - description = "A software package that provides access to the APPLgrid and fastNLO interpolation tools for Monte Carlo event generator codes, allowing for fast and flexible variations of scales, coupling parameters and PDFs in cutting edge leading- and next-to-leading-order QCD calculations"; - license = stdenv.lib.licenses.gpl3; - homepage = "http://mcgrid.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index 9870fadf6ef6..bcf986346ac3 100644 --- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -1,20 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: +{ stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; - version = "2.7.2"; + version = "3.1.1"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1bxcb99a3l5d2gl93zgfzgw6v95kx1ss5045mkz3ciyw8w5nmb9l"; + sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w"; }; patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/37bd34f52cce66946ebb311a8fe61bfc5f69cc00.diff"; - sha256 = "0wj3ilpfq2gpc33bj3800l9vyvc9lrrlj1x9ss5qki0yiqd8i2aa"; - }) ]; latex = texlive.combine { inherit (texlive) @@ -32,26 +28,27 @@ stdenv.mkDerivation rec { xkeyval xstring ;}; - buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ]; - propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; + + nativeBuildInputs = [ rsync makeWrapper ]; + buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ]; + propagatedBuildInputs = [ fastjet fastjet-contrib ]; preConfigure = '' - substituteInPlace analyses/Makefile.in \ - --replace "!(tmp)" "" - substituteInPlace bin/rivet-buildplugin.in \ + substituteInPlace bin/rivet-build.in \ + --replace 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \ --replace 'which' '"${which}/bin/which"' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ - --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " + --replace 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " ''; preInstall = '' substituteInPlace bin/make-plots \ --replace '"which"' '"${which}/bin/which"' \ - --replace '"latex"' '"${latex}/bin/latex"' \ - --replace '"dvips"' '"${latex}/bin/dvips"' \ + --replace '"latex"' '"'$latex'/bin/latex"' \ + --replace '"dvips"' '"'$latex'/bin/dvips"' \ --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \ --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \ - --replace '"kpsewhich"' '"${latex}/bin/kpsewhich"' \ + --replace '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \ --replace '"convert"' '"${imagemagick.out}/bin/convert"' substituteInPlace bin/rivet \ --replace '"less"' '"${less}/bin/less"' @@ -62,9 +59,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" - "--with-hepmc=${hepmc2}" "--with-yoda=${yoda}" - ]; + ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [ + "--with-hepmc3=${hepmc}" + ] else [ + "--with-hepmc=${hepmc}" + ]); enableParallelBuilding = true; @@ -74,11 +74,11 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl3; homepage = "https://rivet.hepforge.org"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index ad7bc7f52f54..9d4d60949c19 100644 --- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -1,22 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; - version = "1.7.7"; + version = "1.8.2"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng"; + sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9"; }; - patches = [ - # fixes "TypeError: expected bytes, str found" in writeYODA() - (fetchpatch { - url = "https://gitlab.com/hepcedar/yoda/commit/d2bbbe92912457f8a29b440cbfa0b39daf28ec34.diff"; - sha256 = "1x60piswpxwak61r2sdclsc8pzi1fshpkjnxlyflsa1iap77vkq8"; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) @@ -27,6 +19,7 @@ stdenv.mkDerivation rec { postPatch = '' touch pyext/yoda/*.{pyx,pxd} + patchShebangs . ''; postInstall = '' @@ -37,6 +30,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + doInstallCheck = true; + installCheckTarget = "check"; + meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; license = stdenv.lib.licenses.gpl3; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index d873555c0fa4..f9cc7b56fff0 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkgconfig @@ -33,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.2"; + version = "0.3.5"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; + sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ="; }; nativeBuildInputs = [ @@ -73,13 +72,6 @@ stdenv.mkDerivation rec { vulkan-loader xorg.libX11 ]; - patches = [ - # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch"; - sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x"; - }) - ]; mesonFlags = [ "-Ddocs=true" diff --git a/nixpkgs/pkgs/development/libraries/pkger/default.nix b/nixpkgs/pkgs/development/libraries/pkger/default.nix new file mode 100644 index 000000000000..4a489127ca56 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pkger/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "pkger"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "markbates"; + repo = "pkger"; + rev = "v${version}"; + sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; + }; + + vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + + meta = with stdenv.lib; { + description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + homepage = "https://github.com/markbates/pkger"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch b/nixpkgs/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch deleted file mode 100644 index 52a4d0b5cccb..000000000000 --- a/nixpkgs/pkgs/development/libraries/precice/0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 078cc28a3ece0dcc4033961090a6e5d6e63b3ec5 Mon Sep 17 00:00:00 2001 -From: Scriptkiddi <fritz@otlinghaus.it> -Date: Sat, 4 Jan 2020 17:59:32 +0100 -Subject: [PATCH] Fix the install target dirs to use the CMAKE flags - ---- - CMakeLists.txt | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96b9d1b5..ff8191ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ project(preCICE VERSION 1.6.1 LANGUAGES CXX) - - # - # Overview of this configuration --# -+# - # PREAMBLE - # Setup Options - # Find Mandatory Dependencies -@@ -30,6 +30,7 @@ include(CheckCXX11Library) - include(CopyTargetProperty) - include(XSDKMacros) - include(Validation) -+include(GNUInstallDirs) - - # CMake Policies - -@@ -197,7 +198,7 @@ if(CMAKE_VERSION VERSION_LESS "3.11") - endif() - endif() - --# Add precice as an empty target -+# Add precice as an empty target - add_library(precice ${preCICE_DUMMY}) - set_target_properties(precice PROPERTIES - # precice is a C++11 project -@@ -267,7 +268,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/DetectGitRevision.cmake) - configure_file("${PROJECT_SOURCE_DIR}/src/precice/impl/versions.hpp.in" "${PROJECT_BINARY_DIR}/src/precice/impl/versions.hpp" @ONLY) - - # Includes Configuration --target_include_directories(precice PUBLIC -+target_include_directories(precice PUBLIC - $<BUILD_INTERFACE:${preCICE_SOURCE_DIR}/src> - $<BUILD_INTERFACE:${preCICE_BINARY_DIR}/src> - $<INSTALL_INTERFACE:include> -@@ -282,7 +283,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/src/sources.cmake) - # - - add_executable(binprecice "src/drivers/main.cpp") --target_link_libraries(binprecice -+target_link_libraries(binprecice - PRIVATE - Threads::Threads - precice -@@ -365,18 +366,18 @@ include(${CMAKE_CURRENT_LIST_DIR}/src/tests.cmake) - # binprecice - the precice binary - install(TARGETS precice binprecice - EXPORT preciceTargets -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -- RUNTIME DESTINATION bin -- PUBLIC_HEADER DESTINATION include/precice -- INCLUDES DESTINATION include/precice -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/precice -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/precice - ) - - if(PRECICE_InstallTest) - # Install the testprecice target - install(TARGETS testprecice - EXPORT preciceTargets -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) - - # Install the resources necessary for the tests -@@ -396,7 +397,7 @@ endif() - install(EXPORT preciceTargets - FILE preciceTargets.cmake - NAMESPACE precice:: -- DESTINATION lib/cmake/precice -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/precice - ) - - # Generate a Package Config File for precice -@@ -408,7 +409,7 @@ write_basic_package_version_file("preciceConfigVersion.cmake" - - # Install the Config and the ConfigVersion files - install(FILES "cmake/preciceConfig.cmake" "${preCICE_BINARY_DIR}/preciceConfigVersion.cmake" -- DESTINATION lib/cmake/precice -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/precice - ) - - # Setup the config in the build directory -@@ -477,7 +478,7 @@ configure_file( - "lib/pkgconfig/libprecice.pc" - @ONLY - ) --install(DIRECTORY "${preCICE_BINARY_DIR}/lib/pkgconfig" -+install(DIRECTORY "${preCICE_BINARY_DIR}/lib/pkgconfig" - DESTINATION lib - ) - --- -2.23.1 - diff --git a/nixpkgs/pkgs/development/libraries/precice/default.nix b/nixpkgs/pkgs/development/libraries/precice/default.nix index a22df8c18e05..22726858a225 100644 --- a/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -1,36 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages, petsc }: stdenv.mkDerivation rec { pname = "precice"; - version = "2020-01-20"; + version = "2.0.2"; # Todo next release switch back to versioning but for python3 support master is needed src = fetchFromGitHub { owner = "precice"; repo = pname; - rev = "9f778290416416255fc73a495e962def301648b0"; - sha256 = "1ij43qjbf1aq3lh91gqpviajc8lyl7qkxfccmj5md5vwf88vjaip"; + rev = "v${version}"; + sha256 = "1s41wv2077d2gqj0wsxls6wkgdk9cgzcbmk2q43ha08ccq5i3dav"; }; cmakeFlags = [ + "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DPETSC=off" "-DPYTHON_LIBRARIES=${python3.libPrefix}" "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" ]; nativeBuildInputs = [ cmake gcc ]; buildInputs = [ boost eigen libxml2 openmpi python3 python3Packages.numpy ]; - patches = [ - ./0001-Fix-the-install-target-dirs-to-use-the-CMAKE-flags.patch # CMake Packaging is not perfect upstream, after this PR it is https://github.com/precice/precice/pull/577/files - ]; enableParallelBuilding = true; - postInstall = '' - substituteInPlace "$out"/lib/cmake/precice/preciceTargets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include;' 'INTERFACE_INCLUDE_DIRECTORIES "'$out/include';' - ''; # Check if this can be removed after upstream PR 577 - meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; license = with lib.licenses; [ gpl3 ]; diff --git a/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix b/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix index 434b3ab84f9c..a82d048b32b2 100644 --- a/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qgnomeplatform"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "QGnomePlatform"; rev = version; - sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a"; + sha256 = "1mwqg2zk0sfjq54vz2jjahbgi5sxw8rb71h6mgg459wp99mhlqi0"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix index 323eff6486d7..abaeba51b451 100644 --- a/nixpkgs/pkgs/development/libraries/qscintilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/qscintilla/default.nix @@ -5,12 +5,6 @@ }: let - # Fix Xcode 8 compilation problem - xcodePatch = fetchurl { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch"; - sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; - }; - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; version = "2.11.2"; @@ -32,8 +26,7 @@ in stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++ - (lib.optional (!withQt5) ./fix-qt4-build.patch ); + patches = lib.optional (!withQt5) ./fix-qt4-build.patch; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 7c2a99804c4d..f17165b5ed34 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.11.2"; + version = "0.15.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; + sha256 = "0cv0lxyi2sr0k7f03rsh1j28avdxd0l0480jsa95ca3d2lq392g3"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/nixpkgs/pkgs/development/libraries/quazip/default.nix b/nixpkgs/pkgs/development/libraries/quazip/default.nix index 13e3f15c8421..4ca3be7fe797 100644 --- a/nixpkgs/pkgs/development/libraries/quazip/default.nix +++ b/nixpkgs/pkgs/development/libraries/quazip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quazip"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s"; + sha256 = "0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn"; }; buildInputs = [ zlib qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index d8f20d74a0df..7539d45627f1 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0axrzjmih1njjpxpwfb6pwjwkjy1b6s5s1sjf165m2cmd6x3vbap"; + sha256 = "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix new file mode 100644 index 000000000000..cfbe19d724be --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "bpp-core"; + version = "2.4.1"; + + src = fetchFromGitHub { owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; + }; + + nativeBuildInputs = [ cmake ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES + # of form /nix/store/.../nix/store/.../include, + # probably due to relative vs absolute path issue + + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Main_Page"; + changelog = "https://github.com/BioPP/bpp-core/blob/master/ChangeLog"; + description = "C++ bioinformatics libraries and tools"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.cecill20; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix new file mode 100644 index 000000000000..8ff6ad433fb5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq }: + +stdenv.mkDerivation rec { + pname = "bpp-phyl"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "192zks6wyk903n06c2lbsscdhkjnfwms8p7jblsmk3lvjhdipb20"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + + doCheck = !stdenv.isDarwin; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bpp-phyl/blob/master/ChangeLog"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix new file mode 100644 index 000000000000..af5d1d00d4d9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core, bpp-seq }: + +stdenv.mkDerivation rec { + pname = "bpp-popgen"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "0bz0fhrq3dri6a0hvfc3zlvrns8mrzzlnicw5pyfa812gc1qwfvh"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core bpp-seq ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES + # of form /nix/store/.../nix/store/.../include, + # probably due to relative vs absolute path issue + + doCheck = !stdenv.isDarwin; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bpp-popgen/blob/master/ChangeLog"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix new file mode 100644 index 000000000000..79fd0fe67716 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, bpp-core }: + +stdenv.mkDerivation rec { + pname = "bpp-seq"; + + inherit (bpp-core) version; + + src = fetchFromGitHub { + owner = "BioPP"; + repo = pname; + rev = "v${version}"; + sha256 = "1mc09g8jswzsa4wgrfv59jxn15ys3q8s0227p1j838wkphlwn2qk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ bpp-core ]; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/src + ''; + + postFixup = '' + substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ + --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' + ''; + # prevents cmake from exporting incorrect INTERFACE_INCLUDE_DIRECTORIES + # of form /nix/store/.../nix/store/.../include, + # probably due to relative vs absolute path issue + + doCheck = !stdenv.isDarwin; + + meta = bpp-core.meta // { + changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog"; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index f6969dcdb6f0..412268654213 100644 --- a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.90"; + version = "0.1.91"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "10y16qkr2ibn8synmyzgwcbkszyfys1v0dx75p3mayh02yif4dx2"; + sha256 = "1yg55h240iigjaii0k70mjb4sh3mgg54rp2sz8bx5glnsjwys5s3"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; diff --git a/nixpkgs/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix index bdd8dd9d9998..ab4fd2c7bf27 100644 --- a/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2019.1.1"; + version = "2020.1.1"; 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 = "12sl18limlj61hlwl3bcv5ysfdpsjmd07cxchhf9xa8shk6d87i0"; + sha256 = "1z52r28xg05q6hdlh4szzfjlpgkvbdyn2dpaji9b57y58ccrqsfh"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix new file mode 100644 index 000000000000..9d0b3bf76b36 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -0,0 +1,46 @@ +{ gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 +, openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { + pname = "sope"; + version = "4.3.2"; + + src = fetchFromGitHub { + owner = "inverse-inc"; + repo = pname; + rev = "SOPE-${version}"; + sha256 = "0ny1ihx38gd25w8f3dfybyswvyjfljvb2fhfmkajgg6hhjrkfar2"; + }; + + nativeBuildInputs = [ gnustep.make ]; + buildInputs = flatten ([ gnustep.base libxml2 openssl_1_1 ] + ++ optional (openldap != null) openldap + ++ optionals (mysql != null) [ libmysqlclient mysql ] + ++ optional (postgresql != null) postgresql); + + postPatch = '' + # Exclude NIX_ variables + sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure + ''; + + preConfigure = '' + export DESTDIR="$out" + ''; + + configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] + ++ optional (openldap != null) "--enable-openldap" + ++ optional (mysql != null) "--enable-mysql" + ++ optional (postgresql != null) "--enable-postgresql"; + + # Yes, this is ugly. + preFixup = '' + cp -rlPa $out/nix/store/*/* $out + rm -rf $out/nix/store + ''; + + meta = { + description = "SOPE is an extensive set of frameworks which form a complete Web application server environment"; + license = licenses.publicDomain; + homepage = "https://github.com/inverse-inc/sope"; + platforms = platforms.linux; + maintainers = with maintainers; [ ajs124 das_j ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 1839bb7bff16..add1dcf10cb0 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -35,8 +35,8 @@ let in { spdlog_1 = generic { - version = "1.4.2"; - sha256 = "1qc3rphvik44136ms0gjq2wmkl6qglri4fqxlhr2l5jwm8zhr8fc"; + version = "1.6.0"; + sha256 = "15fn8nd9xj7wrxcg9n4fjffid790qg2m366rx2lq2fc9v9walrxs"; }; spdlog_0 = generic { diff --git a/nixpkgs/pkgs/development/libraries/speechd/default.nix b/nixpkgs/pkgs/development/libraries/speechd/default.nix index 6b8e42a7c195..eab6c1d446cd 100644 --- a/nixpkgs/pkgs/development/libraries/speechd/default.nix +++ b/nixpkgs/pkgs/development/libraries/speechd/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256:16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; + sha256 = "16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 66d30e26a0d8..f40c80391a23 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, readline ? null, ncurses ? null }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, readline ? null, ncurses ? null }: assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0s1aiwl61nl3b4ym4v050wlbbx0iypknqsj3ar12dw5hljlzx6f8"; + sha256 = "0mx0n5n3s39r25b31sdkrd4psxjqqgcv6rpm9d57w5rlk75g2fiv"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ readline ncurses openssl tcl ]; configureFlags = [ "--enable-threadsafe" "--disable-tcl" ]; @@ -22,9 +24,13 @@ stdenv.mkDerivation rec { doCheck = false; # fails. requires tcl? + postInstall = '' + installManPage sqlcipher.1 + ''; + meta = with stdenv.lib; { - homepage = "http://sqlcipher.net/"; - description = "Full Database Encryption for SQLite"; + homepage = "https://www.zetetic.net/sqlcipher/"; + description = "SQLite extension that provides 256 bit AES encryption of database files"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/libraries/ticpp/default.nix b/nixpkgs/pkgs/development/libraries/ticpp/default.nix index 01fab29b6743..37b093c8e2ec 100644 --- a/nixpkgs/pkgs/development/libraries/ticpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/ticpp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "wxFormBuilder"; repo = "ticpp"; rev = "eb79120ea16b847ce9f483a298a394050f463d6b"; - sha256 = "sha256:0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; + sha256 = "0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 5fa35751e24f..1030aefc1a54 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth-mvtools"; - version = "22"; + version = "23"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; rev = "v${version}"; - sha256 = "11al56liaahkr3819iynq83k8n42wvijfv2ja5fsjdl6j4zfzpbr"; + sha256 = "0lngkvxnzn82rz558nvl96rvclrck07ja1pny7wcfixp9b68ppkn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 043bfb007a3d..87f35fbf60c2 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -36,6 +36,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + # 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; + }; + postInstall = '' wrapProgram $out/bin/vspipe \ --prefix PYTHONPATH : $out/${python3.sitePackages} diff --git a/nixpkgs/pkgs/development/libraries/vtk/7.x.nix b/nixpkgs/pkgs/development/libraries/vtk/7.x.nix new file mode 100644 index 000000000000..f3ec383fddfb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vtk/7.x.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +, fetchpatch +, qtLib ? null +, enablePython ? false, python ? null +# Darwin support +, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "7.1"; + minorVersion = "1"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; + src = fetchurl { + url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; + }; + + patches = [ + (fetchpatch { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; + sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] + ++ optional (qtLib != null) qtLib + ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] + ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit + CFNetwork Security ApplicationServices CoreText + IOSurface ImageIO OpenGL GLUT ] + ++ optional enablePython [ + python + ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; + + preBuild = '' + export LD_LIBRARY_PATH="$(pwd)/lib"; + ''; + + # 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. + # At least, we use -fPIC for other packages to be able to use this in shared + # objects. + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] + ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] + ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; + + enableParallelBuilding = true; + + meta = { + description = "Open source libraries for 3D computer graphics, image processing and visualization"; + homepage = "https://www.vtk.org/"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/vtk/default.nix b/nixpkgs/pkgs/development/libraries/vtk/default.nix index 1cc706f4eb73..4ef140a09996 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/default.nix @@ -10,8 +10,8 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "7.1"; - minorVersion = "1"; + majorVersion = "8.2"; + minorVersion = "0"; version = "${majorVersion}.${minorVersion}"; in @@ -19,20 +19,13 @@ stdenv.mkDerivation rec { name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; src = fetchurl { url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; + sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; }; - patches = [ - (fetchpatch { - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; - sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libtiff ] - ++ optional (qtLib != null) qtLib + ++ optionals (qtLib != null) (with qtLib; [ qtbase qtx11extras qttools ]) ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText @@ -47,7 +40,7 @@ stdenv.mkDerivation rec { ''; # Shared libraries don't work, because of rpath troubles with the current - # nixpkgs camke approach. It wants to call a binary at build time, just + # nixpkgs cmake approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. # At least, we use -fPIC for other packages to be able to use this in shared # objects. diff --git a/nixpkgs/pkgs/development/libraries/xercesc/default.nix b/nixpkgs/pkgs/development/libraries/xercesc/default.nix index 3873fe05e6bb..8c7b12320148 100644 --- a/nixpkgs/pkgs/development/libraries/xercesc/default.nix +++ b/nixpkgs/pkgs/development/libraries/xercesc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xerces-c"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; - sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx"; + sha256 = "0zicsydx6s7carwr7q0csgkg1xncibd6lfp5chg2v2gvn54zr5pv"; }; # Disable SSE2 extensions on platforms for which they are not enabled by default diff --git a/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix index d9786d26a71f..41cdbf0b4f16 100644 --- a/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.39.12"; + name = "xmlrpc-c-1.51.06"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "026fh7w7y3q9pvxd09i5d4hq3l6gd81n9k19yq4zwbc398kg6c6q"; + sha256 = "1l4zz22q10081vr06b8sii0l3krr64xyiywz6rcladw8kiyxip06"; }; buildInputs = [ curl libxml2 ]; |