Merge pull request 'chore: update neovide hash' (#6) from h4rl/fix-neovide-hash:fix-meow into main

Reviewed-on: #6

_sources/generated.json

@@ -1,7 +1,7 @@
 {
     "ath-tools": {
         "cargoLock": null,
-        "date": "2026-01-09",
+        "date": "2026-03-03",
         "extract": null,
         "name": "ath-tools",
         "passthru": null,
@@ -11,17 +11,17 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "f4901c23602cb5b5d86202f3f7f4a62323fdbc82",
-            "sha256": "sha256-8kRhGM0Q/0GLMNGztiUVnyRYLAFMx/w6prgWJ3EIU1c=",
+            "rev": "c8182015b0ec81da1d4c39841aca190deae77c2c",
+            "sha256": "sha256-Va845WLEyB+l7cpLIvYpvwOyMZuLKcb3Afqqs/cUSmI=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://github.com/qca/qca-swiss-army-knife.git"
         },
-        "version": "f4901c23602cb5b5d86202f3f7f4a62323fdbc82"
+        "version": "c8182015b0ec81da1d4c39841aca190deae77c2c"
     },
     "base24-schemes": {
         "cargoLock": null,
-        "date": "2026-02-17",
+        "date": "2026-04-12",
         "extract": null,
         "name": "base24-schemes",
         "passthru": null,
@@ -31,13 +31,13 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "7725e097895102ca2949c7a553b54dca0b2e2667",
-            "sha256": "sha256-lOw77YOBM6HNuWcLL4Qugn+vr4RxMKV8FgXqFlnyLIo=",
+            "rev": "3e228732e93c107e8b65b8be30c36e5b3c507d95",
+            "sha256": "sha256-G34G4hri8H2XNwF0e15MFj3sjO8fTOphNk0WjBwnVew=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://github.com/tinted-theming/schemes.git"
         },
-        "version": "7725e097895102ca2949c7a553b54dca0b2e2667"
+        "version": "3e228732e93c107e8b65b8be30c36e5b3c507d95"
     },
     "claude-code-acp": {
         "cargoLock": null,
@@ -53,12 +53,12 @@
             "name": null,
             "owner": "zed-industries",
             "repo": "claude-code-acp",
-            "rev": "v0.18.0",
-            "sha256": "sha256-KZg9z8cyMqMHOfATaT2gcbp0+HkqzecQvAVeHN+bCYg=",
+            "rev": "v0.26.0",
+            "sha256": "sha256-2G8gjMCnk3W1I2+4sNsumL15ts9bLXAOMguCmwnzWSA=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "v0.18.0"
+        "version": "v0.26.0"
     },
     "flightcore": {
         "cargoLock": null,
@@ -81,6 +81,31 @@
         },
         "version": "v3.2.0"
     },
