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

Merge branch 'master' into staging-next

Browse Source 
Brings in Haskell rebuild.
Hydra nixpkgs: ?compare=1525186
This commit is contained in:
Vladimír Čunát
2019-06-14 17:47:23 +02:00
parent 7184efb40a 21fdd13968
commit 788261a1a9
95 changed files with 4596 additions and 2756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "cli_helpers";
version = "1.2.0";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj";
sha256 = "0rd194l06aw4612j09b44pgh8b8l4cwmz7xgwsgdj9v8m3m25nwq";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/flask-migrate/default.nix
View File

@@ -4,15 +4,15 @@ with stdenv.lib;
buildPythonPackage rec {
pname = "Flask-Migrate";
version = "2.3.1";
version = "2.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3";
sha256 = "00nm76w4xymsiih6hq8y46wp026v7zkzq15cx39hp929ba3z2vx9";
};
checkInputs = optional isPy3k glibcLocales;
propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ];
checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales;
propagatedBuildInputs = [ flask flask_sqlalchemy alembic ];
# tests invoke the flask cli which uses click and therefore has py3k encoding troubles
preCheck = optionalString isPy3k ''

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

@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
sha256 = "0r8w2v89nj6b9p91p495cga5m72a673l2wc0hp0zqk05j4yrc9b4";
};
propagatedBuildInputs = [ flask ];