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

[19.09] nix: 2.3 -> 2.3.1 #76785

Merged
merged 4 commits into from
Jan 1, 2020
Merged

[19.09] nix: 2.3 -> 2.3.1 #76785

merged 4 commits into from
Jan 1, 2020
+13 −74

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jan 1, 2020

Motivation for this change

CVE-2019-17365, which wasn't backported to the stable release.

This is the second attempt of #76736, including all the NixOS activation script changes mentioned by @edolstra.

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.
Notify maintainers

cc @NixOS/backports

Sorry, something went wrong.

@edolstra @flokli
nix: 2.3 -> 2.3.1
88ed1af 
(cherry picked from commit 3ab3614)
@edolstra @flokli
Don't create /nix/var/nix/{gcroots,per-user}/per-user with 1777 permi…
487288f 
…ssion

In fact, don't create them at all because Nix does that automatically.

Also remove modules/programs/shell.nix because everything it did is
now done automatically by Nix.

(cherry picked from commit 4e0d6a5)
@edolstra @flokli
nix-daemon.nix: Use 'nix ping-store' to initialize directories
13b4d10 
(cherry picked from commit 27d2857)
@edolstra @flokli
nix-daemon.nix: Shut up warning
e4ce888 
(cherry picked from commit 9d0de0d)
@flokli flokli added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jan 1, 2020
@flokli flokli requested a review from infinisil as a code owner January 1, 2020 15:48
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jan 1, 2020
@flokli flokli merged commit cc52180 into NixOS:release-19.09 Jan 1, 2020
@flokli flokli deleted the nix-2.3.1 branch January 1, 2020 21:08
@symphorien symphorien mentioned this pull request Jan 3, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc

@lheckemann lheckemann

@zimbatm zimbatm

@andir andir

@edolstra edolstra

@infinisil infinisil

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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.

None yet
4 participants
@flokli @grahamc @lheckemann @edolstra