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
..
4.5	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-15 14:41:01 +00:00
4.6	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-15 14:41:01 +00:00
4.8	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-15 14:41:01 +00:00
4.9	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-12 09:46:53 +00:00
5	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-08-12 09:46:53 +00:00
6	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
builder.sh	Merge #16355: gcc: darwin support	2016-06-23 12:16:40 +02:00
gfortran-darwin-NXConstStr.patch	gcc: fix #12836: build on darwin	2016-02-17 09:42:10 +01:00
gfortran-darwin.nix	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
gfortran-darwin.patch	darwin: gfortran: add needed inputs and other fixes	2015-10-28 13:37:02 +01:00
gfortran-driving.patch	gcc: Remove duplicate files	2015-05-12 15:05:01 +02:00
gnat-cflags.patch	gcc: Remove duplicate files	2015-05-12 15:05:01 +02:00
libstdc++-target.patch	gcc: Remove duplicate files	2015-05-12 15:05:01 +02:00
no-sys-dirs.patch	gcc: Remove duplicate files	2015-05-12 15:05:01 +02:00
parallel-bconfig.patch	gcc: Remove duplicate files	2015-05-12 15:05:01 +02:00
use-source-date-epoch.patch	gcc: Respect $SOURCE_DATE_EPOCH	2016-01-05 17:21:48 +01:00