summary refs log tree commit diff
path: root/pkgs/servers/http/nginx/mainline.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-06 12:07:37 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-06 12:07:37 +0200
commitf504af072bc5cf49da008e6970c214255d5f46ed (patch)
treef2849cd5d239a32d7a2fbdff1dc5b3a0ed369b96 /pkgs/servers/http/nginx/mainline.nix
parent11ceef47699fb0911bea790e4b8059d97e95ad14 (diff)
parent6820e2f0dd16104961d6fc7e8e38846807159c4e (diff)
downloadnixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.gz
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.bz2
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.lz
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.xz
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.zst
nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.zip
Merge branch 'master' into staging-next
There's been some large rebuild on master.
I don't really have time ATM to find what it was.
Diffstat (limited to 'pkgs/servers/http/nginx/mainline.nix')
-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 5afd73c88686..ecde2430f522 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.1";
-  sha256 = "0q2lkpnfqf74p22vrcldx0gcnss3is7rnp54fgpvhcpqsxc6h867";
+  version = "1.15.2";
+  sha256 = "145dcypq8dqc5as03iy1ycwifwynq9p4i8m56fn7g0myryp0kfpf";
 })