+    "neovide": {
+        "cargoLock": {
+            "Cargo.lock": [
+                "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock",
+                {}
+            ]
+        },
+        "date": null,
+        "extract": null,
+        "name": "neovide",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": true,
+            "fetchSubmodules": true,
+            "leaveDotGit": false,
+            "name": null,
+            "rev": "nightly",
+            "sha256": "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD/Ank=",
+            "sparseCheckout": [],
+            "type": "git",
+            "url": "https://github.com/neovide/neovide.git"
+        },
+        "version": "nightly"
+    },
     "qebspil": {
         "cargoLock": null,
         "date": "2025-10-25",
@@ -115,12 +140,12 @@
             "name": null,
             "owner": "radareorg",
             "repo": "r2ghidra",
-            "rev": "6.1.0",
-            "sha256": "sha256-KmzS4Q39ztiGc8rnUqcx5tUXuTCK8WcQrFelKzvaOEw=",
+            "rev": "6.1.2",
+            "sha256": "sha256-bGA7izBSvlwnD4BZXNucYS39BDdmo+49cY3o4LjIpYM=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "6.1.0"
+        "version": "6.1.2"
     },
     "radare2-mcp": {
         "cargoLock": null,
@@ -136,12 +161,12 @@
             "name": null,
             "owner": "radareorg",
             "repo": "radare2-mcp",
-            "rev": "1.5.6",
-            "sha256": "sha256-oR7+6djPmrEWpomqNPnw+ciEgXWsB/pmJPvpt37z21w=",
+            "rev": "1.7.2",
+            "sha256": "sha256-ToSvRmgOyrmsFWjfwuDit5hLXYJQD7YKGoy2utkqUe0=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "1.5.6"
+        "version": "1.7.2"
     },
     "slbounce": {
         "cargoLock": null,

_sources/generated.nix

@@ -4,45 +4,44 @@
   fetchurl,
   fetchFromGitHub,
   dockerTools,
-}:
-{
+}: {
   ath-tools = {
     pname = "ath-tools";
-    version = "f4901c23602cb5b5d86202f3f7f4a62323fdbc82";
+    version = "c8182015b0ec81da1d4c39841aca190deae77c2c";
     src = fetchgit {
       url = "https://github.com/qca/qca-swiss-army-knife.git";
-      rev = "f4901c23602cb5b5d86202f3f7f4a62323fdbc82";
+      rev = "c8182015b0ec81da1d4c39841aca190deae77c2c";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
       sparseCheckout = [];
-      sha256 = "sha256-8kRhGM0Q/0GLMNGztiUVnyRYLAFMx/w6prgWJ3EIU1c=";
+      sha256 = "sha256-Va845WLEyB+l7cpLIvYpvwOyMZuLKcb3Afqqs/cUSmI=";
     };
-    date = "2026-01-09";
+    date = "2026-03-03";
   };
   base24-schemes = {
     pname = "base24-schemes";
-    version = "7725e097895102ca2949c7a553b54dca0b2e2667";
+    version = "3e228732e93c107e8b65b8be30c36e5b3c507d95";
     src = fetchgit {
       url = "https://github.com/tinted-theming/schemes.git";
-      rev = "7725e097895102ca2949c7a553b54dca0b2e2667";
+      rev = "3e228732e93c107e8b65b8be30c36e5b3c507d95";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
       sparseCheckout = [];
-      sha256 = "sha256-lOw77YOBM6HNuWcLL4Qugn+vr4RxMKV8FgXqFlnyLIo=";
+      sha256 = "sha256-G34G4hri8H2XNwF0e15MFj3sjO8fTOphNk0WjBwnVew=";
     };
-    date = "2026-02-17";
+    date = "2026-04-12";
   };
   claude-code-acp = {
     pname = "claude-code-acp";
-    version = "v0.18.0";
+    version = "v0.26.0";
     src = fetchFromGitHub {
       owner = "zed-industries";
       repo = "claude-code-acp";
-      rev = "v0.18.0";
+      rev = "v0.26.0";
       fetchSubmodules = false;
-      sha256 = "sha256-KZg9z8cyMqMHOfATaT2gcbp0+HkqzecQvAVeHN+bCYg=";
+      sha256 = "sha256-2G8gjMCnk3W1I2+4sNsumL15ts9bLXAOMguCmwnzWSA=";
     };
   };
   flightcore = {
@@ -56,6 +55,24 @@
       sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
     };
   };
