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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Use newer vagrant from master
This commit is contained in:
John Ericson
2018-05-23 09:40:37 -04:00
parent 2e831da76d bbcaf78350
commit 18742471af
68 changed files with 807 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/python-packages.nix
View File

@@ -547,6 +547,8 @@ in {
asyncio = callPackage ../development/python-modules/asyncio {};
asyncssh = callPackage ../development/python-modules/asyncssh { };
python-fontconfig = callPackage ../development/python-modules/python-fontconfig { };
funcsigs = callPackage ../development/python-modules/funcsigs { };
@@ -16337,8 +16339,8 @@ EOF
};
};
# For backwards compatibility. Please use nixpkgs.udiskie instead.
udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; });
# added 2018-05-23, can be removed once 18.09 is branched off
udiskie = throw "pythonPackages.udiskie has been replaced by udiskie";
# Should be bumped along with EFL!
pythonefl = buildPythonPackage rec {