forked from mirrors/nixpkgs
099c13da1b
* substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commitf8db20fb3a. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit305ac4dade. (cherry picked from commit273d68eff8) Signed-off-by: Domen Kožar <domen@dev.si>
56 lines
1.4 KiB
Diff
56 lines
1.4 KiB
Diff
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
|
|
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
|
|
@@ -34,7 +34,7 @@
|
|
#ifndef VMW_SCREEN_H_
|
|
#define VMW_SCREEN_H_
|
|
|
|
-
|
|
+#include <sys/stat.h>
|
|
#include "pipe/p_compiler.h"
|
|
#include "pipe/p_state.h"
|
|
|
|
--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200
|
|
+++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200
|
|
@@ -24,6 +24,8 @@
|
|
#ifndef _THREADPOOL_H_
|
|
#define _THREADPOOL_H_
|
|
|
|
+#include <pthread.h>
|
|
+
|
|
#define MAXTHREADS 1
|
|
|
|
struct threadpool {
|
|
--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200
|
|
+++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200
|
|
@@ -23,7 +23,9 @@
|
|
*/
|
|
|
|
#if defined(__linux__)
|
|
+#include <sys/types.h>
|
|
#include <sys/file.h>
|
|
+#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#else
|
|
--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
|
|
+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
|
|
@@ -37,6 +37,7 @@
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
+#include <time.h>
|
|
#include "util/u_atomic.h"
|
|
#include "util/list.h"
|
|
|
|
--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
|
|
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
|
|
@@ -28,6 +28,8 @@
|
|
#ifndef RADV_AMDGPU_WINSYS_H
|
|
#define RADV_AMDGPU_WINSYS_H
|
|
|
|
+#include <sys/types.h>
|
|
+
|
|
#include "radv_radeon_winsys.h"
|
|
#include "ac_gpu_info.h"
|
|
#include "addrlib/addrinterface.h"<Paste>
|