+  neovide = {
+    pname = "neovide";
+    version = "nightly";
+    src = fetchgit {
+      url = "https://github.com/neovide/neovide.git";
+      rev = "nightly";
+      fetchSubmodules = true;
+      deepClone = true;
+      leaveDotGit = false;
+      sparseCheckout = [];
+      sha256 = "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD/Ank=";
+    };
+    cargoLock."Cargo.lock" = {
+      lockFile = ./. + "/sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock";
+      outputHashes = {
+      };
+    };
+  };
   qebspil = {
     pname = "qebspil";
     version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0";
@@ -72,24 +89,24 @@
   };
   radare2-ghidra = {
     pname = "radare2-ghidra";
-    version = "6.1.0";
+    version = "6.1.2";
     src = fetchFromGitHub {
       owner = "radareorg";
       repo = "r2ghidra";
-      rev = "6.1.0";
+      rev = "6.1.2";
       fetchSubmodules = false;
-      sha256 = "sha256-KmzS4Q39ztiGc8rnUqcx5tUXuTCK8WcQrFelKzvaOEw=";
+      sha256 = "sha256-bGA7izBSvlwnD4BZXNucYS39BDdmo+49cY3o4LjIpYM=";
     };
   };
   radare2-mcp = {
     pname = "radare2-mcp";
-    version = "1.5.6";
+    version = "1.7.2";
     src = fetchFromGitHub {
       owner = "radareorg";
       repo = "radare2-mcp";
-      rev = "1.5.6";
+      rev = "1.7.2";
       fetchSubmodules = false;
-      sha256 = "sha256-oR7+6djPmrEWpomqNPnw+ciEgXWsB/pmJPvpt37z21w=";
+      sha256 = "sha256-ToSvRmgOyrmsFWjfwuDit5hLXYJQD7YKGoy2utkqUe0=";
     };
   };
   slbounce = {

nvfetcher.toml

@@ -30,3 +30,10 @@ git.fetchSubmodules = true
 [ath-tools]
 src.git = "https://github.com/qca/qca-swiss-army-knife.git"
 fetch.git = "https://github.com/qca/qca-swiss-army-knife.git"
+
+[neovide]
+src.manual = "nightly"
+fetch.git = "https://github.com/neovide/neovide.git"
+git.fetchSubmodules = true
+git.deepClone = true
+cargo_lock = ["Cargo.lock"]

pkgs/by-name/fl/flightcore/package.nix

@@ -15,7 +15,6 @@
   wrapGAppsHook4,
   fetchFromGitHub,
 }:
-
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flightcore";
   version = "3.2.0";
