From 80dd94d4c0382be505218918bfb2a97678c28957 Mon Sep 17 00:00:00 2001 From: Kjuvi Date: Tue, 26 Feb 2019 20:17:46 +0100 Subject: [PATCH 1/2] ping: init at 0.6.0 ping: init at 0.6.0 Update pkgs/development/web/ping/default.nix Co-Authored-By: Kjuvi Update pkgs/development/web/ping/default.nix Co-Authored-By: Kjuvi Update pkgs/development/web/ping/default.nix Co-Authored-By: Kjuvi Update pkgs/development/web/ping/default.nix Co-Authored-By: Kjuvi Update pkgs/development/web/ping/default.nix Co-Authored-By: Kjuvi Update maintainers/maintainer-list.nix Co-Authored-By: Kjuvi Update maintainer-list.nix ping: init at 0.6.0 --- pkgs/development/web/ping/default.nix | 58 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/web/ping/default.nix diff --git a/pkgs/development/web/ping/default.nix b/pkgs/development/web/ping/default.nix new file mode 100644 index 00000000000..11bae6ac977 --- /dev/null +++ b/pkgs/development/web/ping/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, gtk3 +, gtksourceview +, json-glib +, libsoup +, libgee +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "ping"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "jeremyvaartjes"; + repo = "ping"; + rev = version; + sha256 = "1h9cdy2jxa2ffykjg89j21hazls32z9yyv3g0x07x3vizzl5xcij"; + }; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gtksourceview + hicolor-icon-theme + json-glib + libgee + libsoup + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "A helpful tool that lets you debug what part of your API is causing you issues"; + homepage = https://github.com/jeremyvaartjes/ping; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb678f9dee..a947290f3ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9016,6 +9016,8 @@ in phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; + ping = callPackages ../development/web/ping { }; + pmccabe = callPackage ../development/tools/misc/pmccabe { }; pkgconf = callPackage ../development/tools/misc/pkgconf {}; From 527d236578264173137bd0d55cfdaa620dbcf338 Mon Sep 17 00:00:00 2001 From: Quentin Vaucher Date: Wed, 27 Feb 2019 09:03:25 +0100 Subject: [PATCH 2/2] maintainers: add kjuvi fix missing glib Fix missing import: hicolor-icon-theme move ping under applications/networking ping: init at 0.6.0 ping: init at 0.6.0 maintainers: add kjuvi --- maintainers/maintainer-list.nix | 5 +++++ .../web => applications/networking}/ping/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) rename pkgs/{development/web => applications/networking}/ping/default.nix (97%) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a44660ebef5..f6c76b465fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2454,6 +2454,11 @@ github = "kisonecat"; name = "Jim Fowler"; }; + kjuvi = { + email = "quentin.vaucher@pm.me"; + github = "kjuvi"; + name = "Quentin Vaucher"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; diff --git a/pkgs/development/web/ping/default.nix b/pkgs/applications/networking/ping/default.nix similarity index 97% rename from pkgs/development/web/ping/default.nix rename to pkgs/applications/networking/ping/default.nix index 11bae6ac977..d20b07a8d3b 100644 --- a/pkgs/development/web/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -5,8 +5,10 @@ , pkgconfig , pantheon , python3 +, glib , gtk3 , gtksourceview +, hicolor-icon-theme , json-glib , libsoup , libgee diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a947290f3ca..c0e7d69b355 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9016,8 +9016,6 @@ in phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; - ping = callPackages ../development/web/ping { }; - pmccabe = callPackage ../development/tools/misc/pmccabe { }; pkgconf = callPackage ../development/tools/misc/pkgconf {}; @@ -18510,6 +18508,8 @@ in pijul = callPackage ../applications/version-management/pijul {}; + ping = callPackage ../applications/networking/ping { }; + piper = callPackage ../os-specific/linux/piper { }; plank = callPackage ../applications/misc/plank { };