Ben Darwin d737f310ff ocamlPackages.owl: unbreak by reversing previous edits ... - package was broken by 1c8aba83 (#83888) - fixes #85915		2020-05-06 09:21:58 +02:00
..
applications	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
build-support	Merge master into staging-next	2020-05-05 19:51:09 +02:00
common-updater	Merge pull request #85337 from petabyteboy/feature/mark-broken	2020-04-24 19:16:41 -04:00
data	Merge master into staging-next	2020-05-05 19:51:09 +02:00
desktops	Merge master into staging-next	2020-05-05 19:51:09 +02:00
development	ocamlPackages.owl: unbreak by reversing previous edits	2020-05-06 09:21:58 +02:00
games	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
misc	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
os-specific	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
servers	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
shells	Merge pull request #86938 from marsam/update-xonsh	2020-05-05 15:17:27 +01:00
stdenv	mkDerivation mesonFlags: Fix arm cpu families	2020-04-28 22:56:20 -04:00
test	tests.nixos-functions: port test to python	2020-02-09 23:53:58 +01:00
tools	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00
top-level	Merge branch 'staging-next'	2020-05-06 08:20:05 +02:00