Branch: refs/heads/cross-win-osx
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 42ef963cd221a5fb294a844c7af40e1a00738815
      
https://github.com/NixOS/nixpkgs/commit/42ef963cd221a5fb294a844c7af40e1a00738815
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-03-30 (Sun, 30 Mar 2014)

  Changed paths:
    M pkgs/development/libraries/libarchive/default.nix

  Log Message:
  -----------
  libarchive: *permanently* fix patch source and hash

Unfortunately github's *.patch URIs contain version of git generating them,
which changes from time to time. It seems that *.diff doesn't suffer from that.

Conflicts:
        pkgs/development/libraries/libarchive/default.nix


  Commit: 4eefc983a2d4e2d7ac2bbe7cf8bc393fa8da3aaa
      
https://github.com/NixOS/nixpkgs/commit/4eefc983a2d4e2d7ac2bbe7cf8bc393fa8da3aaa
  Author: Jaka Hudoklin <[email protected]>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M pkgs/os-specific/darwin/xcode/default.nix

  Log Message:
  -----------
  xcode: fix hash


  Commit: c3524a8dd6cb3cc03a65a486290b29f97ba469d0
      
https://github.com/NixOS/nixpkgs/commit/c3524a8dd6cb3cc03a65a486290b29f97ba469d0
  Author: Jaka Hudoklin <[email protected]>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M pkgs/development/libraries/libpng/12.nix
    M pkgs/tools/graphics/optipng/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  optipng: use system libpng & zlib, fix cross builds and add support for 
static builds


  Commit: 65cc76c44ac81191cc0b82cef58d1ad698a24412
      
https://github.com/NixOS/nixpkgs/commit/65cc76c44ac81191cc0b82cef58d1ad698a24412
  Author: Jaka Hudoklin <[email protected]>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M pkgs/development/libraries/libjpeg/default.nix

  Log Message:
  -----------
  libjpeg_original: add optional static builds


  Commit: 776203453f8b338db35b2cf23eeff3b4be8af51c
      
https://github.com/NixOS/nixpkgs/commit/776203453f8b338db35b2cf23eeff3b4be8af51c
  Author: Jaka Hudoklin <[email protected]>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M pkgs/tools/graphics/gifsicle/default.nix

  Log Message:
  -----------
  gifsicle: add optional static builds, make gifview optional


  Commit: 2d3376e84e4a24ca10480a9ade972db1e5c54e9f
      
https://github.com/NixOS/nixpkgs/commit/2d3376e84e4a24ca10480a9ade972db1e5c54e9f
  Author: aszlig <[email protected]>
  Date:   2014-04-19 (Sat, 19 Apr 2014)

  Changed paths:
    M pkgs/development/libraries/libarchive/default.nix
    M pkgs/development/libraries/libjpeg/default.nix
    M pkgs/development/libraries/libpng/12.nix
    M pkgs/os-specific/darwin/xcode/default.nix
    M pkgs/tools/graphics/gifsicle/default.nix
    M pkgs/tools/graphics/optipng/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #2087 into cross-win-osx.

Thanks to @offlinehacker for the fixes.

* 'crossdev' of github.com:offlinehacker/nixpkgs:
  gifsicle: add optional static builds, make gifview optional
  libjpeg_original: add optional static builds
  optipng: use system libpng & zlib, fix cross builds and add ...
  xcode: fix hash
  libarchive: *permanently* fix patch source and hash


Compare: https://github.com/NixOS/nixpkgs/compare/5cc4f3a260fa...2d3376e84e4a
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to