From acbf6aef5f328548a507a3214fa0dcbea0d1cc2a Mon Sep 17 00:00:00 2001 From: Sarah Renkhoff Date: Wed, 28 Feb 2024 13:26:53 +0100 Subject: [PATCH] nix-flake: Update flake.lock and west2nix.toml manifest after rebase Signed-off-by: Sarah Renkhoff --- flake.lock | 12 ++++++------ west2nix.toml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 8bdbb88154..32a20aaee2 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708294118, - "narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=", + "lastModified": 1708979614, + "narHash": "sha256-FWLWmYojIg6TeqxSnHkKpHu5SGnFP5um1uUjH+wRV6g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0da498ad77ac8909a980f07eff060862417ccf7", + "rev": "b7ee09cf5614b02d289cd86fcfa6f24d4e078c2a", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "zephyr": { "flake": false, "locked": { - "lastModified": 1708470279, - "narHash": "sha256-rEWA+154sbvDF1gVPLqXWWcOr2rfAplYvRvsxvkQg+U=", + "lastModified": 1709120303, + "narHash": "sha256-UmHHyhbGmmdZGFbxu3J8tBGZdXVMDOFikqKVUWRHgIE=", "owner": "tiacsys", "repo": "zephyr", - "rev": "53f527cc2dc322302a11e2a524126e62a4dc6834", + "rev": "ff8c8923aefad2de2a8371f8579e5f2523d3536e", "type": "github" }, "original": { diff --git a/west2nix.toml b/west2nix.toml index ee5d587761..ec3faa5e64 100644 --- a/west2nix.toml +++ b/west2nix.toml @@ -4,16 +4,16 @@ group-filter = ["-babblesim"] [[manifest.projects]] name = "ubxlib" url = "https://github.com/tiacsys/ubxlib" -revision = "373f57933ba2fb9fbdd8166fe1d9db79a372a334" +revision = "3537ea286e9e5ed88818b6a2eda04a93484e9e03" path = "modules/lib/ubxlib" [manifest.projects.nix] -hash = "sha256-zv058Sz4+c4vJJe+dtqJ8B1vbTfxPym5r1nH1gyXB+U=" +hash = "sha256-U5MzTFexIGGy4ttvf7GBQ6W/p+uGTwFKrIvY+lYhZIg=" [[manifest.projects]] name = "zephyr" url = "https://github.com/tiacsys/zephyr" -revision = "e2d504bd2390a68981781b29db7572cc26f9188c" +revision = "6c93afc3d2572a8f3f4aed0c81d80176f6bbb2ff" clone-depth = 5000 west-commands = "scripts/west-commands.yml" @@ -21,7 +21,7 @@ west-commands = "scripts/west-commands.yml" west-commands-path = "scripts/west_commands" [manifest.projects.nix] -hash = "sha256-klB4g70S577aBrgRgxXpsxpb56Gj+p78/ivyCRhnZts=" +hash = "sha256-WsAK7oFvYPPU1zIxelnfARKj82XdtJt5ndKOTaXJZrY=" [[manifest.projects]] name = "canopennode"