Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Staging next #84442

Merged
merged 52 commits into from Apr 18, 2020
Merged

Staging next #84442

merged 52 commits into from Apr 18, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Apr 6, 2020 •
edited by jtojnar

Motivation for this change

https://hydra.nixos.org/jobset/nixpkgs/staging-next

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

roastiek and others added 30 commits March 29, 2020 20:34
@roastiek
alsa-ucm-conf: init at 1.2.2
4acda90
@roastiek
alsa-topology-conf: init at 1.2.2
f0a6dfc
@roastiek
alsaLib: 1.1.9 -> 1.2.2
4fef426
@Emantor
linux config: enable SND CA0132 DSP loading
62cdbd6 
Since we select everything as a module, snd_hda_codec_ca0132 is built as
well. DSP loading is not enabled by default, but without it the
soundcard produces timeouts within ALSA and does not emit sound.
Explicitly enable the firmware loading to ensure Soundblaster
Z/Zx/ZxR/Recon devices can be used with NixOS.
The patch to enable this by default in the kernel is staged for 5.8.
@jtojnar
tree-wide: Switch from gnome3.maintainers to lib.teams.gnome
15002f1
@dasj19 @ttuegel
cmake: 3.16.5 -> 3.17.0
b18e7e5
@r-ryantm
apacheHttpd: 2.4.41 -> 2.4.43
f26b2af
@worldofpeace
Merge pull request #83975 from jtojnar/gnome-team
7d91eb2 
tree-wide: Switch from gnome3.maintainers to lib.teams.gnome
@vcunat @flokli
openssl(_1_1): patch CVE-2019-1551
e48a55d 
fetchpatch can't be used here and fetchurl from GitHub
like in PR #82928 has the risk of breaking the hash later;
fortunately the patches aren't too large.

(cherry picked from commit 2071e3b)
@vcunat
openssl: 1.1.1d -> 1.1.1f
6c8692f 
pyca/pyopenssl#899 (comment)
The tests in python3.pkgs.pyopenssl succeed!
Fixing this problem we experienced is listed as the only major change:
https://www.openssl.org/news/openssl-1.1.1-notes.html
@ttuegel
Merge pull request #83862 from dasj19/cmake_update
40239ac 
cmake: 3.16.5 -> 3.17.0
@flokli
go_1_14: 1.14 -> 1.14.1
da2146d 
This contains at least golang/go#37807, which
currently causes some of our go binaries to just fail when booted with
older kernels.

See golang/go#37436 for context.
@Mic92
Merge pull request #83689 from flokli/go-1.14.1
d7f86b3 
go_1_14: 1.14 -> 1.14.1
@flokli
Merge pull request #83658 from Emantor/topic/kernel-snd-ca0132
35916a8 
linux config: enable Creative Soundblaster DSP loading
@FRidh
Merge staging-next into staging
edaa972
@burke @FRidh
itstool: fix double-shebang issue on macOS
da7ac56
@Mic92 @FRidh
itstool: use wrapPython to fix double shebang on macOS
2bec129
@r-ryantm @FRidh
graphite2: 1.3.13 -> 1.3.14
bcd9b9b
@peterhoeg @FRidh
pythonPackages.click: 7.0 -> 7.1.1
4588e6a
@peterhoeg @FRidh
maestral: 0.6.1 -> 0.6.3
022ebea
@r-ryantm @FRidh
help2man: 1.47.12 -> 1.47.13
88a6078
@lsix @FRidh
automake: 1.16.1 -> 1.16.2
a44ac81
@jtojnar
Merge branch 'staging-next' into staging
5d4c6f7
@mmilata
gnutls: 3.6.12 -> 3.6.13
7cb24f9 
Fixes CVE-2020-11501.

Changes: https://lists.gnupg.org/pipermail/gnutls-help/2020-March/004642.html
@jtojnar
gobject-introspection: Clean libregress symlink
52f8228 
Adding phases to preInstallPhases is not possible in preBuild since by that time, phases is already populated.
@aanderse
Merge pull request #84045 from r-ryantm/auto-update/apache-httpd
d757d81 
apacheHttpd: 2.4.41 -> 2.4.43
@FRidh
Merge staging-next into staging
ce2321f
@vcunat
Merge #84273: gnutls: 3.6.12 -> 3.6.13 [security]
f91b34e 
... into staging.  Fixes CVE-2020-11501.
@ggreif
llvmPackages: change homepages to https:// scheme
e336bdf 
also: https://www.cmake.org/Wiki/CMake_RPATH_handling has moved
@globin @FRidh
ghc883: fix structuredAttrs build
fb015f8
@jonringer
Copy link
Contributor

#84660 should probably be included in this.

@vcunat
alsaTools: 1.1.7 -> 1.2.2
acb4710 
Fixes build regression (after alsa update, I assume).
Despite the version number change, the diff is trivial:
https://git.alsa-project.org/?p=alsa-tools.git;a=log;h=refs/tags/v1.2.2
@vcunat
Copy link
Member

vcunat commented Apr 17, 2020 •
edited

There are apparently some python regressions that break e.g. nixops. One way might be to migrate anything important away from python2 anyway, but pyopenssl might be too important...

@FRidh
Copy link
Member Author

FRidh commented Apr 17, 2020 •
edited

Probably best to drop nixops in Nixpkgs since it's changed quite a bit upstream cc @adisbladis @grahamc

@vcunat
python2.pkgs.cryptography: fixup build of dependants
312e903 
... most notably fix pyopenssl.  I can't say I really understand this,
but the commit seems safe enough.
@vcunat
Merge branch 'master' into staging-next
d96487b 
Hydra nixpkgs: ?compare=1582510
@vcunat
Copy link
Member

vcunat commented Apr 18, 2020

I fixed it somehow in 312e903; feel free to improve.

@primeos primeos mentioned this pull request Apr 18, 2020
Merged
10 tasks
vcunat
vcunat approved these changes Apr 18, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Hydra it looks good. About a third of darwin packages still hasn't been finished, but that risk seems acceptable – on the other hand we have security fixes inside.

@vcunat vcunat merged commit e233a9d into master Apr 18, 2020
@adisbladis
Copy link
Member

@FRidh A new release of NixOps is still pretty far away, in the mean time we need the current release.

If you'd like I can try to repackage the current release using Poetry/poetry2nix so NixOps won't be blocking any progression in pythonPackages?

@vcunat
Copy link
Member

vcunat commented Apr 20, 2020

I fixed the build of pyopenssl which was blocking it, so nixops builds now and I don't expect you need to hurry with anything.

@ghost
Copy link

ghost commented Apr 21, 2020 •
edited by ghost

I could need some help with #85668. Both parent commits of this merge commit work fine, but waybar built from the merge commit does not (starts up fine but doesn't show the bar). Any idea what could cause this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
1.severity: security 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: nixos 6.topic: python 8.has: documentation 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet