Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc35e4da0880
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9089e5aad502
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 9, 2020

  1. [20.09] csvkit: fix failing test 

    The build for this package was failing due to failing tests that were caused by a breaking change in a dependency. The requirements.txt for this package does not pin specific versions so it was trying to build with the new version of the dependency and failing. This commit overrides the version of the dependency that is used to build the package.

(cherry picked from commit 32c9ee2)
    Tim Zook committed Sep 9, 2020
    Copy the full SHA
    ca58161 View commit details

  2. Merge pull request #97580 from zookatron/release-20.09 

    [20.09] csvkit: fix failing test
    @worldofpeace
    worldofpeace authored Sep 9, 2020
    Copy the full SHA
    9089e5a View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/tools/text/csvkit/default.nix
9 changes: 8 additions & 1 deletion pkgs/tools/text/csvkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,14 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
agate
agate-excel
agate-dbf
# dbf test fail with agate-dbf-0.2.2
(agate-dbf.overridePythonAttrs(old: rec {
version = "0.2.1";
src = python3.pkgs.fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80";
};}))
# sql test fail with agate-sql-0.5.4
(agate-sql.overridePythonAttrs(old: rec {
version = "0.5.3";