diff options
| -rw-r--r-- | devShells/c.nix | 18 | ||||
| -rw-r--r-- | devShells/default.nix (renamed from develop/default.nix) | 1 | ||||
| -rw-r--r-- | devShells/nuttx.nix (renamed from develop/nuttx.nix) | 0 | ||||
| -rw-r--r-- | devShells/riscv.nix (renamed from develop/riscv.nix) | 0 | ||||
| -rw-r--r-- | flake.lock | 11 | ||||
| -rw-r--r-- | flake.nix | 5 |
6 files changed, 26 insertions, 9 deletions
diff --git a/devShells/c.nix b/devShells/c.nix new file mode 100644 index 0000000..2a16700 --- /dev/null +++ b/devShells/c.nix @@ -0,0 +1,18 @@ +{ nixpkgs, shellrc, system }: +let + pkgs = nixpkgs.legacyPackages.${system}; + +in pkgs.mkShell { + packages = (with pkgs; [ + ccls gcc gdb + cppcheck flawfinder bear + meson + lcov massif-visualizer + ]); + inputsFrom = with pkgs; [ + check + + shellrc.packages.${system}.default + ]; + meta.platforms = nixpkgs.lib.platforms.linux; +} diff --git a/develop/default.nix b/devShells/default.nix index 421250f..108d6a3 100644 --- a/develop/default.nix +++ b/devShells/default.nix @@ -11,6 +11,7 @@ in { armv6 = callDevelop ./nuttx.nix "armv6-m"; armv7e = callDevelop ./nuttx.nix "armv7e-m"; + c = callDevelop ./c.nix; riscv = callDevelop ./riscv.nix; } diff --git a/develop/nuttx.nix b/devShells/nuttx.nix index 3066997..3066997 100644 --- a/develop/nuttx.nix +++ b/devShells/nuttx.nix diff --git a/develop/riscv.nix b/devShells/riscv.nix index ded7859..ded7859 100644 --- a/develop/riscv.nix +++ b/devShells/riscv.nix @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654964420, - "narHash": "sha256-Pu9TvVyWMLH362RGBYKMgX2ILSxRPtWovBmBC2s6Zjo=", + "lastModified": 1655034456, + "narHash": "sha256-HXXyvGqZLa+2u8IPIRm/uNQiw+gBtTNu58YaXMJtKRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "419e07c3823fff0bbe24b2759a2d73a01ecd3c69", + "rev": "72b1ec0a79b1fc50f6cc0694c2f0b1eb384a932e", "type": "github" }, "original": { @@ -169,14 +169,13 @@ "locked": { "lastModified": 1654787204, "narHash": "sha256-SFzlL4FxwazJqzMPvLPT0IVWaYqV+NMdHxOEOawZ9Z8=", - "owner": "cynerd", + "owner": "wentasah", "repo": "sterm", "rev": "aec0022e09119ec4e0cf8ba85515cbde907384b6", "type": "github" }, "original": { - "owner": "cynerd", - "ref": "comp", + "owner": "wentasah", "repo": "sterm", "type": "github" } @@ -6,8 +6,7 @@ nixturris.url = "git+https://git.cynerd.cz/nixturris"; personal-secret.url = "git+ssh://git@cynerd.cz/nixos-personal-secret"; - #sterm.url = "github:wentasah/sterm"; - sterm.url = "github:cynerd/sterm/comp"; + sterm.url = "github:wentasah/sterm"; }; outputs = { self @@ -76,7 +75,7 @@ import ./pkgs { nixpkgs = nixpkgs.legacyPackages."${system}"; } )); devShells = filterPackages system - (import ./develop { inherit nixpkgs; inherit shellrc; inherit system; }); + (import ./devShells { inherit nixpkgs; inherit shellrc; inherit system; }); }); } |