Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 91cb80e4397d
head repository: NixOS/nixpkgs-channels
compare: f5e7da91cfa7
- 19 commits
- 25 files changed
- 12 contributors
Commits on Mar 21, 2019
-
wire-desktop: 3.6.2885 -> 3.7.2891
Wire uses Electron 4.08 and support for i686-linux has been dropped in 4.0 [0] Release Notes: https://medium.com/wire-news/linux-3-7-2891-edc6f663c0b2 Changelog: wireapp/wire-desktop@linux/3.6.2885...linux/3.7.2891 [0]: https://electronjs.org/blog/linux-32bit-support (cherry picked from commit 23568a1)
-
flatpak: Fix bubblewrap paths for icon-validator
Otherwise, `flatpak-validate-icon --sandbox` gives error: bwrap: Can't find source path /etc/ld.so.cache: No such file or directory (cherry picked from commit f2d6e4a)
-
-
-
python.pkgs.mecab-python3: fix build
fallout of NixOS/nixpkgs#54182 (cherry picked from commit 06bcb5c)
Robert Schütz committedMar 21, 2019 -
python.pkgs.mecab-python3: correct meta
(cherry picked from commit deb20c1)
Robert Schütz committedMar 21, 2019 -
python.pkgs.hglib: use patch to specify hg path (#57926)
(cherry picked from commit 19aaebe)
-
pythonPackages.pyhepmc: fix build
(cherry picked from commit 283a124)
-
atlassian-confluence: 6.14.1 -> 6.14.2
CVE-2019-3395, CVE-2019-3396 (cherry picked from commit 5ef5bbcd46aab2ba6ea65eff19ef3e9e7037e207)
-
buildGoModule: remove SSL env vars in favor of cacert in buildInputs …
…(#58082) cacert already exposes NIX_SSL_CERT_FILE in its setupHook. Fetchers and builders are already setup to use this variable and there's no need to export them manually. (cherry picked from commit 6d7d69f)
-
Merge overlayfs fix, LTS kernel bump and test
In Linux 4.19 there has been a major rework of the overlayfs implementation and it now opens files in lowerdir with O_NOATIME, which in turn caused issues in our VM tests because the process owner of QEMU doesn't match the file owner of the lowerdir. The crux here is that 9p propagates the O_NOATIME flag to the host and the guest kernel has no way of verifying whether that flag will lead to any problems beforehand. There is ongoing work to possibly fix this in the kernel, but it will take a while until there is a working patch and consensus. So in order to bring our default kernel back to 4.19 and of course make it possible to run newer kernels in VM tests, I'm merging a small QEMU patch as an interim solution, which we can drop once we have a working fix in the next round of stable kernels. Now we already had Linux 4.19 set as the default kernel, but that was subsequently reverted in 048c36c because the patch we have used was the revert of the commit I bisected a while ago. This patch broke overlayfs in other ways, so I'm also merging in a VM test by @bachp, which only tests whether overlayfs is working, just to be on the safe side that something like this won't happen in the future. Even though this change could be considered a moderate mass-rebuild at least for GNU/Linux, I'm merging this to master, mainly to give us some time to get it into the current 19.03 release branch (and subsequent testing window) once we got no new breaking builds from Hydra. Cc: @samueldr, @lheckemann Fixes: NixOS/nixpkgs#54509 Fixes: NixOS/nixpkgs#48828 Merges: NixOS/nixpkgs#57641 Merges: NixOS/nixpkgs#54508 (cherry picked from commit 12efcc2)
Commits on Mar 22, 2019
-
python.pkgs.python-mapnik: fix build
fallout of NixOS/nixpkgs#54182 (cherry picked from commit 8519983)
Robert Schütz committedMar 22, 2019 -
python.pkgs.tilestache: fix build
(cherry picked from commit 48d1219)
Robert Schütz committedMar 22, 2019 -
python.pkgs.suds-jurko: use pytest_3
(cherry picked from commit 77ab988)
Robert Schütz committedMar 22, 2019 -
python.pkgs.retry: init at 0.9.2
(cherry picked from commit d716cad)
Robert Schütz committedMar 22, 2019 -
python.pkgs.pytest-server-fixtures: fix build
(cherry picked from commit dc88463)
Robert Schütz committedMar 22, 2019 -
(cherry picked from commit 76bfc09)
Robert Schütz committedMar 22, 2019
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 91cb80e4397d...f5e7da91cfa7