lint: removed some comments

fix: vpkmerge and grimorie are using nvfetch now
bump nixpkgs
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 · 2026-05-30 12:48:06 +01:00
3 changed files with 52 additions and 55 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,61 +13,58 @@
  pkg-config,
  webkitgtk_4_1,
  wrapGAppsHook4,
-  fetchFromGitHub,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "flightcore";
-  version = "3.2.0";
-  src = fetchFromGitHub {
-    owner = "R2NorthstarTools";
-    repo = "FlightCore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
-  };
-  patches = [./cargo-lock.patch];
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    src = finalAttrs.src;
-    sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
-    hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
-    patchFlags = "-p2";
-    inherit (finalAttrs) patches;
-  };
-  postPatch = ''
-    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
-  '';
-  npmDeps = fetchNpmDeps {
-    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
-    src = "${finalAttrs.src}/src-vue";
-    hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
-  };
+  callPackage,
+}: let
+  sources = callPackage ../../../../_sources/generated.nix {};
+in
+  rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "flightcore";
+    version = lib.removePrefix "v" sources.flightcore.version;
+    inherit (sources.flightcore) src;
+    patches = [./cargo-lock.patch];
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      src = finalAttrs.src;
+      sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+      hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
+      patchFlags = "-p2";
+      inherit (finalAttrs) patches;
+    };
+    postPatch = ''
+      jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
+    '';
+    npmDeps = fetchNpmDeps {
+      name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+      src = "${finalAttrs.src}/src-vue";
+      hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
+    };

-  nativeBuildInputs =
-    [
-      cargo-tauri.hook
+    nativeBuildInputs =
+      [
+        cargo-tauri.hook

-      nodejs
-      npmHooks.npmConfigHook
+        nodejs
+        npmHooks.npmConfigHook

-      pkg-config
+        pkg-config

-      jq
-      moreutils
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
+        jq
+        moreutils
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];

-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    glib-networking
-    openssl
-    webkitgtk_4_1
-  ];
+    buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+      glib-networking
+      openssl
+      webkitgtk_4_1
+    ];

-  cargoRoot = "src-tauri";
-  npmRoot = "src-vue";
+    cargoRoot = "src-tauri";
+    npmRoot = "src-vue";

-  buildAndTestSubdir = finalAttrs.cargoRoot;
+    buildAndTestSubdir = finalAttrs.cargoRoot;

-  meta = {
-    platforms = ["x86_64-linux"];
-    description = "FlightCore A Northstar installer, updater, and mod-manager";
-  };
-})
+    meta = {
+      platforms = ["x86_64-linux"];
+      description = "FlightCore A Northstar installer, updater, and mod-manager";
+    };
+  })
@@ -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	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