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: cba065468224
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: 96ae9a352288
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 5, 2018

  1. thinc: relax dependency version requirements 

    (cherry picked from commit ffb094f)
    @danieldk @Mic92
    danieldk authored and Mic92 committed Sep 5, 2018
    Copy the full SHA
    7888e26 View commit details

  2. spacy: relax dependency versions 

    (cherry picked from commit da84757)
    @danieldk @Mic92
    danieldk authored and Mic92 committed Sep 5, 2018
    Copy the full SHA
    e928fd9 View commit details

  3. restic: Fix autocomplete for zsh 

    zsh requires for files to be prepended with underscore to be
recognized as widgets, see [1] for more details.

[1] NixOS/nixpkgs#46001 (comment)

(cherry picked from commit e9fe3a3)
    @uskudnik @Mic92
    uskudnik authored and Mic92 committed Sep 5, 2018
    Copy the full SHA
    96ae9a3 View commit details
Showing with 6 additions and 3 deletions.
  1. +2 −1 pkgs/development/python-modules/spacy/default.nix
  2. +3 −1 pkgs/development/python-modules/thinc/default.nix
  3. +1 −1 pkgs/tools/backup/restic/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/spacy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,8 @@ buildPythonPackage rec {
--replace "ftfy==" "ftfy>=" \
--replace "msgpack-python==" "msgpack-python>=" \
--replace "msgpack-numpy==" "msgpack-numpy>=" \
--replace "pathlib" "pathlib; python_version<\"3.4\""
--replace "thinc>=6.10.3,<6.11.0" "thinc>=6.10.3" \
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
'';

propagatedBuildInputs = [
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/thinc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "msgpack-python==" "msgpack-python>=" \
--replace "msgpack-numpy==" "msgpack-numpy>="
--replace "msgpack-numpy==" "msgpack-numpy>=" \
--replace "plac>=0.9,<1.0" "plac>=0.9" \
--replace "hypothesis>=2,<3" "hypothesis>=2"
'';

propagatedBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/tools/backup/restic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ buildGoPackage rec {
cp restic $bin/bin/
$bin/bin/restic generate \
--bash-completion $bin/etc/bash_completion.d/restic.sh \
--zsh-completion $bin/share/zsh/vendor-completions/restic.sh \
--zsh-completion $bin/share/zsh/vendor-completions/_restic \
--man $bin/share/man/man1
'';