Merge master into staging-next

pkgs/development/compilers/dmd/binary.nix

@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
+{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
 , version, hashes }:
-with stdenv;
+
 let
+  inherit (stdenv) hostPlatform;
   OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
   MODEL = toString hostPlatform.parsed.cpu.bits;
-in mkDerivation {
+in stdenv.mkDerivation {
   pname = "dmd-bootstrap";
   inherit version;
 

pkgs/development/compilers/ldc/binary.nix

@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
+{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
 , version, hashes }:
-with stdenv;
+
 let
-  OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
+  inherit (stdenv) hostPlatform;
+  OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
   ARCH = toString hostPlatform.parsed.cpu.name;
-in mkDerivation {
+in stdenv.mkDerivation {
   pname = "ldc-bootstrap";
   inherit version;
 

pkgs/development/compilers/nextpnr/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, cmake
 , boost, python3, eigen
 , icestorm, trellis
 , llvmPackages
@@ -12,7 +12,7 @@
 let
   boostPython = boost.override { python = python3; enablePython = true; };
 in
-with stdenv; mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "nextpnr";
   version = "2021.01.02";
 

pkgs/development/compilers/zz/default.nix

@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
 
   # commit chosen by using the latest build from http://bin.zetz.it/
   src = fetchFromGitHub {
-    owner = "aep";
+    owner = "zetzit";
     repo = "zz";
     rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f";
     sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89";
@@ -16,13 +16,23 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg";
 
+  postPatch = ''
+    # remove search path entry which would reference /build
+    sed -i '/env!("CARGO_MANIFEST_DIR")/d' src/lib.rs
+  '';
+
   postInstall = ''
-    wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin"
+    mkdir -p "$out/share/zz"
+    cp -r modules "$out/share/zz/"
+
+    wrapProgram $out/bin/zz \
+      --prefix PATH ":" "${lib.getBin z3}/bin" \
+      --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules"
   '';
 
   meta = with lib; {
     description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C";
-    homepage = "https://github.com/aep/zz";
+    homepage = "https://github.com/zetzit/zz";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];
   };