Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: af3c4a2744bf1b9adc1c2ff56fe7f8266ddb4192
      
https://github.com/NixOS/nixpkgs/commit/af3c4a2744bf1b9adc1c2ff56fe7f8266ddb4192
  Author: Russell O'Connor <[email protected]>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    A pkgs/development/libraries/openssl/1.0.1j.nix
    A pkgs/development/libraries/openssl/no-date-in-library.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Bitcoin 0.9.3 won't work with OpenSSL 1.0.1k.
This patch restores OpenSSL 1.0.1j and builds Bitcoin against it.


  Commit: 3feac4fd8680e17a0b096cdca72ca4415f92b06b
      
https://github.com/NixOS/nixpkgs/commit/3feac4fd8680e17a0b096cdca72ca4415f92b06b
  Author: Russell O'Connor <[email protected]>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M nixos/modules/security/ca.nix
    M pkgs/build-support/build-fhs-chrootenv/default.nix
    M pkgs/build-support/build-fhs-chrootenv/destroy.sh.in
    A pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/build-support/build-fhs-chrootenv/init.sh.in
    A pkgs/build-support/build-fhs-userenv/chroot-user.rb
    A pkgs/build-support/build-fhs-userenv/default.nix
    A pkgs/development/compilers/openjdk/nonreparenting-wm.patch
    M pkgs/development/compilers/openjdk/openjdk8.nix
    M pkgs/development/libraries/despotify/default.nix
    M pkgs/development/tools/analysis/cppcheck/default.nix
    M pkgs/games/steam/chrootenv.nix
    M pkgs/tools/networking/i2pd/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge branch 'master' of github.com:NixOS/nixpkgs


Compare: https://github.com/NixOS/nixpkgs/compare/e647414e4a8b...3feac4fd8680
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to