Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs

2016-09-13 12:51:34 +03:00
parent 9c47876b84 a769e0ffae
commit 4748709926
340 changed files with 898 additions and 873 deletions
@@ -129330,7 +129330,7 @@ self: {
       homepage = "http://projects.haskell.org/gtk2hs/";
       description = "Binding to the Pango text rendering engine";
       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome2) pango;};

  "papa" = callPackage
    ({ mkDerivation, base, directory, doctest, filepath, papa-base