merge master into staging #36756
Merged
merge master into staging #36756
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
Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3/bin/.git-secret-wrapped --version` and found version 0.2.3 - found 0.2.3 with grep in /nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3 - found 0.2.3 in filename of file in /nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3
gfan: 0.6 -> 0.6.2
Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped -h` got 0 exit code - ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped --help` got 0 exit code - ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped --version` and found version 0.8.6 - ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl -h` got 0 exit code - ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl --help` got 0 exit code - ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl --version` and found version 0.8.6 - found 0.8.6 with grep in /nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6 - found 0.8.6 in filename of file in /nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6
Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags --version` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global --version` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gozilla --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gozilla --version` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags -h` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags --version` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope -h` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope -V` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope --version` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped --version` and found version 6.6.2 - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped --help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped help` got 0 exit code - ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped --version` and found version 6.6.2 - found 6.6.2 with grep in /nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2 - found 6.6.2 in filename of file in /nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2
Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -h` got 0 exit code - ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --help` got 0 exit code - ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -v` and found version 4.65 - ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --version` and found version 4.65 - ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -h` and found version 4.65 - ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --help` and found version 4.65 - found 4.65 with grep in /nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65 - found 4.65 in filename of file in /nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65
Upgrade Nuget version from 2.8.5 to 3.4.3
lldb_4: fix w/gcc7
virtualbox: drop headless patch that no longer applies, fixed upstream
squishyball: fix w/new ncurses
llvm 6: init
wyrd: fix build error with ncurses-6.0-abi5-compat
The "A network error occured (SSL error 4)" is finally fixed!
Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.0.6 with grep in /nix/store/ha4gl4kswiq7pz4chb1ba9ixb51rcdsn-gmsh-3.0.6 - found 3.0.6 in filename of file in /nix/store/ha4gl4kswiq7pz4chb1ba9ixb51rcdsn-gmsh-3.0.6
Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.3.11 with grep in /nix/store/8lp6lwxfy7zq94jd2f26vgxc1zs0scfm-gmtp-1.3.11 - found 1.3.11 in filename of file in /nix/store/8lp6lwxfy7zq94jd2f26vgxc1zs0scfm-gmtp-1.3.11
Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg -h` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg --help` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg -v` and found version 1.06.001 - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg --version` and found version 1.06.001 - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makebearoff -h` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makebearoff --help` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makehyper -h` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makehyper --help` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/bearoffdump -h` got 0 exit code - ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/bearoffdump --help` got 0 exit code - found 1.06.001 with grep in /nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001 - found 1.06.001 in filename of file in /nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001
skhd: init at 0.0.10
nixos: inline set-environment for bash and zsh
Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51/bin/gocr --help` got 0 exit code - ran `/nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51/bin/gocr --help` and found version 0.51 - found 0.51 with grep in /nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51 - found 0.51 in filename of file in /nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51
Semi-automatic update. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 190.0.1 with grep in /nix/store/y7rvgsj3077w8div5qny11xhgyjvy06c-google-cloud-sdk-190.0.1
global: 6.5.7 -> 6.6.2
GrahamcOfBorg
added
6.topic: qt/kde
6.topic: ruby
6.topic: steam
6.topic: vim
6.topic: xfce
oxij
force-pushed
the
merge/master-to-staging-20180310
branch
from
5f08329
to
f537692
Compare
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
oxij
force-pushed
the
merge/master-to-staging-20180310
branch
from
f537692
to
7079e74
Compare
|
@GrahamcOfBorg build systemd epoxy gtk3 python3Packages.asgiref python3Packages.daphne |
|
LGTM. No longer WIP. |
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
|
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
|
Thanks. Paths with conflicts: The Python modules look fine. |
|
@FRidh: 👍 - Diffed against a rebase and the contents of |
|
Will merge at the sooner of @lsix's positive review or a day. |
|
Hi all, sorry for the delay. I have checked and tested the parts I am involved with. Everything is fine for me. @shlevy you can merge when you like. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
I want to push the rest of
libcardiacarrestswitch (see #35374), but it's a mass-rebuild, so I need this.I'm sure I screwed up some of thesrchashes, because some packages switchedsrcsources. Currently building the newstdenvto check it.srcbuild.