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

kjv: init at unstable-2018-12-25 #64565

Merged
merged 2 commits into from Jul 24, 2019
Merged

kjv: init at unstable-2018-12-25 #64565

merged 2 commits into from Jul 24, 2019

Conversation

jtobin
Copy link
Contributor

@jtobin jtobin commented Jul 10, 2019 •
edited

Motivation for this change

Simply adds bonibon's kjv to nixpkgs.

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtobin jtobin force-pushed the master branch 3 times, most recently from 20b777a to c9e6697 Compare July 10, 2019 13:05
jonringer
jonringer reviewed Jul 10, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

A few suggestions, but i was able to build the package.

./result/bin/kjv --help
usage: kjv [flags] [reference...]

  -l      list books
  -W      no line wrap
  -h      show help
...

pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
@jtobin
Copy link
Contributor Author

jtobin commented Jul 10, 2019

@jonringer Thanks for the careful review! I've made all the changes you suggested.

@jtobin jtobin changed the title kjv: init at 1.0.0 kjv: init at 20190311 Jul 10, 2019
jonringer
jonringer reviewed Jul 10, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

just a little more cleanup, doesn't change the closure though :)

$ nix-store -q --tree ./result # after
/nix/store/wzdw64avynfad1mlr11sb7qa02v86jdz-kjv
+---/nix/store/7bkv33x88dc64yhjvfvjvh0fqyhlliwj-bash-4.4-p23
    +---/nix/store/bjmg1g133m9xwxa0iy5inp2snvnfg151-glibc-2.27
    |   +---/nix/store/bjmg1g133m9xwxa0iy5inp2snvnfg151-glibc-2.27 [...]
    +---/nix/store/7bkv33x88dc64yhjvfvjvh0fqyhlliwj-bash-4.4-p23 [...]

$ nix-store -q --tree ./result # before
/nix/store/av5h5mj4w1cxc0kxm31ndawn4pcrc18g-kjv
+---/nix/store/7bkv33x88dc64yhjvfvjvh0fqyhlliwj-bash-4.4-p23
    +---/nix/store/bjmg1g133m9xwxa0iy5inp2snvnfg151-glibc-2.27
    |   +---/nix/store/bjmg1g133m9xwxa0iy5inp2snvnfg151-glibc-2.27 [...]
    +---/nix/store/7bkv33x88dc64yhjvfvjvh0fqyhlliwj-bash-4.4-p23 [...]

pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

You'll have to sit tight until someone with commit access reviews :)

jb55
jb55 suggested changes Jul 11, 2019
View reviewed changes
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
jb55
jb55 suggested changes Jul 11, 2019
View reviewed changes
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
@jtobin jtobin force-pushed the master branch 2 times, most recently from 7d86fcc to bb6a77a Compare July 11, 2019 23:00
@jtobin
Copy link
Contributor Author

jtobin commented Jul 11, 2019

@jb55 Thanks for the review! I kept the raw URL for the homepage, but simplified the repo attribute per your suggestion.

@jtobin
Copy link
Contributor Author

jtobin commented Jul 16, 2019

(Pinging anyone with push access to take another look at this.)

@jonringer
Copy link
Contributor

@marsam do you mind take a look at this? :). Should be ready to go

marsam
marsam reviewed Jul 18, 2019
View reviewed changes
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
@jtobin jtobin changed the title kjv: init at 20190311 kjv: init at unstable-2019-03-11 Jul 18, 2019
@jtobin
Copy link
Contributor Author

jtobin commented Jul 18, 2019

@marsam Thanks for the review! I've made most of your suggestions, and left a comment re: packaging the fork.

worldofpeace
worldofpeace suggested changes Jul 23, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

See comments.

Also can you change the commit msg Add maintainer info for Jared Tobin. to

maintainers: add Jared Tobin

pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build kjv

@jtobin jtobin force-pushed the master branch 2 times, most recently from 70ceba6 to 1893cdc Compare July 23, 2019 11:04
@jtobin jtobin changed the title kjv: init at unstable-2019-03-11 kjv: init at unstable-2018-12-25 Jul 23, 2019
@jtobin
Copy link
Contributor Author

jtobin commented Jul 23, 2019

@worldofpeace Thanks for the review -- I've made the changes you (and, re: avoiding the fork, also @marsam) requested.

Just let me know if anything else seems worth patching up. In particular, I added a manual installPhase definition to account for the lack of a phony install target in the canonical repo's Makefile, and I wouldn't be surprised if there were some more idiomatic way of handling that.

worldofpeace
worldofpeace suggested changes Jul 23, 2019
View reviewed changes
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/kjv/default.nix Outdated Show resolved Hide resolved
@jtobin
Copy link
Contributor Author

jtobin commented Jul 23, 2019

@worldofpeace Thanks for following up! I left some comments, but will happily defer to you here if my approach isn't acceptable.

@worldofpeace
Copy link
Contributor

I'd have to disagree with #64565 (comment).

The commit adds an install target LukeSmithxyz/kjv@f4ad735#diff-b67911656ef5d18c4ae36cb6741b7965R16
which in nixpkgs would always be preferred instead of doing something manually.

@jtobin
Copy link
Contributor Author

jtobin commented Jul 24, 2019 •
edited

@worldofpeace All good -- I've rebased and added the install target patch as well.

worldofpeace
worldofpeace approved these changes Jul 24, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment •
edited

Choose a reason for hiding this comment

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

LGTM 👍

I'd also like to mention it's best avoided to start your PR branch directly on master.
See https://nixos.org/nixpkgs/manual/#submitting-changes-making-patches

@worldofpeace worldofpeace merged commit 2e869f7 into NixOS:master Jul 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jb55 jb55 jb55 requested changes

@marsam marsam marsam left review comments

@jonringer jonringer jonringer left review comments

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jtobin @jonringer @worldofpeace @jb55 @marsam