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

[20.09] nixUnstable: 2.4pre20201205_a5d85d0 -> 2.4pre20210308_1c0e3e4, hydra-unstable: 2020-10-20 -> 2021-03-10 #115947

Merged
merged 8 commits into from Mar 11, 2021

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Mar 11, 2021

Motivation for this change

Backport of #114786.
Also had to backport most recent lowdown bumps to get Nix compiling.

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.

Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lowdown-related changes look good to me, the breaking changes in 0.8.0 are as follows:

  • Library API changes for functions that may fail due to allocation errors. This is what nixUnstable actually needs and fine since no other package currently depends on lowdown as a library
  • The --nroff-hardwrap option got removed. This is most likely a breakage fine to backport since it is reasonably obscure.

@roberth
Copy link
Member

roberth commented Mar 11, 2021

no other package currently depends on lowdown as a library

Not in Nixpkgs perhaps. For a simple package like lowdown, isn't it just as easy to duplicate it, so we have a lowdown_0_8 package next to the old lowdown?

@shlevy
Copy link
Member

shlevy commented Mar 11, 2021

Not a big deal especially on a maintenance branch, but would be nice to have the lowdown fixes in first so we don't have a known-broken commit in the history.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Mar 11, 2021

Result of nixpkgs-review pr 115947 at 82f018b7 run on aarch64-linux 1

5 packages marked as broken and skipped:
  • disnix
  • disnixos
  • hydra-unstable
  • nixFlakes
  • nixUnstable
2 packages built successfully:

Result of nixpkgs-review pr 115947 at 82f018b7 run on x86_64-linux 1

6 packages built successfully:

sternenseemann and others added 7 commits March 11, 2021 16:52
(cherry picked from commit 182dc8b)
(cherry picked from commit cd62625)
(cherry picked from commit 8ee8dc8)
(cherry picked from commit 44f1a10)
Bug fixes for gemini and the difference engine, new lowdown-diff(1) man
page:

https://github.com/kristapsdz/lowdown/blob/e1ed0e1b11d152e6b8791c85f12496ff45b0a391/versions.xml#L1021-L1066
(cherry picked from commit b9f5c99)
hydra-unstable: 2020-10-20 -> 2021-03-10
(cherry picked from commit 9c5f8a2)
@sternenseemann
Copy link
Member

Not in Nixpkgs perhaps. For a simple package like lowdown, isn't it just as easy to duplicate it, so we have a lowdown_0_8 package next to the old lowdown?

FWIW the lowdown library is pretty seldomly used where the lowdown utility and nix are the only known downstream users to the library's author afaik. But agreed, a lowdown_0_8 attribute would be the cleaner solution.

@Ma27
Copy link
Member Author

Ma27 commented Mar 11, 2021

FWIW the lowdown library is pretty seldomly used where the lowdown utility and nix are the only known downstream users to the library's author afaik. But agreed, a lowdown_0_8 attribute would be the cleaner solution.

Done.

Not a big deal especially on a maintenance branch, but would be nice to have the lowdown fixes in first so we don't have a known-broken commit in the history.

Done.

@Ma27 Ma27 merged commit 6be212c into NixOS:release-20.09 Mar 11, 2021
@Ma27 Ma27 deleted the backport-nix-unstable branch March 11, 2021 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants