e08b9ab8d3
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix |
||
---|---|---|
.. | ||
darwin-compilation.patch | ||
default.nix | ||
setup-hook.sh | ||
skip-timer-test.patch |