@@ -42,7 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
+    [
       cargo-tauri.hook
 
       nodejs

pkgs/by-name/ne/neovide/package.nix

@@ -0,0 +1,134 @@
+{
+  lib,
+  rustPlatform,
+  clangStdenv,
+  fetchFromGitHub,
+  linkFarm,
+  fetchgit,
+  runCommand,
+  gn,
+  neovim,
+  ninja,
+  makeWrapper,
+  pkg-config,
+  python3,
+  removeReferencesTo,
+  cctools,
+  SDL2,
+  fontconfig,
+  libxrandr,
+  libxi,
+  libxext,
+  libxcursor,
+  libx11,
+  stdenv,
+  libglvnd,
+  libxkbcommon,
+  enableWayland ? stdenv.hostPlatform.isLinux,
+  wayland,
+  callPackage,
+}: let
+  sources = callPackage ../../../../_sources/generated.nix {};
+  inherit (sources.neovide) src;
+in
+  rustPlatform.buildRustPackage.override {stdenv = clangStdenv;} (finalAttrs: {
+    pname = "neovide";
+    version = src.rev;
+    src = src;
+
+    cargoLock = sources.neovide.cargoLock."Cargo.lock";
+
+    env = {
+      SKIA_SOURCE_DIR = let
+        repo = fetchFromGitHub {
+          owner = "rust-skia";
+          repo = "skia";
+          # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
+          tag = "m145-0.92.0";
+          hash = "sha256-9N780AwheKBJRcZC4l/uWFNq+oOyoNp4M6dJAVVAFeo=";
+        };
+        # The externals for skia are taken from skia/DEPS
+        externals = linkFarm "skia-externals" (
+          lib.mapAttrsToList (name: value: {
+            inherit name;
+            path = fetchgit value;
+          }) (lib.importJSON ./skia-externals.json)
+        );
+      in
+        runCommand "source" {} ''
+          cp -R ${repo} $out
+          chmod -R +w $out
+          ln -s ${externals} $out/third_party/externals
+        '';
+
+      SKIA_GN_COMMAND = "${gn}/bin/gn";
+      SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
+    };
+
+    nativeBuildInputs =
+      [
+        makeWrapper
+        pkg-config
+        python3 # skia
+        removeReferencesTo
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        cctools.libtool
+      ];
+
+    nativeCheckInputs = [neovim];
+
+    buildInputs = [
+      SDL2
+      fontconfig
+      rustPlatform.bindgenHook
+    ];
+
+    postFixup = let
+      libPath = lib.makeLibraryPath (
+        [
+          libglvnd
+          libxkbcommon
+          libx11
+          libxcursor
+          libxext
+          libxrandr
+          libxi
+        ]
+        ++ lib.optionals enableWayland [wayland]
+      );
+    in ''
+      # library skia embeds the path to its sources
+      remove-references-to -t "$SKIA_SOURCE_DIR" \
+        $out/bin/neovide
+
+      wrapProgram $out/bin/neovide \
+        --prefix LD_LIBRARY_PATH : ${libPath}
+    '';
+
+    postInstall =
+      lib.optionalString stdenv.hostPlatform.isDarwin ''
+        mkdir -p $out/Applications
+        cp -r extra/osx/Neovide.app $out/Applications
+        ln -s $out/bin $out/Applications/Neovide.app/Contents/MacOS
+      ''
+      + lib.optionalString stdenv.hostPlatform.isLinux ''
+        for n in 16x16 32x32 48x48 256x256; do
+          install -m444 -D "assets/neovide-$n.png" \
+            "$out/share/icons/hicolor/$n/apps/neovide.png"
+        done
+        install -m444 -Dt $out/share/icons/hicolor/scalable/apps assets/neovide.svg
+        install -m444 -Dt $out/share/applications assets/neovide.desktop
+      '';
+
+    disallowedReferences = [finalAttrs.env.SKIA_SOURCE_DIR];
+
+    meta = {
+      description = "Simple, no-nonsense, cross-platform graphical user interface for Neovim";
+      mainProgram = "neovide";
+      homepage = "https://neovide.dev/";
+      changelog = "https://github.com/neovide/neovide/releases/tag/${finalAttrs.version}";
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+    };
+  })

pkgs/by-name/ne/neovide/skia-externals.json

@@ -0,0 +1,37 @@
+{
+  "expat": {
+    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
+    "rev": "8e49998f003d693213b538ef765814c7d21abada",
+    "sha256": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y="
+  },
+  "libjpeg-turbo": {
+    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
+    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
+    "sha256": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs="
+  },
+  "icu": {
+    "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
+    "rev": "364118a1d9da24bb5b770ac3d762ac144d6da5a4",
+    "sha256": "sha256-frsmwYMiFixEULsE91x5+p98DvkyC0s0fNupqjoRnvg="
+  },
+  "zlib": {
+    "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
+    "rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596",
+    "sha256": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ="
+  },
+  "harfbuzz": {
+    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
+    "rev": "31695252eb6ed25096893aec7f848889dad874bc",
+    "sha256": "sha256-Csyz08JTNXfY2fo27x1Eg1CqO/tt8Rt9udr3KflojSg="
+  },
+  "wuffs": {
+    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
+    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+    "sha256": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
+  },
+  "libpng": {
+    "url": "https://skia.googlesource.com/third_party/libpng.git",
+    "rev": "4e3f57d50f552841550a36eabbb3fbcecacb7750",
+    "sha256": "sha256-tNRrA9RUp6Mi7dbIB/70a/4tn/JxAsTUb9EI9nlXLjM="
+  }
+}

pkgs/by-name/x1/x1e80100-firmware/package.nix

@@ -27,11 +27,11 @@ stdenv.mkDerivation (
 
   rec {
     name = "x1e80100-firmware";
-    version = "26100_25.101.12926.0";
+    version = "26100_26.011.9344.0";
     src = fetchurl {
       # https://www.microsoft.com/en-us/download/details.aspx?id=106120
       url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
-      hash = "sha256-4LVqkA4YwGrAh3gNSUQ5G2ahwBoj/5QvyFqvNgznvX4=";
+      hash = "sha256-ZkZgmKz5ihrRaarAioWoc0dx9XbmobGwTTyY/VLzahk=";
     };
     nativeBuildInputs = [
       msitools