[Nix-commits] [NixOS/nixpkgs] 399565: Revert "Merge pull request #17145 from kalhauge/ha...

2016-11-19 Thread Vladimír Čunát
  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3995655d2c2cc7d9804172cd393cf673a21c5832
  
https://github.com/NixOS/nixpkgs/commit/3995655d2c2cc7d9804172cd393cf673a21c5832
  Author: Shea Levy 
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  ---
  Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld"

This fix doesn't actually fix the cabal bug (see #16357), but it does
cause other bugs (see #20476)

Fixes #20476

This reverts commit b89fa5fd5cc3e7d27fb87bc792fe0d6553aec28d, reversing
changes made to e4b146b0417762c461c7f90f587dc82e8524f796.


  Commit: 2aea31b52e42942b5991d480669e88e1e29205ef
  
https://github.com/NixOS/nixpkgs/commit/2aea31b52e42942b5991d480669e88e1e29205ef
  Author: Vladimír Čunát 
  Date:   2016-11-19 (Sat, 19 Nov 2016)

  Changed paths:
M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  ---
  Merge branch 'staging'


Compare: https://github.com/NixOS/nixpkgs/compare/c49cd8ee96e9...2aea31b52e42___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits


[Nix-commits] [NixOS/nixpkgs] 399565: Revert "Merge pull request #17145 from kalhauge/ha...

2016-11-18 Thread Shea Levy
  Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 3995655d2c2cc7d9804172cd393cf673a21c5832
  
https://github.com/NixOS/nixpkgs/commit/3995655d2c2cc7d9804172cd393cf673a21c5832
  Author: Shea Levy 
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
M pkgs/development/haskell-modules/generic-builder.nix

  Log Message:
  ---
  Revert "Merge pull request #17145 from kalhauge/haskell_darwin_dyld"

This fix doesn't actually fix the cabal bug (see #16357), but it does
cause other bugs (see #20476)

Fixes #20476

This reverts commit b89fa5fd5cc3e7d27fb87bc792fe0d6553aec28d, reversing
changes made to e4b146b0417762c461c7f90f587dc82e8524f796.


___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits