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

djview: 4.10.6 -> 4.12 #267944

Merged
merged 1 commit into from
Jun 17, 2024
Merged

djview: 4.10.6 -> 4.12 #267944

merged 1 commit into from
Jun 17, 2024

Conversation

6t8k
Copy link
Contributor

@6t8k 6t8k commented Nov 16, 2023

Description of changes

Changelog: https://sourceforge.net/p/djvu/djview-git/ci/release.4.12/tree/NEWS

The release tarball no longer contains a configure script, so pull in the necessary dependencies to generate it here.

Disable building the nsdejavu plugin as modern browsers have dropped support for NPAPI. The npdjvu plugin is based on NPAPI too, so remove the respective note.

Split man output from out.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@6t8k
Copy link
Contributor Author

6t8k commented Nov 16, 2023

Result of nixpkgs-review run on x86_64-linux 1

2 packages built:
  • djview
  • djview.man

@6t8k
Copy link
Contributor Author

6t8k commented Nov 16, 2023

Addendum: changed meta.license from licenses.gpl2 to licenses.gpl2Plus.

I currently have no means to test whether djview is (still) broken on Darwin.

Copy link
Contributor

@Anton-Latukha Anton-Latukha left a comment

Choose a reason for hiding this comment

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

Code changes are concise and simple, I approve.

@pbsds
Copy link
Contributor

pbsds commented Jun 7, 2024

when merged with master:

error:
       … while calling the 'listToAttrs' builtin

         at /nix/store/0anpglz0hkcvl5plw9wy628pcjn786p7-nixpkgs-review-2.10.3/lib/python3.11/site-packages/nixpkgs_review/nix/evalAttrs.nix:46:1:

           45|
           46| listToAttrs (concatMap getProperties attrs)
             | ^
           47|

       … while calling the 'concatMap' builtin

         at /nix/store/0anpglz0hkcvl5plw9wy628pcjn786p7-nixpkgs-review-2.10.3/lib/python3.11/site-packages/nixpkgs_review/nix/evalAttrs.nix:46:14:

           45|
           46| listToAttrs (concatMap getProperties attrs)
             |              ^
           47|

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: attribute 'mainProgram' already defined at /dev/shm/nixpkgs-review/pr-267944/nixpkgs/pkgs/applications/graphics/djview/default.nix:57:5

       at /dev/shm/nixpkgs-review/pr-267944/nixpkgs/pkgs/applications/graphics/djview/default.nix:62:5:

           61|     maintainers = with maintainers; [ Anton-Latukha ];
           62|     mainProgram = "djview";
             |     ^
           63|     longDescription = ''

I assume some other PR must've already added mainProgram

Changelog:
https://sourceforge.net/p/djvu/djview-git/ci/release.4.12/tree/NEWS

The release tarball no longer contains a configure script, so pull in
the necessary dependencies to generate it here.

Disable building the `nsdejavu` plugin as modern browsers have dropped
support for NPAPI. The `npdjvu` plugin is based on NPAPI too, so remove
the respective note.

Split `man` output from `out`.
@6t8k
Copy link
Contributor Author

6t8k commented Jun 15, 2024

I assume some other PR must've already added mainProgram

Right, looks to be ff1a94e - I've removed the line here and rebased. Still builds and runs fine on x86_64-linux, the initial comment remains accurate.

@ofborg ofborg bot requested a review from Anton-Latukha June 15, 2024 20:07
@Aleksanaa Aleksanaa merged commit a81321e into NixOS:master Jun 17, 2024
24 checks passed
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

5 participants