3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/build-support/kernel
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
..
make-initrd.nix makeInitrd: explain why we don't use closureInfo 2018-03-05 13:04:55 +01:00
make-initrd.sh Revert "makeInitrd: Use closureInfo" 2018-03-05 12:49:59 +01:00
modules-closure.nix makeModulesClosure: Fix cross-compilation 2018-02-28 15:01:32 -05:00
modules-closure.sh
paths-from-graph.pl