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
..
cc-wrapper
cross
cuda	cudatoolkit-{9,9_0,9_1,9_2}: remove	2021-04-18 11:55:10 +02:00
haskell	tests.haskell-setBuildTarget: inline haskell package def to avoid IFD	2021-05-02 13:35:14 +09:00
install-shell-files
ld-library-path
macos-sierra-shared
mkOption
nixos-functions
patch-shebangs
rust-sysroot	treewide: fix cargoSha256/cargoHash	2021-05-08 00:36:37 -07:00
simple
stdenv-inputs
texlive	tests.texlive.dvipng: apply recurseIntoAttrs	2021-05-02 19:35:47 -04:00
vim	tests.vim: init (moved from vim-utils.nix) (#119467)	2021-04-21 12:55:05 +02:00
default.nix	writeDirectReferencesToFile: init	2021-05-15 17:04:25 +02:00
kernel.nix