Skip to content

gss: fix build#327128

Merged
alyssais merged 1 commit intoNixOS:stagingfrom
alyssais:gss-expired
Jul 20, 2024
Merged

gss: fix build#327128
alyssais merged 1 commit intoNixOS:stagingfrom
alyssais:gss-expired

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Jul 14, 2024

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais changed the base branch from master to staging July 14, 2024 15:17
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 14, 2024
@alyssais alyssais merged commit 743b4c8 into NixOS:staging Jul 20, 2024
@alyssais alyssais deleted the gss-expired branch July 20, 2024 08:05
@pillowtrucker pillowtrucker mentioned this pull request Jul 20, 2024
Closed
de11n pushed a commit to deshaw/nixpkgs that referenced this pull request Aug 17, 2024
gss: re-enable tests
7a34959 
Two in-flight PRs (NixOS#327128 and NixOS#328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.
@de11n de11n mentioned this pull request Aug 17, 2024
Merged
13 tasks
alyssais pushed a commit that referenced this pull request Aug 17, 2024
@alyssais
gss: re-enable tests
b83b5ef 
Two in-flight PRs (#327128 and #328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.
de11n pushed a commit to deshaw/nixpkgs that referenced this pull request Aug 17, 2024
Reapply "gss: re-enable tests"
d22da54 
Two in-flight PRs (NixOS#327128 and NixOS#328673) both solved the same problem in
a different way. This merges the best of both PRs and re-enables tests.

This reverts commit e850cbb.

The original commit was accidentally merged to master instead of
staging.
alyssais pushed a commit that referenced this pull request Aug 17, 2024
@alyssais
Reapply "gss: re-enable tests"
9b9d704 
Two in-flight PRs (#327128 and #328673) both solved the same problem in
a different way. This merges the best of both PRs and re-enables tests.

This reverts commit e850cbb.

The original commit was accidentally merged to master instead of
staging.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@alyssais