nixpkgs/pkgs/os-specific
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
..
darwin Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
gnu Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
linux Merge branch 'master' into staging 2016-08-27 23:54:54 +01:00
windows mingw: update 3.1.0 -> 4.0.6 2016-04-21 13:38:20 +02:00