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

Merge pull request #41614 from teto/flent_wrap

Browse Source 
[RFC/RDY] flent: add manpage + init http-getter
This commit is contained in:
Matthew Justin Bauer 2018-06-21 21:33:49 -04:00 committed by GitHub
commit 9185df5f9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/flent/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }:
{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5
, sphinx
}:
buildPythonApplication rec {
pname = "flent";
@ -10,7 +12,8 @@ buildPythonApplication rec {
sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r";
};
buildInputs = [ netperf ];
buildInputs = [ sphinx ];
propagatedBuildInputs = [
matplotlib
procps

23
pkgs/applications/networking/flent/http-getter.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, cmake
, curl, pkgconfig }:
stdenv.mkDerivation rec {
name = "http-getter";
version = "20180606";
src = fetchFromGitHub {
owner = "tohojo";
repo = "http-getter";
rev = "79bcccce721825a745f089d0c347bbaf2e6e12f4";
sha256 = "1zxk52s1h5qx62idil237zdpj8agrry0w1xwkfx05wvv9sw4ld35";
};
buildInputs = [ cmake pkgconfig curl ];
meta = with stdenv.lib; {
homepage = https://github.com/tohojo/http-getter;
description = "Simple getter for HTTP URLs using cURL";
platforms = platforms.unix;
license = licenses.gpl3;
};
}

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

@ -3030,6 +3030,8 @@ with pkgs;
http-prompt = callPackage ../tools/networking/http-prompt { };
http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
httpie = callPackage ../tools/networking/httpie { };
httping = callPackage ../tools/networking/httping {};