Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 654e49be5393
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 04768cefa256
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 14, 2020

  1. gping: 1.1 -> 0.1.6

    @evanjs
    evanjs committed Nov 14, 2020
    Copy the full SHA
    32160d8 View commit details

Commits on Nov 16, 2020

  1. Merge pull request #103767 from evanjs/gping/0.1.6 

    gping: 1.1 -> 0.1.6
    @danieldk
    danieldk authored Nov 16, 2020
    Copy the full SHA
    04768ce View commit details
Showing with 11 additions and 18 deletions.
  1. +11 −18 pkgs/tools/networking/gping/default.nix
29 changes: 11 additions & 18 deletions pkgs/tools/networking/gping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
{ lib
, iputils
, python3
, python3Packages
, rustPlatform
, fetchFromGitHub
}:

python3Packages.buildPythonApplication rec {
rustPlatform.buildRustPackage rec {
pname = "gping";
version = "1.1";
version = "0.1.6";

propagatedBuildInputs = with python3Packages; [ colorama ];

src = python3Packages.fetchPypi {
inherit version;
pname = "pinggraph";
sha256 = "0q5ma98457zb6vxsnhmrr3p38j1vg0gl155y0adzfg67wlniac92";
src = fetchFromGitHub {
owner = "orf";
repo = "gping";
rev = "v${version}";
sha256 = "1scwwrrj30ff9yr776gpn4jyl3lbrx2s2dv0pc8b1zj7mvwp3as2";
};

# Make path to ping explicit
postFixup = ''
substituteInPlace $out/${python3.sitePackages}/gping/pinger.py \
--replace 'subprocess.getoutput("ping ' 'subprocess.getoutput("${iputils}/bin/ping ' \
--replace 'args = ["ping"]' 'args = ["${iputils}/bin/ping"]'
'';
cargoSha256 = "1dsfrl5cajl9nmzl6p43j7j50xn1z7dymqaz8kqs7zalj9zadm8k";

meta = with lib; {
description = "Ping, but with a graph";
homepage = "https://github.com/orf/gping";
license = licenses.gpl2;
license = licenses.mit;
maintainers = with maintainers; [ andrew-d ];
};
}