Navigation Menu

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

x3270: init at 4.0ga9 #79072

Merged
merged 1 commit into from Aug 15, 2020
Merged

x3270: init at 4.0ga9 #79072

merged 1 commit into from Aug 15, 2020

Conversation

anna328p
Copy link
Member

@anna328p anna328p commented Feb 2, 2020

Motivation for this change

Adds x3270, an IBM 3270 terminal emulator for the X Window System, to nixpkgs.

Things done
  • 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 nixpkgs-review --run "nixpkgs-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.

@sikmir
Copy link
Member

sikmir commented Feb 2, 2020

Could you please squash commits into one?

@anna328p
Copy link
Member Author

anna328p commented Feb 2, 2020

Could you please squash commits into one?

Doesn't Github have an option to automatically do that when merging a pull request?

@anna328p
Copy link
Member Author

@sikmir Done

@jonringer
Copy link
Contributor

there still some merge conflicts.

Generally rebasing is prefered over merging:

git pull -r origin master

@anna328p
Copy link
Member Author

@jonringer Fixed the merge conflicts, bumped the package version, and rebased to latest master.

Dropped the patch that removed references to /bin from the Makefile because it was merged into upstream.

@anna328p anna328p changed the title x3270: init at 3.6ga8 x3270: init at 4.0ga9 Jul 19, 2020
@anna328p anna328p force-pushed the x3270 branch 2 times, most recently from 05ad071 to b1424cd Compare July 29, 2020 02:52
jonringer
jonringer approved these changes Aug 15, 2020
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.

LGTM
shows usage

https://github.com/NixOS/nixpkgs/pull/79072
1 package built:
x3270

@jonringer jonringer merged commit 08930e0 into NixOS:master Aug 15, 2020
@anna328p anna328p deleted the x3270 branch August 15, 2020 22:09
@anna328p anna328p restored the x3270 branch August 15, 2020 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sikmir sikmir sikmir left review comments

@jonringer jonringer jonringer approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@anna328p @sikmir @jonringer