diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-03 17:46:39 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-03 17:46:39 +0000 |
| commit | f1370041799b17454dc252d137795810edf37594 (patch) | |
| tree | c3a8dce88803a52060fe88c73fe7d2af4afa1cba /pkgs/servers/http | |
| parent | 3c3d8710b5d61baace6e412fd4b765a3a50e4188 (diff) | |
| parent | b465d9c1fff4e92d6790e10dafc6a578c44ac98e (diff) | |
| download | nixlib-f1370041799b17454dc252d137795810edf37594.tar nixlib-f1370041799b17454dc252d137795810edf37594.tar.gz nixlib-f1370041799b17454dc252d137795810edf37594.tar.bz2 nixlib-f1370041799b17454dc252d137795810edf37594.tar.lz nixlib-f1370041799b17454dc252d137795810edf37594.tar.xz nixlib-f1370041799b17454dc252d137795810edf37594.tar.zst nixlib-f1370041799b17454dc252d137795810edf37594.zip | |
Merge branch 'master' into staging
* master: (81 commits) Add NixOS 17.09 AMIs gradle: 4.2 -> 4.2.1 maintainers.nix: use my GitHub handle as maintainer name fcitx-engines.rime: init at 0.3.2 brise: init at 2017-09-16 librime: init at 1.2.9 marisa: init at 0.2.4 opencc: build shared library and programs josm: 12712 -> 12914 exa: 0.7.0 -> 0.8.0 krb5: add deprecation date for old configuration rustRegistry: 2017-09-10 -> 2017-10-03 go-ethereum: Fix libusb segmentation faults on Darwin tor-browser-bundle-bin: 7.0.5 -> 7.0.6 libsodium: 1.0.13 -> 1.0.15 tor-browser-bundle: geoip support tor-browser-bundle: support transports obfs2,obfs3 tor-browser-bundle: bump https-everywhere to 2017.9.12 tint2: limit platforms to Linux since macOS is not supported and fails the tests eclipse-plugin-vrapper: init at 0.72.0 ...
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/mainline.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 64d0a9b79524..5ec0c7d4da5e 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.13.4"; - sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy"; + version = "1.13.5"; + sha256 = "0blzna6h76xd7ddz37yb7yqg4yx7gpwsz8zbg8vlbxxk552bjx8f"; }) |