Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a3783f968b05
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba0bd29a1aef
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 22, 2020

  1. topydo: Don't fail build on tests 

    Signed-off-by: Pamplemousse <xav.maso@gmail.com>
(cherry picked from commit c603f62)
    @Pamplemousse
    Pamplemousse authored and Jon committed Sep 22, 2020
    Copy the full SHA
    8e0373f View commit details

  2. tensorflow: Fix compilation with numpy 1.19.x 

    Numpy introduced a breaking API change in version 1.19.x, see [1].

There is a simple fix [2] available in the master branch.

[1]: tensorflow/tensorflow#40688
[2]: tensorflow/tensorflow@75ea0b3

(cherry picked from commit 8f5bfd6)
    @avdv
    avdv authored and Jon committed Sep 22, 2020
    Copy the full SHA
    ba0bd29 View commit details
Showing with 15 additions and 1 deletion.
  1. +8 −1 pkgs/applications/misc/topydo/default.nix
  2. +7 −0 pkgs/development/python-modules/tensorflow/1/default.nix
9 changes: 8 additions & 1 deletion pkgs/applications/misc/topydo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,14 @@ buildPythonApplication rec {
watchdog
];

checkInputs = [ mock freezegun coverage green pylint ];
checkInputs = [ mock freezegun pylint ];

# Skip test that has been reported multiple times upstream without result:
# bram85/topydo#271, bram85/topydo#274.
checkPhase = ''
substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls'
python -m unittest discover
'';

LC_ALL="en_US.UTF-8";

7 changes: 7 additions & 0 deletions pkgs/development/python-modules/tensorflow/1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -132,6 +132,13 @@ let
})
./lift-gast-restriction.patch

(fetchpatch {
# fix compilation with numpy >= 1.19
name = "add-const-overload.patch";
url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
})

# cuda 10.2 does not have "-bin2c-path" option anymore
# https://github.com/tensorflow/tensorflow/issues/34429
../cuda-10.2-no-bin2c-path.patch