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

Merge branch 'master' into staging-next

Browse Source 
Hydra nixpkgs: ?compare=1525828
This commit is contained in:
Vladimír Čunát
2019-06-18 09:41:36 +02:00
parent 7adbdd9758 03acdd20be
commit 0aa9f35a99
855 changed files with 1664 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/buildbot/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized,
glibcLocales }:

2
pkgs/development/python-modules/buildbot/pkg.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, setuptools }:
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "buildbot-pkg";

2
pkgs/development/python-modules/buildbot/worker.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, python, setuptoolsTrial, mock, twisted, future }:
{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }:
buildPythonPackage (rec {
pname = "buildbot-worker";