danieldk

diff -ruN orig/XQilla-2.3.4/Win32Projects/VC10/xqilla.vcxproj XQilla-2.3.4/Win32Projects/VC10/xqilla.vcxproj
--- orig/XQilla-2.3.4/Win32Projects/VC10/xqilla.vcxproj	2018-05-04 22:18:39.000000000 +0200
+++ XQilla-2.3.4/Win32Projects/VC10/xqilla.vcxproj	2018-07-03 20:37:15.000000000 +0200
@@ -266,7 +266,7 @@
       mkdir build
       cd build
       cmake -DCMAKE_INSTALL_PREFIX=..\..\..\bin\release -DBUILD_SHARED_LIBS=ON -G "Visual Studio 10 2010 "  ..\
-      cmake --build .</Command>
+      cmake --build . --config Release</Command>
       <Message>Building Xerces-C</Message>

danieldk

error: linking with `cc` failed: exit code: 1
  |
  = note: "cc" "-m64" "-L" "/private/tmp/nix-build-rustc-1.29.2.drv-0/rustc-1.29.2-src/build/x86_64-apple-darwin/stage0-sysroot/lib/rustlib/x86_64-apple-darwin/lib" "/private/tmp/nix-build-rustc-1.29.2.drv-0/rustc-1.29.2-src/build/x86_64-apple-darwin/stage0-std/x86_64-apple-darwin/release/deps/std-ec2ed65eaa044d02.std0-253959ed13d7cb4de72920affc706e1c.rs.rcgu.o" "/private/tmp/nix-build-rustc-1.29.2.drv-0/rustc-1.29.2-src/build/x86_64-apple-darwin/stage0-std/x86_64-apple-darwin/release/deps/std-ec2ed65eaa044d02.std1-253959ed13d7cb4de72920affc706e1c.rs.rcgu.o" "/private/tmp/nix-build-rustc-1.29.2.drv-0/rustc-1.29.2-src/build/x86_64-apple-darwin/stage0-std/x86_64-apple-darwin/release/deps/std-ec2ed65eaa044d02.std2-253959ed13d7cb4de72920affc706e1c.rs.rcgu.o" "/private/tmp/nix-build-rustc-1.29.2.drv-0/rustc-1.29.2-src/build/x86_64-apple-darwin/stage0-std/x86_64-apple-darwin/release/deps/std-ec2ed65eaa044d02.std3-253959ed13d7cb4de72920affc706e1c.rs.rcgu.o" "/private

danieldk

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a925127596d..9e697155f96 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -29,7 +29,7 @@ in rec {
       ./patches/disable-test-inherit-env.patch
     ];
 
-    forceBundledLLVM = true;
+    withBundledLLVM = false;

danieldk

running 38 tests
Process 77464 stopped
* thread #2, name = 'test_absolute_path', stop reason = EXC_BAD_ACCESS (code=1, address=0x190178c63c)
    frame #0: 0x00000001000c6b0b tests-090b3e427c9f00ad`free + 347
tests-090b3e427c9f00ad`free:
->  0x1000c6b0b <+347>: movl   0x594(%r13,%rbx,8), %eax
    0x1000c6b13 <+355>: cmpl   (%rdx,%rcx,4), %eax
    0x1000c6b16 <+358>: je     0x1000c6f96               ; <+1510>
    0x1000c6b1c <+364>: incl   %eax
Target 0: (tests-090b3e427c9f00ad) stopped.

danieldk

macro_rules! some_or {
    ($expr:expr, $none_expr:expr) => {
        match $expr {
            Some(val) => val,
            None => $none_expr,
        }
    };
}

danieldk

diff --brief -r /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor      
Files /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/aho-corasick/.cargo-checksum.json and /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor/aho-corasick/.cargo-checksum.json differ
Only in /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/aho-corasick: .cargo_vcs_info.json
Files /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/ansi_term/.cargo-checksum.json and /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor/ansi_term/.cargo-checksum.json differ
Only in /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/ansi_term: .travis.yml
Files /nix/store/gicpd9gpwcvjw44qjp8j7szsf1malwmx-conllx-utils-0.4.3-vendor/approx/.cargo-checksum.json and /nix/store/4dlg22k4dh73ab9amkbrkljscm8fr405-conllx-utils-0.4.3-vendor/approx/.cargo-checksum.jso

danieldk

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 1eee203373a..6ead97e80f8 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,6 +1,6 @@
 { stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring,
   harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
-  libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
+  libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
   libxkbcommon, libXi, libXext, wayland-protocols, wayland,

danieldk

diff --git a/crate2nix.nix b/crate2nix.nix
index bca75df..8adad74 100644
--- a/crate2nix.nix
+++ b/crate2nix.nix
@@ -123,6 +123,34 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
+    "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index) renamed to getrandom_package"
+      = rec {

danieldk

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 2999c3d4c1d..d3f9ded4a04 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -3,11 +3,11 @@
   dependencies,
   crateFeatures, libName, release, libPath,
   crateType, metadata, crateBin, hasCrateBin,
-  extraRustcOpts, verbose, colors }:
+  extraRustcOpts, verbose, colors, renames }:

danieldk

diff --git a/crate2nix.nix b/crate2nix.nix
index bca75df..9e0d364 100644
--- a/crate2nix.nix
+++ b/crate2nix.nix
@@ -178,6 +178,7 @@ rec {
         dependencies = {
           "getrandom" = {
             packageId = "getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)";
+            rename = "getrandom_package";
             optional = true;