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

ifconfig-parser and jc: init #79452

Merged
merged 2 commits into from Feb 29, 2020
Merged

ifconfig-parser and jc: init #79452

merged 2 commits into from Feb 29, 2020

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Feb 7, 2020

Motivation for this change

https://www.reddit.com/r/linux/comments/ezvj04/jc_jsonify_the_output_of_dozens_of_common/

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.

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.

commit history should be:

pythonPackages.ifconfig-parser: init at 0.0.5
pythonPackages.jc: init at 1.7.2

@jonringer
Copy link
Contributor

jonringer commented Feb 12, 2020

git reset HEAD~5
git add  pkgs/development/python-modules/ifconfig-parser/
git commit -m "pythonPackages.ifconfig-parser: init at 0.0.5"
git add  pkgs/development/python-modules/jc/
git commit -m "pythonPackages.jc: init at 1.7.2"
git push .. .. --force

getting the changes to python-modules is a little more difficult, but you can use git add -p instead to selectively add certain changes to a given file

@Atemu
Copy link
Member Author

Atemu commented Feb 14, 2020

commit history should be:

pythonPackages.ifconfig-parser: init at 0.0.5
pythonPackages.jc: init at 1.7.2

Thanks!

I usually like to keep the history transparent but this is definitely cleaner.

git reset HEAD~5
git add  pkgs/development/python-modules/ifconfig-parser/
git commit -m "pythonPackages.ifconfig-parser: init at 0.0.5"
git add  pkgs/development/python-modules/jc/
git commit -m "pythonPackages.jc: init at 1.7.2"
git push .. .. --force

getting the changes to python-modules is a little more difficult, but you can use git add -p instead to selectively add certain changes to a given file

A rebase with rewords and fixups is easier IMO and avoids the second issue

@Atemu Atemu force-pushed the jc-init branch 2 times, most recently from a774ec6 to fb9a51b Compare February 14, 2020 19:28
@jonringer
Copy link
Contributor

please fix conflicts

@Atemu
Copy link
Member Author

Atemu commented Feb 18, 2020

Thanks a bunch for your feedback @jonringer!

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.

diff LGTM
jc shows usage

[8 built, 0.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/79452
5 package built:
jc python27Packages.ifconfig-parser python37Packages.ifconfig-parser python38Packages.ifconfig-parser python38Packages.jc

@jonringer
Copy link
Contributor

@GrahamcOfBorg eval
@GrahamcOfBorg build jc python27Packages.ifconfig-parser python37Packages.ifconfig-parser python38Packages.ifconfig-parser python38Packages.jc

@Atemu
Copy link
Member Author

Atemu commented Feb 29, 2020

Updated to 1.7.5.

Btw, what's the status on this? I'm not too familiar with the process of adding a package yet.

@jonringer
Copy link
Contributor

@GrahamcOfBorg build jc python27Packages.ifconfig-parser python37Packages.ifconfig-parser python38Packages.ifconfig-parser python38Packages.jc

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

[8 built, 0.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/79452
5 package built:
jc python27Packages.ifconfig-parser python37Packages.ifconfig-parser python38Packages.ifconfig-parser python38Packages.jc

@jonringer
Copy link
Contributor

the status was: I forgot to follow up after doing ofborg

@jonringer jonringer merged commit c6a5cc3 into NixOS:master Feb 29, 2020
@Atemu Atemu deleted the jc-init branch July 30, 2020 12:52
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

2 participants