diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/libinput | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libinput')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libinput/default.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index 89bdc15ff62c..0092a8fdc6c7 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -1,6 +1,7 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, gitUpdater , pkg-config , meson , ninja @@ -31,7 +32,7 @@ let env = python3.withPackages (pp: with pp; [ sphinx recommonmark - sphinx_rtd_theme + sphinx-rtd-theme ]); in # Expose only the sphinx-build binary to avoid contaminating @@ -44,13 +45,16 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.3"; + version = "1.21.0"; outputs = [ "bin" "out" "dev" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libinput"; + repo = "libinput"; + rev = version; + sha256 = "R94BdrjI4szNbVtQ+ydRNUg9clR8mkRL7+GE9b2FcDs="; }; patches = [ @@ -113,8 +117,14 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - passthru.tests = { - libinput-module = nixosTests.libinput; + passthru = { + tests = { + libinput-module = nixosTests.libinput; + }; + updateScript = gitUpdater { + inherit pname version; + patchlevel-unstable = true; + }; }; meta = with lib; { |