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

asciidoctor: 1.5.7.1 -> 2.0.10 #62707

Merged
merged 1 commit into from Jun 12, 2019

Conversation

Projects
None yet
4 participants
@michaelpj
Copy link
Contributor

commented Jun 4, 2019

Motivation for this change

There has been a new major version, so it seems good to upgrade.

I had to drop two plugins:

  • asciidoctor-latex seems dead, and hasn't had any commits since 2015.
  • asciidoctor-bespoke also hasn't been updated for over a year, and
    doesn't seem to be compatible with the new version.

@yacinehmito

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 nix-review --run "nix-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.

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jun 5, 2019

commit msg should be

asciidoctor: 1.5.7.1 -> 2.0.10
asciidoctor: 1.5.7.1 -> 2.0.10
There has been a new major version, so it seems good to upgrade.

I had to drop two plugins:
- `asciidoctor-latex` seems dead, and hasn't had any commits since 2015.
- `asciidoctor-bespoke` also hasn't been updated for over a year, and
doesn't seem to be compatible with the new version.

@michaelpj michaelpj force-pushed the michaelpj:imp/update-asciidoctor branch from d0f51a3 to 3d1e0da Jun 5, 2019

@michaelpj

This comment has been minimized.

Copy link
Contributor Author

commented Jun 5, 2019

Commit message fixed.

@yacinehmito
Copy link
Contributor

left a comment

I have not tested (not running a NixOS system currently) but it LGTM 👍 .

Also, small question: why did you remove asciidoctor-latex?

@michaelpj

This comment has been minimized.

Copy link
Contributor Author

commented Jun 5, 2019

Also, small question: why did you remove asciidoctor-latex?

Ah, I said why I didn't feel bad about dropping it, but not why I had to: it specifies an old version of asciidoctor in its gemspec. I don't know if there's a way to override it's version constraints, but I couldn't get bundix to work for me with it included. Also, I think the internals of asciidoctor changed a fair bit in 2.0, which is likely to affect plugins that aren't explicitly updated.

@worldofpeace worldofpeace changed the title asciidoctor: update to 2.0.10 asciidoctor: 1.5.7.1 -> 2.0.10 Jun 5, 2019

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jun 5, 2019

Looks good to me, is there someway I can use this nix expression to run their tests?

@michaelpj

This comment has been minimized.

Copy link
Contributor Author

commented Jun 6, 2019

No obviously. I tried installing rake and using nix-shell on it, but it didn't work. Nor does it have an .env attribute as the manual says it should...

@FRidh FRidh added this to the 19.09 milestone Jun 9, 2019

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jun 11, 2019

I tried installing rake and using nix-shell on it, but it didn't work. Nor does it have an .env attribute as the manual says it should...

Looks like that's WIP being fixed #62971

@michaelpj

This comment has been minimized.

Copy link
Contributor Author

commented Jun 11, 2019

Do you want to wait to try that out or can we merge this? I've tested the executables by hand and they seem to work.

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Jun 12, 2019

That sounds fine, merging now.

@worldofpeace worldofpeace merged commit 17d0fc2 into NixOS:master Jun 12, 2019

13 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.