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: 7ee5dc023211
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: 6e966de055ed
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 28, 2019

  1. python37Packages.blist: fix compatibility for python 3.7

    @ahiaao
    ahiaao committed Nov 28, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ac7a46 View commit details

  2. python37Packages.PyLD: fix behavior to terminate generators

    @ahiaao
    ahiaao committed Nov 28, 2019
    Copy the full SHA
    271da09 View commit details

  3. Merge pull request #73599 from ahiaao/fix/pyld-python37 

    python37Packages.PyLD: fix behavior to terminate generators
    @marsam
    marsam authored Nov 28, 2019
    Copy the full SHA
    a374ffa View commit details

Commits on Nov 29, 2019

  1. Merge pull request #73603 from ahiaao/fix/blist-python37-backport 

    python37Packages.blist: fix compatibility for python 3.7 19.09 backport
    @marsam
    marsam authored Nov 29, 2019
    Copy the full SHA
    6e966de View commit details
Showing with 18 additions and 1 deletion.
  1. +9 −1 pkgs/development/python-modules/PyLD/default.nix
  2. +9 −0 pkgs/development/python-modules/blist/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/PyLD/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, python, gnugrep }:

let

@@ -29,6 +29,14 @@ buildPythonPackage {
sha256 = "1bmpz4s6j7by6l45wwxy7dn7hmrhxc26kbx2hbfy41x29vbjg6j9";
};

patches = [
# Fix tests on Python 3. Remove with the next release
(fetchpatch {
url = "https://github.com/digitalbazaar/pyld/commit/ec4bd907b7fbd566e1f6c76d09676e4900e3dcd0.patch";
sha256 = "0i5phs5qnq4bjsb72if1sbfg751qc14qbdskqn0xhlzx0r75l7za";
})
];

# Unfortunately PyLD does not pass all testcases in the JSON-LD corpus. We
# check for at least a minimum amount of successful tests so we know it's not
# getting worse, at least.
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/blist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchpatch
, fetchPypi
, isPyPy
}:
@@ -14,6 +15,14 @@ buildPythonPackage rec {
sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
};

patches = [
# Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78
(fetchpatch {
url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch";
sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y";
})
];

meta = with stdenv.lib; {
homepage = http://stutzbachenterprises.com/blist/;
description = "A list-like type with better asymptotic performance and similar performance on small lists";