Peter Simons 8f400527a7 haskell-hspec: update ghc-8.6.x overrides for version 2.5.8		2018-10-02 21:08:47 +02:00
..
applications	i3lock-color: 2.11-c -> 2.12.c (#47674)	2018-10-02 21:03:41 +02:00
build-support	Merge branch 'master' into staging-next	2018-10-01 19:42:07 +02:00
common-updater
data	Merge pull request #47604 from NixOS/staging-next	2018-10-02 18:22:18 +02:00
desktops	deepin.dtkcore: 2.0.9 -> 2.0.9.4 (#47072)	2018-09-28 21:31:40 +02:00
development	haskell-hspec: update ghc-8.6.x overrides for version 2.5.8	2018-10-02 21:08:47 +02:00
games	Merge pull request #47455 from nyanloutre/steamPackages.steam-udev	2018-10-02 00:55:41 +01:00
misc	theme-obsidian2: fix theme name in index.theme (#47661)	2018-10-02 15:51:47 +02:00
os-specific	Merge branch 'master' into staging-next	2018-10-01 19:42:07 +02:00
servers	Merge pull request #47604 from NixOS/staging-next	2018-10-02 18:22:18 +02:00
shells	zsh: 5.6.1 -> 5.6.2	2018-09-15 00:05:48 -05:00
stdenv	Merge pull request #47400 from obsidiansystems/paxctl-darwin-no-mass-rebuild	2018-09-26 15:52:31 -04:00
test	Merge branch 'master' into staging	2018-09-24 21:18:23 +02:00
tools	twa: set meta.platforms to platforms.unix	2018-10-02 11:30:55 -07:00
top-level	Merge pull request #47604 from NixOS/staging-next	2018-10-02 18:22:18 +02:00