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

Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix

2021-05-18 11:03:38 -07:00

..

applications

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

2021-05-18 11:03:38 -07:00

build-support

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

2021-05-17 07:01:38 -07:00

common-updater

…

data

ddccontrol-db: 20201221 -> 20210505

2021-05-17 14:03:47 -07:00

desktops

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

2021-05-18 11:03:38 -07:00

development

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

2021-05-18 11:03:38 -07:00

games

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

2021-05-18 08:57:16 -07:00

misc

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

2021-05-18 08:57:16 -07:00

os-specific

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

2021-05-18 08:57:16 -07:00

pkgs-lib

…

servers

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

2021-05-18 11:03:38 -07:00

shells

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

2021-05-18 08:57:16 -07:00

stdenv

stdenv/darwin: Apple Silicon support

2021-05-17 00:27:02 +09:00

test

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

2021-05-17 07:01:38 -07:00

tools

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

2021-05-18 11:03:38 -07:00

top-level

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

2021-05-18 11:03:38 -07:00