Merge master into staging-next

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -257,6 +257,10 @@ self: super: {
     '';
   });
 
+  compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs (old: {
+    dependencies = with self; [ plenary-nvim ];
+  });
+
   completion-buffers = super.completion-buffers.overrideAttrs (old: {
     dependencies = with self; [ completion-nvim ];
   });

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -155,6 +155,7 @@ https://github.com/hrsh7th/compe-conjure/,,
 https://github.com/GoldsteinE/compe-latex-symbols/,,
 https://github.com/tzachar/compe-tabnine/,,
 https://github.com/tamago324/compe-zsh/,,
+https://github.com/krady21/compiler-explorer.nvim/,HEAD,
 https://github.com/steelsojka/completion-buffers/,,
 https://github.com/nvim-lua/completion-nvim/,,
 https://github.com/aca/completion-tabnine/,,

pkgs/applications/video/mpv/default.nix

@@ -24,6 +24,7 @@
 , waylandSupport ? stdenv.isLinux
   , wayland
   , wayland-protocols
+  , wayland-scanner
   , libxkbcommon
 
 , x11Support ? stdenv.isLinux
@@ -100,6 +101,8 @@ in stdenv.mkDerivation rec {
   NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "
     + lib.optionalString stdenv.isDarwin "-framework CoreFoundation";
 
+  dontAddWafCrossFlags = true;
+
   wafConfigureFlags = [
     "--enable-libmpv-shared"
     "--enable-manpage-build"
@@ -127,7 +130,8 @@ in stdenv.mkDerivation rec {
     python3
     wafHook
     which
-  ] ++ lib.optionals swiftSupport [ swift ];
+  ] ++ lib.optionals swiftSupport [ swift ]
+    ++ lib.optionals waylandSupport [ wayland-scanner ];
 
   buildInputs = [
     ffmpeg

pkgs/development/libraries/SDL_compat/default.nix

@@ -1,9 +1,12 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , pkg-config
 , SDL2
+, libiconv
+, Cocoa
 , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , openglSupport ? libGLSupported
 , libGL
@@ -25,9 +28,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
   };
 
+  patches = optionals stdenv.hostPlatform.isDarwin [
+    # Fix broken install name in dylib, https://github.com/libsdl-org/sdl12-compat/issues/194
+    # Remove when bump > 1.2.52
+    (fetchpatch {
+      name = "SDL_compat-fix-install-name.patch";
+      url = "https://github.com/libsdl-org/sdl12-compat/commit/5642d47ae489f2eb362cece2464ecc466a700ed5.patch";
+      sha256 = "sha256-kQ5H8gXjTZVHHRF6UpgXKl3NIy87iULcc2iCsYt5Hqo=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake pkg-config ];
 
   propagatedBuildInputs = [ SDL2 ]
+    ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ]
     ++ optionals openglSupport [ libGL libGLU ];
 
   enableParallelBuilding = true;
@@ -35,15 +49,18 @@ stdenv.mkDerivation rec {
   setupHook = ../SDL/setup-hook.sh;
 
   postFixup = ''
-    for lib in $out/lib/*.so* ; do
+    for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do
       if [[ -L "$lib" ]]; then
-        patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
+        ${if stdenv.hostPlatform.isDarwin then ''
+          install_name_tool ${lib.strings.concatMapStrings (x: " -add_rpath ${makeLibraryPath [x]} ") propagatedBuildInputs} "$lib"
+        '' else ''
+          patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
+        ''}
       fi
     done
   '';
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0";
     homepage = "https://www.libsdl.org/";
     license = licenses.zlib;

pkgs/development/ocaml-modules/bap/default.nix

@@ -16,12 +16,12 @@ else
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-bap";
-  version = "2.4.0";
+  version = "2.5.0";
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap";
     rev = "v${version}";
-    sha256 = "1xc8zfcwm40zihs3ajcrh2x32xd08qnygay03qy3qxhybr5hqngr";
+    sha256 = "1c30zxn0zyi0wypvjmik3fd6n6a8xjcb102qfnccn1af052bvsrd";
   };
 
   sigs = fetchurl {
@@ -66,10 +66,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./curses_is_ncurses.patch
-    (fetchpatch {
-      url = "https://github.com/BinaryAnalysisPlatform/bap/commit/8b1bba30ebb551256a5b15122e70d07f40184039.patch";
-      sha256 = "0il0ik5f6nyqyrlln3n43mz1zpqq34lfnhmp10wdsah4ck2dy75h";
-    })
   ];
 
   preConfigure = ''

pkgs/development/python-modules/bitcoinlib/default.nix

@@ -1,29 +1,31 @@
 { stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }:
 
-let ext = if stdenv.isDarwin then "dylib" else "so";
+buildPythonPackage rec {
-in buildPythonPackage rec {
   pname = "bitcoinlib";
-  version = "0.11.0";
+  version = "0.11.2";
 
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
-    owner  = "petertodd";
+    owner = "petertodd";
-    repo   = "python-bitcoinlib";
+    repo = "python-bitcoinlib";
-    rev    = "python-${pname}-v${version}";
+    rev = "refs/tags/python-bitcoinlib-v${version}";
-    sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm";
+    sha256 = "sha256-/VgCTN010W/Svdrs0mGA8W1YZnyTHhcaWJKgP/c8CN8=";
   };
 
   postPatch = ''
     substituteInPlace bitcoin/core/key.py --replace \
       "ctypes.util.find_library('ssl') or 'libeay32'" \
-      "'${lib.getLib openssl}/lib/libssl.${ext}'"
+      "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'"
   '';
 
-  meta = {
+  pythonImportsCheck = [ "bitcoin" "bitcoin.core.key" ];
-    homepage = src.meta.homepage;
+
+  meta = with lib; {
+    homepage = "https://github.com/petertodd/python-bitcoinlib";
     description = "Easy interface to the Bitcoin data structures and protocol";
-    license = with lib.licenses; [ lgpl3 ];
+    changelog = "https://github.com/petertodd/python-bitcoinlib/raw/${src.rev}/release-notes.md";
-    maintainers = with lib.maintainers; [ jb55 ];
+    license = with licenses; [ lgpl3Plus ];
+    maintainers = with maintainers; [ jb55 ];
   };
 }

pkgs/development/python-modules/django-stubs-ext/default.nix

@@ -0,0 +1,23 @@
+{ buildPythonPackage, django, fetchPypi, lib, typing-extensions }:
+
+buildPythonPackage rec {
+  pname = "django-stubs-ext";
+  version = "0.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-m9dBg3arALf4jW1Wvp/s6Fv6DHw0isYhFV+k16kRRvI=";
+  };
+
+  # setup.cfg tries to pull in nonexistent LICENSE.txt file
+  postPatch = "rm setup.cfg";
+
+  propagatedBuildInputs = [ django typing-extensions ];
+
+  meta = with lib; {
+    description = "Extensions and monkey-patching for django-stubs";
+    homepage = "https://github.com/typeddjango/django-stubs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}

pkgs/development/python-modules/django-stubs/default.nix

@@ -0,0 +1,38 @@
+{ buildPythonPackage
+, django
+, django-stubs-ext
+, fetchPypi
+, lib
+, mypy
+, tomli
+, types-pytz
+, types-pyyaml
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "django-stubs";
+  version = "1.12.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-6os10NpJ97LumaeRJfGUPgM0Md0RRybWZDzDXeYZIw4=";
+  };
+
+  propagatedBuildInputs = [
+    django
+    django-stubs-ext
+    mypy
+    tomli
+    types-pytz
+    types-pyyaml
+    typing-extensions
+  ];
+
+  meta = with lib; {
+    description = "PEP-484 stubs for Django";
+    homepage = "https://github.com/typeddjango/django-stubs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}

pkgs/development/python-modules/jupyterlab/default.nix

@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "3.4.5";
+  version = "3.4.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Ry9reZbHX2mRWSSDwm2f4gWlmnHMvOFYQkABVdxk9Zs=";
+    sha256 = "sha256-41mci8dM7gZBFfluOIzSeipyUbHcAvStG/in/1Jw8Xk=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/losant-rest/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "losant-rest";
-  version = "1.16.3";
+  version = "1.16.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Losant";
     repo = "losant-rest-python";
     rev = "v${version}";
-    sha256 = "sha256-s9WPr5sFSyPIDRgRYcD55iRLhaVIvkiDGg/m//6acFY=";
+    sha256 = "sha256-dwlLoRRY1Fx1VBOGIJr//zFPf0WpOabS3HuCxHsn4HI=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/tweepy/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "tweepy";
-  version = "4.10.0";
+  version = "4.10.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-D/cArsGzWr+rCC9iW9qOfc5fT7UKZDupeR/rQMNK5I4=";
+    hash = "sha256-S8lF40ioarnR1ZDSy6/9arANDYvy0NpYlVi65LQlPA8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/millet/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-HV/0ORI3siAnVyLcNDzu4BwK/sFO841ptQoxK6c+1Xs=";
+    sha256 = "sha256-RTOFwgs9A7ESWT8g5EcVzmv9UGON/+cNj21VC8bURlk=";
   };
 
-  cargoSha256 = "sha256-jhn795bTcqOG60yzydWJ5Y9eR2UTVUBteuMw03M7wM0=";
+  cargoSha256 = "sha256-/yUyvFTaoQQ4Ttlp1IHye9Iu7iD2W/yhuHKC3Seu6k0=";
 
   cargoBuildFlags = [ "--package" "lang-srv" ];
 

pkgs/games/blightmud/default.nix

@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "blightmud";
-  version = "3.6.2";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0TFJjOuaixBqpo6gHJynIbVHvI+PxRhwdubIXDcR098=";
+    sha256 = "sha256-80uTwbZjXoQnfP0VWM/CnvaHyRsPA1puASJwBm3GqJk=";
   };
 
-  cargoSha256 = "sha256-jTyXoEC/QBeVbAnv2BspflGP1jA9qH+NPrRAx3x2kEg=";
+  cargoSha256 = "sha256-uXr/5G0TH3EKqPwUKTwOguBExBEYB1D3/hr8nzOwCcM=";
 
   buildFeatures = lib.optional withTTS "tts";
 

pkgs/misc/autotiling/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "autotiling";
-  version = "1.6";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "1hjlvg7095s322gb43r9g7mqlsy3pj13l827jpnbn5x0918rq9rr";
+    sha256 = "sha256-BpBDafpMbK2Xcb+lGzcf5RivhwMCtoQ078EKO9AbE9U=";
   };
 
   propagatedBuildInputs = [ i3ipc importlib-metadata ];

pkgs/tools/inputmethods/keyd/default.nix

@@ -4,10 +4,11 @@
 , cmake
 , pkg-config
 , systemd
+, runtimeShell
+, python3
 }:
 
-stdenv.mkDerivation rec {
+let
-  pname = "keyd";
   version = "2.4.2";
 
   src = fetchFromGitHub {
@@ -17,11 +18,38 @@ stdenv.mkDerivation rec {
     hash = "sha256-QWr+xog16MmybhQlEWbskYa/dypb9Ld54MOdobTbyMo=";
   };
 
+  pypkgs = python3.pkgs;
+
+  appMap = pypkgs.buildPythonApplication rec {
+    pname = "keyd-application-mapper";
+    inherit version src;
+    format = "other";
+
+    postPatch = ''
+      substituteInPlace scripts/${pname} \
+        --replace /bin/sh ${runtimeShell}
+    '';
+
+    propagatedBuildInputs = with pypkgs; [ xlib ];
+
+    dontBuild = true;
+
+    installPhase = ''
+      install -Dm555 -t $out/bin scripts/${pname}
+    '';
+
+    meta.mainProgram = pname;
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "keyd";
+  inherit version src;
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace DESTDIR= DESTDIR=${placeholder "out"} \
-      --replace /usr "" \
+      --replace /usr ""
-      --replace /var/log/keyd.log /var/log/keyd/keyd.log
 
     substituteInPlace keyd.service \
       --replace /usr/bin $out/bin
@@ -32,6 +60,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
+    ln -sf ${lib.getExe appMap} $out/bin/${appMap.pname}
     rm -rf $out/etc
   '';
 

pkgs/tools/misc/hyfetch/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "HyFetch";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     repo = "hyfetch";
     owner = "hykilpikonna";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-15FeW3yaM7eUJ1O20H/bQquDRAsRWTJMzkzQ5Kv1ezE=";
+    sha256 = "sha256-aVALjuFXg3ielDfxEDMTOtaPghsBg9+vKRbR3aDTalQ=";
   };
 
   propagatedBuildInputs = [

pkgs/tools/networking/gen6dns/default.nix

@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, installShellFiles }:
+
+stdenv.mkDerivation rec {
+  pname = "gen6dns";
+  version = "1.3";
+
+  src = fetchurl {
+    url = "https://www.hznet.de/tools/gen6dns-${version}.tar.gz";
+    hash = "sha256-MhYfgzbGPmrhPx89EpObrEkxaII7uz4TbWXeEGF7Xws=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  postInstall = ''
+    installManPage gen6dns.1
+  '';
+
+  makeFlags = [ "INSTALL_DIR=$(out)/bin" ];
+
+  meta = with lib; {
+    description = "Tool to generate static DNS records (AAAA and PTR) for hosts using Stateless Address Autoconfig (SLAAC)";
+    homepage = "https://www.hznet.de/tools.html#gen6dns";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ majiir ];
+    platforms = platforms.unix;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1269,6 +1269,8 @@ with pkgs;
 
   gam = callPackage ../tools/admin/gam { };
 
+  gen6dns = callPackage ../tools/networking/gen6dns { };
+
   gfshare = callPackage ../tools/security/gfshare { };
 
   gh-cal = callPackage ../tools/misc/gh-cal {
@@ -21452,7 +21454,9 @@ with pkgs;
     libGLU = null;
   });
 
-  SDL_compat = callPackage ../development/libraries/SDL_compat { };
+  SDL_compat = callPackage ../development/libraries/SDL_compat {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   SDL = SDL_classic;
 

pkgs/top-level/python-packages.nix

@@ -2617,6 +2617,10 @@ in {
 
   django-storages = callPackage ../development/python-modules/django-storages { };
 
+  django-stubs = callPackage ../development/python-modules/django-stubs { };
+
+  django-stubs-ext = callPackage ../development/python-modules/django-stubs-ext { };
+
   django-tables2 = callPackage ../development/python-modules/django-tables2 { };
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };