fix: hash

lint: removed some comments
fix: vpkmerge and grimorie are using nvfetch now
2026-05-30 12:54:18 +01:00 · 2026-05-30 12:48:07 +01:00 · 2026-05-30 12:48:07 +01:00 · 2026-05-30 12:48:07 +01:00 · 2026-05-30 12:48:07 +01:00 · 2026-05-30 12:48:07 +01:00
4 changed files with 53 additions and 56 deletions
@@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764897201,
-        "narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=",
+        "lastModified": 1780011192,
+        "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc",
+        "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
        "type": "github"
      },
      "original": {
@@ -13,17 +13,14 @@
  pkg-config,
  webkitgtk_4_1,
  wrapGAppsHook4,
-  fetchFromGitHub,
-}:
+  callPackage,
+}: let
+  sources = callPackage ../../../../_sources/generated.nix {};
+in
  rustPlatform.buildRustPackage (finalAttrs: {
    pname = "flightcore";
-  version = "3.2.0";
-  src = fetchFromGitHub {
-    owner = "R2NorthstarTools";
-    repo = "FlightCore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
-  };
+    version = lib.removePrefix "v" sources.flightcore.version;
+    inherit (sources.flightcore) src;
    patches = [./cargo-lock.patch];
    cargoDeps = rustPlatform.fetchCargoVendor {
      src = finalAttrs.src;
@@ -32,7 +32,7 @@
    pname = "grimoire";
    inherit version src;
    fetcherVersion = 3;
-    hash = "sha256-CrVc0gO0CtesGHbGxnrFeDR3NahyaxGSI3lMHtbGfcM=";
+    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
  };
 in
  stdenv.mkDerivation {
@@ -27,11 +27,11 @@ stdenv.mkDerivation (

  rec {
    name = "x1e80100-firmware";
-    version = "26100_26.011.9344.0";
+    version = "26100_26.033.32430.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-ZkZgmKz5ihrRaarAioWoc0dx9XbmobGwTTyY/VLzahk=";
+      hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
    };
    nativeBuildInputs = [
      msitools
Author	SHA1	Message	Date
doloro	be39398615	fix: hash	2026-05-30 12:54:18 +01:00
doloro	c8274e668e	lint: removed some comments	2026-05-30 12:48:07 +01:00
doloro	4a59b86a47	fix: vpkmerge and grimorie are using nvfetch now	2026-05-30 12:48:07 +01:00
nikkuss	8969f1cb5c	bump nixpkgs	2026-05-30 12:48:07 +01:00
nikkuss	67ca4c6edb	bump firwmware version	2026-05-30 12:48:07 +01:00
nikkuss	888d1338cd	refactor(flightcore): consume source from nvfetcher generated.nix (#14 ) Reviewed-on: nikkuss/pkgs#14 Co-authored-by: Nikkuss <Scuggo@pm.me> Co-committed-by: Nikkuss <Scuggo@pm.me>	2026-05-30 12:48:07 +01:00
nikkuss	9927693901	bump firwmware version (#13 ) Reviewed-on: nikkuss/pkgs#13 Co-authored-by: Nikkuss <Scuggo@pm.me> Co-committed-by: Nikkuss <Scuggo@pm.me>	2026-05-30 12:48:06 +01:00