Commit graph

176209 commits

Author SHA1 Message Date
aszlig
1f24685d93
nginx/etag-patch: Use Nix store dir from build env
So far, the Nix store directory was hardcoded and if someone uses a
different Nix store directory the patch won't work. Of course, this is
pretty uncommon, but by not only substituting the store directory but
also the length of it we also save a few calls to ngx_strlen(), which
should save us a few cycles.

Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 10:07:55 +02:00
aszlig
d533285224
nixos/tests/nginx: Add subtest for Nix ETag patch
This is to make sure that we get different ETag values whenever we
switch to a different store path but with the same file contents.

I've checked this against the old behaviour without the patch and it
fails as expected.

Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 09:41:13 +02:00
aszlig
af5a3ce474
nginx: Fix memleak in nix-etag patch
The original patch introduced a new "real" variable which gets populated
(and allocated) via ngx_realpath(). It's properly freed in error
conditions but it won't be freed if ngx_http_set_etag returns
successfully.

Adding another ngx_free() just before returning fixes that memory leak.

I also fixed a small indentation issue along the way.

Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 09:40:13 +02:00
Yegor Timoshenko
1da8eec00f
nginx: handle impure symlinks in ETag patch 2019-04-18 09:40:11 +02:00
Yegor Timoshenko
f03302b636
nginx: check for realpath() == NULL in ETag patch
Thanks to Gabriel Ebner!
2019-04-18 09:40:09 +02:00
Yegor Timoshenko
135d54f535
nginx: if root is in Nix store, use path's hash as ETag
Resolves #25485. Usage example:

