about summary refs log tree commit diff
path: root/pkgs/servers/http
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-11-29 08:12:56 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-11-29 08:12:56 +0100
commit9db2421d1f65beb38911e8133349193db0042a1d (patch)
tree90a2f4a56cf871c74aad86138d85e9631c2c2f86 /pkgs/servers/http
parent9caab8ff4a1ad36fbc0ab866f1b0f7c15d35ba90 (diff)
parent8d88e4f6c7b09fe811d92b346e5eafefe07a47c9 (diff)
downloadnixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar
nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.gz
nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.bz2
nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.lz
nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.xz
nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.zst
nixlib-9db2421d1f65beb38911e8133349193db0042a1d.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r--pkgs/servers/http/nginx/mainline.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 93dfbbad2b41..8f33fa8d33b1 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.15.6";
-  sha256 = "1ikchbnq1dv8wjnsf6jj24xkb36vcgigyps71my8r01m41ycdn53";
+  version = "1.15.7";
+  sha256 = "14yz5cag9jdi088kdyammpi0ixrzi91bc0nwdldj42hfdhpyl8lg";
 })