nixpkgs/pkgs
Peter Simons 6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
..
applications Merge branch 'master' into staging. 2015-03-10 12:09:43 +01:00
build-support Merge branch 'master' into staging. 2015-03-10 12:09:43 +01:00
data hicolor-icon-theme: 0.13 -> 0.14 2015-03-09 18:34:00 -07:00
desktops Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
development Merge branch 'master' into staging. 2015-03-10 12:09:43 +01:00
games steam: add primus support 2015-03-09 23:02:47 +03:00
misc vim-plugins: wakatime 3.0.7 -> 3.0.8 2015-03-10 04:58:45 +01:00
os-specific Merge branch 'master' into staging. 2015-03-10 12:09:43 +01:00
servers xf86-video-vmware: drop patch included in update 2015-03-09 15:55:28 +01:00
shells fish: 2.1.1 -> 2.1.2 2015-03-05 01:55:45 +01:00
stdenv Fix eval-release.nix evaluation 2015-03-06 15:09:51 +01:00
test Merge recent master into staging 2014-09-13 21:48:29 +02:00
tools Merge branch 'master' into staging. 2015-03-10 12:09:43 +01:00
top-level Merge branch 'master' into staging. 2015-03-10 12:09:43 +01:00