colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Jörg Thalheim 2020-12-06 08:12:29 +01:00
commit c0ff5c7b7a
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/marl/default.nix Normal file
View File

@ -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 ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -2376,6 +2376,8 @@ in
mapproxy = callPackage ../applications/misc/mapproxy { };
marl = callPackage ../development/libraries/marl {};
marlin-calc = callPackage ../tools/misc/marlin-calc {};
masscan = callPackage ../tools/security/masscan {