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

twinkle: init at 1.10.2 #74767

Merged
merged 2 commits into from Dec 7, 2019
Merged

twinkle: init at 1.10.2 #74767

merged 2 commits into from Dec 7, 2019

Conversation

mkg20001
Copy link
Member

@mkg20001 mkg20001 commented Dec 1, 2019

Motivation for this change

Need this for myself, useful for others as well.

Things done

Added the twinkle package

  • 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 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.
Notify maintainers

@mkg20001 mkg20001 mentioned this pull request Dec 1, 2019
Closed
@rnhmjoj
Copy link
Contributor

rnhmjoj commented Dec 1, 2019

Could you please follow the commit message convention?

c0bw3b
c0bw3b reviewed Dec 1, 2019
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment

Choose a reason for hiding this comment

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

Also the separate commit to add yourself to maintainers-list should read
maintainers: add mkg20001

pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated Show resolved Hide resolved
@mkg20001 mkg20001 force-pushed the pkg/twinkle branch 2 times, most recently from 367c441 to 5f98e27 Compare December 1, 2019 21:46
@mkg20001 mkg20001 changed the title twinkle: added 1.10.2 twinkle: init at 1.10.2 Dec 1, 2019
@mkg20001 mkg20001 requested a review from c0bw3b December 7, 2019 07:04
@mkg20001
Copy link
Member Author

mkg20001 commented Dec 7, 2019

Can this get merged please?

rnhmjoj
rnhmjoj approved these changes Dec 7, 2019
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

Looks good now.

pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated Show resolved Hide resolved
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/78

timokau
timokau requested changes Dec 7, 2019
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

When you think the PR is mergeable, please squash the commit history into two commits (one adding yourself as a maintainer, one adding the package).

There is no need to maintain commit history within a PR. Commits should be logical units that could be useful in the future, e.g. for a revert, a bisect, a cherry-pick. For example it might make sense to revert the package addition without also reverting your addition to the maintainers list. But there is no reason to keep fixup commits like "twinkle: fix description".

pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated

nativeBuildInputs = [ cmake bison flex wrapQtAppsHook bcg729 ];

cmakeFlags = [ "-DWITH_G729=On" "-DWITH_SPEEX=On" "-DWITH_ILBC=On" /* "-DWITH_DIAMONDCARD=On" broken code */ ];
Copy link
Member

Choose a reason for hiding this comment

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

What does "broken code" mean?

Copy link
Member Author

Choose a reason for hiding this comment

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

Seems ancient and broken

/build/source/src/gui/mphoneform.cpp: In member function 'void MphoneForm::init()':
/build/source/src/gui/mphoneform.cpp:244:9: error: 'class QMenu' has no member named 'insertItem'; did you mean 'insertMenu'?
   menu->insertItem("Diamondcard", Diamondcard);
         ^~~~~~~~~~
         insertMenu

pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated Show resolved Hide resolved
@mkg20001 mkg20001 requested a review from timokau December 7, 2019 10:40
@mkg20001 mkg20001 force-pushed the pkg/twinkle branch 2 times, most recently from 5238df3 to 7eb798f Compare December 7, 2019 10:49
@mkg20001 mkg20001 force-pushed the pkg/twinkle branch 3 times, most recently from e6ea734 to eb71e9b Compare December 7, 2019 10:56
worldofpeace
worldofpeace reviewed Dec 7, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/twinkle/default.nix Outdated

cmakeFlags = [ "-DWITH_G729=On" "-DWITH_SPEEX=On" "-DWITH_ILBC=On" /* "-DWITH_DIAMONDCARD=On" seems ancient and broken */ ];

enableParallelBuilding = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

this is default 031138b, no need to specify

Copy link
Member Author

Choose a reason for hiding this comment

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

But only for cmake and not meson?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, the commit I mentioned is for cmake which this project uses. For meson it's for sure a default.

worldofpeace
worldofpeace approved these changes Dec 7, 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.

LGTM. Could you add a changelog meta attribute?

changelog = "https://github.com/LubosD/twinkle/blob/${version}/NEWS";

timokau
timokau approved these changes Dec 7, 2019
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thanks!

@mkg20001
Copy link
Member Author

mkg20001 commented Dec 7, 2019

So, somewhere in between I messed up and pushed an older version

Fixed that

@timokau timokau merged commit 07266e2 into NixOS:master Dec 7, 2019
@mkg20001 mkg20001 deleted the pkg/twinkle branch June 28, 2021 04:09
@mkg20001 mkg20001 restored the pkg/twinkle branch June 28, 2021 04:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rnhmjoj rnhmjoj rnhmjoj approved these changes

@timokau timokau timokau approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

@c0bw3b c0bw3b Awaiting requested review from c0bw3b

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
6 participants
@mkg20001 @rnhmjoj @nixos-discourse @timokau @c0bw3b @worldofpeace