public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79119 from NixOS/staging-next

Browse Source 
Staging next
This commit is contained in:
Frederik Rietdijk
2020-02-05 19:09:27 +01:00
committed by GitHub
parent f720f14137 76a439239e
commit 87a19e9048
28 changed files with 341 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/python-modules/Babel/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }:
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, pytz, pytest, freezegun, glibcLocales }:
buildPythonPackage rec {
pname = "Babel";
@@ -9,14 +9,31 @@ buildPythonPackage rec {
sha256 = "e86135ae101e31e2c8ec20a4e0c5220f4eed12487d5cf3f78be7e98d3a57fc28";
};
patches = [
# The following 2 patches fix the test suite failing on nix < 2.3 with
# Python < 3 because those nix versions do not run in a pseudoterminal,
# which makes Python 2 not set the default encoding to UTF-8, and the
# Babel code crashes when printing a warning in that case.
# See #75676 and https://github.com/python-babel/babel/pull/691.
# It is important to fix this because otherwise Babel is not buildable
# with older nix versions (e.g. on machines used as --builders).
# TODO: Remove at release > 2.8.0.
(fetchpatch {
name = "Babel-Introduce-invariant-that-invalid_pofile-takes-unicode-line.patch";
url = "https://github.com/python-babel/babel/commit/f4f6653e6aa053724d2c6dc0ee71dcb928013352.patch";
sha256 = "1kyknwn9blspcf9yxmgdiaxdii1dnkblyhcflqwhxyl1mss1dxv5";
})
(fetchpatch {
name = "Babel-Fix-unicode-printing-error-on-Python-2-without-TTY.patch";
url = "https://github.com/python-babel/babel/commit/da7f31143847659b6b74d802618b03438aceb350.patch";
sha256 = "09yny8614knr8ngrrddmqzkxk70am135rccv2ncc6dji4xbqbfln";
})
];
propagatedBuildInputs = [ pytz ];
checkInputs = [ pytest freezegun ];
# Note that a test will fail with an encoding error on Python 2 with Nix < 2.3
# due to https://github.com/NixOS/nixpkgs/pull/75676#issuecomment-579008837.
# TODO: Remove the above comment when we use a version that includes the fix
# from https://github.com/python-babel/babel/pull/691
doCheck = !stdenv.isDarwin;
meta = with lib; {

4
pkgs/development/python-modules/pyatspi/default.nix
View File

@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyatspi";
version = "2.32.1";
version = "2.34.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1283cbwd2kacgdij96xk26721f6amyzdhy2py11kdj5cprdlm5c4";
sha256 = "0j3f75j0zd6ca8msg7yr19qsfirqkn9fk8pqbjnlhqrpri455g4p";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/python-modules/pygobject/3.nix
View File

@@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
buildPythonPackage rec {
pname = "pygobject";
version = "3.32.1";
version = "3.34.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1n04dnvq3bx7vk7pgnxlg6kiwnc7xxv9bjabkv7abpmqjkprvj9j";
sha256 = "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7";
};
outputs = [ "out" "dev" ];