summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-02-10 11:17:56 +0100
committerlethalman <lucabru@src.gnome.org>2015-02-10 11:17:56 +0100
commit93ebaafabe1bc8bf978827437791bbe8cfc95bb5 (patch)
tree98d69526d41af13e130cc129accdbdf0cf9599d3 /pkgs/top-level
parent7614b2f9848345a5b3fef361867af6c3d1a760de (diff)
parent1439e72147bf73adb862fd2d153602a5e52103d7 (diff)
downloadnixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.tar
nixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.tar.gz
nixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.tar.bz2
nixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.tar.lz
nixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.tar.xz
nixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.tar.zst
nixlib-93ebaafabe1bc8bf978827437791bbe8cfc95bb5.zip
Merge pull request #6170 from k0ral/sslh
New sslh module
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eca5410da25..7ed94373a12b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8231,6 +8231,8 @@ let
   });
   squid = squids.squid31; # has ipv6 support
 
+  sslh = callPackage ../servers/sslh { };
+
   thttpd = callPackage ../servers/http/thttpd { };
 
   storm = callPackage ../servers/computing/storm { };