diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-06-23 02:51:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-23 02:51:28 +0100 |
| commit | 8d752c01322da4cef77e67e1864be24ec577773b (patch) | |
| tree | ff980aa5dfa2806d0feb1de6ff9c0a0dff5daad1 /pkgs | |
| parent | 97530e9843975036da47b4f10c30f49d447ce875 (diff) | |
| parent | de493c4f8cf6c208d86616c63c401d2405627b07 (diff) | |
Merge pull request #319276 from alyssais/libwacom-2.12.1
libwacom: 2.11.0 -> 2.12.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libwacom/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/libwacom/surface.nix | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 58c9b7c7f6669..22aab5c669447 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -8,14 +8,13 @@ , udev , libevdev , libgudev -, libxml2 , python3 , valgrind }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.11.0"; + version = "2.12.2"; outputs = [ "out" "dev" ]; @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - hash = "sha256-TQOe954Zos3VpAG5M/O5je9dr8d4gOXIwy4xl3o+e1g="; + hash = "sha256-dxnXh+O/8q8ShsPbpqvaBPNQR6lJBphBolYTmcJEF/0="; }; postPatch = '' @@ -53,10 +52,6 @@ stdenv.mkDerivation rec { "-Dtests=${if doCheck then "enabled" else "disabled"}" ]; - checkInputs = [ - libxml2 - ]; - nativeCheckInputs = [ valgrind (python3.withPackages (ps: with ps; [ diff --git a/pkgs/development/libraries/libwacom/surface.nix b/pkgs/development/libraries/libwacom/surface.nix index 54f5c424fda31..0d6ec49a6a5b5 100644 --- a/pkgs/development/libraries/libwacom/surface.nix +++ b/pkgs/development/libraries/libwacom/surface.nix @@ -7,8 +7,8 @@ let libwacom-surface = fetchFromGitHub { owner = "linux-surface"; repo = "libwacom-surface"; - rev = "v2.10.0-1"; - hash = "sha256-5/9X20veXazXEdSDGY5aMGQixulqMlC5Av0NGOF9m98="; + rev = "v2.12.0-1"; + hash = "sha256-z/qNXbe89/0GIDj0BDQY6xdjHKA9chAPpviHPtBLjFM="; }; in libwacom.overrideAttrs (old: { pname = "libwacom-surface"; |