diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-03 18:38:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 18:38:32 +0000 |
| commit | 07165c7226bb5300ea0b56b52a5d9401fbb20fd4 (patch) | |
| tree | 7a16b89664d7a4ab330bf9aaab2ebdd9f94eb30b /pkgs/tools/networking | |
| parent | 3c9adde0f1fc0f078c5826888cd7f1b9363122c4 (diff) | |
| parent | 0ec29efbb76dee52e6534089778930bc76810f34 (diff) | |
| download | nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.tar nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.tar.gz nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.tar.bz2 nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.tar.lz nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.tar.xz nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.tar.zst nixlib-07165c7226bb5300ea0b56b52a5d9401fbb20fd4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/corerad/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/megatools/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 38331163c122..6ac3c48100e8 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "053rihi8lqai3z837ddi441yl41lsg1zj9gl62s9vbjmq5l11fjh"; + sha256 = "1q4wcliifas8xvwy7kcq4fbc1iv7dha3k6j1nbwl7pjqmyggs3f4"; }; - vendorSha256 = "1ra4yfplmgzxzs1nlbm0izg339fjnkfrw071y8w4m6q6wnzdhljb"; + vendorSha256 = "07khxs15z9xzcmp4gyggdwqyz361y96h6ib92qax8k83cr0l494p"; doCheck = false; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 43bbc62be954..2a957c8a3f41 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking -, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: +, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsNoGuiHook }: stdenv.mkDerivation rec { pname = "megatools"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2 + autoreconfHook pkg-config wrapGAppsNoGuiHook asciidoc libxml2 docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] |