From e96ce01e766a1f142d9aed5ee01bc51cbc9b093b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 7 Jun 2018 13:44:51 +0900 Subject: [PATCH 1/2] flent: enable man by default --- pkgs/applications/networking/flent/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 90ff868d6be..2f97b39da60 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -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 From 0080fe93fcaf18f390696f9c4e715b5ac6952d4a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 14 Jun 2018 08:22:54 +0900 Subject: [PATCH 2/2] http-getter: init at 20180606 Used by flent --- .../networking/flent/http-getter.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/flent/http-getter.nix diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix new file mode 100644 index 00000000000..20557c18c52 --- /dev/null +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d652824d8b9..47a2899c505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3020,6 +3020,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 {};