From 2a07fadbbaa200df3eae4489489d71bc4e6832fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Jul 2022 08:26:55 +0000 Subject: [PATCH 1/9] python310Packages.myst-docutils: 0.17.2 -> 0.18.0 --- pkgs/development/python-modules/myst-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index 5897573c8007..c7d9f7999bc7 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 = [ From bd97387c0e9469dd20a6063b954cff37893384d3 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 12 Jul 2022 22:50:07 +0800 Subject: [PATCH 2/9] boringtun: 0.4.0 -> 0.5.0 --- pkgs/tools/networking/boringtun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index b5c5b5389fc3..dbf990fd551d 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; From c308cc97348bbd875fa0f3967c81e1ffd1987e97 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Mon, 11 Jul 2022 15:18:23 +0200 Subject: [PATCH 3/9] aws-sso-cli: add xdg-utils dependency Since the tool opens up the browser it requires xdg-open --- pkgs/tools/admin/aws-sso-cli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 96ee8959dba8..f5f81092a879 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, makeWrapper, xdg-utils }: buildGoModule rec { pname = "aws-sso-cli"; version = "1.9.2"; @@ -11,8 +11,12 @@ }; vendorSha256 = "BlSCLvlrKiubMtfFSZ5ppMmL2ZhJcBXxJfeRgMADYB4="; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' mv $out/bin/cmd $out/bin/aws-sso + wrapProgram $out/bin/aws-sso \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; meta = with lib; { From 5476ab31caf26e585dd03487f6c47152f5d8db8a Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Wed, 13 Jul 2022 15:23:42 +0200 Subject: [PATCH 4/9] aws-sso-cli: format with nixpkgs-fmt --- pkgs/tools/admin/aws-sso-cli/default.nix | 53 +++++++++++++----------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index f5f81092a879..e248244204e7 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -1,29 +1,34 @@ -{ buildGoModule, fetchFromGitHub, lib, makeWrapper, xdg-utils }: - 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="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - mv $out/bin/cmd $out/bin/aws-sso - wrapProgram $out/bin/aws-sso \ - --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} - ''; + 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"; - }; + 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"; + }; } From f9418f4eabdc1a32bbc2a16c6a4b36606dddfa5d Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Wed, 13 Jul 2022 15:15:23 -0500 Subject: [PATCH 5/9] nushell: 0.64.0 -> 0.65.0 https://www.nushell.sh/blog/2022-07-05-nushell-0_65.html --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 625634467a7c..08445c4176a4 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 From 38f8a4d71c05f41bbe6193d340777a317bed5171 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 13 Jul 2022 17:18:46 -0700 Subject: [PATCH 6/9] openscad: fix on wayland systems --- pkgs/applications/graphics/openscad/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 2379962bb55f..98afab94f3d1 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 ; From e4f3664e623e8d2a2e1adf0e28fbaf6f2e281999 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 Jul 2022 07:54:10 +1000 Subject: [PATCH 7/9] go_1_18: 1.18.3 -> 1.18.4 --- pkgs/development/compilers/go/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index f5659dd92b77..05c40b689370 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; From b52679fe88c811131078e8297567ebe3fedd6be1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 13 Jul 2022 21:05:29 +0800 Subject: [PATCH 8/9] keyd: init at 2.4.1 --- pkgs/tools/inputmethods/keyd/default.nix | 43 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/inputmethods/keyd/default.nix diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix new file mode 100644 index 000000000000..dec6919a241c --- /dev/null +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -0,0 +1,43 @@ +{ 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 = "keyd"; + # license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9209b47de3b4..62fe8ba56ae4 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 { }; From ed781ecbeada8359b86f6c4b4fd6ed5b19dc61e5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 13 Jul 2022 21:09:58 +0800 Subject: [PATCH 9/9] meta --- pkgs/tools/inputmethods/keyd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix index dec6919a241c..a2ff8c4b10c2 100644 --- a/pkgs/tools/inputmethods/keyd/default.nix +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -36,8 +36,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "keyd"; - # license = licenses.gpl3; + description = "A key remapping daemon for linux."; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; }; }