obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
cygwin	Allow not rebasing in cygwin stdenv.	2016-05-20 17:17:10 +02:00
darwin	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
freebsd	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
generic	Tweak error message	2016-08-26 18:58:49 +02:00
linux	make-bootstrap-tools-cross.nix: Fix gcc build-time options for armv5tel	2016-08-28 00:30:48 +03:00
native	cc-wrapper: add option to skip flags for native optimizations	2016-03-24 20:16:17 +03:00
nix	cc-wrapper: add option to skip flags for native optimizations	2016-03-24 20:16:17 +03:00
adapters.nix	Remove more dead code: stdenvDarwinNaked no longer exists	2016-06-20 23:53:09 -07:00
common-path.nix
default.nix	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00