From bf4f4e37f5aff6f4e0356252cbffcfa89d803d06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 09:10:29 +0000 Subject: [PATCH 1/9] =?UTF-8?q?libinput:=201.19.1=20=E2=86=92=201.19.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.x.org/archives/wayland-devel/2021-October/042003.html https://lists.x.org/archives/wayland-devel/2021-December/042068.html (cherry picked from commit 58fb597c43a9bfd4f128ed640cb9c46f232105e8) --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 54843486e137..924237d58fbe 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -23,11 +23,11 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.1"; + version = "1.19.3"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-C9z1sXg7c3hUt68coi32e8Nqb+fJz6cfAekUn5IgRG0="; + sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; }; outputs = [ "bin" "out" "dev" ]; From 5e10136092973fdde436271c54378f200c4aaffc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 19:20:16 +0100 Subject: [PATCH 2/9] libinput: Clean up - format with nixpkgs-fmt - use more conventional attribute ordering - remove non-existent file from patchShebang args - remove unnecessary if from sphinx-build binding (Nix is lazy so we do not need to null it when not used) (cherry picked from commit 2144f37d365c36ed5b35d3f96c56969bc5becc11) --- .../libraries/libinput/default.nix | 95 +++++++++++++------ 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 924237d58fbe..d34d50b19e3d 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,47 +1,70 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja -, libevdev, mtdev, udev, libwacom -, documentationSupport ? false, doxygen, graphviz # Documentation -, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support -, testsSupport ? false, check, valgrind, python3 +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, libevdev +, mtdev +, udev +, libwacom +, documentationSupport ? false +, doxygen +, graphviz +, eventGUISupport ? false +, cairo +, glib +, gtk3 +, testsSupport ? false +, check +, valgrind +, python3 , nixosTests }: let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; - sphinx-build = if documentationSupport then - python3.pkgs.sphinx.overrideAttrs (super: { - propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]); + sphinx-build = + python3.pkgs.sphinx.overrideAttrs (attrs: { + propagatedBuildInputs = + attrs.propagatedBuildInputs + ++ (with python3.pkgs; [ + recommonmark + sphinx_rtd_theme + ]); - postFixup = super.postFixup or "" + '' + postFixup = attrs.postFixup or "" + '' # Do not propagate Python rm $out/nix-support/propagated-build-inputs ''; - }) - else null; + }); in stdenv.mkDerivation rec { pname = "libinput"; version = "1.19.3"; + outputs = [ "bin" "out" "dev" ]; + src = fetchurl { url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; }; - outputs = [ "bin" "out" "dev" ]; - - mesonFlags = [ - (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "debug-gui") - (mkFlag testsSupport "tests") - "--sysconfdir=/etc" - "--libexecdir=${placeholder "bin"}/libexec" + patches = [ + ./udev-absolute-path.patch ]; - nativeBuildInputs = [ pkg-config meson ninja ] - ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ] ++ lib.optionals documentationSupport [ + doxygen + graphviz + sphinx-build + ]; buildInputs = [ libevdev @@ -53,20 +76,34 @@ stdenv.mkDerivation rec { pyyaml setuptools ])) - ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ]; + ] ++ lib.optionals eventGUISupport [ + # GUI event viewer + cairo + glib + gtk3 + ]; + + propagatedBuildInputs = [ + udev + ]; checkInputs = [ check valgrind ]; - propagatedBuildInputs = [ udev ]; + mesonFlags = [ + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "debug-gui") + (mkFlag testsSupport "tests") + "--sysconfdir=/etc" + "--libexecdir=${placeholder "bin"}/libexec" + ]; - patches = [ ./udev-absolute-path.patch ]; + doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; postPatch = '' patchShebangs \ - tools/helper-copy-and-exec-from-tmp.sh \ test/symbols-leak-test \ test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh @@ -75,17 +112,15 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; - passthru.tests = { libinput-module = nixosTests.libinput; }; meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; - license = licenses.mit; - platforms = platforms.unix; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; + license = licenses.mit; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; } From b7877574ed6b4c414ca595644e469f838523ee85 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 19:22:53 +0100 Subject: [PATCH 3/9] libinput: add freedesktop team to maintainers (cherry picked from commit 1e144d4d087eb9d751e6a776aafa6b08c34cf331) --- pkgs/development/libraries/libinput/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index d34d50b19e3d..30919baf5c04 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -121,6 +121,6 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members; }; } From eda888e821659ea15075dd21676f42e902c65da0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 20:06:49 +0100 Subject: [PATCH 4/9] libinput: fix docs build (cherry picked from commit 818de15e48953cf0a3ffc65ae42d07ffe83acca7) --- .../libraries/libinput/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 30919baf5c04..89bdc15ff62c 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -11,6 +11,7 @@ , documentationSupport ? false , doxygen , graphviz +, runCommand , eventGUISupport ? false , cairo , glib @@ -26,19 +27,19 @@ let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; sphinx-build = - python3.pkgs.sphinx.overrideAttrs (attrs: { - propagatedBuildInputs = - attrs.propagatedBuildInputs - ++ (with python3.pkgs; [ - recommonmark - sphinx_rtd_theme - ]); - - postFixup = attrs.postFixup or "" + '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - }); + let + env = python3.withPackages (pp: with pp; [ + sphinx + recommonmark + sphinx_rtd_theme + ]); + in + # Expose only the sphinx-build binary to avoid contaminating + # everything with Sphinx’s Python environment. + runCommand "sphinx-build" { } '' + mkdir -p "$out/bin" + ln -s "${env}/bin/sphinx-build" "$out/bin" + ''; in stdenv.mkDerivation rec { From 4e653dfd912ba538015b6104f59c8708b2a6ea42 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 20 Apr 2022 14:30:58 +0800 Subject: [PATCH 5/9] =?UTF-8?q?libinput:=201.19.3=20=E2=86=92=201.19.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.x.org/archives/wayland-devel/2022-April/042161.html Fixes: CVE-2022-1215 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 89bdc15ff62c..f57239700f9b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.3"; + version = "1.19.4"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; + sha256 = "sha256-/zOlcLWpNsgebAg4moWBwmZTEdAmzj0iXIjQnEn5tEA="; }; patches = [ From 6d12f503f79d176b09eb25b5f83e726d62d8938f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 20:33:57 +0000 Subject: [PATCH 6/9] vim: 8.2.4186 -> 8.2.4227 (cherry picked from commit ed89447f2c7b267b00d7aa91f8da989d640a3dfd) --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 51a9b9af5bfd..0cb09814c0f0 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4186"; + version = "8.2.4227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph"; + sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig="; }; enableParallelBuilding = true; From 04e51420710e0ee9baea0b4296c084f8209a169d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 12:37:02 +0000 Subject: [PATCH 7/9] vim: 8.2.4227 -> 8.2.4350 (cherry picked from commit a7cf36f84118aa503e09a1b188f6cbba63dd4cd6) --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0cb09814c0f0..13c5c49db482 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4227"; + version = "8.2.4350"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-Xj4ymkrWY5GWpQhEDYtPtaRovBa6j19dW9GWg9WSdig="; + sha256 = "sha256-+fCyLZi9+9r7tYoRQsVESkcoHHtM7vrVuOGdJi/9iF0="; }; enableParallelBuilding = true; From 5fb48032eae2ddaffb828d87cf87bb94f8ecd131 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 02:52:34 +0000 Subject: [PATCH 8/9] vim: 8.2.4350 -> 8.2.4609 (cherry picked from commit 71fba1fb0b662677effd89ec7ec86b0ef954fb8c) --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 13c5c49db482..fe5d5b85080d 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4350"; + version = "8.2.4609"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-+fCyLZi9+9r7tYoRQsVESkcoHHtM7vrVuOGdJi/9iF0="; + sha256 = "sha256-IiWZJ4zT+VbcxwKChl847pS9jU9AlxZ/yQUIL8I2MhQ="; }; enableParallelBuilding = true; From 64564e63c68d74012636ebbf6bdc315b73070fb2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 24 Apr 2022 14:28:39 +0200 Subject: [PATCH 9/9] vim: 8.2.4609 -> 8.2.4816 (cherry picked from commit 0c2197472daaf4f61b5c09692df5c083f855a0e1) --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index fe5d5b85080d..8c5058658495 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4609"; + version = "8.2.4816"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-IiWZJ4zT+VbcxwKChl847pS9jU9AlxZ/yQUIL8I2MhQ="; + sha256 = "1lgqr3ki50hwkz4vhdyaryirrs99qq4kgkhmpx7ygvn6aj2wapg5"; }; enableParallelBuilding = true;