From 41bd6d2614749d12ce5ded3e991555b56ea6b2dc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 26 Apr 2020 14:24:18 +0200 Subject: nixos/wireguard: test against multiple kernel versions When testing WireGuard updates, I usually run the VM-tests with different kernels to make sure we're not introducing accidental regressions for e.g. older kernels. I figured that we should automate this process to ensure continuously that WireGuard works fine on several kernels. For now I decided to test the latest LTS version (5.4) and the latest kernel (currently 5.6). We can add more kernels in the future, however this seems to significantly slow down evaluation and time. The list can be customized by running a command like this: nix-build nixos/tests/wireguard --arg kernelVersionsToTest '["4.19"]' The `kernelPackages` argument in the tests is null by default to make sure that it's still possible to invoke the test-files directly. In that case the default kernel of NixOS (currently 5.4) is used. --- pkgs/tools/networking/wireguard-tools/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 4fac72f7d035..90055a1a4a7c 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - tests = { - inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces; - }; + tests = nixosTests.wireguard; }; meta = { -- cgit 1.4.1 From de4466d684aefdae26b6e3787620be302d938e2e Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 28 May 2020 09:57:57 +0000 Subject: wormhole: rename to tunnelto --- pkgs/tools/networking/tunnelto/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/tools/networking/wormhole/default.nix | 33 ------------------------------ pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 pkgs/tools/networking/tunnelto/default.nix delete mode 100644 pkgs/tools/networking/wormhole/default.nix (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix new file mode 100644 index 000000000000..1d33850a96e1 --- /dev/null +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "tunnelto"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "agrinman"; + repo = pname; + rev = version; + sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + }; + + cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "Expose your local web server to the internet with a public URL"; + homepage = "https://tunnelto.dev"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/networking/wormhole/default.nix b/pkgs/tools/networking/wormhole/default.nix deleted file mode 100644 index 2b826224f42b..000000000000 --- a/pkgs/tools/networking/wormhole/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, rustPlatform -, fetchFromGitHub -, openssl -, pkg-config -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "wormhole"; - version = "0.1.5"; - - src = fetchFromGitHub { - owner = "agrinman"; - repo = pname; - rev = version; - sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; - }; - - cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; - - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { - description = "Expose your local web server to the internet with a public URL"; - homepage = "https://tunnelto.dev"; - license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcdcc8f10cea..d211209cd51f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7194,6 +7194,10 @@ in tuir = callPackage ../applications/misc/tuir { }; + tunnelto = callPackage ../tools/networking/tunnelto { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tuptime = callPackage ../tools/system/tuptime { }; turses = callPackage ../applications/networking/instant-messengers/turses { }; @@ -7447,10 +7451,6 @@ in wootility = callPackage ../tools/misc/wootility { }; - wormhole = callPackage ../tools/networking/wormhole { - inherit (darwin.apple_sdk.frameworks) Security; - }; - wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; -- cgit 1.4.1 From 0c1e538855fd624680836e66f3ae77e145366701 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 28 May 2020 10:01:35 +0000 Subject: tunnelto: 0.1.5 -> 0.1.6 --- pkgs/tools/networking/tunnelto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/networking') diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 1d33850a96e1..c61da53c6ad5 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7"; }; - cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] -- cgit 1.4.1