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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-12 14:32:56 +01:00
parent 20b3bd194b 326e5ec55b
commit d688c7cd05
45 changed files with 554 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }:
{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }:
buildPythonPackage rec {
pname = "Babel";
@@ -13,6 +13,8 @@ buildPythonPackage rec {
checkInputs = [ pytest freezegun glibcLocales ];
doCheck = !stdenv.isDarwin;
preCheck = ''
export LC_ALL="en_US.UTF-8"
'';

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

@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "websockets";
version = "8.0.2";
version = "8.1";
src = fetchFromGitHub {
owner = "aaugustin";
repo = pname;
rev = version;
sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8";
sha256 = "05jbqcbjg50ydwl0fijhdlqcq7fl6v99kjva66kmmzzza7vwa872";
};
disabled = pythonOlder "3.3";