yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'drop bear from buildinputs of nix-unit' (#370) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2023-09-28 14:03:46 +00:00
parent 00e3979c17 cc68aac21f
commit 9a2dfa5926
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/flake-module.nix
View File

@@ -11,7 +11,7 @@
# this gives us a reference to our flake but also all flake inputs # this gives us a reference to our flake but also all flake inputs
inherit self; inherit self;
}; };
nixosTests = { nixosTests = lib.optionalAttrs (pkgs.stdenv.isLinux) {
# import our test # import our test
secrets = import ./secrets nixosTestArgs; secrets = import ./secrets nixosTestArgs;
}; };

1
flake.nix
View File

@@ -25,6 +25,7 @@
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
"aarch64-darwin"
]; ];
imports = [ imports = [
./checks/flake-module.nix ./checks/flake-module.nix

4
pkgs/nix-unit/default.nix
View File

@@ -4,7 +4,6 @@
, fetchFromGitHub , fetchFromGitHub
, nlohmann_json , nlohmann_json
, boost , boost
, bear
, meson , meson
, pkg-config , pkg-config
, ninja , ninja
@@ -27,13 +26,12 @@ stdenv.mkDerivation {
boost boost
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
bear
meson meson
pkg-config pkg-config
ninja ninja
# nlohmann_json can be only discovered via cmake files # nlohmann_json can be only discovered via cmake files
cmake cmake
] ++ (lib.optional stdenv.cc.isClang [ bear clang-tools ]); ] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]);
meta = { meta = {
description = "Nix unit test runner"; description = "Nix unit test runner";