artemist/play
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake: switch to nixfmt-rfc-style

Browse source
This commit is contained in:
Artemis Tosini 2024-07-07 21:13:56 +00:00
parent 489dcfacd7
commit 8a129be532
Signed by: artemist
GPG key ID: EE5227935FE3FF18
3 changed files with 110 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
flake.nix
View file

@ -13,8 +13,16 @@
inputs.flake-utils.follows = "utils"; inputs.flake-utils.follows = "utils";
}; };
}; };
outputs = { self, nixpkgs, utils, artemist-packages, rust-overlay }: outputs =
utils.lib.eachDefaultSystem (system: {
self,
nixpkgs,
utils,
artemist-packages,
rust-overlay,
}:
utils.lib.eachDefaultSystem (
system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -23,77 +31,94 @@
rust-overlay.overlays.default rust-overlay.overlays.default
]; ];
}; };
in rec { in
devShells.zephyr = rec {
artemist-packages.devShells.${system}.zephyr.override { devShells.zephyr = artemist-packages.devShells.${system}.zephyr.override {
toolchains = with pkgs.zephyrPackages.toolchains; [ toolchains = with pkgs.zephyrPackages.toolchains; [
arm-zephyr-eabi arm-zephyr-eabi
riscv64-zephyr-elf riscv64-zephyr-elf
]; ];
modules = with pkgs.zephyrPackages.modules; [ modules = with pkgs.zephyrPackages.modules; [
mbedtls mbedtls
hal_rpi_pico hal_rpi_pico
hal_atmel hal_atmel
cmsis cmsis
]; ];
extraPackages = with pkgs; [ pyocd ]; extraPackages = with pkgs; [ pyocd ];
}; };
devShells.zephyr-west = devShells.zephyr.override { devShells.zephyr-west = devShells.zephyr.override {
enableWest = true; enableWest = true;
zephyrSrc = null; zephyrSrc = null;
modules = [ ]; modules = [ ];
}; };
devShells.rust-embedded = let devShells.rust-embedded =
rust = pkgs.rust-bin.stable.latest.default.override { let
extensions = [ "rust-src" "llvm-tools-preview" "clippy" ]; rust = pkgs.rust-bin.stable.latest.default.override {
# just use all of them, why not extensions = [
targets = [ "rust-src"
"thumbv6m-none-eabi" "llvm-tools-preview"
"thumbv7m-none-eabi" "clippy"
"thumbv7em-none-eabi" ];
"thumbv7em-none-eabihf" # just use all of them, why not
"riscv32imac-unknown-none-elf" targets = [
]; "thumbv6m-none-eabi"
}; "thumbv7m-none-eabi"
rust-form = pkgs.rustPlatform.buildRustPackage rec { "thumbv7em-none-eabi"
pname = "form"; "thumbv7em-none-eabihf"
version = "0.10.0"; "riscv32imac-unknown-none-elf"
src = pkgs.fetchFromGitHub { ];
owner = "djmcgill";
repo = pname;
rev = "v${version}";
hash = "sha256-cqoc2sTtVdhTAQ65oaJKo1+YMfQu7eHCe8zjRPDz9zg=";
}; };
cargoHash = "sha256-dhPp93AH4VlOVJWXMMUwv8b53vLPdBY3WyaXE4kcEm4="; rust-form = pkgs.rustPlatform.buildRustPackage rec {
}; pname = "form";
in with pkgs; version = "0.10.0";
mkShell { src = pkgs.fetchFromGitHub {
packages = [ owner = "djmcgill";
cargo-binutils repo = pname;
cargo-generate rev = "v${version}";
gdb hash = "sha256-cqoc2sTtVdhTAQ65oaJKo1+YMfQu7eHCe8zjRPDz9zg=";
openocd };
probe-rs cargoHash = "sha256-dhPp93AH4VlOVJWXMMUwv8b53vLPdBY3WyaXE4kcEm4=";
rust };
rust-form in
svd2rust with pkgs;
svdtools
];
RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
};
devShells.rust = with pkgs;
mkShell { mkShell {
nativeBuildInputs = [ rustc cargo rustfmt clippy ]; packages = [
cargo-binutils
cargo-generate
gdb
openocd
probe-rs
rust
rust-form
svd2rust
svdtools
];
RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
};
devShells.rust =
with pkgs;
mkShell {
nativeBuildInputs = [
rustc
cargo
rustfmt
clippy
];
RUST_SRC_PATH = "${rust.packages.stable.rustPlatform.rustLibSrc}"; RUST_SRC_PATH = "${rust.packages.stable.rustPlatform.rustLibSrc}";
}; };
devShells.avr = with pkgs; devShells.avr =
with pkgs;
pkgsCross.avr.mkShell { pkgsCross.avr.mkShell {
packages = [ avrdude gnumake ]; packages = [
avrdude
gnumake
];
LIBC = pkgsCross.avr.avrlibc; LIBC = pkgsCross.avr.avrlibc;
}; };
devShells.emoji = with pkgs; devShells.emoji =
with pkgs;
mkShell { mkShell {
packages = [ packages = [
chromedriver chromedriver
@ -105,32 +130,34 @@
python3Packages.trio python3Packages.trio
python3Packages.gql python3Packages.gql
(python3Packages.selenium.overrideAttrs (old: { (python3Packages.selenium.overrideAttrs (old: {
postInstall = old.postInstall + '' postInstall =
for ver in v85 v120 v121 v122; do old.postInstall
DEVTOOLS=../common/devtools/chromium/$ver + ''
for proto in js browser; do for ver in v85 v120 v121 v122; do
python3 ../common/devtools/convert_protocol_to_json.py \ DEVTOOLS=../common/devtools/chromium/$ver
$DEVTOOLS/"$proto"_protocol.pdl \ for proto in js browser; do
--map_binary_to_string=true \ python3 ../common/devtools/convert_protocol_to_json.py \
$DEVTOOLS/"$proto"_protocol.json $DEVTOOLS/"$proto"_protocol.pdl \
--map_binary_to_string=true \
$DEVTOOLS/"$proto"_protocol.json
done
mkdir -p $DST_PREFIX/common/devtools/$ver
python3 generate.py \
$DEVTOOLS/browser_protocol.json \
$DEVTOOLS/js_protocol.json \
$DST_PREFIX/common/devtools/$ver
done done
mkdir -p $DST_PREFIX/common/devtools/$ver '';
python3 generate.py \
$DEVTOOLS/browser_protocol.json \
$DEVTOOLS/js_protocol.json \
$DST_PREFIX/common/devtools/$ver
done
'';
nativeBuildInputs = old.nativeBuildInputs nativeBuildInputs = old.nativeBuildInputs ++ [ python3Packages.inflection ];
++ [ python3Packages.inflection ];
})) }))
]; ];
CHROME = "${chromium}/bin/chromium"; CHROME = "${chromium}/bin/chromium";
}; };
devShells.typst = with pkgs; mkShell { packages = [ typst ]; }; devShells.typst = with pkgs; mkShell { packages = [ typst ]; };
formatter = pkgs.nixfmt; formatter = pkgs.nixfmt-rfc-style;
}); }
);
} }

3
nix/aarch64_be.nix
View file

@ -12,4 +12,5 @@ let
} }
]; ];
}; };
in system.config.system.build.sdImage in
system.config.system.build.sdImage

3
rp2040/shell.nix
View file

@ -7,7 +7,8 @@ let
rev = "1.4.0"; rev = "1.4.0";
sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E="; sha256 = "sha256-i3IAaNcd0EfKNvU104a776O1poDAChlx1m+nP8iFn8E=";
}; };
in mkShell rec { in
mkShell rec {
name = "pico-env"; name = "pico-env";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];