Skip to content

Commit 14e590a

Browse files
authored
Merge pull request #495 from tock/dev/nix-shell-uncrustify
shell.nix: add specific uncrustify version (0.75.1)
2 parents ad4bf4a + 69f881c commit 14e590a

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

shell.nix

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,25 @@ let
3737

3838
cargoHash = "sha256-UHAwk1fBcabRqy7VMhz4aoQuIur+MQshDOhC7KFyGm4=";
3939
};
40+
41+
# The formatting scripts require a specific version of uncrustify:
42+
uncrustify-0_75_1 = stdenv.mkDerivation rec {
43+
pname = "uncrustify";
44+
version = "0.75.1";
45+
46+
src = pkgs.fetchFromGitHub {
47+
owner = "uncrustify";
48+
repo = "uncrustify";
49+
rev = "uncrustify-${version}";
50+
sha256 = "sha256-wLzj/KcqXlcTsOJo7T166jLcWi1KNLmgblIqqkj7/9c=";
51+
};
52+
53+
nativeBuildInputs = with pkgs; [
54+
cmake
55+
python3
56+
];
57+
};
58+
4059
in
4160
pkgs.mkShell {
4261
name = "tock-dev";
@@ -47,9 +66,9 @@ in
4766
python3Full
4867
tockloader
4968
pkgsCross.riscv32-embedded.buildPackages.gcc
50-
uncrustify
5169
unzip
5270
openocd
71+
uncrustify-0_75_1
5372
] ++ (lib.optionals withUnfreePkgs [
5473
segger-jlink
5574
tockloader.nrf-command-line-tools

0 commit comments

Comments
 (0)