Jonathan Ringer 6b15fdce86

Merge remote-tracking branch 'origin/master' into staging-next ...

Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix

2021-05-20 22:11:42 -07:00

..

applications

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00

build-support

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-19 10:39:54 -07:00

common-updater

…

data

julia-mono: 0.037 -> 0.039

2021-05-20 12:02:24 -07:00

desktops

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 09:12:42 -07:00

development

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00

games

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00

misc

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 09:12:42 -07:00

os-specific

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00

pkgs-lib

…

servers

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00

shells

ion: unstable-2020-03-22 -> unstable-2020-05-10

2021-05-21 11:53:16 +09:00

stdenv

…

test

…

tools

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00

top-level

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 22:11:42 -07:00