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.

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

Revert "Merge #56170: Revert "file: 5.35 -> 5.36" (staging)" #56494

Merged
merged 1 commit into from Mar 1, 2019
Merged

Revert "Merge #56170: Revert "file: 5.35 -> 5.36" (staging)" #56494

merged 1 commit into from Mar 1, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 27, 2019

Motivation for this change

Try this again, seems to work now.

Motivated by new version possibly fixing security issues
described here:

#56360

This reverts commit 7d47102, reversing
changes made to 2ed8187.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @vcunat

@dtzWill
Revert "Merge NixOS#56170: Revert "file: 5.35 -> 5.36" (staging)"
7aea4cc 
Try this again, seems to work now.

Motivated by new version possibly fixing security issues
described here:

NixOS#56360

This reverts commit 7d47102, reversing
changes made to 2ed8187.
@dtzWill dtzWill merged commit 63e68e5 into NixOS:staging Mar 1, 2019
@dtzWill dtzWill deleted the update/file-5.36 branch March 1, 2019 05:40
@vcunat vcunat mentioned this pull request Mar 1, 2019
Closed
4 tasks
vcunat pushed a commit that referenced this pull request Mar 1, 2019
@dtzWill @vcunat
Merge #56494: file: 5.34 -> 5.36 (staging-18.09)
2325b5f 
(cherry picked from commit 63e68e5)
Minimal changes, .36 fixes some CVEs.
vcunat pushed a commit that referenced this pull request Mar 10, 2019
@dtzWill @vcunat
Merge #56494: file: 5.35 -> 5.36 (staging-19.03)
ca14bce 
(cherry picked from commit 63e68e5)
Fixes #57141.
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: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @GrahamcOfBorg