Commit graph

8978 commits

Author SHA1 Message Date
Frederik Rietdijk 7aa2b0215b Merge master into staging-next 2020-01-03 10:25:14 +01:00
Maximilian Bosch 9b298ad945
Merge pull request #76278 from r-ryantm/auto-update/homeassistant-cli
home-assistant-cli: 0.7.0 -> 0.8.0
2020-01-02 23:20:23 +01:00
aszlig 845e92835d
Merge Last-Modified fix for nginx (#76697)
This fixes the patch for nginx to clear the Last-Modified header if a
static file is served from the Nix store.

So far we only used the ETag from the store path, but if the
Last-Modified header is always set to "Thu, 01 Jan 1970 00:00:01 GMT",
Firefox and Chrome/Chromium seem to ignore the ETag and simply use the
cached content instead of revalidating.

Alongside the fix, this also adds a dedicated NixOS VM test, which uses
WebDriver and Firefox to check whether the content is actually served
from the browser's cache and to have a more real-world test case.
2020-01-02 21:41:59 +01:00
Frederik Rietdijk f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Maximilian Bosch 0e31950cb4
gotify-server: 2.0.12 -> 2.0.13
https://github.com/gotify/server/releases/tag/v2.0.13
2020-01-02 21:25:58 +01:00
Maximilian Bosch c016cf0fce
Merge pull request #76740 from Ma27/bump-matrix-synapse
matrix-synapse: 1.7.2 -> 1.7.3
2020-01-02 17:43:37 +01:00
misuzu 6d66795575 freeswitch: 1.8.7 -> 1.10.2 2020-01-01 23:07:45 +02:00
misuzu 96f4563f1e freeswitch: fix gsmopen build and enable by default for linux 2020-01-01 18:09:54 +02:00
zimbatm c187844214
unit: add withRuby_2_7 option 2020-01-01 00:25:03 +00:00
Maximilian Bosch a5689a2ff1
matrix-synapse: 1.7.2 -> 1.7.3
https://github.com/matrix-org/synapse/releases/tag/v1.7.3
2019-12-31 16:00:51 +01:00
Jan Tojnar 0c2adc0fb1
Merge branch 'staging' into staging-next 2019-12-31 03:59:58 +01:00
Jan Tojnar c5406e30b0
qpid-cpp: fix eval 2019-12-31 02:59:40 +01:00
Robin Gloster 6ca6ac796b
treewide: configureFlags is a flat list 2019-12-31 01:37:49 +01:00
Robin Gloster 760e23136a
treewide: *inputs are lists 2019-12-31 01:09:25 +01:00
Robin Gloster 755db0b689
treewide: installTargets is a list 2019-12-31 00:25:26 +01:00
Robin Gloster 313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster 5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Jonathan Ringer d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Aaron Andersen 66bf75415f
Merge pull request #76551 from symphorien/nagios2
nagios: various improvements
2019-12-30 14:21:03 -05:00
Symphorien Gibol cb38bf33e7 nagios: add nixos test 2019-12-30 16:41:18 +01:00
symphorien+git@xlumurb.eu be25e45fc8 nagios: various improvements
* structured config for main config file allows to launch nagios in
debug mode without having to write the whole config file by hand
* build time syntax check
* all options have types, one more example
* I find it misleading that the main nagios config file is linked in
/etc but that if you change the link in /etc/ and restart nagios, it
has no effect. Have nagios use /etc/nagios.cfg
* fix paths in example nagios config files, which allows to reuse it:
  services.nagios.objectDefs =
   (map (x: "${pkgs.nagios}/etc/objects/${x}.cfg")
   [ "templates" "timeperiods" "commands" ]) ++ [ ./main.cfg ]
* for the above reason, add mailutils to default plugins

Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
2019-12-30 16:40:52 +01:00
Frederik Rietdijk 6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
aszlig ccf55bead1
nginx: Clear Last-Modified if ETag is from store
This is what I've suspected a while ago[1]:

> Heads-up everyone: After testing this in a few production instances,
> it seems that some browsers still get cache hits for new store paths
> (and changed contents) for some reason. I highly suspect that it might
> be due to the last-modified header (as mentioned in [2]).
>
> Going to test this with last-modified disabled for a little while and
> if this is the case I think we should improve that patch by disabling
> last-modified if serving from a store path.

Much earlier[2] when I reviewed the patch, I wrote this:

> Other than that, it looks good to me.
>
> However, I'm not sure what we should do with Last-Modified header.
> From RFC 2616, section 13.3.4:
>
> - If both an entity tag and a Last-Modified value have been
>   provided by the origin server, SHOULD use both validators in
>   cache-conditional requests. This allows both HTTP/1.0 and
>   HTTP/1.1 caches to respond appropriately.
>
> I'm a bit nervous about the SHOULD here, as user agents in the wild
> could possibly just use Last-Modified and use the cached content
> instead.

Unfortunately, I didn't pursue this any further back then because
@pbogdan noted[3] the following:

> Hmm, could they (assuming they are conforming):
>
>  * If an entity tag has been provided by the origin server, MUST
>    use that entity tag in any cache-conditional request (using If-
>    Match or If-None-Match).

Since running with this patch in some deployments, I found that both
Firefox and Chrome/Chromium do NOT re-validate against the ETag if the
Last-Modified header is still the same.

So I wrote a small NixOS VM test with Geckodriver to have a test case
which is closer to the real world and I indeed was able to reproduce
this.

Whether this is actually a bug in Chrome or Firefox is an entirely
different issue and even IF it is the fault of the browsers and it is
fixed at some point, we'd still need to handle this for older browser
versions.

Apart from clearing the header, I also recreated the patch by using a
plain "git diff" with a small description on top. This should make it
easier for future authors to work on that patch.

[1]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-495072764
[2]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451644084
[3]: https://github.com/NixOS/nixpkgs/pull/48337#issuecomment-451646135

Signed-off-by: aszlig <aszlig@nix.build>
2019-12-30 14:30:36 +01:00
Robin Gloster 2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster f85cfd274d
uhub: *Flags are lists 2019-12-30 12:15:29 +01:00
Robin Gloster 8fb0e16133
munin: *Flags are lists 2019-12-30 12:15:29 +01:00
Robin Gloster 7def878f1e
xorg.*: *Flags are lists 2019-12-30 11:13:41 +01:00
Jan Tojnar 480fc1856a
Merge branch 'master' into staging-next 2019-12-30 05:22:23 +01:00
Maximilian Bosch 975a6b7b1d mautrix-telegram: mark as broken on darwin
Tests currently fail like this:

```
/nix/store/yslk7x7iw3hka6d33kmnba9sxaia4492-python3.7-mautrix-0.4.0/lib/python3.7/site-packages/mautrix/util/manhole.py:9: in <module>
    from socket import SOL_SOCKET, SO_PEERCRED
E   ImportError: cannot import name 'SO_PEERCRED' from 'socket' (/nix/store/81qani7sdir46gjwf3a3jr2cv1aggkz1-python3-3.7.5/lib/python3.7/socket.py)
!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
=============================== 1 error in 1.73s ===============================
```

Those values don't seem to be available on the MacOS-version of that
module. As there's no workaround implemented in the source, I assume
that upstream doesn't intend to support darwin-alike platforms atm.
2019-12-29 19:56:05 -08:00
Maximilian Bosch 95ee079ae6 mautrix-telegram: 0.6.1 -> 0.7.0
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc4
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc3
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc2
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc1
2019-12-29 19:56:05 -08:00
R. RyanTM 1d2b233528 metabase: 0.33.6 -> 0.33.7.1 2019-12-29 15:49:22 -06:00
symphorien+git@xlumurb.eu 18090331d6 monitoring plugins: fix path to sudo and mailq
this fixes check_mailq with postfix at least
2019-12-29 15:45:13 -06:00
Christoph Hrdinka 03c8eca08b
Merge pull request #76340 from r-ryantm/auto-update/nsd
nsd: 4.2.3 -> 4.2.4
2019-12-29 11:01:46 +01:00
Frederik Rietdijk fb66525297 Merge master into staging-next 2019-12-29 10:19:39 +01:00
Peter Simons bc555a24af
Merge pull request #76209 from r-ryantm/auto-update/bind
bind: 9.14.8 -> 9.14.9
2019-12-27 12:17:36 +01:00
Franz Pletz ee8cc1c7ba
qpid-cpp: fix build on darwin 2019-12-27 05:21:41 +01:00
Franz Pletz 66237e1bca
cockroachdb: fix build on darwin 2019-12-27 05:21:40 +01:00
Nathan b0caf68bff
maintainer-list.nix: remove ndowens 2019-12-26 16:47:41 -05:00
Ryan Mulligan 264f44b1d0
Merge pull request #76355 from r-ryantm/auto-update/pdns-recursor
pdns-recursor: 4.2.0 -> 4.2.1
2019-12-26 07:56:25 -08:00
Maximilian Bosch 9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Franz Pletz 77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Maximilian Bosch 8daee5f6ce
Merge pull request #76467 from alyssais/spamassassin-ipv6
spamassassin: fix IPv6
2019-12-26 02:13:07 +01:00
Aaron Andersen 117ef4af8a
Merge pull request #76307 from r-ryantm/auto-update/mediawiki
mediawiki: 1.33.1 -> 1.34.0
2019-12-25 10:26:10 -05:00
Jörg Thalheim 89c55c0a6d
net-snmp: split outputs (#76155)
net-snmp: split outputs
2019-12-25 06:27:55 +00:00
Jan Tojnar ca39dd3a8a
Merge branch 'master' into staging-next 2019-12-25 05:15:06 +01:00
Alyssa Ross 7ea65c5746
spamassassin: fix IPv6
The Net::CIDR::Lite package was missing.
2019-12-24 23:41:03 +00:00
Jonathan Ringer 051c67dc4c mautrix-telegram: fix build 2019-12-24 11:30:01 -08:00
markuskowa 0b41391890
Merge pull request #76425 from r-ryantm/auto-update/slurm
slurm: 19.05.4.1 -> 19.05.5.1
2019-12-24 20:19:50 +01:00