From cab07508991e5fba289024e6e5ffc4d39c285c1a Mon Sep 17 00:00:00 2001 From: Sarah Renkhoff Date: Tue, 9 Jan 2024 11:37:23 +0100 Subject: [PATCH] nix-flake: Use Zephyr SDK v0.16.4 Signed-off-by: Sarah Renkhoff --- flake.lock | 38 ++++++++++++++++++++++++++------------ flake.nix | 4 ++-- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 45a35ef3bd..ddb3b597e2 100644 --- a/flake.lock +++ b/flake.lock @@ -563,16 +563,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700827275, - "narHash": "sha256-2/5n7d7SGgzaEZpxgurP3n71lyEqOakbNMLuHmqvQ0Y=", + "lastModified": 1704626572, + "narHash": "sha256-VwRTEKzK4wSSv64G+g3RLF3t6yBHrhR2VK3kZ5UWisU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18ffb605d570fc496cceb8793d83f3b530d0bf34", + "rev": "24fe8bb4f552ad3926274d29e083b79d84707da6", "type": "github" }, "original": { "owner": "nixos", - "ref": "staging-next", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -860,11 +860,11 @@ }, "locked": { "dir": "nix-workspace", - "lastModified": 1700829103, - "narHash": "sha256-MfG06+WJmfy32vALeTWPIvGCGqBqQlLzJVbKAdCJKUo=", + "lastModified": 1704794144, + "narHash": "sha256-mKRKcApfAKKbTYzh2ng8yG+HjuB0Ct1uLCwJ2vnG6lk=", "ref": "HEAD", - "rev": "fbfdbf6135ac6db1d9e74703db687c48c64c7993", - "revCount": 782, + "rev": "904ef9444771b69295dac6e864f64122d3f76ee5", + "revCount": 849, "type": "git", "url": "file:.?dir=nix-workspace" }, @@ -884,14 +884,15 @@ "zephyr-sdk-src-0-16-0-beta1": "zephyr-sdk-src-0-16-0-beta1", "zephyr-sdk-src-0-16-0-rc1": "zephyr-sdk-src-0-16-0-rc1", "zephyr-sdk-src-0-16-1": "zephyr-sdk-src-0-16-1", - "zephyr-sdk-src-0-16-3": "zephyr-sdk-src-0-16-3" + "zephyr-sdk-src-0-16-3": "zephyr-sdk-src-0-16-3", + "zephyr-sdk-src-0-16-4": "zephyr-sdk-src-0-16-4" }, "locked": { - "lastModified": 1700827373, - "narHash": "sha256-Jge9Allf9OW5ZbXBtv5VJSpz11TjQdsbFltgKMzx/zc=", + "lastModified": 1704791657, + "narHash": "sha256-682wCq5TGorOd2PMGhxLUvwEdQSFFxXqKqvfVCoS2mA=", "owner": "Irockasingranite", "repo": "zephyr-sdk-nix", - "rev": "56fa3d48a4036746c3a44d65e2439966919379dd", + "rev": "0e4e16ddb7bcfc8708eee46bc5abe9991f8c641b", "type": "github" }, "original": { @@ -965,6 +966,19 @@ "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/zephyr-sdk-0.16.3_linux-x86_64.tar.xz" } }, + "zephyr-sdk-src-0-16-4": { + "flake": false, + "locked": { + "lastModified": 1700101702, + "narHash": "sha256-drHIE6cYvxqPY5gexpFEKS4040lAJA52BO9pIQk7Jis=", + "type": "tarball", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_linux-x86_64.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_linux-x86_64.tar.xz" + } + }, "zephyr-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1c64950ff1..568cd1d660 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A flake for working with a bridle workspace"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/staging-next"; # Running against staging-next to get sphinx 7.2.6 (stable only has 5.3.0) + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; workspace = { url = "git+file:.?dir=nix-workspace&ref=HEAD"; # Path in this same repo @@ -46,7 +46,7 @@ pkgs = import nixpkgs { system = "x86_64-linux"; }; - zephyr-sdk-pkg = zephyr-sdk.packages.x86_64-linux.zephyr-sdk-0-16-3; + zephyr-sdk-pkg = zephyr-sdk.packages.x86_64-linux.zephyr-sdk-0-16-4; pypkgs = pkgs.python311Packages; sphinx-tsn-theme = pkgs.python311Packages.buildPythonPackage {