nixpkgs/pkgs
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
..
applications Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
build-support Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
common-updater update-source-version: Fix regex metacharacter 2018-02-17 22:34:12 +02:00
data Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
desktops evince: 3.26.0 -> 3.28.0 2018-03-14 02:49:40 -07:00
development Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
games Merge pull request #36985 from obsidiansystems/no-allBut 2018-03-14 18:57:28 -04:00
misc Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
os-specific Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
servers Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-03-13 23:04:18 +02:00
stdenv Merge branch 'master' into staging 2018-03-10 20:38:13 +00:00
test tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
tools Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00
top-level Merge commit '3ab2949' from staging into master 2018-03-15 22:30:56 +02:00