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

Merge commit 'adaee73' from staging into master

Browse Source 
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.

Conflicts:
	pkgs/data/documentation/man-pages/default.nix
This commit is contained in:
Tuomas Tynkkynen
2016-09-03 01:02:51 +03:00
parent a1c24ab976 adaee7352b
commit e2c6740c37
40 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ mkPythonDerivation rec {
sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
};
outputs = [ "out" "docdev" ];
outputs = [ "out" "devdoc" ];
patches = [
# Fix warning spam