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

Merge master #179293

Merged
merged 21 commits into from
Jun 27, 2022
Merged

Merge master #179293

merged 21 commits into from
Jun 27, 2022

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Jun 27, 2022 •
edited
Loading

Description of changes

To fix eval in #173702

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Madouura and others added 21 commits June 24, 2022 03:07
@Madouura
release-notes: move zfs update from 22.11 to 22.05
93b55ff
@marsam
scheme-manpages: 2022-04-21 -> 2022-05-14
37da161
@r-ryantm
mariadb-galera: 26.4.11 -> 26.4.12
1415a8e
@bdd
Replace use of testVersion alias
a9f9124 
- lndconnect: Drop unused input `testVersion`
- other packages: Import `testers` and use `testers.testVersion`
@r-ryantm
python310Packages.pubnub: 6.3.2 -> 6.3.3
1b89160
@ajs124
Merge pull request NixOS#179126 from r-ryantm/auto-update/mariadb-galera
37f4b6b 
mariadb-galera: 26.4.11 -> 26.4.12
@zopieux @peterhoeg
pykms: switch to maintained fork, fix PYTHONPATH, add test
32964dd 
I have read the full diff[0] between the previous owner and the new
maintained fork that I'm switching to, and could not find any suspicious
code. The new fork includes fixes that are otherwise crashing as of
Python 3.10.

This commit also fixes the PYTHONPATH which prevents the client from
starting.

This commit also adds a test that the client can successfully query the
server, testing the two components at once.

[0] SystemRage/py-kms@master...Py-KMS-Organization:master
@marsam
Merge pull request NixOS#179238 from r-ryantm/auto-update/python3.10-…
7c3910a 
…pubnub

python310Packages.pubnub: 6.3.2 -> 6.3.3
@marsam
Merge pull request NixOS#179270 from marsam/update-scheme-manpages
3880580 
scheme-manpages: 2022-04-21 -> 2022-05-14
@r-ryantm
python310Packages.nibabel: 4.0.0 -> 4.0.1
81b65cc
@zowoq
terraform-providers.equinix: init at 1.5.0
192ac79
@flokli
Merge pull request NixOS#178841 from Madouura/dev/zfs
4c6b648 
release-notes: move zfs update from 22.11 to 22.05
@bryanasdev000
cilium-cli: enable shell completion
7a242c5
@bryanasdev000
hubble: 0.9.0 -> 0.10.0
8341401 
- bump version

- add upstream ldflags

- add myself as a maintainer

- add install check

- disable tests to build

- enable shell completions for unix-like
@marsam
Merge pull request NixOS#179127 from bryanasdev000/hubbleup
19f0f43 
hubble: 0.9.0 -> 0.10.0
@marsam
Merge pull request NixOS#179130 from bryanasdev000/ciliumshell
a05fdcf 
cilium-cli: enable shell completion
@marsam
Merge pull request NixOS#179273 from r-ryantm/auto-update/python3.10-…
a5bc99a 
…nibabel

python310Packages.nibabel: 4.0.0 -> 4.0.1
@marsam @vbgl
ocamlPackages.mldoc: init at 1.3.9
9467dd3
@zowoq
metal-cli: 0.7.4 -> 0.9.0
6c0aa00 
https://github.com/equinix/metal-cli/releases/tag/v0.8.0
https://github.com/equinix/metal-cli/releases/tag/v0.9.0
@Mic92
Merge pull request NixOS#179226 from bdd/use_testers_testversion
725cee0 
Replace use of `testVersion` alias
@Mic92
Merge remote-tracking branch 'upstream/master' into HEAD
fc949ce
@Mic92 Mic92 merged commit 8260ea3 into NixOS:staging Jun 27, 2022
@Mic92 Mic92 deleted the merge-master branch June 27, 2022 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

@mmahut mmahut Awaiting requested review from mmahut mmahut is a code owner

@RaghavSood RaghavSood Awaiting requested review from RaghavSood RaghavSood is a code owner

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
6.topic: nixos 6.topic: ocaml 6.topic: python 8.has: changelog 8.has: documentation 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Mic92 @Madouura @marsam @r-ryantm @bdd @ajs124 @zopieux @zowoq @flokli @bryanasdev000