Tuomas Tynkkynen 3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/development/tools/misc/binutils/default.nix		2018-04-22 22:31:30 +03:00
..
builder.sh
check-meta.nix	Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options	2018-04-19 14:59:58 -04:00
default-builder.sh
default.nix	libgcrypt: Fix cross-compilation	2018-02-24 22:51:22 -05:00
make-derivation.nix	Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix""	2018-04-11 14:00:13 -04:00
setup.sh	Handle sourceRoots with leading dashes	2018-02-15 11:50:24 -05:00