Merge openssl 1.1 into staging #67375
Conversation
Some build-time and run-time dependencies were mixed. I put them in a right place!
nixos/fontconfig: harmonize with penultimate
Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog Configuration flag changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure Ignored new configuration flags: --enable-libaribb24 enable ARIB text and caption decoding via libaribb24 [no] --enable-pocketsphinx enable PocketSphinx, needed for asr filter [no] --enable-cuda-nvcc enable Nvidia CUDA compiler [no] --disable-cuda-llvm disable CUDA compilation using clang [autodetect] --disable-msa2 disable MSA2 optimizations The renamed and removed configuration options where not used. I've added a patch to prefer libdav1d over libaom, as libaom wasn't even able to play my sample videos for AV1 (apart from the reduced performance, at least in theory).
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/thermald/versions
sympow: 2.023.4 -> 2.023.5
Per https://www.php.net/manual/en/intro.mhash.php, mhash extension is obsolete, so disabling it here. (Also it doesn't cross-compile) **Warning**: This could be a breaking change for some packages that are very old and rely on this extension, maintainer discretion is advised.
python3Packages.xdis: 4.0.1 -> 4.0.3
libressl: build libcrypto with noexecstack
gitkraken: 6.1.3 -> 6.1.4
Dead project, broken with openssl 1.1
Dead project, broken with openssl 1.1
nixos/containers: fix imperative containers
Dead project, broken with openssl 1.1
xonsh: 0.9.9 -> 0.9.10
wpa_supplicant: 2.8 -> 2.9
wpgtk: 6.0.8 -> 6.0.9
waybar: 0.7.1 -> 0.7.2
xst: 0.7.1 -> 0.7.2
xkb-switch: 1.5.0 -> 1.6.0
ofborg
bot
added
6.topic: fetch
6.topic: GNOME
lheckemann
force-pushed
the
staging+openssl
branch
2 times, most recently
from
70f2b5c
to
06a46cf
Compare
lheckemann
force-pushed
the
staging+openssl
branch
from
06a46cf
to
436bbbd
Compare
|
Oh, I haven't noticed this work. I'm afraid I duplicated much of it now when merging master to staging-next in 2e6bf42. In my experience it's a bit better to merge like master <-> staging-next <-> staging and not the spiral-staircase master -> staging -> staging-next -> master. (Well, for most/easy changes it doesn't matter how you do it.) |
|
Yeah that's my fault for breaking the merge yesterday, thus not being able to push it until I recovered it this morning… Sorry about that! |
|
So do you want to merge staging-next into staging? |
|
When the conflict-resolution work was done twice, we might as well compare whether my merge and yours arrived at the same result :-) (after merging into some common staging commit) At least in my case it's well possible I overlooked some things that weren't caught as evaluation errors (I had to fixup two or three of those). |
|
I don't get this PR. If master already has openssl 1.1, then why does openssl 1.1 specifically need to be merged into staging? Shouldn't we just merge master into staging? |
|
git reports conflicts in very many files, so it's not just a trivial step. (I know of no other motivation.) |
|
If it's in master then master needs to be merged into staging-next and
staging-next into staging.
…On Sat, Aug 24, 2019, 20:16 Vladimír Čunát ***@***.***> wrote:
git reports conflicts in very many files, so it's not just a trivial step.
(I know of no other motivation.)
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#67375?email_source=notifications&email_token=AAQHZ37WFVZTXOJLHXS3K2TQGF3GDA5CNFSM4IPFHFPKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD5CFAVY#issuecomment-524570711>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAQHZ37GM6K6IP4WFW3XMLTQGF3GDANCNFSM4IPFHFPA>
.
|
Motivation for this change
openssl 1.1 has been merged into master since it had its own hydra jobset. That means we need to merge it into staging. I'm making this PR so @GrahamcOfBorg can evaluate it, to check if I haven't made any silly mistakes while fixing merge conflicts (lots of them because of the pname change).
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @