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

ptask: init at 1.0.0 #23062

Merged
merged 1 commit into from Mar 18, 2017
Merged

ptask: init at 1.0.0 #23062

merged 1 commit into from Mar 18, 2017

Conversation

spacefrogg
Copy link
Contributor

Motivation for this change
  • Adds a simple GTK GUI for managing taskwarrior tasks
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • 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.

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

You forgot to add the package to pkgs/top-level/all-packages.nix.

sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
};

buildInputs = [ pkgconfig makeWrapper gtk3 json_c ];
Copy link
Member

Choose a reason for hiding this comment

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

pkgconfig and makeWrapper are nativeBuildInputs.

Copy link
Contributor

@matthiasbeyer matthiasbeyer left a comment

Choose a reason for hiding this comment

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

Overall it looks good, besides my two annotations.

@@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }:
Copy link
Contributor

Choose a reason for hiding this comment

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

You have taskwarrior here in the input of the function, but not in any buildinputs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It appears in the call to wrapProgram as it is a run-time dependency.

|| !strcmp(ver, "2.4.0")
|| !strcmp(ver, "2.4.1")
- || !strcmp(ver, "2.5.0"))
+ || !strcmp(ver, "2.5.1"))
Copy link
Contributor

Choose a reason for hiding this comment

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

I can see why we need this patch, but I would really opt for contributing this upstream as well... I'm not sure why there is still the 2.5.0 version in here... Maybe both work? Have you tested it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I haven't had the time yet to contribute it upstream. ptask has a --force switch to circumvent this check, but this obviously degrades usability. It does work, though, as 2.5.1 is a maintenance release. I would leave the patch until it is fixed upstream. As ptask is meant to be a graphical interface, it does not make a lot of sense to force the user to go back to the terminal to make it work.

@spacefrogg
Copy link
Contributor Author

@fpletz, @matthiasbeyer Are we good to merge, now? I think I addressed all concerns.

@7c6f434c 7c6f434c merged commit b89d66a into NixOS:master Mar 18, 2017
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

4 participants