nixpkgs/pkgs/development/libraries/libical
Jonathan Ringer c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
..
default.nix Merge remote-tracking branch 'origin/master' into staging-next 2021-05-17 07:01:38 -07:00
respect-env-tzdir.patch