Skip to content

Staging nss fixup #102469

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
Merged
merged 1 commit into from
Nov 2, 2020
Merged

Staging nss fixup #102469

merged 1 commit into from
Nov 2, 2020
+2 −2

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented Nov 2, 2020 •
edited
Loading

Motivation for this change

#102156 was merged too fast

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.

Sorry, something went wrong.

@zimbatm
fixup! nss: make reproducible (NixOS#102156)
5ff35fa 
Fixes a precedence issue from fe9f559

`lib.optionalString <cond> 'text' + 'text2'` will always have 'text2' as
part of the result.
@zimbatm zimbatm requested a review from flokli November 2, 2020 11:01
@zimbatm zimbatm changed the base branch from master to staging November 2, 2020 11:01
@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux-stdenv This PR causes stdenv to rebuild 8.has: clean-up 8.has: package (new) This PR adds a new package and removed 6.topic: GNOME GNOME desktop environment and its underlying platform labels Nov 2, 2020
@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ and removed 6.topic: golang 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 2, 2020
@flokli flokli merged commit 75c5e59 into NixOS:staging Nov 2, 2020
@flokli flokli mentioned this pull request Nov 2, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli

@alyssais alyssais

@cdepillabout cdepillabout

@Ericson2314 Ericson2314

@FRidh FRidh

@jonringer jonringer

@kalbasit kalbasit

@LnL7 LnL7

@matthewbauer matthewbauer

@Mic92 Mic92

@zowoq zowoq

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@zimbatm @flokli