3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/stdenv/linux
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
..
bootstrap-files x86_64-musl bootstrap: use separate 64bit busybox 2018-02-13 09:45:05 -06:00
bootstrap-tools
bootstrap-tools-musl linux bootstrap for musl: kludgery 2018-02-13 09:44:39 -06:00
default.nix Merge remote-tracking branch 'upstream/master' into staging 2018-02-28 20:52:49 +02:00
make-bootstrap-tools-cross.nix Enable building riscv64 cross bootstrap tools 2018-02-18 16:07:13 -05:00
make-bootstrap-tools.nix make-bootstrap-tools: preserve coreutils symlinks 2018-03-06 15:13:56 +02:00