$ realpath /var/www
/nix/store/wnrhnnpdj3x50j5xz38zp1qxs1ygwccw-site
$ curl --head localhost
HTTP/1.1 200 OK
Server: nginx
Date: Fri, 28 Sep 2018 06:09:25 GMT
Content-Type: text/html
Content-Length: 50
Last-Modified: Thu, 01 Jan 1970 00:00:01 GMT
Connection: keep-alive
ETag: "wnrhnnpdj3x50j5xz38zp1qxs1ygwccw"
Accept-Ranges: bytes
2019-04-18 09:40:06 +02:00
Ryan Mulligan
b050097edf
Merge pull request #59559 from r-ryantm/auto-update/latte-dock
latte-dock: 0.8.6 -> 0.8.8
2019-04-15 21:01:23 -07:00
Brian McKenna
098cf3b348 steam: fix steamrt trying to use a missing setup.sh (#59326)
I was getting the following error after a Steam update:

    internal error: /steamrt/setup.sh is missing, this runtime is invalid or corrupted

The script is used to put things on PATH but it doesn't seem we need to do that.
2019-04-15 22:13:05 -04:00
Dmitry Kalinkin
04ff9941b6
Merge pull request #58506 from nyanloutre/wine-update
Update wine{unstable,staging,mono,winetricks}
2019-04-15 22:02:06 -04:00
Francesco Gazzetta
24786ff49f drawpile: 2.1.6 -> 2.1.7 (#59650) 2019-04-15 21:55:04 -04:00
Matthew Bauer
f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes
treewide: update homepages to https where available
2019-04-15 20:47:30 -04:00
Mario Rodas
7bfe30917a
Merge pull request #59292 from steve-chavez/pgrouting
pgrouting: init at 2.6.2
2019-04-15 19:38:12 -05:00
R. RyanTM
dbcf6cb52f metabase: 0.30.4 -> 0.32.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/metabase/versions
2019-04-15 18:59:46 -05:00
steve-chavez
1f69a954e6 pgrouting: init at 2.6.2
* Remove configurePhase and gcc. Move perl dependency
* Shorten github rev
* Add $out/bin workaround
2019-04-15 18:24:45 -05:00
Francesco Gazzetta
7ba046d906 drawpile: add build options (#57573)
Also add server-headless variant
2019-04-15 18:20:13 -04:00
Dan Callahan
71727f32a9 rapid-photo-downloader: 0.9.13 -> 0.9.14 (#59347)
This updates Rapid Photo Downloader to 0.9.14 and fixes #56815

Support for RAW images is not currently functioning; the rawkit bindings
are unmaintained and only support libraw <= 0.18, but nixpkgs ships 0.19
2019-04-16 00:03:30 +02:00
Silvan Mosberger
4630bf2f86
Merge pull request #59639 from r-ryantm/auto-update/pulseeffects
pulseeffects: 4.5.5 -> 4.5.9
2019-04-15 23:58:32 +02:00
Silvan Mosberger
d122aacf69
Merge pull request #59632 from r-ryantm/auto-update/pdd
pdd: 1.3.1 -> 1.4
2019-04-15 23:58:13 +02:00
adisbladis
888f32f32f
Merge pull request #59611 from r-ryantm/auto-update/nodejs-slim
nodejs-slim-11_x: 11.13.0 -> 11.14.0
2019-04-16 00:34:41 +03:00
R. RyanTM
dffb40b181 pulseeffects: 4.5.5 -> 4.5.9
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseeffects/versions
2019-04-15 14:33:19 -07:00
Tim Steinbach
8b6403eb04
vivaldi: 2.4.1488.38-1 -> 2.4.1488.40-1 2019-04-15 17:21:46 -04:00
Pascal Wittmann
a204bb9ca2
Merge pull request #59536 from r-ryantm/auto-update/homebank
homebank: 5.2.3 -> 5.2.4
2019-04-15 22:41:21 +02:00
Bas van Dijk
fd05e3407e
Merge pull request #59608 from basvandijk/prometheus-pushgateway-0.8.0
prometheus-pushgateway: 0.7.0 -> 0.8.0
2019-04-15 21:52:58 +02:00
R. RyanTM
ab8978cc93 pdd: 1.3.1 -> 1.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pdd/versions
2019-04-15 12:23:12 -07:00
R. RyanTM
c8022b5ef2
josm: 14760 -> 14945
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/josm/versions
2019-04-15 21:16:52 +02:00
worldofpeace
9e3d9e2379
Merge pull request #59627 from worldofpeace/tracker-correct
gnome3.tracker: correct gdbus path
2019-04-15 15:15:45 -04:00
Daiderd Jordan
29884b2b39
Merge pull request #59619 from strager/python37
python37: fix build on macOS
2019-04-15 20:58:44 +02:00
worldofpeace
ebb1d6006f gnome3.tracker: correct gdbus path
It's in glib.bin
2019-04-15 14:57:48 -04:00
Joachim F
3fa154fd7f
Merge pull request #55543 from wucke13/pivx-wallet
pivx: init at 3.2.0
2019-04-15 18:21:44 +00:00
Matthew Glazar
fdbcf5ba36 python37: fix build on macOS
The upstream patch for distutils does not apply cleanly to Python
3.7.3's sources. (The patch applies cleanly to Python 3.7.2's sources,
but nixpkgs commit 0ddae82e6a upgraded
Python to 3.7.3.) Fix the patch to make python37 build on macOS.
2019-04-15 10:49:34 -07:00
Peter Simons
4f11c82d6e hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.14.2-9-ge08962a from Hackage revision
554b854eb0.
2019-04-15 19:29:18 +02:00
Peter Simons
221f65b041 hackage2nix: update list of broken packages
Closes https://github.com/NixOS/nixpkgs/pull/59333.
2019-04-15 19:29:17 +02:00
Peter Simons
f9dd1b813e LTS Haskell 13.17 2019-04-15 19:28:57 +02:00
worldofpeace
27ac8cb2c4
Merge pull request #59185 from worldofpeace/glib-networking
nixos/glib-networking: init
2019-04-15 13:17:58 -04:00
worldofpeace
7802b18958 nixos/pantheon: use glib-networking module 2019-04-15 13:11:58 -04:00
Eelco Dolstra
5399f34ad9
nix: 2.2 -> 2.2.2 2019-04-15 19:06:57 +02:00
worldofpeace
b0e9f85f47 nixos/glib-networking: init
Note that we were previously didn't have glib-networking
in systemd.packages so the PacRunner was non-functional.
2019-04-15 13:04:06 -04:00
Silvan Mosberger
7a2dabce74
Merge pull request #59597 from r-ryantm/auto-update/ncmpc
ncmpc: 0.33 -> 0.34
2019-04-15 18:55:59 +02:00
R. RyanTM
7073400468 kubetail: 1.6.7 -> 1.6.8 (#59558) 2019-04-15 09:27:57 -07:00
adisbladis
9a176d669a
nixos/tox-node: Add descriptions to module options.
Missing these broke the tarball build
https://hydra.nixos.org/build/92258938/nixlog/1
2019-04-15 17:11:10 +01:00
Matthew Bauer
7d0db6af7e
Merge pull request #59551 from matthewbauer/busybox-clang-cross
busybox: add patch to allow cross in llvm
2019-04-15 11:24:09 -04:00
R. RyanTM
0aa97a84ed nodejs-slim-11_x: 11.13.0 -> 11.14.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nodejs-slim/versions
2019-04-15 07:55:53 -07:00
worldofpeace
c7997510ae
Merge pull request #59604 from pacien/riot-v1.0.7
riot-{web,desktop}: 1.0.{6,4} -> 1.0.7
2019-04-15 10:21:31 -04:00
Bas van Dijk
b0fbe1df3f prometheus-pushgateway: 0.7.0 -> 0.8.0 2019-04-15 16:12:14 +02:00
Matthew Bauer
290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
José Romildo Malaquias
c32b50a5f7
Merge pull request #59520 from romildo/upd.deepin.deepin-daemon
nixos/dde-daemon: init
2019-04-15 10:30:51 -03:00
Michael Raskin
7a85205366
Merge pull request #59592 from r-ryantm/auto-update/mlterm
mlterm: 3.8.7 -> 3.8.8
2019-04-15 13:07:24 +00:00
pacien
037edc2cba riot-desktop: 1.0.4 -> 1.0.7 2019-04-15 14:54:05 +02:00
pacien
f97effd53c riot-web: 1.0.6 -> 1.0.7 2019-04-15 14:50:41 +02:00
Tim Steinbach
4907b2165b
linux: 5.1-rc4 -> 5.1-rc5 2019-04-15 08:26:04 -04:00