diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index dc82af49030..578763478f5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -64,12 +64,8 @@ stdenv.mkDerivation { # TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available (fetchpatch { name = "nine_debug-Make-tid-more-type-correct"; - # Patch adjusted for version `20.1`, before the big mesa dirs change - # `gallium: rename 'state tracker' to 'frontend'`. - # Patch for versions after that change is at - # https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e3b4745ef16d0e833300ad67044.patch - url = "https://gitlab.freedesktop.org/nh2/mesa/commit/3385c49684375f1153a52ed7ccda3f5135268a41.patch"; - sha256 = "1ci694sqjll44c9g2md4krhk6qlvq51r7ad5rnnfdnf3l8ys0i50"; + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; + sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) ] # do not prefix user provided dri-drivers-path @@ -101,6 +97,10 @@ stdenv.mkDerivation { 'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"' substituteInPlace src/util/meson.build --replace \ "get_option('datadir')" "'${placeholder "out"}'" + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace meson.build --replace \ + "find_program('nm')" \ + "find_program('${stdenv.cc.targetPrefix}nm')" ''; outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa"; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index 938f64d06ef..4dec2f3cfcb 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { pname = "rnnoise"; - version = "2019-04-24"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "xiph"; repo = "rnnoise"; - rev = "9acc1e5a633e0961a5895a73204df24744f199b6"; - sha256 = "17xip4z0skpzas7wrdyi87j46mbz9jncpj554m8654bqpkxis0pr"; + rev = "90ec41ef659fd82cfec2103e9bb7fc235e9ea66c"; + sha256 = "02z6qzjajhlpsb80lwl7cqqga9hm638psnqnppjkw84w4lrp15ny"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b16dd3997f6..e3407f8fe5f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,14 +33,15 @@ rec { beta = stable; # Vulkan developer beta driver - vulkan_beta = generic { - version = "450.56.11"; - persistencedVersion = "450.57"; - settingsVersion = "450.57"; - sha256_64bit = "1k64h8sp4rf6kc7liypznjgkmxi67njy1s8xy2r341fhl62pl010"; - settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan"; - persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5"; - url = "https://developer.nvidia.com/vulkan-beta-4505611-linux"; + # See here for more information: https://developer.nvidia.com/vulkan-driver + vulkan_beta = generic rec { + version = "455.46.02"; + persistencedVersion = "455.45.01"; + settingsVersion = "455.45.01"; + sha256_64bit = "05y4scg62mrhjnj2c8689m5hdyzqnx5p8vqvdqvv76zy970723l7"; + settingsSha256 = "09v86y2c8xas9ql0bqr7vrjxx3if6javccwjzyly11dzffm02h7g"; + persistencedSha256 = "13s4b73il0lq2hs81q03176n16mng737bfsp3bxnxgnrv3whrayz"; + url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; # Last one supporting x86 diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index a3d819e8dcf..68107f19328 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -1,25 +1,29 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig -, bind, zlib, openssl, libcap +, openssl, ldns }: stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.3.4"; + version = "2.4.0"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "1lyci2vdl6g0s5pqs7dkq7pxdahcpkzh614wmy5fwi2f3334y0d1"; + sha256 = "0q7zmzhhx71v41wf6rhyvpil43ch4a9sx21x47wgcg362lca3cbz"; }; outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ bind zlib openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap.lib ]; + buildInputs = [ + openssl + ldns # optional for DDNS (but cheap anyway) + ]; + + doCheck = true; # For now, keep including the old PDFs as well. # https://github.com/DNS-OARC/dnsperf/issues/27 diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 965624a5098..fc4a971f230 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "yJzfymA4elyyeVR8FzTJe8wgs+vm3RWwcOh7IlmBYPE="; + sha256 = "1ncczcchyphprkrb8spya400gi212a6akx18fm3j4xdhmg9caj3f"; }; - cargoSha256 = "7zqr54H6GemiM/xuHOH6+s669IG2orj1neoqAH+wnV4="; + cargoSha256 = "11xvq0l9xrppcplkshd5wxv90s97x4iavhzbdk9px992zl0m6ar6"; nativeBuildInputs = [ pkgconfig ]; @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; homepage = "https://tectonic-typesetting.github.io/"; + changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = [ maintainers.lluchs maintainers.doronbehar ]; };