Commit Graph
186896 Commits
Author SHA1 Message Date
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
Peter Hoeg 734eba699c libqmatrixclient: init at 0.5.1.2 2019-04-18 15:37:31 +08:00
nyanloutre 676a77a5e5 wine-mono: 4.8.0 -> 4.8.2 2019-04-18 09:27:10 +02:00
nyanloutre e2adc64175 wine{unstable,staging}: 4.5 -> 4.6 2019-04-18 09:27:10 +02:00
bb010g d79aad43a3 pyflame: fix builds & support 3.7 2019-04-18 09:12:27 +02:00
R. RyanTM 759b542e5a mkvtoolnix: 32.0.0 -> 33.0.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/mkvtoolnix/versions
2019-04-18 08:51:25 +02:00
R. RyanTM 057091f0fa postsrsd: 1.5 -> 1.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/postsrsd/versions
2019-04-18 08:51:02 +02:00
R. RyanTM 7eacaca13d pmd: 6.12.0 -> 6.13.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/pmd/versions
2019-04-18 08:50:45 +02:00
R. RyanTM b249f2c2d9 yubico-piv-tool: 1.6.2 -> 1.7.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/yubico-piv-tool/versions
2019-04-18 08:50:21 +02:00
R. RyanTM cfaa5014c1 libu2f-host: 1.1.7 -> 1.1.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/libu2f-host/versions
2019-04-18 08:49:43 +02:00
R. RyanTM e9c36ec81b lnav: 0.8.4 -> 0.8.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lnav/versions
2019-04-18 08:49:00 +02:00
R. RyanTM 17dd396fd7 librealsense: 2.19.0 -> 2.20.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/librealsense/versions
2019-04-18 08:48:37 +02:00
R. RyanTM 53f69f0ba2 libp11: 0.4.9 -> 0.4.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libp11/versions
2019-04-18 08:48:22 +02:00
R. RyanTM 77736c47fe libnabo: 1.0.6 -> 1.0.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libnabo/versions
2019-04-18 08:47:56 +02:00
R. RyanTM dc1b0631e3 libltc: 1.3.0 -> 1.3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libltc/versions
2019-04-18 08:47:18 +02:00
R. RyanTM f9505a1e1c vulkan-headers: 1.1.101.0 -> 1.1.106
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vulkan-headers/versions
2019-04-18 08:46:48 +02:00
R. RyanTM 55542f0cfb zotero: 5.0.60 -> 5.0.66
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zotero/versions
2019-04-18 08:43:31 +02:00
Will Dietz e1c7c1981a libcap: 2.26 -> 2.27
https://sites.google.com/site/fullycapable/release-notes-for-libcap/releasenotesfor227
2019-04-18 08:43:05 +02:00
R. RyanTM 20194c1bef xmrig-proxy: 2.14.0 -> 2.14.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xmrig-proxy/versions
2019-04-18 08:42:21 +02:00
Edmund Wu f8eed03044 vscode: patch proper executable 2019-04-18 08:41:32 +02:00
Ben Wolsieffer aa2468f4a1 cracklib: fix cross build 2019-04-18 08:40:54 +02:00
Will Dietz cd5343a7fc xl2tpd: 1.3.13 -> 1.3.14
https://github.com/xelerance/xl2tpd/releases/tag/v1.3.14
2019-04-18 08:39:59 +02:00
Will Dietz ab4b33cdbf libseccomp: 2.4.0 -> 2.4.1
https://github.com/seccomp/libseccomp/releases/tag/v2.4.1
2019-04-18 08:39:29 +02:00
Robert Schütz 707bff5e73 Merge pull request #59491 from dotlambda/esphome-1.12.2
esphome: 1.11.2 -> 1.12.2
2019-04-18 08:29:32 +02:00
Dave Nicponski a6a88bffd5 python3.7-docutils: build fix on darwin
Fix python docutils package for OSX.  On a relatively clean new macbook,
with latest OS Mojave 10.14.3, this package failed to build.  A bit of
searching led to:
https://coderwall.com/p/-k_93g/mac-os-x-valueerror-unknown-locale-utf-8-in-python
2019-04-18 08:27:28 +02:00
Frederik Rietdijk 2346182c2c Merge staging-next into staging 2019-04-18 08:26:30 +02:00
Frederik Rietdijk 9d87ccabce Merge master into staging-next 2019-04-18 08:25:25 +02:00
bb010g 28ac309309 python3{5,6}: Reintroduce bytecode determinism
Originally introduced in 8970a9c and 1531b5e, these patches were lost in
efbe87f when the CPython version files were merged, likely due to
CPython 3.7 not needing them anymore. These patches should remain
in-tree until CPython 3.5 and 3.6 support is dropped completely.

