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

boomerang: switch to new active fork, cleanup, maintain #34021

Merged
merged 1 commit into from Feb 10, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 18, 2018

Fixes many bugs and GUI doesn't have missing icons, etc.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.


stdenv.mkDerivation rec {
name = "boomerang-${version}";
version = "0.3.99-alpha-2016-11-02";
version = "0.4.0-alpha-20180118";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you keep hyphens in the date? (https://nixos.org/nixpkgs/manual/#sec-package-naming documents that YYYY-MM-DD is the preferred format)

Why are you changing 0.3.99 to 0.4.0? The latest tag is v0.3.99-alpha, so leaving it as is seems appropriate.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's the version the code gives itself currently: https://github.com/ceeac/boomerang/blob/dc53653f2374676c07296b4c51eed4ac4eeba127/cmake-scripts/boomerang-version.cmake#L11

Happy to conform with date, wasn't sure how to handle this.
My understanding is that 2018-01-18 (nothing else) is preferred, but didn't want to "break" upgrades by anyone currently having it installed. Will change as you suggest.

@@ -807,7 +807,7 @@ with pkgs;

borgbackup = callPackage ../tools/backup/borg { };

boomerang = callPackage ../development/tools/boomerang { };
boomerang = qt5.callPackage ../development/tools/boomerang { };
Copy link
Contributor

Choose a reason for hiding this comment

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

Please use libsForQt5.callPackage.

Copy link
Member Author

Choose a reason for hiding this comment

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

I somehow got it into my head that qt5.callPackage was no preferred over libsForQt5; I'm not sure where this came from, and will of course fix it :).

@Mic92 Mic92 merged commit b3e42e6 into NixOS:master Feb 10, 2018
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