Merge pull request 'cliamp upgrade' (#31) from cliamp-upgrade into master

Reviewed-on: #31

.gitea/workflows/publish-attic.yaml

@@ -70,6 +70,11 @@ jobs:
           NIXPKGS_ALLOW_UNFREE=1 nix build --impure --sandbox --no-sandbox-fallback --accept-flake-config --no-link --print-out-paths -L \
             ".#packages.${system}.atuinLatest" \
             ".#packages.${system}.cliampLatest" \
+            ".#packages.${system}.lazygitLatest" \
+            ".#packages.${system}.ghDashLatest" \
+            ".#packages.${system}.diffNavLatest" \
+            ".#packages.${system}.k9sLatest" \
+            ".#packages.${system}.sable-web" \
             ".#packages.${system}.musicpresence" \
             ".#packages.${system}.vintage-story" \
             ".#packages.${system}.swaytreesave" \

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1788133146,
+        "lastModified": 1791702392,
-        "narHash": "sha256-rjxs1D9duSUWf/lnJV6JZXqdpTEbJ1ntX1hZyYHOuK4=",
+        "narHash": "sha256-8uWZP3UiJBtYzBzazI18WvlshKYHxPb+8aqm02OxL5M=",
         "ref": "refs/heads/master",
-        "rev": "427757654f013e316b3e267dd345c3ab780da7b6",
+        "rev": "ee2a27ad749d6d774e26c2be5de5f3a5ecd4a93f",
-        "revCount": 22,
+        "revCount": 28,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
       },
