New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Xearth #41482
Closed
Closed
Xearth #41482
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 4d6a14e)
* fetchs3: add configurable name Change the default from "foo" to the basename of the s3 URL and make it configurable. * fetchs3: fix error on missing credentials.session_token The session token should default to null instead of failing * fetchs3: make use of the region argument Set it to null if you don't want to use it * fetchs3: prefer local build Fetcher-types spend more time on network than CPU (cherry picked from commit f7abcb0)
Security update, backport of #39922.
(cherry picked from commit 3d97455)
(cherry picked from commit ce3961c)
[18.03] matrix-synapse: 0.26.1 -> 0.28.1 (security update)
runInLinuxVM: fix ext4 and crc32c-intel interactions
(cherry picked from commit f99ded2)
(cherry picked from commit 814938a)
(cherry picked from commit 374fde0)
(cherry picked from commit 6fd4462)
(cherry picked from commit 97ca2f5)
To mitigate Spectre Variant 2, GCC needs to have retpoline support (-mindirect-branch and -mfunction-return arguments on amd64 and i386). Patches were pulled from H.J. Lu's backport branch to 4.9 (hjl/indirect/gcc-4_9-branch), available at https://github.com/hjl-tools/gcc/tree/hjl/indirect/gcc-4_9-branch/master. Upstream GCC does not apply patches to anything older than the gcc-6-branch. H.J. Lu is the author of the upstream retpoline commits as well. Several Linux distributions already backported these patches to GCC 4 branches and some old kernels (3.13 for instance) have been recompiled with these GCC patches. These kernels only allow to load kernel modules that are compiled with the retpoline support. References: - Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1749261 - Ubuntu package: https://launchpad.net/ubuntu/+source/gcc-4.8/4.8.4-2ubuntu1~14.04.4 Fixes #38394 (cherry picked from commit ada2fc0)
This synchronizes with the move in master to make backports easier.
On nixpkgs master/staging we have 2.32 - that includes this patch. https://nvd.nist.gov/vuln/detail/CVE-2018-7738 claims 2.32-rc1 fixes this and upstream master hasn't changed umount completion except for this patch, so it has to be it. /cc #38994.
…ening a GIF file (cherry picked from commit b41ede5)
Vscode backport
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/uftp/versions. These checks were done: - built on NixOS - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftpd help’ got 0 exit code - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt -h’ got 0 exit code - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt --help’ got 0 exit code - ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt help’ got 0 exit code - found 4.9.6 with grep in /nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6 - directory tree listing: https://gist.github.com/c08d432d7a238559a904561aa46161bd
(cherry picked from commit 8994bf5)
MarcFontaine
requested review from
LnL7,
Mic92,
nbp,
peti,
rycee,
ttuegel and
zimbatm
as code owners
June 5, 2018 11:48
peti
requested changes
Jun 5, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR targets master
using a branch other than master
as the source. Therefore, it wants to modify 1000+ files. That's not good.
GrahamcOfBorg
added
6.topic: erlang
6.topic: fetch
6.topic: GNOME
GNOME desktop environment and its underlying platform
6.topic: golang
6.topic: haskell
6.topic: nixos
6.topic: printing
6.topic: python
6.topic: qt/kde
6.topic: ruby
6.topic: rust
6.topic: stdenv
Standard environment
6.topic: steam
6.topic: vim
6.topic: xfce
The Xfce Desktop Environment
8.has: changelog
8.has: documentation
8.has: module (update)
2.status: merge conflict
labels
Jun 5, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
2.status: merge conflict
6.topic: erlang
6.topic: fetch
6.topic: GNOME
GNOME desktop environment and its underlying platform
6.topic: golang
6.topic: haskell
6.topic: nixos
6.topic: printing
6.topic: python
6.topic: qt/kde
6.topic: ruby
6.topic: rust
6.topic: stdenv
Standard environment
6.topic: steam
6.topic: vim
6.topic: xfce
The Xfce Desktop Environment
8.has: changelog
8.has: documentation
8.has: module (update)
12. first-time contribution
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
add a derivation for a the xearth tool
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)sorry something went please close this pull request