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

tomb: init at version 2.2 #14899

Merged
merged 1 commit into from
Apr 22, 2016
Merged

tomb: init at version 2.2 #14899

merged 1 commit into from
Apr 22, 2016

Conversation

ethanpailes
Copy link

Things done
  • Tested using sandboxing (nix-build --option build-use-chroot true or nix.useChroot on NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@ethanpailes
Copy link
Author

I'm sorry for the staggering git incompetence displayed in my previous PR.

'';

meta = {
description = "File encryption on GNU/Linux.";
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove the punctuation from the description, per the guidelines

@ethanpailes
Copy link
Author

ethanpailes commented Apr 22, 2016

I have managed to squash these two commits together on my local branch, but I don't know how to overwrite the remote branch with the squashed commits. What is the best way to proceed?

Never mind, I just discovered the --force option.

mkdir -p $out/man

cp tomb $out/bin/tomb
cp doc/tomb.1 $out/man.1
Copy link
Contributor

@joachifm joachifm Apr 22, 2016

Choose a reason for hiding this comment

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

Man pages go into $out/share/man/man<section>; in the current version the man page won't be available to the user.

@joachifm
Copy link
Contributor

Apart from my last note, I think this is ready.

@FRidh FRidh added the 8.has: package (new) This PR adds a new package label Apr 22, 2016
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/man

cp tomb $out/bin/tomb
cp doc/tomb.1 $out/man.1
cp doc/tomb.1 $out/share/man/man1
Copy link
Contributor

Choose a reason for hiding this comment

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

I suspect this will fail, the destination dir doesn't exist at this point.

@joachifm
Copy link
Contributor

@ethanpailes please squash & let's merge this

@ethanpailes
Copy link
Author

squashed

@joachifm
Copy link
Contributor

Thank you

@joachifm joachifm merged commit ea9275f into NixOS:master Apr 22, 2016
@ethanpailes ethanpailes deleted the tomb branch April 23, 2016 01:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants