diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-12-17 17:44:14 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-12-17 17:44:14 +0100 |
commit | 778336429cc37ad5b0d736336141d09bf227653d (patch) | |
tree | 4aa85bd5d87d5bb5fb2c35ab9313987606abca89 /nixpkgs/pkgs/tools/networking | |
parent | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (diff) | |
parent | 7d6929828a2d28eda9d37254ff6be3b6819506ca (diff) | |
download | nixlib-778336429cc37ad5b0d736336141d09bf227653d.tar nixlib-778336429cc37ad5b0d736336141d09bf227653d.tar.gz nixlib-778336429cc37ad5b0d736336141d09bf227653d.tar.bz2 nixlib-778336429cc37ad5b0d736336141d09bf227653d.tar.lz nixlib-778336429cc37ad5b0d736336141d09bf227653d.tar.xz nixlib-778336429cc37ad5b0d736336141d09bf227653d.tar.zst nixlib-778336429cc37ad5b0d736336141d09bf227653d.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/chrony/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/networking/quicktun/default.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/networking/chrony/default.nix b/nixpkgs/pkgs/tools/networking/chrony/default.nix index c188fbb7ccd8..74132e792447 100644 --- a/nixpkgs/pkgs/tools/networking/chrony/default.nix +++ b/nixpkgs/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "chrony"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - hash = "sha256-6vsH5tr5KxQiAPR4hW3+1u/J6i0Ubu3tXtywm5MScIg="; + hash = "sha256-Gf4dn0Zk1EWmmpbHHo/bYLzY3yTHPROG4CKH9zZq1CI="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/nixpkgs/pkgs/tools/networking/quicktun/default.nix index b997aad0c2d6..2c1799387df8 100644 --- a/nixpkgs/pkgs/tools/networking/quicktun/default.nix +++ b/nixpkgs/pkgs/tools/networking/quicktun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libsodium }: +{ lib, stdenv, fetchFromGitHub, libsodium, nixosTests }: stdenv.mkDerivation { pname = "quicktun"; @@ -22,11 +22,13 @@ stdenv.mkDerivation { install -vD out/quicktun* -t $out/bin ''; + passthru.tests.quicktun = nixosTests.quicktun; + meta = with lib; { broken = stdenv.isDarwin; description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; - maintainers = [ ]; + maintainers = with maintainers; [ h7x4 ]; platforms = platforms.unix; license = licenses.bsd2; }; |