public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-11 09:09:10 +02:00
parent e56889eb49 10e16ec9ab
commit 7982550ac4
224 changed files with 6308 additions and 10564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch
+29
View File
@@ -0,0 +1,29 @@
------------------------------------------------------------------------
r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines
Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion).
Index: iodev/display/voodoo_data.h
===================================================================
--- a/iodev/display/voodoo_data.h (revision 13881)
+++ b/iodev/display/voodoo_data.h (revision 13882)
@@ -1837,11 +1837,11 @@
/* fifo content defines */
#define FIFO_TYPES (7 << 29)
-#define FIFO_WR_REG (1 << 29)
-#define FIFO_WR_TEX (2 << 29)
-#define FIFO_WR_FBI_32 (3 << 29)
-#define FIFO_WR_FBI_16L (4 << 29)
-#define FIFO_WR_FBI_16H (5 << 29)
+#define FIFO_WR_REG (1U << 29)
+#define FIFO_WR_TEX (2U << 29)
+#define FIFO_WR_FBI_32 (3U << 29)
+#define FIFO_WR_FBI_16L (4U << 29)
+#define FIFO_WR_FBI_16H (5U << 29)
BX_CPP_INLINE void fifo_reset(fifo_state *f)
{
------------------------------------------------------------------------
pkgs/applications/virtualization/bochs/default.nix
+5 -1
View File
@@ -26,7 +26,11 @@ stdenv.mkDerivation rec {
sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3";
};
patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ];
patches = [
./bochs-2.6.11-glibc-2.26.patch
./fix-build-smp.patch
./bochs_fix_narrowing_conv_warning.patch
];
buildInputs =
[ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
pkgs/applications/virtualization/runc/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
buildGoPackage rec {
pname = "runc";
version = "1.0.0-rc93";
version = "1.0.0-rc94";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
sha256 = "008d5wkznic80n5q1vwx727qn5ifalc7cydq68hc1gk9wrhna4v4";
sha256 = "sha256-53P48jNSfC6ELpZNI30yAf7kofUsrJpNY96u0UT+ITg=";
};
goPackagePath = "github.com/opencontainers/runc";