Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 8b890cac072b08540c9434b9d3a2f83d180e8757
      
https://github.com/NixOS/nixpkgs/commit/8b890cac072b08540c9434b9d3a2f83d180e8757
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    R pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch
    R 
pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gtkstyle.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
    A 
pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/series
    A pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch

  Log Message:
  -----------
  qt55.qtbase: manage patches with quilt


  Commit: 14f27e5eb737260457c248ff54e35b114498ecec
      
https://github.com/NixOS/nixpkgs/commit/14f27e5eb737260457c248ff54e35b114498ecec
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

  Log Message:
  -----------
  qt55.qtbase: move sed scripts to postPatch


  Commit: 081b1f1707a20fbf12768d855c6a7880059e4bbe
      
https://github.com/NixOS/nixpkgs/commit/081b1f1707a20fbf12768d855c6a7880059e4bbe
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    A pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
    M pkgs/development/libraries/qt-5/5.5/qtbase/series

  Log Message:
  -----------
  qt55.qtbase: set compose search path

This was previously set using substituteInPlace, but this leads to
duplicate search paths.


  Commit: 9f62af08854a446e6e87434895ae0032d19778f4
      
https://github.com/NixOS/nixpkgs/commit/9f62af08854a446e6e87434895ae0032d19778f4
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
    M pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch

  Log Message:
  -----------
  qt55.qtbase: fallback libGL path

If libGL is not found on the system library path, fall back to the
default Mesa driver.


  Commit: 0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a
      
https://github.com/NixOS/nixpkgs/commit/0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

  Log Message:
  -----------
  qt55.qtbase: don't include optional dependencies unconditionally


  Commit: 98e2fbe6302b5f642340e80770d75aab9c658a44
      
https://github.com/NixOS/nixpkgs/commit/98e2fbe6302b5f642340e80770d75aab9c658a44
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

  Log Message:
  -----------
  qt55.qtbase: remove non-existent paths from LD_LIBRARY_PATH


  Commit: 09e9e3e35963c27857b38900625bf5a474305f24
      
https://github.com/NixOS/nixpkgs/commit/09e9e3e35963c27857b38900625bf5a474305f24
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

  Log Message:
  -----------
  fixup! qt55.qtbase: don't include optional dependencies unconditionally


  Commit: 36dda9231794e7a9fb2bd808e1fdf49dab94c718
      
https://github.com/NixOS/nixpkgs/commit/36dda9231794e7a9fb2bd808e1fdf49dab94c718
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

  Log Message:
  -----------
  qt55.qtbase: don't interpolate needlessly


  Commit: 5958deb7d8a67912a67010594568f27aa7e020fc
      
https://github.com/NixOS/nixpkgs/commit/5958deb7d8a67912a67010594568f27aa7e020fc
  Author: Thomas Tuegel <[email protected]>
  Date:   2015-12-19 (Sat, 19 Dec 2015)

  Changed paths:
    R pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
    R pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch
    R 
pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
    M pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gtkstyle.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
    A 
pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/series
    A pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
    A pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch

  Log Message:
  -----------
  Merge branch 'qt-libgl'


Compare: https://github.com/NixOS/nixpkgs/compare/dac2c6510980...5958deb7d8a6
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to