Skip to content

Bump sdk and python #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Bump sdk and python #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d804d29
sdk: 0.16.8 -> 0.16.9
urob Oct 22, 2024
490015c
sdk: 0.16.9 -> 0.17.0
urob Oct 22, 2024
20c671a
Add missing buildInputs
urob Oct 22, 2024
f440df9
Revert "Bump nixpkgs to 24.05 & use Python 3.8 from cachix/nixpkgs-py…
urob Oct 22, 2024
d37ebf7
Bump python to 3.10
urob Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, pyproject-nix
, lib
, fetchurl
, python38
, python310
, newScope
, openocd
, gcc_multi
Expand Down Expand Up @@ -32,7 +32,7 @@ let
};

sdkArgs = {
python3 = python38;
python3 = python310;
};

in
Expand All @@ -52,6 +52,8 @@ in {
, which
, cmake
, autoPatchelfHook
, libxcrypt-legacy
, ncurses
, python3
, targets ? [ ]
}:
Expand All @@ -76,7 +78,7 @@ in {
++ lib.optional (!stdenv.isDarwin) autoPatchelfHook
;

buildInputs = [ stdenv.cc.cc python3 ];
buildInputs = [ stdenv.cc.cc ncurses libxcrypt-legacy python3 ];

dontBuild = true;
dontUseCmakeConfigure = true;
Expand Down
38 changes: 0 additions & 38 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@
pyproject-nix.url = "github:nix-community/pyproject.nix";
pyproject-nix.inputs.nixpkgs.follows = "nixpkgs";

nixpkgs-python.url = "github:cachix/nixpkgs-python";
nixpkgs-python.inputs.nixpkgs.follows = "nixpkgs";

zephyr.url = "github:zephyrproject-rtos/zephyr/v3.7.0";
zephyr.flake = false;
};

outputs = { self, nixpkgs, zephyr, pyproject-nix, nixpkgs-python }: (
outputs = { self, nixpkgs, zephyr, pyproject-nix }: (
let
inherit (nixpkgs) lib;
forAllSystems = lib.genAttrs lib.systems.flakeExposed;
Expand All @@ -38,13 +35,8 @@
system:
let
pkgs = nixpkgs.legacyPackages.${system};

callPackage = lib.callPackageWith (pkgs // {
python38 = nixpkgs-python.packages.${system}."3.8";
});

in
clean (callPackage ./. {
clean (pkgs.callPackage ./. {
zephyr-src = zephyr;
inherit pyproject-nix;
})
Expand Down
Loading