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

coolreader: init at 3.2.45 #95923

Merged
merged 2 commits into from Aug 22, 2020
Merged

coolreader: init at 3.2.45 #95923

merged 2 commits into from Aug 22, 2020

Conversation

gebner
Copy link
Member

@gebner gebner commented Aug 21, 2020

Motivation for this change

New package. Coolreader is an e-book reader.

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.

@gebner
Copy link
Member Author

gebner commented Aug 21, 2020

@GrahamcOfBorg eval
@GrahamcOfBorg build coolreader

Comment on lines 7 to 13
src = fetchFromGitHub {
owner = "adah1972";
repo = pname;
rev = "libunibreak_4_3";
sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx";
Copy link
Contributor

Choose a reason for hiding this comment

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

to better support updates

Suggested change
src = fetchFromGitHub {
owner = "adah1972";
repo = pname;
rev = "libunibreak_4_3";
sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx";
src = let
rev_version = stdenv.lib.replaceStrings ["-"] ["_"] version;
in fetchFromGitHub {
owner = "adah1972";
repo = pname;
rev = "libunibreak_${rev_version}";
sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx";

Copy link
Contributor

Choose a reason for hiding this comment

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

needs to be

stdenv.lib.replaceStrings ["."] ["_"] 

not -. Getting 404 from at the moment github...

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, apparently ofborg didn't catch this because it had already cached the download... Fixed in 2446a98

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks @gebner!

sha256 = "0nkk4d0j04yjwanjszq8h8hvx87rnwax2k6akm4bpjxwpcs4icws";
};

nativeBuildInputs = [ cmake pkgconfig ];
Copy link
Contributor

Choose a reason for hiding this comment

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

In new expressions, pkg-config should be used instead of the pkgconfig alias.

meta = with lib; {
homepage = "https://github.com/buggins/coolreader";
description = "Cross platform open source e-book reader";
license = licenses.gpl2Only; # see https://github.com/buggins/coolreader/issues/80
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment says -or-later: buggins/coolreader#80 (comment)

@jtojnar
Copy link
Contributor

jtojnar commented Aug 21, 2020

@GrahamcOfBorg build fbreader

@zowoq
Copy link
Contributor

zowoq commented Aug 21, 2020

@ofborg eval

@gebner
Copy link
Member Author

gebner commented Aug 22, 2020

Thanks for the reviews!

@gebner gebner merged commit 0811ec6 into NixOS:master Aug 22, 2020
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