From d4e9fd48836327e087b64d47ae83f4e2a9c56958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Nov 2023 13:56:27 +0100 Subject: [PATCH] Revert "nix-unit; update" This reverts commit 3b50f62b37412d0d64bca8314b50b1be94df14f0. --- pkgs/nix-unit/default.nix | 47 ++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/pkgs/nix-unit/default.nix b/pkgs/nix-unit/default.nix index 8d0e1e6f6..388c03657 100644 --- a/pkgs/nix-unit/default.nix +++ b/pkgs/nix-unit/default.nix @@ -1,8 +1,43 @@ -{ callPackage }: -let - nix-unit-src = builtins.fetchGit { - url = "https://github.com/adisbladis/nix-unit"; +{ stdenv +, lib +, nixVersions +, fetchFromGitHub +, nlohmann_json +, boost +, meson +, pkg-config +, ninja +, cmake +, clang-tools +}: + +stdenv.mkDerivation { + pname = "nix-unit"; + version = "0.1"; + src = fetchFromGitHub { + owner = "adisbladis"; + repo = "nix-unit"; rev = "7e2ee1c70f930b9b65b9fc33c3f3eca0dfae00d1"; + sha256 = "sha256-UaUkh+/lxzNCRH64YB6SbyRIvvDhgY98izX9CvWgJA4="; }; -in -callPackage nix-unit-src { } + buildInputs = [ + nlohmann_json + nixVersions.stable + boost + ]; + nativeBuildInputs = [ + meson + pkg-config + ninja + # nlohmann_json can be only discovered via cmake files + cmake + ] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]); + + meta = { + description = "Nix unit test runner"; + homepage = "https://github.com/adisbladis/nix-unit"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ adisbladis ]; + platforms = lib.platforms.unix; + }; +}