diff options
| author | Raghav Sood <r@raghavsood.com> | 2020-12-06 06:28:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 06:28:06 +0000 |
| commit | 6dfa0d8c5fb3a794c93151e0141771c2b7013f07 (patch) | |
| tree | ea9663119076fa454954009fdad945c2fce2cc5c | |
| parent | bb2a7b943917aba1c9c86f049e75a4a594040746 (diff) | |
| parent | e9293077ff02fdb3dd8e52cc1cb1bbe2c17ee460 (diff) | |
Merge pull request #106042 from breakds/marl
marl: init at 1.0.0
| -rw-r--r-- | pkgs/development/libraries/marl/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix new file mode 100644 index 000000000000..2bf23962d53e --- /dev/null +++ b/pkgs/development/libraries/marl/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "marl"; + version = "1.0.0"; # Based on marl's CHANGES.md + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + sha256 = "0pnbarbyv82h05ckays2m3vgxzdhpcpg59bnzsddlb5v7rqhw51w"; + rev = "40209e952f5c1f3bc883d2b7f53b274bd454ca53"; + }; + + nativeBuildInputs = [ cmake ]; + + # Turn on the flag to install after building the library. + cmakeFlags = ["-DMARL_INSTALL=ON"]; + + meta = with stdenv.lib; { + homepage = "https://github.com/google/marl"; + description = "A hybrid thread / fiber task scheduler written in C++ 11"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40acceafc2e0..c314129b0b43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2374,6 +2374,8 @@ in mapproxy = callPackage ../applications/misc/mapproxy { }; + marl = callPackage ../development/libraries/marl {}; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; masscan = callPackage ../tools/security/masscan { |