public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target

Browse Source
This commit is contained in:
John Ericson
2020-11-28 18:10:38 +00:00
parent c6617d28ef 2622548c13
commit 8ddf5c6907
3603 changed files with 82300 additions and 52646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/test/default.nix
+3
View File
@@ -23,10 +23,13 @@ with pkgs;
stdenv-inputs = callPackage ./stdenv-inputs { };
haskell-shellFor = callPackage ./haskell-shellFor { };
haskell-documentationTarball = callPackage ./haskell-documentationTarball { };
cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
install-shell-files = callPackage ./install-shell-files {};
kernel-config = callPackage ./kernel.nix {};
ld-library-path = callPackage ./ld-library-path {};