From 2003ac153ac22051340966fffb3a99f95c1fd122 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 5 Jan 2025 09:33:45 -0500
Subject: [PATCH] river: fix updateScript

---
 pkgs/by-name/ri/river/package.nix | 59 ++++++++++++++++---------------
 pkgs/by-name/ri/river/update.nu   |  9 -----
 pkgs/by-name/ri/river/update.sh   | 14 ++++++++
 3 files changed, 45 insertions(+), 37 deletions(-)
 delete mode 100755 pkgs/by-name/ri/river/update.nu
 create mode 100755 pkgs/by-name/ri/river/update.sh

diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 7cb285fb0cf8..b3ebddac7522 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -1,24 +1,25 @@
-{ lib
-, stdenv
-, callPackage
-, fetchFromGitea
-, libGL
-, libX11
-, libevdev
-, libinput
-, libxkbcommon
-, pixman
-, pkg-config
-, scdoc
-, udev
-, wayland
-, wayland-protocols
-, wayland-scanner
-, wlroots_0_18
-, xwayland
-, zig_0_13
-, withManpages ? true
-, xwaylandSupport ? true
+{
+  lib,
+  stdenv,
+  callPackage,
+  fetchFromGitea,
+  libGL,
+  libX11,
+  libevdev,
+  libinput,
+  libxkbcommon,
+  pixman,
+  pkg-config,
+  scdoc,
+  udev,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  wlroots_0_18,
+  xwayland,
+  zig_0_13,
+  withManpages ? true,
+  xwaylandSupport ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -43,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
     xwayland
     zig_0_13.hook
-  ]
-  ++ lib.optional withManpages scdoc;
+  ] ++ lib.optional withManpages scdoc;
 
   buildInputs = [
     libGL
@@ -60,10 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontConfigure = true;
 
-  zigBuildFlags = [
-    "--system"
-    "${finalAttrs.deps}"
-  ] ++ lib.optional withManpages "-Dman-pages" ++ lib.optional xwaylandSupport "-Dxwayland";
+  zigBuildFlags =
+    [
+      "--system"
+      "${finalAttrs.deps}"
+    ]
+    ++ lib.optional withManpages "-Dman-pages"
+    ++ lib.optional xwaylandSupport "-Dxwayland";
 
   postInstall = ''
     install contrib/river.desktop -Dt $out/share/wayland-sessions
@@ -71,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     providedSessions = [ "river" ];
-    updateScript = ./update.nu;
+    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/ri/river/update.nu b/pkgs/by-name/ri/river/update.nu
deleted file mode 100755
index a14e241e0bcf..000000000000
--- a/pkgs/by-name/ri/river/update.nu
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i nu -p nushell common-updater-scripts zon2nix
-
-let latest_tag = list-git-tags --url=https://codeberg.org/river/river | lines | sort --natural | str replace v '' | last
-update-source-version river $latest_tag
-
-http get $"https://codeberg.org/river/river/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon
-zon2nix | save -f pkgs/by-name/ri/river/build.zig.zon.nix
-rm build.zig.zon
diff --git a/pkgs/by-name/ri/river/update.sh b/pkgs/by-name/ri/river/update.sh
new file mode 100755
index 000000000000..1cca378b3daf
--- /dev/null
+++ b/pkgs/by-name/ri/river/update.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style
+
+latest_tag=$(list-git-tags --url=https://codeberg.org/river/river | sed 's/^v//' | tail -n 1)
+
+update-source-version river "$latest_tag"
+
+wget "https://codeberg.org/river/river/raw/tag/v${latest_tag}/build.zig.zon"
+nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/ri/river/build.zig.zon.nix
+# strip file protocol
+sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/ri/river/build.zig.zon.nix
+nixfmt pkgs/by-name/ri/river/build.zig.zon.nix
+
+rm -f build.zig.zon build.zig.zon2json-lock