diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 9fd6614..b100757 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -18,7 +18,8 @@ jobs: - os: ubuntu-latest target: x86_64-linux - os: macos-latest - target: x86_64-darwin + target: aarch64-darwin + runs-on: ${{ matrix.os }} steps: - name: Setup | Checkout diff --git a/flake.lock b/flake.lock index 42f9bc5..1643a3e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706515015, - "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", + "lastModified": 1727129439, + "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", + "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 594198e..bdb221e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; flake-utils = { url = "github:numtide/flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; @@ -19,7 +19,18 @@ outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; }; + overlay = self': super': { + platformdirs3 = super'.python3Packages.platformdirs.overrideAttrs (old: { + version = "3.5.1"; + src = super'.fetchFromGitHub { + owner = old.pname; + repo = old.pname; + rev = "refs/tags/3.5.1"; + hash = "sha256-/qi22jiF+P7XcG/D+dxoOrHk89amdBoGewrTqZZOsoM="; + }; + }); + }; + pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; }; pcpp = with pkgs; python311Packages.buildPythonPackage rec { pname = "pcpp"; version = "1.30"; @@ -34,14 +45,14 @@ }; keymap-drawer = with pkgs; python3Packages.buildPythonApplication rec{ pname = "keymap-drawer"; - version = "0.13.3"; + version = "0.18.0"; format = "pyproject"; src = pkgs.fetchFromGitHub { owner = "caksoylar"; repo = "keymap-drawer"; rev = "v${version}"; - sha256 = "sha256-dbVpsgsWuFpmt8LMIXVTYXNSrS0gYyehULhhBtNa+Bs="; + sha256 = "sha256-3NLOoCSPt/2Mt+e4xL4RyAqN4gF0sAgkQoZMsmKdnYw="; }; doCheck = false; @@ -54,8 +65,10 @@ pyyaml pyparsing pydantic - platformdirs - ] ++ [ pcpp ]; + pydantic-settings + platformdirs3 + pcpp + ]; }; in {