Merge master into staging-next

8 files changed, 90 insertions, 32 deletions

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 2379962bb55f7..98afab94f3d16 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -26,6 +26,9 @@
 , qtmacextras
 , qmake
 , spacenavSupport ? stdenv.isLinux, libspnav
+, wayland
+, wayland-protocols
+, qtwayland
 }:
 
 mkDerivation rec {
@@ -45,7 +48,7 @@ mkDerivation rec {
     eigen boost glew opencsg cgal mpfr gmp glib
     harfbuzz lib3mf libzip double-conversion freetype fontconfig
     qtbase qtmultimedia qscintilla
-  ] ++ lib.optionals stdenv.isLinux [ libGLU libGL ]
+  ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ]
     ++ lib.optional stdenv.isDarwin qtmacextras
     ++ lib.optional spacenavSupport libspnav
   ;
diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index f5659dd92b774..05c40b6893700 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -60,11 +60,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.18.3";
+  version = "1.18.4";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${version}.src.tar.gz";
-    sha256 = "sha256-ABI4bdy7XzNQ5AfGeZI4EdvSg/zcQhckkxYUqELsvC0=";
+    sha256 = "sha256-RSWqaw487LV4RfQGCnB1qvyat1K7e2tM+KIS1DB44eQ=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix
index 5897573c80076..c7d9f7999bc7e 100644
--- a/pkgs/development/python-modules/myst-docutils/default.nix
+++ b/pkgs/development/python-modules/myst-docutils/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "myst-docutils";
-  version = "0.17.2";
+  version = "0.18.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Of3AVM0OsspcmvRAEXbfu2+V3ju6yqb2sFBexkbmNIU=";
+    sha256 = "sha256-evyIuNLbBWR3KfQMv2lNw6fOgX1+/uMS5cHIbSTYDmA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 625634467a7c4..08445c4176a4a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.64.0";
+  version = "0.65.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-mDKoZVen3g8GujWF8WILEqdlHFDx2BxGyBJJFmK9Mdw=";
+    sha256 = "sha256-KgXhmAOJaAvmNuDqSaW+h6GF5rWYgj8/wn+vz9V9S7M=";
   };
 
-  cargoSha256 = "sha256-A2RJoU2hHcN6DfBQ+cPECtoVnrxlEHHlOV9bLqQE8VU=";
+  cargoSha256 = "sha256-YqtM/1p6oP0+E0rYSFPeCbof06E81eC2PZIwkU7J0I4=";
   # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and
   # `parquet`, for dataframe support), which by default has an impure build
   # (git submodule for the `zstd` C library). The `pkg-config` feature flag
diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix
index 96ee8959dba8a..e248244204e7e 100644
--- a/pkgs/tools/admin/aws-sso-cli/default.nix
+++ b/pkgs/tools/admin/aws-sso-cli/default.nix
@@ -1,25 +1,34 @@
-{ buildGoModule, fetchFromGitHub, lib }:
-  buildGoModule rec {
-    pname = "aws-sso-cli";
-    version = "1.9.2";
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, makeWrapper
+, xdg-utils
+}:
+buildGoModule rec {
+  pname = "aws-sso-cli";
+  version = "1.9.2";
 
-    src = fetchFromGitHub {
-      owner = "synfinatic";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "9/dZfRmFAyE5NEMmuiVsRvwgqQrTNhXkTR9N0d3zgfk=";
-    };
-    vendorSha256 = "BlSCLvlrKiubMtfFSZ5ppMmL2ZhJcBXxJfeRgMADYB4=";
+  src = fetchFromGitHub {
+    owner = "synfinatic";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "9/dZfRmFAyE5NEMmuiVsRvwgqQrTNhXkTR9N0d3zgfk=";
+  };
+  vendorSha256 = "BlSCLvlrKiubMtfFSZ5ppMmL2ZhJcBXxJfeRgMADYB4=";
 
-    postInstall = ''
-      mv $out/bin/cmd $out/bin/aws-sso
-    '';
+  nativeBuildInputs = [ makeWrapper ];
 
-    meta = with lib; {
-      homepage = "https://github.com/synfinatic/aws-sso-cli";
-      description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard";
-      license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ devusb ];
-      mainProgram = "aws-sso";
-    };
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/aws-sso
+    wrapProgram $out/bin/aws-sso \
+      --prefix PATH : ${lib.makeBinPath [ xdg-utils ]}
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/synfinatic/aws-sso-cli";
+    description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ devusb ];
+    mainProgram = "aws-sso";
+  };
 }
diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix
new file mode 100644
index 0000000000000..a2ff8c4b10c27
--- /dev/null
+++ b/pkgs/tools/inputmethods/keyd/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "keyd";
+  version = "2.4.1";
+
+  src = fetchFromGitHub {
+    owner = "rvaiya";
+    repo = "keyd";
+    rev = "v" + version;
+    hash = "sha256-p0f8iGT4QtyWAnlcG4SfOhD94ySNNkQrnVjnGCmQwAk=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace DESTDIR= DESTDIR=${placeholder "out"} \
+      --replace /usr "" \
+      --replace /var/log/keyd.log /var/log/keyd/keyd.log
+
+    substituteInPlace keyd.service \
+      --replace /usr/bin $out/bin
+  '';
+
+  buildInputs = [ systemd ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    rm -rf $out/etc
+  '';
+
+  meta = with lib; {
+    description = "A key remapping daemon for linux.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index b5c5b5389fc3c..dbf990fd551d8 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "boringtun";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fZchh02CsVC5sdnR3blojslsKi7OxFcblHMuyuHsH/4=";
+    sha256 = "sha256-TE+K7eJ+yetLliZ5k+iyxeBBRIgCAidFhpCey+yEoA0=";
   };
 
-  cargoSha256 = "sha256-iJbzvhRPVDHXqianQ6UbmYEfmZCS/obxFZV/PsJMhD0=";
+  cargoSha256 = "sha256-zIosLh+F0UoTVoLwiQ71lHLLp7bMrLXIueMRF95Y7dg=";
 
   buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89f171ee1139a..d863a12f8d2ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4982,6 +4982,8 @@ with pkgs;
 
   evscript = callPackage ../tools/inputmethods/evscript { };
 
+  keyd = callPackage ../tools/inputmethods/keyd { };
+
   gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; };
 
   kime = callPackage ../tools/inputmethods/kime { };