diff options
Diffstat (limited to 'pkgs/applications')
4 files changed, 47 insertions, 23 deletions
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 90ff868d6bec..2f97b39da60f 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 diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix new file mode 100644 index 000000000000..20557c18c52c --- /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/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ceec9f1e75b6..4e9b7d2428de 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation { preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin + rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o ''; postInstall = diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 1a6e8bc56f40..c9f666390b55 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,38 +1,35 @@ -{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }: +{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "hub-${version}"; version = "2.4.0"; - src = fetchgit { - url = https://github.com/github/hub.git; - rev = "refs/tags/v${version}"; + goPackagePath = "github.com/github/hub"; + + src = fetchFromGitHub { + owner = "github"; + repo = "hub"; + rev = "v${version}"; sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2"; }; + buildInputs = [ groff ronn ruby utillinux ] ++ + stdenv.lib.optional stdenv.isDarwin Security; - buildInputs = [ go ronn groff utillinux ] - ++ stdenv.lib.optional stdenv.isDarwin Security; - - buildPhase = '' + postPatch = '' mkdir bin ln -s ${ronn}/bin/ronn bin/ronn - patchShebangs . - make all man-pages ''; - installPhase = '' - prefix=$out sh -x < script/install.sh - - mkdir -p "$out/share/zsh/site-functions" - cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub" - - mkdir -p "$out/etc/bash_completion.d" - cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" + postInstall = '' + cd go/src/${goPackagePath} + install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub" + install -D etc/hub.bash_completion.sh "$bin/etc/bash_completion.d/hub.bash_completion.sh" + install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" - # Should we also install provided git-hooks? - # And fish completion? + make man-pages + cp -r share/man $bin/share/man ''; meta = with stdenv.lib; { |