diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
commit | 02e12559a420f8c544b2facc4931904900a05518 (patch) | |
tree | ba39d8fa9e874b935d204e74accfed5caaccf0fa /nixpkgs/pkgs/development/libraries | |
parent | 542f80867c380b0ac79250b6e5358dda8bc49e0d (diff) | |
parent | 3d085a399c436a41d875801619e8f976b8519196 (diff) | |
download | nixlib-02e12559a420f8c544b2facc4931904900a05518.tar nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.gz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.bz2 nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.lz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.xz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.zst nixlib-02e12559a420f8c544b2facc4931904900a05518.zip |
Merge commit '3d085a399c436a41d875801619e8f976b8519196'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
24 files changed, 164 insertions, 91 deletions
diff --git a/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix b/nixpkgs/pkgs/development/libraries/audio/sratom/default.nix index d7353af0d3d3..840b50d788f9 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.2"; + version = "0.6.4"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; + sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"; }; nativeBuildInputs = [ pkgconfig wafHook python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index c4b1d36ce701..5a579a0505b0 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.72"; + version = "0.1.74"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"; + sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; }; - patches = [ - # Apple linker does not know --version-script flag - # https://gitlab.gnome.org/GNOME/babl/merge_requests/26 - ./fix-darwin.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/development/libraries/babl/fix-darwin.patch b/nixpkgs/pkgs/development/libraries/babl/fix-darwin.patch deleted file mode 100644 index eaeff63689fc..000000000000 --- a/nixpkgs/pkgs/development/libraries/babl/fix-darwin.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/babl/meson.build b/babl/meson.build -index b551c9a..f452435 100644 ---- a/babl/meson.build -+++ b/babl/meson.build -@@ -24,9 +24,9 @@ - ] - - # Linker arguments --babl_link_args = [ -+babl_link_args = cc.get_supported_link_arguments([ - '-Wl,--version-script,' + version_script, --] -+]) - if platform_win32 - babl_link_args += '-Wl,--no-undefined' - endif diff --git a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index ccf38fa09fbb..78cefe89e3b8 100644 --- a/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "1n34sj322ay8839q6cxivckkrhz9avy31615i5jdxfal06mgya43"; + sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/dnnl/bash-to-sh.patch b/nixpkgs/pkgs/development/libraries/dnnl/bash-to-sh.patch new file mode 100644 index 000000000000..063d9ef952be --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/dnnl/bash-to-sh.patch @@ -0,0 +1,13 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index f6810246..e1d2a1f1 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -72,7 +72,7 @@ if(UNIX OR MINGW) + set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c") + add_custom_command( + OUTPUT ${test_c_symbols} +- COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh ++ COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh + ${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs} + ) + register_exe(test_c_symbols-c ${test_c_symbols} "test") diff --git a/nixpkgs/pkgs/development/libraries/dnnl/default.nix b/nixpkgs/pkgs/development/libraries/dnnl/default.nix new file mode 100644 index 000000000000..8a02ea1598c6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/dnnl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }: + +stdenv.mkDerivation rec { + pname = "dnnl"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "mkl-dnn"; + rev = "v${version}"; + sha256 = "150cdyfiw4izvzmbmdqidwadppb1qjmzhpaqjczm397ygi1m92l1"; + }; + + # Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631 + # Delete patch when 1.2.0 is released + patches = [ (substituteAll { + src = ./bash-to-sh.patch; + inherit bash; + }) ]; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ]; + + # The test driver doesn't add an RPath to the build libdir + preCheck = '' + export LD_LIBRARY_PATH=$PWD/src + ''; + + doCheck = true; + + meta = with lib; { + description = "Deep Neural Network Library (DNNL)"; + homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ alexarice bhipple ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index b3e8ec2e1780..45f2c96dffe5 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -33,37 +33,17 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.18"; + version = "0.4.20"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r6akqnrkvxizyhyi8sv40mxm7j4bcwjb6mqjpxy0zzbbfsdyin9"; + sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93"; }; patches = [ - # Fix arch detection. - # https://gitlab.gnome.org/GNOME/gegl/merge_requests/53 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8.patch"; - sha256 = "0aqdr3y5mr47wq44jnhp97188bvpjlf56zrlmn8aazdf07r2apma"; - }) - - # Fix Darwin build. - # https://gitlab.gnome.org/GNOME/gegl/merge_requests/54 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch"; - sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d"; - }) - - # Fix test timeout. Downstream debian patch. - (fetchpatch { - url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch"; - sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly"; - }) - # Remove gegl:simple / backend-file test that times out frequently ./patches/no-simple-backend-file-test.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix new file mode 100644 index 000000000000..20e2f6905ce8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "gensio"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "cminyard"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "04yrm3kg8m77kh6z0b9yw4h43fm0d54wnyrd8lp5ddn487kawm5g"; + }; + + configureFlags = [ + "--with-python=no" + ]; + + buildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "General Stream I/O"; + homepage = "https://sourceforge.net/projects/ser2net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 6c872272e379..4637c8c950fe 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 = "19.3.4"; + version = "19.4.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1vgh14vdmwr34l6rfzmbpsdwp4xi7qp8lg527p16pm7nv0bwx2zk"; + sha256 = "167g5rmrmzmfp4y4vghyxqi4schvvkwax3cvqgniqx8q1ib5l346"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libasr/default.nix b/nixpkgs/pkgs/development/libraries/libasr/default.nix index 0c8f82138e7f..40158898f3d3 100644 --- a/nixpkgs/pkgs/development/libraries/libasr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libasr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libasr"; - version= "1.0.2"; + version= "1.0.4"; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6"; + sha256 = "1d6s8njqhvayx2gp47409sp1fn8m608ws26hr1srfp6i23nnpyqr"; }; buildInputs = [ libevent openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/libieee1284/default.nix b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix new file mode 100644 index 000000000000..b5708a83a7d3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: + +stdenv.mkDerivation rec { + pname = "libieee1284"; + version = "0.2.11"; + + src = fetchFromGitHub { + owner = "twaugh"; + repo = pname; + rev = "V${builtins.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x"; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + xmlto + docbook_xml_dtd_412 + docbook_xsl + ]; + + configureFlags = [ + "--without-python" + ]; + + preConfigure = '' + ./bootstrap + ''; + + meta = with stdenv.lib; { + description = "Parallel port communication library"; + homepage = "http://cyberelk.net/tim/software/libieee1284/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix index 96dbd463370b..abd6c7bbf6c3 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation { - name = "libjpeg-9c"; + name = "libjpeg-9d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz; - sha256 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5"; + url = http://www.ijg.org/files/jpegsrc.v9d.tar.gz; + sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr"; }; configureFlags = optional static "--enable-static --disable-shared"; diff --git a/nixpkgs/pkgs/development/libraries/libpst/default.nix b/nixpkgs/pkgs/development/libraries/libpst/default.nix index 564fb96d0be4..24b948271223 100644 --- a/nixpkgs/pkgs/development/libraries/libpst/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.72"; + name = "libpst-0.6.74"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "01ymym0218805g7bqhr7x2rlhzsbsbidi3nr0z2r2w07xf8xh6ca"; + sha256 = "0dzx8jniz7mczbbp08zfrl46h27hyfrsnjxmka9pi5aawzfdm1zp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index d369eebd88fd..dd6e3cbe9526 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0qfdgxb46c18cp43z67n986xhj6x0sa95hryq42spf1p5ymbylqy"; + sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18"; }; outputs = [ "out" "dev" "doc" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; patchPhase = '' - substituteInPlace libqalculate/Calculator.cc \ + substituteInPlace libqalculate/Calculator-plot.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' '' + stdenv.lib.optionalString stdenv.cc.isClang '' diff --git a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix index 2a1846e40a64..bd43ae442043 100644 --- a/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/cernlib/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { pname = "cernlib"; src = fetchurl { - url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; + urls = [ + "https://ftp.riken.jp/cernlib/download/${version}_source/tar/${version}_src.tar.gz" + "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz" + ]; sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; }; diff --git a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix index a7f5e03c7380..002208dcc0b0 100644 --- a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix +++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "0dnsvyg990ln3bdjdyc5b4lbb63wcjij0skq8pb4x4jglfy7vz4z"; + sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8"; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index b6f424ee35c9..94e83c883c42 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1hsi6c1466m5lgh8ayhf3hj4ddy6ambraagzgvvy7g370z4mx2yw"; + sha256 = "184lcw56r0hq3d6msy5ccscs01zhvml7m4w56wbvy9lzcc4sk200"; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/nixpkgs/pkgs/development/libraries/range-v3/default.nix index 56c5754831ef..ca2c7d9b70fb 100644 --- a/nixpkgs/pkgs/development/libraries/range-v3/default.nix +++ b/nixpkgs/pkgs/development/libraries/range-v3/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; + # Building the tests currently fails on AArch64 due to internal compiler + # errors (with GCC 9.2): + cmakeFlags = stdenv.lib.optional stdenv.isAarch64 "-DRANGE_V3_TESTS=OFF"; + + doCheck = !stdenv.isAarch64; checkTarget = "test"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix index 764901adf7b4..50e0c576e696 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/m4ri/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20140914"; + version = "20200115"; pname = "m4ri"; src = fetchFromBitbucket { owner = "malb"; repo = "m4ri"; rev = "release-${version}"; - sha256 = "0xfg6pffbn8r1s0y7bn9b8i55l00d41dkmhrpf7pwk53qa3achd3"; + sha256 = "1c17casrw6dvwj067kfcgyjjajfisz56s30wjv7fwaw55mqrny19"; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix index 6a91230002a0..6a7ecdf46fd9 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20150908"; + version = "20200115"; pname = "m4rie"; src = fetchFromBitbucket { owner = "malb"; repo = "m4rie"; rev = "release-${version}"; - sha256 = "0r8lv46qx5mkz5kp3ay2jnsp0mbhlqr5z2z220wdk73wdshcznss"; + sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8"; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/serd/default.nix b/nixpkgs/pkgs/development/libraries/serd/default.nix index c390603c51da..63af0d40781d 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.0"; + version = "0.30.2"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; + sha256 = "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx"; }; nativeBuildInputs = [ pkgconfig python3 wafHook ]; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index d1e171566eea..8d1129c11685 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.26.2"; + version = "2.26.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b"; + sha256 = "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd"; }; patches = optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index a567e66285cc..9f9c4acb0d85 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -1,29 +1,20 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4, freerdp +, libpng, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm"; + sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; }; - patches = [ - # add missing header that changed in mesa-19.2.2 - # https://github.com/swaywm/wlroots/issues/1862 - (fetchpatch { - url = "https://github.com/swaywm/wlroots/commit/d113e48a2a32542fe6e12f1759f07888364609bf.diff"; - sha256 = "1h09j1gmnzlz4py92a92chgy8xzsd8h8xn5irq9s2hq4cla66h87"; - }) - ]; - # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; @@ -32,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 freerdp + libpng ffmpeg_4 ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/yder/default.nix b/nixpkgs/pkgs/development/libraries/yder/default.nix index 7025fd2eb1cc..10d055eb4d76 100644 --- a/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -4,13 +4,13 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "0r3rhcsp182cg0vmx8wwibb415mg2qkx8zrfpb0b97nz30h9hbvd"; + sha256 = "06kxkq8ydgbb6b827hkvmaqd0irpal0n4hm96r3inq1bigz9gnvx"; }; patches = [ |