NaxdyOrg/NaxGCC-FW
2
0
Fork 2
Code Issues Pull requests 1 Releases 4 Activity Actions

flake: remove obsolete embassy input
Some checks failed
Code quality / check (pull_request) Failing after 3m24s
Details

Browse source
This commit is contained in:
Naxdy 2024-10-14 16:12:39 +02:00
parent 2fa8779d90
commit 463551dad8
Signed by: Naxdy
GPG key ID: CC15075846BCE91B
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -1,22 +1,5 @@
{ {
"nodes": { "nodes": {
"embassy-rs-patched": {
"flake": false,
"locked": {
"lastModified": 1710754402,
"narHash": "sha256-HyTw5VQXlSqz9UOq0Dc6G/NWNzQOPXf3PNWffMkfLC4=",
"ref": "naxgcc-fw",
"rev": "2ee4657727b9679998d941de00b43e1754f570bf",
"revCount": 6754,
"type": "git",
"url": "https://gitea@git.naxdy.org/NaxdyOrg/embassy"
},
"original": {
"ref": "naxgcc-fw",
"type": "git",
"url": "https://gitea@git.naxdy.org/NaxdyOrg/embassy"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -89,7 +72,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"embassy-rs-patched": "embassy-rs-patched",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

16
flake.nix
View file

@ -8,11 +8,6 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
embassy-rs-patched = {
url = "git+https://gitea@git.naxdy.org/NaxdyOrg/embassy?ref=naxgcc-fw";
flake = false;
};
naersk = { naersk = {
url = "github:nmattia/naersk"; url = "github:nmattia/naersk";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -25,7 +20,6 @@
, rust-overlay , rust-overlay
, flake-utils , flake-utils
, naersk , naersk
, embassy-rs-patched
}: (flake-utils.lib.eachDefaultSystem (system: }: (flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -51,12 +45,6 @@
}; };
CARGO_BUILD_TARGET = "thumbv6m-none-eabi"; CARGO_BUILD_TARGET = "thumbv6m-none-eabi";
prepCmd = ''
mkdir -p lib
rm lib/embassy-rs || true
ln -s "${embassy-rs-patched}" lib/embassy-rs
'';
in in
{ {
packages.default = self.packages.${system}.naxgcc-fw-uf2; packages.default = self.packages.${system}.naxgcc-fw-uf2;
@ -70,8 +58,6 @@
pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name; pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name;
version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version; version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
prePatch = prepCmd;
src = self; src = self;
cargoBuildOptions = _orig: _orig ++ [ cargoBuildOptions = _orig: _orig ++ [
@ -92,8 +78,6 @@
DEFMT_LOG = "debug"; DEFMT_LOG = "debug";
inherit CARGO_BUILD_TARGET; inherit CARGO_BUILD_TARGET;
shellHook = prepCmd;
}; };
})); }));
} }