Compare commits

...

2 Commits

Author SHA1 Message Date
6436a82d58 add actions
Some checks failed
checks / checks (push) Failing after 28s
2025-07-29 21:49:55 +04:00
9473348b57 make pkgs work! 2025-07-29 21:42:11 +04:00
5 changed files with 43 additions and 15 deletions

View File

@@ -0,0 +1,11 @@
name: checks
on:
push:
branches:
- main
jobs:
checks:
runs-on: nix
steps:
- uses: actions/checkout@v4
- run: nix flake check -L --all-systems

View File

@@ -36,8 +36,11 @@
let
isDrv = lib.isDerivation pkg;
isAttrs = lib.isAttrs pkg;
isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
in
if isDrv then
if !isSameSystem then
[ ]
else if isDrv then
[
(lib.nameValuePair name pkg)
]
@@ -48,14 +51,32 @@
flatPackages = builtins.listToAttrs (
lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
);
workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) self.packages.${system};
workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
recursePackageSets =
pkg:
let
isDrv = lib.isDerivation pkg;
isAttrs = lib.isAttrs pkg;
isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
in
if isDrv && isSameSystem then
pkg
else if isAttrs then
lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
else
null;
# Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
);
in
{
inherit packageSets;
inherit flatPackages;
inherit pkgs;
packages = lib.filterAttrs (
_: pkg: lib.isDerivation pkg && (lib.meta.availableOn pkgs.stdenv.hostPlatform pkg)
) scope;
packages = packageSets;
checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
}
);

View File

@@ -13,10 +13,6 @@ let
hash = "sha256-iE4lqyr3zmLcgFnsrDvQ/CKUV15ijqmIbUIs9sgMECg=";
};
in
lib.packagesFromDirectoryRecursive {
inherit callPackage newScope;
directory = ./tools;
}
# lib.makeScope newScope (self: {
# ath12k-tools = self.callPackage ./ath12k-tools.nix { inherit src; };
# })
lib.makeScope newScope (self: {
ath12k-tools = self.callPackage ./ath12k-tools.nix { inherit src; };
})

View File

@@ -34,10 +34,10 @@ stdenv.mkDerivation (
tree
];
unpackPhase = ''
msiextract -C . $src
msiextract -C . "$src"
'';
buildPhase = ''
mkdir -p $out/lib/firmware/qcom/x1e80100/microsoft/Romulus
mkdir -p "$out/lib/firmware/qcom/x1e80100/microsoft/Romulus"
for file in ${lib.concatStringsSep " " fw_files}; do
echo -e "\tSearching for $file..."
fw_path=$(find . -type f -name "$file" -print | head -n 1)
@@ -48,7 +48,7 @@ stdenv.mkDerivation (
exit 1
fi
done
cp $out/lib/firmware/qcom/x1e80100/microsoft/Romulus/qcdxkmsuc8380.mbn $out/lib/firmware/qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn
cp "$out/lib/firmware/qcom/x1e80100/microsoft/Romulus/qcdxkmsuc8380.mbn" "$out/lib/firmware/qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn"
'';
meta = {
platforms = [ "aarch64-linux" ];