Skip to content

Commit e1ab38d

Browse files
authored
Update nix channel to 24.05 (#45)
* update to nix 24.05 Signed-off-by: Thing-han, Lim <[email protected]> * use astyle 3.4.13 instead astyle > 3.4.13 will result in some weird format Signed-off-by: Thing-han, Lim <[email protected]> --------- Signed-off-by: Thing-han, Lim <[email protected]>
1 parent c921ed6 commit e1ab38d

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
description = "mlkem-c-embedded";
55

66
inputs = {
7-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
7+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
88

99
flake-parts = {
1010
url = "github:hercules-ci/flake-parts";
@@ -24,24 +24,31 @@
2424
mbed-os = pkgs.callPackage ./mbed-os.nix {
2525
targets = [ "TARGET_MPS2_M3" "TARGET_MPS2_M4" "TARGET_MPS2_M7" ];
2626
};
27+
astyle = pkgs.astyle.overrideAttrs (old: rec {
28+
version = "3.4.13";
29+
src = pkgs.fetchurl {
30+
url = "mirror://sourceforge/${old.pname}/${old.pname}-${version}.tar.bz2";
31+
hash = "sha256-eKYQq9OelOD5E+nuXNoehbtizWM1U97LngDT2SAQGc4=";
32+
};
33+
});
2734
core = builtins.attrValues {
2835
libopencm3 = libopencm3;
2936
mbed-os = mbed-os;
37+
astyle = astyle;
3038

3139
inherit (pkgs)
3240
# formatter & linters
3341
nixpkgs-fmt
3442
shfmt
35-
astyle# 3.4.10
3643

3744
# build dependencies
3845
gcc-arm-embedded-13# arm-gnu-toolchain-13.2.rel1
39-
python311
40-
qemu# 8.1.5
46+
qemu# 8.2.4
4147

4248
yq;
4349

4450
inherit (pkgs.python311Packages)
51+
python
4552
black
4653
pyserial# 3.5
4754
click;

0 commit comments

Comments
 (0)