diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-15 06:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 06:01:45 +0000 |
| commit | e49cc7f7edad7c1eab60396c1465507d57b6699b (patch) | |
| tree | 5756e2cc5769b012531d394638630f0e7348f85a /pkgs/os-specific | |
| parent | 691c486ddee9af163adc91cdf3adaa32182a93ce (diff) | |
| parent | 1e0970778c11c024c7059832067275fa8a9109e3 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/yabai/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ocf-resource-agents/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/xpadneo/default.nix | 7 |
3 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 549acdce24f0d..565aa114bdbd5 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "6.0.11"; + version = "6.0.12"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-CfyuWvxkeZQVuwMbX90CZF0RiY6q+o0WtfE3H9Z8q1o="; + hash = "sha256-wCxx/XqUrdD2xyoS6VCKMt6PhiQ8ALM6PHkv9lSCYsM="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-HaflgZJ7QqooaSUNW+Uu0LD9+AVu4hHyJtILUrOC9+I="; + hash = "sha256-acoMOM0vaMHUXmgSToFa4PYEIUWfOiD5+ewsqB3DX+E="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 11f094f72c9dc..0e63774526706 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -5,6 +5,7 @@ , runCommand , lndir , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , python3 @@ -32,6 +33,16 @@ let sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir"; }; + patches = [ + # autoconf-2.72 upstream fix: + # https://github.com/ClusterLabs/resource-agents/pull/1908 + (fetchpatch { + name = "autoconf-2.72.patch"; + url = "https://github.com/ClusterLabs/resource-agents/commit/bac658711a61fd704e792e2a0a45a2137213c442.patch"; + hash = "sha256-Xq7W8pMRmFZmkqb2430bY5zdmVTrUrob6GwGiN6/bKY="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index e470fa66adf35..b186c90ddbd78 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -4,17 +4,18 @@ , kernel , bluez , nixosTests +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "xpadneo"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "atar-axis"; repo = "xpadneo"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-rT2Mq40fE055FemDG7PBjt+cxgIHJG9tTjtw2nW6B98="; + sha256 = "sha256-pX9zpAGnhDLKUAKOQ5iqtK8cKEkjCqDa5v3MwYViWX4="; }; setSourceRoot = '' @@ -39,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: { xpadneo = nixosTests.xpadneo; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; |