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

csvkit: fix build #97517

Merged
merged 4 commits into from Sep 20, 2020
Merged

csvkit: fix build #97517

merged 4 commits into from Sep 20, 2020

Conversation

doronbehar
Copy link
Contributor

Motivation for this change

#97479 cc @NixOS/nixos-release-managers .

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.

@ofborg ofborg bot requested a review from vrthra September 9, 2020 09:45
@jonringer
Copy link
Contributor

sorry, I saw the other first, I think a fix already went it

for the commit message, please have it adhere to CONTRIBUTing:

csvkit: <message>

ZHF is just a period of time

@doronbehar
Copy link
Contributor Author

sorry, I saw the other first, I think a fix already went it

I saw the merge conflicts, and hence the changes performed by @zookatron at 32c9ee2 . TBH, I think my changes are better. I rebased it all upon the current master. All of the packages used in my version are of their latest versions, and there are no overrides at all used. An upstream PR was fetched so all tests should pass, plus a version bump.

for the commit message, please have it adhere to CONTRIBUTing:

I do adhere to it. The PR includes 4 commits each dealing with a different package and the PR title is just the name of the branch.

@doronbehar doronbehar changed the title Zhf/csvkit csvkit: fix build Sep 9, 2020
@zookatron
Copy link
Contributor

Thanks for taking the time to update these packages more thoroughly @doronbehar. For my changes I was just trying to make the minimal changes necessary for Zero Hydra Failures and I did not update the package version itself as my understanding is that we should avoid updating the package versions themselves when back-porting changes to an already stable branch.

jonringer
jonringer reviewed Sep 10, 2020
View reviewed changes
pkgs/tools/text/csvkit/default.nix
};

patches = [
Copy link
Contributor

Choose a reason for hiding this comment

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

please add a comment as to why the patch is necesary, and when it's likely to be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍.

pkgs/top-level/python-packages.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/crate/default.nix Outdated
meta = with stdenv.lib; {
homepage = "http://www.sqlalchemy.org/";
description = "A Python SQL toolkit and Object Relational Mapper";
license = licenses.mit;
Copy link
Contributor

Choose a reason for hiding this comment

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

I would really like to have a maintainer of this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, myself. I also updated the whole meta attribute as this one was of a copy paste.

@doronbehar
Copy link
Contributor Author

Are we still interested in this @jonringer ?

@jonringer
Copy link
Contributor

I think for master, this is fine, but for release-20.09 it's adding a new package, and affecting some others.

I was on vacation and only had a laptop, so I couldn't do large rebuilds

@jonringer
Copy link
Contributor

actually, seeing as the package addition was to fix a different build, maybe it should be included

cc @worldofpeace

@doronbehar
python3Packages.crate: init at 0.24.0
28ede75
@doronbehar
python.pkgs.agate-sql: fix tests by adding crate to inputs
992dc83
@doronbehar
csvkit: 1.0.4 -> 1.0.5
d5d320c
@doronbehar
csvkit: fix tests
77bd374 
Remove unneeded glibcLocales. Remove overrided agate-sql and agate-dbf,
as these overrides are not needed. Use pytestCheckHook instead of
overriding checkPhase. Add an upstream patch that fixes tests.
drewrisinger
drewrisinger approved these changes Sep 15, 2020
View reviewed changes
Copy link
Contributor

@drewrisinger drewrisinger 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
  • Commits LGTM
  • Builds
https://github.com/NixOS/nixpkgs/pull/97517
5 packages built:
csvkit python37Packages.agate-sql python37Packages.crate python38Packages.agate-sql python38Packages.crate

jonringer
jonringer approved these changes Sep 20, 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

Result of nixpkgs-review pr 97517 1

5 packages built:
  • csvkit
  • python37Packages.agate-sql
  • python37Packages.crate
  • python38Packages.agate-sql
  • python38Packages.crate

@jonringer jonringer merged commit 8bf99f6 into NixOS:master Sep 20, 2020
@doronbehar doronbehar deleted the ZHF/csvkit branch March 2, 2023 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@drewrisinger drewrisinger drewrisinger approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@vrthra vrthra Awaiting requested review from vrthra

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@doronbehar @jonringer @zookatron @drewrisinger