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

..

1.1.nix

…

1.2.nix

…

1.3.nix

…

1.4.nix

Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-05-18 17:10:02 +02:00

1.5.nix

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-06-10 09:27:04 +00:00

1.6.nix

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-12 09:46:53 +00:00

1.7.nix

Merge branch 'master' into staging

2016-08-27 23:54:54 +01:00

default.nix

…

new-binutils.patch

go-1.4: Update binutils patch to handle i686-linux

2016-03-10 21:06:13 +01:00

remove-tools-1.4.patch

…

remove-tools-1.5.patch

…

remove-tools-1.7.patch

go: add 1.7 compiler

2016-08-21 21:20:07 +03:00

setup-hook.sh

…

strip.patch

…