@@ -60,12 +60,12 @@
     },
     "flake-schemas": {
       "locked": {
-        "lastModified": 1761577921,
+        "lastModified": 1780327564,
-        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
+        "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
-        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
+        "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
-        "revCount": 107,
+        "revCount": 149,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -107,18 +107,17 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
         "nixpkgs": [
           "go-overlay",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1778507602,
+        "lastModified": 1788267358,
-        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
         "type": "github"
       },
       "original": {
@@ -127,28 +126,6 @@
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "go-overlay",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "go-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -158,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788301927,
+        "lastModified": 1792166485,
-        "narHash": "sha256-Zmcvt5yW//YLT3HYe3bWN1Sf2txYrnBpa5jLULVokc0=",
+        "narHash": "sha256-TL2RJ56FbBQNi6vsCXAn7QhZECh5DPbvzfiX6v+4r1A=",
         "owner": "purpleclay",
         "repo": "go-overlay",
-        "rev": "fe48ae4f56981f9f7c2bf03d4951fb0aa6e2095b",
+        "rev": "5971ffb6c5de960d37f3b85c53cb5a30387cd05a",
         "type": "github"
       },
       "original": {
@@ -180,11 +157,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1788130254,
+        "lastModified": 1791702441,
-        "narHash": "sha256-LR+73+2a51LOUKVTkEsP/XMVSZXm2P4hlgb7/KxdQ30=",
+        "narHash": "sha256-qHf8tVIYu6OE1PKcthmpBgblg27u3bU7v4TVqy0B3jg=",
         "ref": "refs/heads/master",
-        "rev": "f2049db9c29bf3ab0beff7cf0a990735d5571446",
+        "rev": "2c2e99f6347e9be744a72f7df6043015989d6cd7",
-        "revCount": 6,
+        "revCount": 17,
         "type": "git",
         "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
       },
@@ -200,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788651960,
+        "lastModified": 1792098797,
-        "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=",
+        "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2c0350c759688177331b8f5242311fae8877bdb3",
+        "rev": "640725978b99076e18e069f6e7d2959124584f8f",
         "type": "github"
       },
       "original": {
@@ -215,11 +192,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788584326,
+        "lastModified": 1792030654,
-        "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=",
+        "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6713828a351efa628b025a1adf7f43cbf8597513",
+        "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8",
         "type": "github"
       },
       "original": {
@@ -248,11 +225,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771729765,
+        "lastModified": 1791620365,
-        "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=",
+        "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c",
+        "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
         "type": "github"
       },
       "original": {
@@ -269,11 +246,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784438913,
+        "lastModified": 1791620365,
-        "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
+        "narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
+        "rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
         "type": "github"
       },
       "original": {
@@ -289,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788678114,
+        "lastModified": 1792219666,
-        "narHash": "sha256-pcqbpV4ZI79al6KAlr+WJjaEo/PYfgctRlG43D5BSJM=",
+        "narHash": "sha256-RMO08tKD+hFIL5ryWi85VY4aHE5oIpdV1h4kVFctOkw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4748ec2f5ed4a881474ed4c98aa71a5308cdac8d",
+        "rev": "a110337465cfb76e3806b81b9db3094c3e6e770a",
         "type": "github"
       },
       "original": {

overlays/cliamp.nix

@@ -1,15 +1,15 @@
-final: prev: {
+_: prev: {
-  cliampLatest = prev.cliamp.overrideAttrs (oldAttrs: rec {
+  cliampLatest = prev.cliamp.overrideAttrs (_: rec {
-    version = "2.0.1";
+    version = "2.3.0";
 
     src = prev.fetchFromGitHub {
       owner = "bjarneo";
       repo = "cliamp";
       tag = "v${version}";
-      sha256 = "sha256-r7MrrcVt+/f+iPozn9jaczJmpPv431wAoW8LvHKBtB8=";
+      sha256 = "sha256-+q3/AfxHtEYH/gzaiimn0gDx98vlytVsJFfYnq04U9Y=";
     };
 
-    vendorHash = "sha256-rtwUWbft5XGEbuBCn0OMCn4TS5Ul+UXJNIqNOzXfU+M=";
+    vendorHash = "sha256-cythuV9J/Iu+ibRVza8dQ6RHjYKa0hVllc2t6dh3hhs=";
 
     buildInputs = with prev; [
       libogg

overlays/container.nix

@@ -1,10 +1,10 @@
-final: prev: {
+_: prev: {
-  containerLatest = prev.container.overrideAttrs (oldAttrs: rec {
+  containerLatest = prev.container.overrideAttrs (_: rec {
-    version = "1.3.1";
+    version = "1.4.1";
 
     src = prev.fetchurl {
       url = "https://github.com/apple/container/releases/download/${version}/container-${version}-installer-signed.pkg";
-      hash = "sha256-p8G515J9MIdfL2x70dDLBsLapspXzp6QpRROiY/fVKg=";
+      hash = "sha256-wNJxav77sZTJP65mLpyufMGGvLz3RoFmCOxnPdZIpqQ=";
     };
   });
 }

overlays/gh-dash.nix

@@ -12,10 +12,10 @@ in {
       owner = "dlvhdr";
       repo = "gh-dash";
       rev = "v${version}";
-      hash = "sha256-FUb4zrGT0L7S1O5EcOCop4n0zlx1ODsANzBcEl9bvOU=";
+      hash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU=";
     };
 
-    vendorHash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU=";
+    vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk=";
     doCheck = false;
     checkFlags = [
       "-skip=TestFullOutput"

pkgs/common/sable.nix

@@ -1,60 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  pnpm_10,
-  fetchPnpmDeps,
-  pnpmConfigHook,
-  nodejs_24,
-  fetchFromGitHub,
-}:
-buildNpmPackage (finalAttrs:
-let
-  pnpm = pnpm_10.override {
-    nodejs = nodejs_24;
-  };
-in {
-  pname = "sable-unwrapped";
-  version = "1.14.0";
-
-  src = fetchFromGitHub {
-    owner = "SableClient";
-    repo = "Sable";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-zoGKs0pm9m42JrTNAdU33LP139JlVz3RZnkTyY0aiqY=";
-  };
-
-  nodejs = nodejs_24;
-
-  nativeBuildInputs = [ pnpm ];
-  npmConfigHook = pnpmConfigHook;
-
-  npmDeps = finalAttrs.pnpmDeps;
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-2GwUz0jsuVKQZyeidM0F4rDzijm9AFcAxN7x/m/b3Is=";
-  };
-
-  npmInstallFlags = [
-    "--ignore-scripts"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r dist $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "An almost stable Matrix client";
-    homepage = "https://app.sable.moe/";
-    maintainers = with lib.maintainers; [
-      wymillerlinux
-    ];
-    license = lib.licenses.agpl3Only;
-    platforms = lib.platforms.all;
-  };
-})

pkgs/common/sable/0001-races-patch.patch

@@ -0,0 +1,31 @@
+diff --git a/src/app/pages/client/ClientRoot.tsx b/src/app/pages/client/ClientRoot.tsx
+index acdeab967..d64f32c53 100644
+--- a/src/app/pages/client/ClientRoot.tsx
++++ b/src/app/pages/client/ClientRoot.tsx
+@@ -86,8 +86,6 @@ function ClientRootLoading() {
+   const activeSessionId = useAtomValue(activeSessionIdAtom);
+   const setSessions = useSetAtom(sessionsAtom);
+ 
+-  const [showEasterEggs] = useSetting(settingsAtom, 'showEasterEggs');
+-  const [animalKind] = useSetting(settingsAtom, 'animalKind');
+ 
+   const activeSession: Session | undefined =
+     sessions.find((session) => session.userId === activeSessionId) ?? sessions[0];
+@@ -108,14 +106,15 @@ function ClientRootLoading() {
+     window.location.reload();
+   };
+ 
+-  const loadingAnimal = showEasterEggs && animalKind ? animalKind : 'cats';
++  const races = ["Petting Miqo’te", "Hugging Roegadyn", "Punting Lalafell", "Climbing Elezen", "Booping Viera"];
++  const result = races[Math.floor(Math.random() * races.length)];
+ 
+   return (
+     <SplashScreen>
+       <Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="400">
+         <Spinner variant="Secondary" size="600" />
+ 
+-        <Text>{`Petting ${loadingAnimal}`}</Text>
++        <Text>{`${result}`}</Text>
+ 
+         {activeSession && (
+           <Text

pkgs/common/sable/sable.nix

@@ -0,0 +1,93 @@
+{
+  lib,
+  buildNpmPackage,
+  pnpm_10_latest,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  nodejs_24,
+  fetchFromGitHub,
+}:
+buildNpmPackage (
+  finalAttrs:
+  let
+    pnpm = pnpm_10_latest.override {
+      nodejs-slim = nodejs_24;
+    };
+    matrixrtcSrc = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "matrix-rtc";
+      rev = "519fe6b863cfac78700f4e2b1748649103bb8a8d";
+      hash = "sha256-n5f7529RdRxY8/a43Xkgrhg4yRz5aNgfoZqWrB7kvak=";
+    };
+    livekitMobileSrc = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "tauri-plugin-livekit-mobile";
+      rev = "c6f0d02ab3da1174535bc1dc8e598a2e6873f977";
+      hash = "sha256-ZPx6Ic+Gkvzg9LXYP9BaQALzOrvLCcQHOms8U3VfnU0=";
+    };
+  in
+  {
+    pname = "sable-unwrapped";
+    version = "1.22.11";
+
+    src = fetchFromGitHub {
+      owner = "SableClient";
+      repo = "Sable";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-RwYKaJ4k2lqXjVSPN/o0Qw8GIGnXfb6acCpva36qQoM=";
+    };
+
+    nodejs = nodejs_24;
+
+    nativeBuildInputs = [ pnpm ];
+    npmConfigHook = pnpmConfigHook;
+
+    npmDeps = finalAttrs.pnpmDeps;
+    pnpmDeps = fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      inherit pnpm;
+      fetcherVersion = 3;
+      hash = "sha256-sI0tE73l+yKS8186tUHrNAJmGD26XEe7828ohvvc+1o=";
+    };
+
+    npmInstallFlags = [
+      "--ignore-scripts"
+    ];
+
+    preBuild = ''
+      cp -r --no-preserve=mode ${matrixrtcSrc}/. node_modules/@sableclient/matrixrtc/
+      pnpm exec tsc \
+        -p node_modules/@sableclient/matrixrtc/tsconfig.build.json \
+        --rootDir node_modules/@sableclient/matrixrtc/src
+      cp -r --no-preserve=mode ${livekitMobileSrc}/. node_modules/@sableclient/tauri-plugin-livekit-mobile/
+      pnpm exec tsc \
+        -p node_modules/@sableclient/tauri-plugin-livekit-mobile/tsconfig.json \
+        --noEmit false \
+        --declaration \
+        --rootDir node_modules/@sableclient/tauri-plugin-livekit-mobile/guest-js \
+        --outDir node_modules/@sableclient/tauri-plugin-livekit-mobile/dist-js
+    '';
+
+    patches = [
+      ./0001-races-patch.patch
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      cp -r dist $out
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "An almost stable Matrix client";
+      homepage = "https://app.sable.moe/";
+      maintainers = with lib.maintainers; [
+        (wymillerlinux or) "wymillerlinux"
+      ];
+      license = lib.licenses.agpl3Only;
+      platforms = lib.platforms.all;
+    };
+  }
+)

pkgs/default.nix

@@ -18,7 +18,7 @@
   inherit caitsith;
 
   # any packages that build instructions are in this repo, they go here
-  sable-web = pkgs.callPackage ./common/sable.nix { };
+  sable-web = pkgs.callPackage ./common/sable/sable.nix { };
   swaytreesave = pkgs.callPackage ./linux/swaytreesave.nix { };
   musicpresence = pkgs.callPackage ./linux/musicpresence.nix { };
   vintage-story = pkgs.callPackage ./linux/vintage-story.nix { };

pkgs/linux/archon.nix

@@ -1,11 +1,11 @@
 { pkgs }:
 let
   pname = "archon";
-  version = "9.5.8";
+  version = "9.6.94";
 
   src = pkgs.fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-archon/releases/download/v${version}/${pname}-v${version}.AppImage";
-    hash = "sha256-tEMfDK0BCBvNWFlA78FKWcOvU1wzIorBM4ZmLQ+6hzU=";
+    hash = "sha256-l38nmbxLDdi/yMtoamG+hPqT22y32CfvdGtFitqIiZk=";
   };
 
   appimageContents = pkgs.appimageTools.extract {

pkgs/linux/vintage-story.nix

@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vintagestory";
-  version = "1.22.6";
+  version = "1.22.7";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
-    hash = "sha256-xJPyaYklEq2BeUX9+7hNPI6WC6ibcQDS+sKeqKYSh3A=";
+    hash = "sha256-SDzGgnpQwIxcQczQJixvEiPBBOVMpxNcRmBSeNifXeE=";
   };
 
   __structuredAttrs = true;