Found with the diffoscope ( https://diffoscope.org/ ).
2019-04-18 08:12:29 +02:00
Will Dietz b25ffa1246 zstd: 1.3.8 -> 1.4.0
https://github.com/facebook/zstd/releases/tag/v1.4.0
2019-04-17 22:29:41 -05:00
Will Dietz a7ac961366 dhcpcd: 7.1.1 -> 7.2.0
https://roy.marples.name/blog/dhcpcd-7-2-0-released
2019-04-17 21:39:44 -05:00
Ryan Mulligan e53ade7dab Merge pull request #59542 from r-ryantm/auto-update/zafiro-icons
zafiro-icons: 0.8.7 -> 0.9
2019-04-17 19:12:13 -07:00
volth ca7a18a24b nixos/netboot: import -> callPackage
Copy-paste from iso-image.nix

Besides the simplification, it should use `pkgs.buildPackages.squashfsTools` because it is used in `nativeBuildInputs` instead of incorrect `pkgs.squashfsTools` which was forced by `import'
2019-04-18 01:11:04 +00:00
ash lea 1e8606946f dolphinEmuMaster: 2019-02-16 -> 5.0-9976
changed versioning scheme to match dolphin's own. this also allows us to
include the describe string without deriving it from the git repository
during build.
2019-04-17 17:35:40 -07:00
worldofpeace eb095fa677 Merge pull request #59298 from worldofpeace/gnome-pomodoro
gnome3.pomodoro: 0.13.4 -> 0.15.1
2019-04-17 20:17:42 -04:00
worldofpeace 7f2f8f359f Merge pull request #59800 from worldofpeace/dlenya-renderer-patch
dleyna-renderer: checkout patch in tree
2019-04-17 20:07:56 -04:00
Jan Tojnar 356f3d9654 Merge pull request #59793 from jtojnar/grl-plugins-fix
gnome3.grilo-plugins: add dependencies
2019-04-18 01:44:23 +02:00
Craig Younkins fcede9bbf0 rdesktop: enable darwin support without libgssglue and credssp 2019-04-17 18:53:23 -04:00
worldofpeace 8696640f22 dleyna-renderer: checkout patch in tree
Built this locally and noticed that the hash changed

wanted: sha256:0x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq
got:        sha256:0m7rxv2nnycvwqpc8ak396g8cbb9g6dw290cjbfwhrrhdhbii5qc
2019-04-17 18:27:28 -04:00
ajs124 e03932bbca xmpp-sendmessage: init script file, use in prosody test 2019-04-17 23:36:07 +02:00
Jan Tojnar 5b7f58701c Merge pull request #59746 from jtojnar/gtranslator
gtranslator: init at 3.32.0
2019-04-17 23:32:58 +02:00
adisbladis f249f32f9e Merge pull request #59791 from adisbladis/zfsUnstable-0.8.0-rc4
zfsUnstable: 0.8.0-rc3 -> 0.8.0-rc4
2019-04-18 00:10:02 +03:00
Daiderd Jordan 698af96454 Merge pull request #58638 from Amar1729/darwin-fix/hivex
Fix hivex for darwin
2019-04-17 23:03:09 +02:00
Jorge Acereda 78c018ba8e samba: fix darwin build 2019-04-17 22:50:08 +02:00
Timo Kaufmann 49b8efcb84 sage: 8.6 -> 8.7
https://groups.google.com/forum/#!topic/sage-release/3m8PV9JkFro
2019-04-17 22:44:32 +02:00
Timo Kaufmann 930fa9b92e python.pkgs.cysignals: propagate pari
This didn't cause issues earlier since all packages that depend on
cysignals have a pari dependency anyways.
2019-04-17 22:44:10 +02:00
Timo Kaufmann 1f643b9c49 python.pkgs.pplpy: init at 0.8.4
This is a new dependency for the upcoming sage version.
2019-04-17 22:44:10 +02:00