1
0
forked from nikkuss/pkgs

7 Commits

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
4 changed files with 53 additions and 56 deletions
Generated
+3 -3
View File
@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764897201, "lastModified": 1780011192,
"narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=", "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc", "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
"type": "github" "type": "github"
}, },
"original": { "original": {
+8 -11
View File
@@ -13,17 +13,14 @@
pkg-config, pkg-config,
webkitgtk_4_1, webkitgtk_4_1,
wrapGAppsHook4, wrapGAppsHook4,
fetchFromGitHub, callPackage,
}: }: let
rustPlatform.buildRustPackage (finalAttrs: { sources = callPackage ../../../../_sources/generated.nix {};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "flightcore"; pname = "flightcore";
version = "3.2.0"; version = lib.removePrefix "v" sources.flightcore.version;
src = fetchFromGitHub { inherit (sources.flightcore) src;
owner = "R2NorthstarTools";
repo = "FlightCore";
rev = "v${finalAttrs.version}";
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
};
patches = [./cargo-lock.patch]; patches = [./cargo-lock.patch];
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
src = finalAttrs.src; src = finalAttrs.src;
@@ -70,4 +67,4 @@ rustPlatform.buildRustPackage (finalAttrs: {
platforms = ["x86_64-linux"]; platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager"; description = "FlightCore A Northstar installer, updater, and mod-manager";
}; };
}) })
+1 -1
View File
@@ -32,7 +32,7 @@
pname = "grimoire"; pname = "grimoire";
inherit version src; inherit version src;
fetcherVersion = 3; fetcherVersion = 3;
hash = "sha256-CrVc0gO0CtesGHbGxnrFeDR3NahyaxGSI3lMHtbGfcM="; hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -27,11 +27,11 @@ stdenv.mkDerivation (
rec { rec {
name = "x1e80100-firmware"; name = "x1e80100-firmware";
version = "26100_26.011.9344.0"; version = "26100_26.033.32430.0";
src = fetchurl { src = fetchurl {
# https://www.microsoft.com/en-us/download/details.aspx?id=106120 # 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"; 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 = [ nativeBuildInputs = [
msitools msitools