Update dependencies; support macOS

This commit is contained in:
bluepython508
2024-02-20 12:14:54 +00:00
parent d315e63ac5
commit 6a82f1360f
2 changed files with 47 additions and 19 deletions

25
flake.lock generated
View File

@@ -2,10 +2,10 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1700794826,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"path": "/nix/store/6h04ab83y72nm16hh9g3llgg0s296ynl-source",
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"lastModified": 1708118438,
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
"path": "/nix/store/bg5fbkfa5x53clcjf4p5p92k1l3w8x38-source",
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
"type": "path"
},
"original": {
@@ -15,7 +15,22 @@
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"systems": "systems"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
}
},

View File

@@ -2,11 +2,19 @@
outputs = {
self,
nixpkgs,
systems,
}: let
sys = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${sys};
eachSystem = f:
nixpkgs.lib.genAttrs (import systems) (sys:
f {
inherit sys;
pkgs = nixpkgs.legacyPackages.${sys};
});
in {
packages.${sys} = rec {
packages = eachSystem ({
sys,
pkgs,
}: rec {
python3 = pkgs.python3.override {
packageOverrides = final: prev: {
milc = prev.milc.overrideAttrs {
@@ -35,16 +43,21 @@
};
qmk = pkgs.qmk.override {inherit python3;};
};
devShells.${sys}.default = pkgs.mkShell {
packages = with pkgs; [
self.packages.${sys}.qmk
clang
clang-tools
];
shellHook = ''
export QMK_HOME=$PWD/qmk_firmware
'';
};
});
devShells = eachSystem ({
sys,
pkgs,
}: {
default = pkgs.mkShell {
packages = with pkgs; [
self.packages.${sys}.qmk
clang
clang-tools
];
shellHook = ''
export QMK_HOME=$PWD/qmk_firmware
'';
};
});
};
}