diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-03-26 17:17:48 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-03-26 17:36:07 +0000 |
| commit | 70e58881128ed8170821840138ab08fc5cdd3c11 (patch) | |
| tree | 1bf0d3d977878df5b58493ea02b2e6c79df3ba22 /pkgs/tools/networking | |
| parent | a9847c36e6aa003998c1ef5518e5710658ca5770 (diff) | |
| parent | 90dcc3360327e250536eeeca7fe9d887c9f7a817 (diff) | |
| download | nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.gz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.bz2 nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.lz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.xz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.zst nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/tools/networking')
79 files changed, 829 insertions, 421 deletions
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 9d948eaf822..e1b5f982727 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -3,18 +3,18 @@ , autoreconfHook, usbutils }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.5.2"; + name = "aircrack-ng-1.6"; src = fetchurl { url = "https://download.aircrack-ng.org/${name}.tar.gz"; - sha256 = "0hc2x17bxk2n00z8jj5jfwq3z41681fd19n018724il0cpkjyncy"; + sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg"; }; nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ]; buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' - sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/aircrack-osdep/linux.c + sed -e 's@/usr/local/bin@'${wirelesstools}@ -i lib/osdep/linux.c ''; postFixup = '' diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh index 77648e2fbfb..f33ec8e2ab5 100755 --- a/pkgs/tools/networking/airfield/deps.sh +++ b/pkgs/tools/networking/airfield/deps.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -8 -i deps.json \ +node2nix --nodejs-10 -i deps.json \ --no-copy-node-env \ -e ../../../development/node-packages/node-env.nix -c node.nix diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index 1febe36898b..fe93f449b03 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.8.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "ajv-6.10.0" = { + "ajv-6.12.0" = { name = "ajv"; packageName = "ajv"; - version = "6.10.0"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; - sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; + sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; }; "asn1-0.2.4" = { @@ -49,13 +49,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.8.0" = { + "aws4-1.9.1" = { name = "aws4"; packageName = "aws4"; - version = "1.8.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; - sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; + sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -184,13 +184,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "double-ended-queue-2.1.0-0" = { - name = "double-ended-queue"; - packageName = "double-ended-queue"; - version = "2.1.0-0"; + "denque-1.4.1" = { + name = "denque"; + packageName = "denque"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; - sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; + sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; }; }; "ecc-jsbn-0.1.2" = { @@ -220,22 +220,22 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-2.0.1" = { + "fast-deep-equal-3.1.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "2.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; }; }; - "fast-json-stable-stringify-2.0.0" = { + "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "forever-agent-0.6.1" = { @@ -391,22 +391,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.40.0" = { + "mime-db-1.43.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.40.0"; + version = "1.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; - sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; + sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; }; - "mime-types-2.1.24" = { + "mime-types-2.1.26" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.24"; + version = "2.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; - sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; + sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; }; "mkdirp-0.3.3" = { @@ -418,13 +418,13 @@ let sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13"; }; }; - "ms-2.1.1" = { + "ms-2.1.2" = { name = "ms"; packageName = "ms"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "oauth-sign-0.9.0" = { @@ -454,22 +454,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "psl-1.1.32" = { + "psl-1.7.0" = { name = "psl"; packageName = "psl"; - version = "1.1.32"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; - sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; + sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; "punycode-2.1.1" = { @@ -508,15 +499,6 @@ let sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }; }; - "redis-2.8.0" = { - name = "redis"; - packageName = "redis"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; - }; - }; "redis-commands-1.5.0" = { name = "redis-commands"; packageName = "redis-commands"; @@ -526,22 +508,31 @@ let sha512 = "6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg=="; }; }; - "redis-parser-2.6.0" = { + "redis-errors-1.2.0" = { + name = "redis-errors"; + packageName = "redis-errors"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; + sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + }; + }; + "redis-parser-3.0.0" = { name = "redis-parser"; packageName = "redis-parser"; - version = "2.6.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; - sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; + sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "safe-buffer-5.1.2" = { + "safe-buffer-5.2.0" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.2"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; }; }; "safer-buffer-2.1.2" = { @@ -571,13 +562,13 @@ let sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "tough-cookie-2.4.3" = { + "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "tunnel-agent-0.6.0" = { @@ -598,13 +589,13 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "underscore-1.9.1" = { + "underscore-1.9.2" = { name = "underscore"; packageName = "underscore"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; - sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz"; + sha512 = "D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ=="; }; }; "uri-js-4.2.2" = { @@ -616,13 +607,13 @@ let sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; - "uuid-3.3.2" = { + "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "verror-1.10.0" = { @@ -659,7 +650,7 @@ in sources."methods-0.0.1" sources."mime-1.2.6" sources."mkdirp-0.3.3" - sources."ms-2.1.1" + sources."ms-2.1.2" sources."pause-0.0.1" sources."qs-0.5.1" sources."range-parser-0.0.4" @@ -682,7 +673,7 @@ in sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }; dependencies = [ - sources."underscore-1.9.1" + sources."underscore-1.9.2" ]; buildInputs = globalBuildInputs; meta = { @@ -712,20 +703,21 @@ in redis = nodeEnv.buildNodePackage { name = "redis"; packageName = "redis"; - version = "2.8.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; + url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz"; + sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ=="; }; dependencies = [ - sources."double-ended-queue-2.1.0-0" + sources."denque-1.4.1" sources."redis-commands-1.5.0" - sources."redis-parser-2.6.0" + sources."redis-errors-1.2.0" + sources."redis-parser-3.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Redis client library"; - homepage = https://github.com/NodeRedis/node_redis; + description = "A high performance Redis client."; + homepage = https://github.com/NodeRedis/node-redis; license = "MIT"; }; production = true; @@ -735,19 +727,11 @@ in connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; packageName = "connect-redis"; - version = "3.4.1"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.1.tgz"; - sha512 = "oXNcpLg/PJ6G4gbhyGwrQK9mUQTKYa2aEnOH9kWIxbNUjIFPqUmzz75RdLp5JTPSjrBVcz+9ll4sSxfvlW0ZLA=="; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.4.tgz"; + sha512 = "aXk7btMlG0J5LqtPNRpFKa5fglzlTzukYNx+Fq8cghbUIQHN/gyK9c3+b0XEROMwiSxMoZDADqjp9tdpUoZLAg=="; }; - dependencies = [ - sources."debug-4.1.1" - sources."double-ended-queue-2.1.0-0" - sources."ms-2.1.1" - sources."redis-2.8.0" - sources."redis-commands-1.5.0" - sources."redis-parser-2.6.0" - ]; buildInputs = globalBuildInputs; meta = { description = "Redis session store for Connect"; @@ -761,10 +745,10 @@ in async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "3.0.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.0.1.tgz"; - sha512 = "ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw=="; + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; buildInputs = globalBuildInputs; meta = { @@ -779,18 +763,18 @@ in request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.88.0"; + version = "2.88.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; dependencies = [ - sources."ajv-6.10.0" + sources."ajv-6.12.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.1" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."combined-stream-1.0.8" @@ -800,8 +784,8 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-deep-equal-3.1.1" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" @@ -815,25 +799,21 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."psl-1.1.32" + sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sshpk-1.16.1" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."uri-js-4.2.2" - sources."uuid-3.3.2" + sources."uuid-3.4.0" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 4377681e20d..e306e49c849 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.8.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 06eabec0618..348104e9591 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,30 +1,33 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { pname = "amass"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i"; + sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; }; - modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9"; + modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; outputs = [ "out" "wordlists" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' mkdir -p $wordlists cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; - meta = with lib; { + meta = with stdenv.lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' The OWASP Amass tool suite obtains subdomain names by scraping data diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 5d1ebc74800..ad0139b184d 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: stdenv.mkDerivation rec { - version = "2.20"; + version = "2.21"; pname = "arping"; buildInputs = [ libnet libpcap ]; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0gmyip552k6mq7013cvy5yc4akn2rz28s3g4x4vdq35vnxf66cyk"; + sha256 = "1i7rjn863bnq51ahbvypm1bkzhyshlm5b32yzdd9iaqyz7sa7pa7"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { description = "Broadcasts a who-has ARP packet on the network and prints answers"; - homepage = https://github.com/ThomasHabets/arping; + homepage = "https://github.com/ThomasHabets/arping"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 39024ff462f..1cee7ecdc21 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,19 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy"; + sha256 = "0vg2fkjksjysm5ckdlfswg8w7f52wkh417l7k96hghg9ni4yz575"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6"; + cargoSha256 = "1cyra3mqxpi3m1gqrc5dmjykpsw6swq695dsqirhgb6qxcclxw7p"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 60a9469bced..59654501a39 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs"; + cargoSha256 = "1kbbkbrfjff4yicwanydmcjr2av6s6wrsgafpvbh255vvkd7mr6x"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index eeb69417dc7..2c97e1a17dc 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -18,10 +18,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk"; + cargoSha256 = "1k6mffcs9g0z5lh8hpflyharx6653cs1f2rjpldab0fc5fjmjfza"; buildInputs = [ sqlite ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index bc1f9cebb42..5b9ba71f8c9 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -1,21 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "cassowary"; - version = "0.3.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; - rev = "33b7e81a5d147980f4ddc689818df2b071f6ab4e"; - sha256 = "01cdmh2v9rz8rna08hdsddllck6zp9wcrhxdy6hs77zfsbzyfflx"; + rev = "v${version}"; + sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; }; modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with stdenv.lib; { homepage = "https://github.com/rogerwelin/cassowary"; - description = "Modern cross-platform HTTP load-testing tool written in Go "; + description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index f3d0a584593..8e7499caa47 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "clash"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "0zhbaw9jzl9wqc7yx8yxqlb6fwkss4pqkv26069qg6nsk584ndnf"; + sha256 = "150zpjchldm1632z6gkydgqhx2a612lpwf5lqngd2if99nas54kk"; }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "0vyd61bin7hmpdqrmrikc776mgif9v25627n8hzi65kiycv40kgx"; + modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 517cb111c51..0cfaddcf06a 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,18 +1,26 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "corerad"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "04w77cahnphgd8b09a67dkrgx9jh8mvgjfjydj6drcw67v0d18c0"; + sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w"; }; modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + buildFlagsArray = '' + -ldflags= + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 + -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + ''; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index b7782267b38..d7ab830479e 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,24 +1,25 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "croc"; - version = "6.4.10"; - - goPackagePath = "github.com/schollz/croc"; + version = "8.0.4"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "1w16k0h9zk4q6icyf79jw4zc1jy2h9yzw0bcmywq0pz0pqk6z4nw"; + sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43"; }; - modSha256 = "069n9593jfrlbrfnzr4mxvs1v1y4fvgnc9kawahh2a1rzh3cxrvq"; + modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "." ]; meta = with stdenv.lib; { description = "Easily and securely send things from one computer to another"; - homepage = https://github.com/schollz/croc; + homepage = "https://github.com/schollz/croc"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves equirosa ]; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 6554dd465d4..89173e7b427 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "dnsproxy"; - version = "0.20.0"; + version = "0.23.7"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "0yd3d90ssdzpbsdq068dvsi0r1z2rlv3wpbmpkhfgpxmwrvdanrq"; + sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a"; }; - modSha256 = "0cqwkmhajp3py3b5aj3qz9480qy2ws0vy1gk21bxjm56wqxl2gf0"; + modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 7ee959905ce..bd39cfba8ae 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.6"; + version = "6.0.7"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq"; + sha256 = "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h"; }; nativeBuildInputs = [ cmake ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; - homepage = https://mistertea.github.io/EternalTerminal/; + homepage = "https://mistertea.github.io/EternalTerminal/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg pingiun ]; }; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index b7dd84fd43c..c78a6ad5526 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,19 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka"; + sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0brkza04b38hcjjmqz4bkd8gj0n0mrh0p7427007f5xlnhj7hrn4"; + cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 2ed70c9ef20..7323c914bfa 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -1,21 +1,23 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, stdenv, fetchFromGitHub, Security }: buildGoModule rec { pname = "frp"; - version = "0.31.2"; + version = "0.32.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "0947psq6qcr175xsgwr5k6idphs3s4vdv130ms738bcqf0h9snky"; + sha256 = "1hj3xy7ihwl66hyxc1m8k3fwgz5jyx1bd32f80d7266klhjqf6nw"; }; - modSha256 = "1zbl0gfc99pbzdacxhfa1k3y6i7v13sb441wpbp9aygxhvwqrms9"; + modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 913d1c1a52b..601f70e187a 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -25,10 +25,7 @@ rustPlatform.buildRustPackage { sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; }; sourceRoot = "source/relay-rust"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283"; + cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad"; patchFlags = [ "-p2" ]; patches = [ diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 58e698ed708..de2b3f78798 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, stdenv, Security }: buildGoModule rec { pname = "grpcui"; @@ -13,7 +13,9 @@ buildGoModule rec { modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "An interactive web UI for gRPC, along the lines of postman"; homepage = "https://github.com/fullstorydev/grpcui"; license = licenses.mit; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index a1e87e3153b..9c7adfce21d 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0xqb64nyl7hqnzpqb2jhv1ash47fcf4sspl3lalybb85i65b0yb0"; + sha256 = "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix new file mode 100644 index 00000000000..69cfa452602 --- /dev/null +++ b/pkgs/tools/networking/hey/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, stdenv, fetchFromGitHub, Security }: + +buildGoModule rec { + pname = "hey"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "rakyll"; + repo = pname; + rev = "v${version}"; + sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; + }; + + modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "HTTP load generator, ApacheBench (ab) replacement"; + homepage = "https://github.com/rakyll/hey"; + license = licenses.asl20; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/networking/http2tcp/default.nix b/pkgs/tools/networking/http2tcp/default.nix new file mode 100644 index 00000000000..b1f3c704b1f --- /dev/null +++ b/pkgs/tools/networking/http2tcp/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "http2tcp"; + version = "0.5"; + + src = fetchurl { + url = "https://www.linta.de/~aehlig/http2tcp/${pname}-${version}.tar.gz"; + sha256 = "34fb83c091689dee398ca80db76487e0c39abb17cef390d845ffd888009a5caa"; + }; + + buildInputs = [ + (python3.withPackages (ps: [ + ps.wsgitools + ])) + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/{bin,share/${pname}} + cp http2tcp* $out/bin + cp Protocol $out/share/${pname}/ + ''; + + meta = with lib; { + maintainers = with maintainers; [ clkamp ]; + description = "A tool for tunneling TCP connections via HTTP GET requests"; + longDescription = '' + The http2tcp tools allow to tunnel tcp connections (presumably + ssh) via syntactically correct http requests. It is designed to + work in the presence of so-called "transparent" + store-and-forward proxies disallowing POST requests. + + It also turned out to be useful to stabilise connections where + the client's internet connection is unreliable (frequent long + network outages, rapidly changing IP address, etc). + ''; + homepage = "https://www.linta.de/~aehlig/http2tcp/"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 38fdab358c9..a0e2b8e01cc 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -11,6 +11,8 @@ python3Packages.buildPythonApplication rec { sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0"; }; + outputs = [ "out" "doc" "man" ]; + propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; patches = [ ./strip-venv.patch ]; @@ -22,6 +24,62 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; + postInstall = '' + # install completions + install -Dm555 \ + extras/httpie-completion.bash \ + $out/share/bash-completion/completions/http.bash + install -Dm555 \ + extras/httpie-completion.fish \ + $out/share/fish/vendor_completions.d/http.fish + + mkdir -p $man/share/man/man1 + + docdir=$doc/share/doc/httpie + mkdir -p $docdir/html + + cp AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst $docdir + + # helpfully, the readme has a `no-web` class to exclude + # the parts that are not relevant for offline docs + + # this one build link was not marked however + sed -e 's/^|build|//g' -i README.rst + + toHtml() { + ${docutils}/bin/rst2html5 \ + --strip-elements-with-class=no-web \ + --title=http \ + --no-generator \ + --no-datestamp \ + --no-source-link \ + "$1" \ + "$2" + } + + toHtml README.rst $docdir/html/index.html + toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html + toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html + + # change a few links to the local files + substituteInPlace $docdir/html/index.html \ + --replace \ + 'https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst' \ + "CHANGELOG.html" \ + --replace \ + 'https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst' \ + "CONTRIBUTING.html" + + ${docutils}/bin/rst2man \ + --strip-elements-with-class=no-web \ + --title=http \ + --no-generator \ + --no-datestamp \ + --no-source-link \ + README.rst \ + $man/share/man/man1/http.1 + ''; + # the tests call rst2pseudoxml.py from docutils preCheck = '' export PATH=${docutils}/bin:$PATH diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index c394f216e0f..5d59010ac1e 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq"; + cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl"; postInstall = '' wrapProgram $out/bin/httplz \ diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 971d8e69686..3b968077095 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300"; + sha256 = "nGl7c5UY9kJPRaMveMF+aIf8T11WFrB//37oKzREdvM="; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 20169121cd9..9f7d79bdd88 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw"; + sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://troglobit.com/project/inadyn/; + homepage = "http://troglobit.com/project/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 44bf52c9933..c978a330cee 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, zlib, nettools }: +{ stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: stdenv.mkDerivation rec { - name = "iodine-0.7.0"; + pname = "iodine"; + version = "unstable-2019-09-27"; - src = fetchurl { - url = "https://code.kryo.se/iodine/${name}.tar.gz"; - sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"; + src = fetchFromGitHub { + owner = "yarrick"; + repo = "iodine"; + rev = "8e14f18"; + sha256 = "0k8m99qfjd5n6n56jnq85y7q8h2i2b8yw6ba0kxsz4jyx97lavg3"; }; buildInputs = [ zlib ]; @@ -16,6 +19,10 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=\${out}" ]; + passthru.tests = { + inherit (nixosTests) iodine; + }; + meta = { homepage = http://code.kryo.se/iodine/; description = "Tool to tunnel IPv4 data through a DNS server"; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 4c8b926b582..71fdcc947d3 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -6,7 +6,7 @@ let optional = stdenv.lib.optional; - version = "3.29"; + version = "3.31"; name = "libreswan-${version}"; binPath = stdenv.lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.libreswan.org/${name}.tar.gz"; - sha256 = "0gmbb1m5in5dvnbk1n31r8myrdankzvi6yk9gcqbcwijyih423nn"; + sha256 = "1wxqsv11nqgfj5and5xzfgh6ayqvl47midcghd5ryynh60mp7naa"; }; # These flags were added to compile v3.18. Try to lift them when updating. @@ -83,7 +83,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://libreswan.org; + homepage = "https://libreswan.org"; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index dcf377ca0c0..3e5300549db 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; - version = "3.8"; + version = "3.9"; src = fetchurl { url = "mirror://gnu/${project}/${name}.tar.xz"; - sha256 = "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7"; + sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz"; }; postPatch = '' diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 3c8d1534684..b8cf93bc2d3 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,17 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: -buildGoPackage rec { +buildGoModule rec { pname = "minio-client"; - version = "2019-01-30T19-57-22Z"; + version = "2020-03-06T23-29-45Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1w0ig0daf0zxpkz449xq2hm7ajhzn8hlnnmpac6ip82qy53xnbm4"; + sha256 = "1vqvp7mn841s5g9vvas3c8j4y9lp90maw5y49hdv7zcsqncqvzkv"; }; - goPackagePath = "github.com/minio/mc"; + modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + + subPackages = [ "." ]; preBuild = '' buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 70107d2c74d..e9d925fb930 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.4"; + version = "1.12.6"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "0nx9b6wfz2r29gb3wgsi5vflycibfhnij5wvc068s6hcbrsn2bc5"; + sha256 = "0k32rjh06p3q9yq054gxya6c7n39bilhi4s23p2hb02iwlz3bcrf"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WWAN modem manager, part of NetworkManager"; - homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; + homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/"; license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 3411aca5551..f78d7129c34 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Security }: buildGoModule rec { pname = "nebula"; @@ -13,11 +13,13 @@ buildGoModule rec { modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' Nebula is a scalable overlay networking tool with a focus on performance, diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix new file mode 100644 index 00000000000..38591f38fcf --- /dev/null +++ b/pkgs/tools/networking/netifd/default.nix @@ -0,0 +1,28 @@ +{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }: + +stdenv.mkDerivation { + pname = "netifd"; + version = "unstable-2020-01-18"; + + src = fetchgit { + url = "https://git.openwrt.org/project/netifd.git"; + rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543"; + sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3"; + }; + + buildInputs = [ libnl libubox uci ubus json_c ]; + nativeBuildInputs = [ cmake ]; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ + -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)" + ''; + + meta = with stdenv.lib; { + description = "OpenWrt Network interface configuration daemon"; + homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 69b454ea72e..109c4c8cce1 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -1,46 +1,74 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 -, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? true, gcr, glib }: +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, networkmanager +, gnome3 +, libnotify +, libsecret +, polkit +, modemmanager +, libnma +, mobile-broadband-provider-info +, glib-networking +, gsettings-desktop-schemas +, libgudev +, jansson +, wrapGAppsHook +, gobject-introspection +, python3 +, gtk3 +, libappindicator-gtk3 +, glib +}: -let +stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.8.24"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.16.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"; }; mesonFlags = [ - "-Dlibnm_gtk=false" # It is deprecated "-Dselinux=false" "-Dappindicator=yes" - "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "lib" "dev" "devdoc" "man" ]; + outputs = [ "out" "man" ]; buildInputs = [ - gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes mobile-broadband-provider-info libgudev - modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.adwaita-icon-theme - ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser - - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; + libnma + gtk3 + networkmanager + libnotify + libsecret + gsettings-desktop-schemas + polkit + libgudev + modemmanager + jansson + glib-networking + libappindicator-gtk3 + gnome3.adwaita-icon-theme + ]; - # Needed for wingpanel-indicator-network and switchboard-plug-network - patches = [ ./hardcode-gsettings.patch ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + wrapGAppsHook + gobject-introspection + python3 + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - - substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name} ''; passthru = { @@ -51,7 +79,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/"; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 571b907ee2f..bbec39b9502 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.22.6"; + version = "1.22.8"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0r65hk7nw44jq4k6h91wrprr0x9410ibd1n7mpmlh4f4kgy276dw"; + sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 94a4c4b362a..0ce50a3b2d4 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, -networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }: let pname = "NetworkManager-fortisslvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 29c0d550fe2..47e5a2f4181 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: +{ stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 +, withGnome ? true, gnome3, fetchpatch, libnma }: let pname = "NetworkManager-iodine"; - version = "1.2.0"; + version = "unstable-2019-11-05"; in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "network-manager-iodine"; + rev = "2ef0abf089b00a0546f214dde0d45e63f2990b79"; + sha256 = "1ps26fr9b1yyafj7lrzf2kmaxb0ipl0mhagch5kzrjdsc5xkajz7"; }; patches = [ @@ -25,13 +28,14 @@ in stdenv.mkDerivation { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + preConfigure = "intltoolize"; configureFlags = [ "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index e4ab74f08e3..09fb0c5977b 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig , file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, networkmanagerapplet }: +, withGnome ? true, libnma }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix new file mode 100644 index 00000000000..727c18e92c1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnma/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, gtk-doc +, pkg-config +, vala +, networkmanager +, gnome3 +, isocodes +, libxml2 +, docbook_xsl +, docbook_xml_dtd_43 +, mobile-broadband-provider-info +, gobject-introspection +, gtk3 +, withGnome ? true +, gcr +, glib +, substituteAll +}: + +stdenv.mkDerivation rec { + pname = "libnma"; + version = "1.8.28"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"; + }; + + patches = [ + # Needed for wingpanel-indicator-network and switchboard-plug-network + ./hardcode-gsettings.patch + ]; + + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + libxml2 + vala + ]; + + buildInputs = [ + gtk3 + networkmanager + isocodes + mobile-broadband-provider-info + ] ++ stdenv.lib.optionals withGnome [ + # advanced certificate chooser + gcr + ]; + + mesonFlags = [ + "-Dgcr=${if withGnome then "true" else "false"}" + ]; + + postPatch = '' + substituteInPlace src/nma-ws/nma-eap.c --subst-var-by \ + NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/libnma"; + description = "NetworkManager UI utilities (libnm version)"; + license = licenses.gpl2Plus; # Mix of GPL and LPGL 2+ + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch index a480fd6d91e..9b2f5366950 100644 --- a/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch +++ b/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch @@ -1,32 +1,26 @@ -diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c -index 2e9daa23..6663b3ce 100644 ---- a/src/wireless-security/eap-method.c -+++ b/src/wireless-security/eap-method.c -@@ -265,8 +265,11 @@ eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection) +--- a/src/nma-ws/nma-eap.c ++++ b/src/nma-ws/nma-eap.c +@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection) static GSettings * _get_ca_ignore_settings (NMConnection *connection) { -+ GSettingsSchemaSource *schema_source; ++ g_autoptr (GSettingsSchemaSource) *schema_source; + g_autoptr (GSettingsSchema) *schema; GSettings *settings; -- char *path = NULL; -+ -+ g_autofree char *path = NULL; + char *path = NULL; const char *uuid; - + g_return_val_if_fail (connection, NULL); -@@ -274,9 +277,12 @@ _get_ca_ignore_settings (NMConnection *connection) - uuid = nm_connection_get_uuid (connection); - g_return_val_if_fail (uuid && *uuid, NULL); - + + schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL); + schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE); -+ g_settings_schema_source_unref (schema_source); + + uuid = nm_connection_get_uuid (connection); + g_return_val_if_fail (uuid && *uuid, NULL); + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); - settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); -- g_free (path); + settings = g_settings_new_full (schema, NULL, path); - + g_free (path); + return settings; - } diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 2762b12a364..13f7eab5cc7 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, networkmanagerapplet }: +, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }: let pname = "NetworkManager-openvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 843985bfa3e..4f0a516b420 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, networkmanagerapplet }: +, gtk3, gnome3, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; - buildInputs = [ networkmanager strongswanNM libsecret gtk3 networkmanagerapplet ]; + buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 66392325574..9c1d046e4fb 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, networkmanagerapplet }: +, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 0ae309cf94d..256bb824310 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.18"; in +let version = "1.6.19"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0hfgj9lghkjrjxww0jdk8gxr6g4gbmbdmfg9ddg5jj6gcra21gha"; + sha256 = "0idhg7pdkv602h0d0dz7msk8gsxz32ingn16dkqbxp4mgfiakp9r"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { longDescription = '' nfdump is a set of tools for working with netflow data. ''; - homepage = https://github.com/phaag/nfdump; + homepage = "https://github.com/phaag/nfdump"; license = licenses.bsd3; maintainers = [ maintainers.takikawa ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index 19ae72aaac0..6e6d543c439 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata ]; preConfigure = '' sed -e '/jteeuwen\/go-bindata/d' \ diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index b890e07845e..0ce1c5a0429 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p13"; + name = "ntp-4.2.8p14"; src = fetchurl { url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "0f1a4fya7v5s0426nim8ydvvlcashb8hicgs9xlm76ndrz7751r8"; + sha256 = "1dsfbrad5adwjnm3k0y0ip8dzs7r2nmw66vjil8gvapnh7qf8q0r"; }; # The hardcoded list of allowed system calls for seccomp is @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.ntp.org/; + homepage = "http://www.ntp.org/"; description = "An implementation of the Network Time Protocol"; license = { # very close to isc and bsd2 diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 005abb0968b..93ebdeb0720 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, buildGoModule }: +{ stdenv, fetchgit, buildGoModule, Security }: buildGoModule rec { pname = "obfs4"; @@ -12,7 +12,9 @@ buildGoModule rec { modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; - meta = with lib; { + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix new file mode 100644 index 00000000000..01a0ef2242e --- /dev/null +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + version = "5.0.0-2020-02-04"; + pname = "openapi-generator-cli"; + + jarfilename = "${pname}-${version}.jar"; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar"; + sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${jarfilename}" + ''; + + meta = with stdenv.lib; { + description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; + homepage = https://github.com/OpenAPITools/openapi-generator; + license = licenses.asl20; + maintainers = [ maintainers.shou ]; + }; +} + diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index d1a73f1c148..548f0e97be9 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.11.0"; + version = "1.12.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "03ljyam0027w412vmi4gc0bp9c2xfmcspi676qck8cvvzg4gf736"; + sha256 = "1ndyiw4c2s8m0xds4ff87rdpixhbma5v2g420w3gfc1p7alhqz66"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { meta = { description = "Client for PPP+SSL VPN tunnel services"; - homepage = https://github.com/adrienverge/openfortivpn; + homepage = "https://github.com/adrienverge/openfortivpn"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index e0a0dcd56cb..3fe9f87d658 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opensm"; - version = "3.3.22"; + version = "3.3.23"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; rev = version; - sha256 = "1nb6zl93ffbgb8z8728j0dxrmvk3pm0i6a1sn7mpn8ki1vkf2y0j"; + sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s"; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infiniband subnet manager"; - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; # dual licensed as 2-clause BSD maintainers = [ maintainers.aij ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 90ecba0891d..dd0151c89da 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -4,6 +4,8 @@ , withKerberos ? true , withGssapiPatches ? false , kerberos +, libfido2 +, withFIDO ? stdenv.hostPlatform.isUnix , linkOpenssl? true }: @@ -12,25 +14,25 @@ let # **please** update this patch when you update to a new openssh release. gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch"; - sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.2p1-1/debian/patches/gssapi.patch"; + sha256 = "081gryqkfr5zr4f5m4v0piq1sxz06sb38z5lqxccgpivql7pa8d8"; }; in with stdenv.lib; stdenv.mkDerivation rec { pname = "openssh"; - version = if hpnSupport then "7.8p1" else "8.1p1"; + version = if hpnSupport then "8.1p1" else "8.2p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz"; - sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-8_1_P1.tar.gz"; + sha256 = "1xiv28df9c15h44fv1i93fq8rvkyapjj9vj985ndnw3xk1nvqjyd"; } else fetchurl { url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz"; - sha256 = "1zwk3g57gb13br206k6jdhgnp6y1nibwswzraqspbl1m73pxpx82"; + sha256 = "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3"; }; patches = @@ -41,15 +43,7 @@ stdenv.mkDerivation rec { ./dont_create_privsep_path.patch ./ssh-keysign.patch - ] ++ optional hpnSupport - # CVE-2018-20685, can probably be dropped with next version bump - # See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt - # for details - (fetchpatch { - name = "CVE-2018-20685.patch"; - url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch; - sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds"; - }) + ] ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = @@ -61,6 +55,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook; buildInputs = [ zlib openssl libedit pam ] + ++ optional withFIDO libfido2 ++ optional withKerberos kerberos; preConfigure = '' @@ -80,6 +75,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" + ++ optional withFIDO "--with-security-key-builtin=yes" ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; @@ -108,6 +104,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; - broken = hpnSupport; }; } diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 9bc4c178665..29d3230c6d3 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "par2cmdline"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "Parchive"; repo = "par2cmdline"; rev = "v${version}"; - sha256 = "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz"; + sha256 = "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/passh/default.nix b/pkgs/tools/networking/passh/default.nix new file mode 100644 index 00000000000..6534d3a1d51 --- /dev/null +++ b/pkgs/tools/networking/passh/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, stdenv }: +stdenv.mkDerivation rec { + pname = "passh"; + version = "2020-03-18"; + + src = fetchFromGitHub { + owner = "clarkwang"; + repo = pname; + rev = "7112e667fc9e65f41c384f89ff6938d23e86826c"; + sha256 = "1g0rx94vqg36kp46f8v4x6jcmvdk85ds6bkrpayq772hbdm1b5z5"; + }; + + installPhase = '' + mkdir -p $out/bin + cp passh $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/clarkwang/passh"; + description = "An sshpass alternative for non-interactive ssh auth"; + license = licenses.gpl3; + maintainers = [ maintainers.lovesegfault ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index 0d7b30ae152..617eb0ec40c 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -2,24 +2,27 @@ , pkgconfig, libsoup, meson, ninja }: let - version = "2.3"; + version = "2.4"; in stdenv.mkDerivation rec { pname = "phodav"; inherit version; src = fetchurl { url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ndy5qva6bq7vhk06jq2d4nr5fp98xsdwypg42vjz91h9ii1xxkf"; + sha256 = "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"; }; mesonFlags = [ "-Davahi=disabled" "-Dsystemd=disabled" "-Dgtk_doc=disabled" + "-Dudev=disabled" ]; nativeBuildInputs = [ libsoup pkgconfig meson ninja ]; + outputs = [ "out" "dev" "lib" ]; + meta = with stdenv.lib; { description = "WebDav server implementation and library using libsoup"; homepage = https://wiki.gnome.org/phodav; diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix new file mode 100644 index 00000000000..bc8ec7da169 --- /dev/null +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pixiecore"; + version = "2020-03-25"; + rev = "68743c67a60c18c06cd21fd75143e3e069ca3cfc"; + + src = fetchFromGitHub { + owner = "danderson"; + repo = "netboot"; + inherit rev; + sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; + }; + + modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f"; + subPackages = [ "cmd/pixiecore" ]; + + meta = { + description = "A tool to manage network booting of machines"; + homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 3446157df7a..1579823450b 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, substituteAll, libpcap, openssl }: +{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: stdenv.mkDerivation rec { - version = "2.4.7"; + version = "2.4.8"; pname = "ppp"; - src = fetchurl { - url = "mirror://samba/ppp/${pname}-${version}.tar.gz"; - sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02"; + src = fetchFromGitHub { + owner = "paulusmack"; + repo = "ppp"; + rev = "ppp-${version}"; + sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"; }; patches = [ - # fix for glibc>=2.28 - (fetchurl { - url = "https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875.patch"; - sha256 = "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z"; - }) ( substituteAll { src = ./nix-purity.patch; inherit libpcap; @@ -25,19 +22,20 @@ stdenv.mkDerivation rec { # Without nonpriv.patch, pppd --version doesn't work when not run as # root. ./nonpriv.patch - (fetchurl { + (fetchpatch { name = "CVE-2015-3310.patch"; - url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/rc_mksid-no-buffer-overflow"; - sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh"; - }) - (fetchurl { - url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; - sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; + url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch"; + sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; }) (fetchurl { url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; }) + (fetchpatch { + name = "CVE-2020-8597.patch"; + url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch"; + sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh"; + }) ./musl-fix-headers.patch ]; @@ -49,6 +47,7 @@ stdenv.mkDerivation rec { # everything anyway so we remove it from the Makefiles for file in $(find -name Makefile.linux); do substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)' + substituteInPlace "$file" --replace '-m 4550' '-m 550' done ''; diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch index 030cc97d157..d6252a52675 100644 --- a/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch @@ -34,8 +34,8 @@ index c81213b..305aece 100644 +#include <sys/cdefs.h> + - void magic_init __P((void)); /* Initialize the magic number generator */ - u_int32_t magic __P((void)); /* Returns the next magic number */ + void magic_init (void); /* Initialize the magic number generator */ + u_int32_t magic (void); /* Returns the next magic number */ diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c index 91e9a57..9c0fac3 100644 @@ -119,7 +119,7 @@ index 6d71530..86d224e 100644 #define MAX_ADDR_LEN 7 #endif --#if __GLIBC__ >= 2 +-#if !defined(__GLIBC__) || __GLIBC__ >= 2 #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */ #include <net/if.h> #include <net/if_arp.h> diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/tools/networking/ppp/nix-purity.patch index 5321a472e73..975ea9db609 100644 --- a/pkgs/tools/networking/ppp/nix-purity.patch +++ b/pkgs/tools/networking/ppp/nix-purity.patch @@ -1,26 +1,26 @@ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 1ebebec..bf90c62 100644 +index 9664f70..d07e01e 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -120,7 +120,7 @@ CFLAGS += -DHAS_SHADOW +@@ -125,7 +125,7 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard /usr/include/crypt.h),) +-ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) +ifneq ($(wildcard @glibc@/include/crypt.h),) CFLAGS += -DHAVE_CRYPT_H=1 - LIBS += -lcrypt + LIBS += -lcrypt endif -@@ -132,7 +132,7 @@ endif +@@ -137,7 +137,7 @@ endif ifdef NEEDDES ifndef USE_CRYPT --CFLAGS += -I/usr/include/openssl +-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl +CFLAGS += -I@openssl@/include/openssl LIBS += -lcrypto else CFLAGS += -DUSE_CRYPT=1 -@@ -178,7 +178,7 @@ LIBS += -ldl +@@ -188,7 +188,7 @@ LIBS += -ldl endif ifdef FILTER diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b9..37d5edaec45 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "shadowfox"; @@ -11,10 +11,10 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildFlags = [ "--tags" "release" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index d746d1f42b5..973d0287149 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda"; + cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h"; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index a0a65997414..ff01fc89f09 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.4"; + name = "siege-4.0.5"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "0vzaj5nzb0fir2a4l7ghv3wa5d1nk2ss8gmwjb6bjavjplccyzcg"; + sha256 = "0c82h0idkvfbzspy7h6w97wyk671694nl1ir94zhzn54mw0p0jrv"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index f9add47dd3f..b70bf2952f7 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, libcap, libseccomp }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "0g7apfw33wkxxj7qwvlnnhv7qy13s1gkbmvns8612c0yfv9jrsvq"; + sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libcap libseccomp glib ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/rootless-containers/slirp4netns; + homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; maintainers = with maintainers; [ orivej saschagrunert ]; diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix new file mode 100644 index 00000000000..62a9aaf216c --- /dev/null +++ b/pkgs/tools/networking/smartdns/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "smartdns"; + version = + "30"; # This would be used later in the next release as the FHS commit integrated into realse 31. + + src = fetchFromGitHub { + owner = "pymumu"; + repo = pname; + rev = "3ad7cd7f454eec2fbdf338c0eb0541da301f1e73"; + sha256 = "1y9p8gxpj2k4a10maggkxg8l55jvr7x1wyxi69waxf56ggh2dvv0"; + }; + + buildInputs = [ openssl ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system" + "RUNSTATEDIR=/run" + ]; + + installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ]; + + meta = with stdenv.lib; { + description = + "A local DNS server to obtain the fastest website IP for the best Internet experience"; + longDescription = '' + SmartDNS is a local DNS server. SmartDNS accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients. + Avoiding DNS pollution and improving network access speed, supports high-performance ad filtering. + Unlike dnsmasq's all-servers, smartdns returns the fastest access resolution. + ''; + homepage = "https://github.com/pymumu/smartdns"; + maintainers = [ maintainers.lexuge ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index 9b1ee7a9f79..2a10eb13e32 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, getdns, libtool, m4, file , doxygen -, autoreconfHook, automake, check, libbsd, libyaml, darwin }: +{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }: stdenv.mkDerivation rec { pname = "stubby"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "getdnsapi"; repo = pname; rev = "v${version}"; - sha256 = "164gm5cbnq785s78bqmbsgxrxkq8hw930xwkxxzi1f6jgz928dnf"; + sha256 = "04izd1v4fv9l7r75aafkrp6svczbx4cvv1vnfyx5n9105pin11mx"; }; - nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; + nativeBuildInputs = [ cmake libyaml ]; - buildInputs = [ doxygen getdns automake file check ] + buildInputs = [ doxygen getdns systemd ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with stdenv.lib; { @@ -25,10 +24,10 @@ stdenv.mkDerivation rec { queries sent from a client machine (desktop or laptop) to a DNS Privacy resolver increasing end user privacy. Stubby is developed by the getdns team. -''; - homepage = https://dnsprivacy.org/wiki/x/JYAT; + ''; + homepage = "https://dnsprivacy.org/wiki/x/JYAT"; downloadPage = "https://github.com/getdnsapi/stubby"; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars ehmry ]; license = licenses.bsd3; platforms = platforms.all; - }; + }; } diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 4ad924ee5b5..20bc456eea8 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd"; + cargoSha256 = "0v1hx6kjsmydx6ckjqj31y2gcpvax4mshwrniicplkka3q6hx9ra"; meta = with stdenv.lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 0b9c254deeb..91378757af1 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoModule, Security }: buildGoModule rec { pname = "tendermint"; @@ -13,6 +13,8 @@ buildGoModule rec { modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; homepage = https://tendermint.com/; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 3361127afed..a24ff25ef2b 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }: buildGoModule rec { pname = "termshark"; - version = "1.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "1h9wysvd7i4vzn9qyswrmckmshxmh24ypvca98balkyhsxjwlb6j"; + sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wireshark-cli ]; + buildInputs = [ wireshark-cli ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "09mbjbk5wa18z4xis5b2v2v0b04mf4d896yp88vcj8d8hsmbmc6g"; + modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; postFixup = '' wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} @@ -28,8 +29,7 @@ buildGoModule rec { meta = with stdenv.lib; { homepage = https://termshark.io/; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; - platforms = platforms.linux; license = licenses.mit; - maintainers = [ maintainers.winpat ]; + maintainers = with maintainers; [ winpat elseym ]; }; } diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 3b94c61a713..6f9ee7355df 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -31,10 +31,7 @@ buildRustPackage rec { doCheck = false; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh"; + cargoSha256 = "1ka22krw8s05vpamg9naqqf7vv5h8dkpfdik0wy8nispkrxzgb92"; meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index 42839a8ba2f..a7f0993fed6 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ubridge"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; rev = "v${version}"; - sha256 = "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h"; + sha256 = "1rwhbagac7msd116qymvlfh9qkz9jf0m8nl9xckwv68f57bhhjwl"; }; postPatch = '' @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { and TAP interfaces is supported. Packet capture is also supported. ''; inherit (src.meta) homepage; + changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index b2da1384557..f8c585c3b25 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "uget"; - version = "2.2.2"; + version = "2.2.3-1"; src = fetchurl { url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz"; - sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw"; + sha256 = "0jchvgkkphhwp2z7vd4axxr9ns8b6vqc22b2z8a906qm8916wd8i"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { thinking that it "might be too powerful" because remember power is good and lightweight power is uGet! ''; - homepage = http://www.ugetdm.com; + homepage = "http://www.ugetdm.com"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 010d6a7f8e8..17a55d86b9a 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchgit, cmake, perl, libubox, json_c }: stdenv.mkDerivation { - name = "uqmi-2016-12-19"; + pname = "uqmi"; + version = "unstable-2019-06-27"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; - rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165"; - sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m"; + rev = "1965c713937495a5cb029165c16acdb6572c3f87"; + sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0"; }; postPatch = '' diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 5d1cd4540d7..762d68acdb1 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,20 +3,20 @@ , ... } @ args: callPackage ./generic.nix (rec { - version = "4.22.1"; + version = "4.23.0"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0l4rg9galjcm6dzv7sapnim9a02z7pv354mk5mwqndznii6nkr73"; + sha256 = "0if53d1blj1wf572z21dsywx6czbmhs5dpccx5z1knjhh2xgg9lm"; }; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202001210102"; - geoipSha256 = "1wxhrhrigjqzpy5w8yj7yd9ib245xwhqys2pf9prdknq71piyziz"; + geoipRev = "202003180002"; + geoipSha256 = "08d383phc5qk7glq25nkf1g8za38415x2952phy525ail88afpwl"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -24,8 +24,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "202001211332"; - geositeSha256 = "06qlbjxk21lhyh5l3pd8l4m9rdl7sjh2jriz51zihaqx4417f0m7"; + geositeRev = "202003221514"; + geositeSha256 = "1d4gv6714m97i57srrzybnmc4322qv5lypkqbmhcxb8bi4ljpf1m"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index e43c174ab3f..be3d1267861 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -8,12 +8,19 @@ stdenv.mkDerivation rec { sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { + patches = [ + # Fix build with openssl 1.1.0 + (fetchpatch { + name = "vde_cryptcab-compile-against-openssl-1.1.0.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; + sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; + }) + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; - } - ); + }) + ]; configureFlags = stdenv.lib.optional (!withPython) "--disable-python"; @@ -23,7 +30,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://vde.sourceforge.net/; + homepage = "https://github.com/virtualsquare/vde-2"; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 2306359addf..1010c5d9cda 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.5"; + version = "5.5.6"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "01gni315lnkyrwd173fqw0c12qrisfb38wy066s2j85nq64a3nqv"; + sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 8832560b3b1..a722a8016bc 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20191012"; + version = "0.0.20200121"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i"; + sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9"; }; patches = [ ./0001-Fix-darwin-build.patch ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 4d2e9db33c5..0a86d7dec8f 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,13 +13,15 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200206"; + version = "1.0.20200319"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7"; + sha256 = "0g9vlngg9dnh7qqfhaycw35fq8ij5hfz6p1cykh4ncjgr93i7rbx"; }; + outputs = [ "out" "man" ]; + sourceRoot = "source/src"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index ca10adae0e4..605801b6ab7 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,17 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, Foundation }: buildGoModule rec { pname = "yggdrasil"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "03ywxamjcnhcr20vm9pn3rq3hqq49i6rfdvx44czzr30h8xp8dhw"; + sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50"; }; - modSha256 = "1vqk0jyqc1qcryi247r5pbvfjw3m48l028fb2mrq1xqqfkjqrr85"; + modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ]; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -27,11 +29,12 @@ buildGoModule rec { -s -w ''; - meta = with lib; { - description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; + meta = with stdenv.lib; { + description = + "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; platforms = platforms.all; - maintainers = with maintainers; [ gazally lassulus ]; + maintainers = with maintainers; [ ehmry gazally lassulus ]; }; } diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 4675dac5f47..f5086e15436 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "0a4gxdan3aivbpkxw9cv1bgl7rfrwdii12d096dx06zlymb27gqs"; + sha256 = "0993vqbsqcnxgv5l3il432i4sqzp8ns69rnsgww872vpb4bp3cg8"; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index da5b8837523..2a3987f490f 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ + + substituteInPlace ./make-linux.mk \ + --replace 'armv5' 'armv6' ''; @@ -29,6 +32,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildFlags = [ "all" "selftest" ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkPhase = '' + ./zerotier-selftest + ''; + installPhase = '' install -Dt "$out/bin/" zerotier-one ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool @@ -47,6 +57,6 @@ stdenv.mkDerivation rec { homepage = https://www.zerotier.com; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = with platforms; x86_64 ++ aarch64 ++ arm; + platforms = platforms.all; }; } |