diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-11-27 09:56:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 09:56:16 -0500 |
| commit | b076935a866cfdd11db3cb0ed10f0a64fb8ee0fc (patch) | |
| tree | 5ee8af7cef1a5af6c7b6cd3816ae6271c5de6bab | |
| parent | Merge pull request #270386 from NixOS/backport-270352-to-release-23.11 (diff) | |
| parent | river: 0.2.5 -> 0.2.6 (diff) | |
| download | nixpkgs-b076935a866cfdd11db3cb0ed10f0a64fb8ee0fc.tar.gz | |
Merge pull request #269909 from adamcstephens/backport-269883-to-release-23.11
[Backport release-23.11] river: 0.2.4 -> 0.2.6, rivercarro: 0.1.4 -> 0.3.0
| -rw-r--r-- | pkgs/applications/misc/rivercarro/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/river/default.nix | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index 59537500878e..5962b49ffc6a 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -4,26 +4,28 @@ , pkg-config , river , wayland -, zig_0_9 +, wayland-protocols +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "rivercarro"; - version = "0.1.4"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~novakane"; repo = "rivercarro"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4="; + hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I="; }; nativeBuildInputs = [ pkg-config river wayland - zig_0_9.hook + wayland-protocols + zig_0_11.hook ]; meta = with lib; { @@ -42,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; - inherit (zig_0_9.meta) platforms; + inherit (zig_0_11.meta) platforms; }; }) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index e149bdd65218..4c59222d31bb 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -14,14 +14,14 @@ , wayland-protocols , wlroots_0_16 , xwayland -, zig_0_10 +, zig_0_11 , withManpages ? true , xwaylandSupport ? true }: stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.2.4"; + version = "0.2.6"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; + hash = "sha256-JPb8l5ANxYCqinWNoQK5PAyn4CaiSj0e9mAhZwd9HOw="; }; nativeBuildInputs = [ pkg-config wayland xwayland - zig_0_10.hook + zig_0_11.hook ] ++ lib.optional withManpages scdoc; |