ficd/zmk
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump zephyr-sdk

Browse source
This commit is contained in:
urob 2024-10-21 21:19:02 -04:00
parent ed47900269
commit 4ecd556026
2 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
flake.lock generated
View file

@ -51,11 +51,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723556749, "lastModified": 1729307008,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073", "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -65,22 +65,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1709218635,
"narHash": "sha256-nytX/MkfqeTD4z7bMq4QRXcHxO9B3vRo9tM6fMtPFA8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "068d4db604958d05d0b46c47f79b507d84dbc069",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"pyproject-nix": { "pyproject-nix": {
"inputs": { "inputs": {
"mdbook-nixdoc": "mdbook-nixdoc", "mdbook-nixdoc": "mdbook-nixdoc",
@ -130,18 +114,20 @@
}, },
"zephyr-nix": { "zephyr-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": [
"nixpkgs"
],
"pyproject-nix": "pyproject-nix", "pyproject-nix": "pyproject-nix",
"zephyr": [ "zephyr": [
"zephyr" "zephyr"
] ]
}, },
"locked": { "locked": {
"lastModified": 1723611259, "lastModified": 1729559759,
"narHash": "sha256-0KpCmM2hOb56EYUTQWgMYdQlrkMeqTC0m9Ou6J5f8/8=", "narHash": "sha256-nUPdR93lmDQb+go4t3kBQd3zbFzCj6jsm8Pg037t9Sg=",
"owner": "urob", "owner": "urob",
"repo": "zephyr-nix", "repo": "zephyr-nix",
"rev": "a12131ec450ea66e9005c668c31c8a055a766ef3", "rev": "e3d66e7187b7bd472b6c83ef1ee51bb4ed2c01dd",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -9,9 +9,7 @@
# Zephyr sdk and toolchain # Zephyr sdk and toolchain
zephyr-nix.url = "github:urob/zephyr-nix"; zephyr-nix.url = "github:urob/zephyr-nix";
zephyr-nix.inputs.zephyr.follows = "zephyr"; zephyr-nix.inputs.zephyr.follows = "zephyr";
# Relies on 23.11 to provide py38 until zephyr-sdk bumps the requirement zephyr-nix.inputs.nixpkgs.follows = "nixpkgs";
# https://github.com/zephyrproject-rtos/sdk-ng/issues/752
# zephyr-nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { nixpkgs, zephyr-nix, ... }: let outputs = { nixpkgs, zephyr-nix, ... }: let