Branch: refs/heads/x-updates
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 23464b3241454ad9d29e20fc078a54fcf59dc5ef
      
https://github.com/NixOS/nixpkgs/commit/23464b3241454ad9d29e20fc078a54fcf59dc5ef
  Author: Lluís Batlle i Rossell <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Making more programs use readline63.

Specially those I use.


  Commit: 6a60fc3bddf43fb33d50462e511cfdbc0c57f000
      
https://github.com/NixOS/nixpkgs/commit/6a60fc3bddf43fb33d50462e511cfdbc0c57f000
  Author: Rickard Nilsson <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M nixos/modules/services/search/solr.nix

  Log Message:
  -----------
  solr module: Activate JSP support in Winstone

Required by older versions of solr. The JSP support
in Winstone seems spotty, but at one point we'll switch
over to Jetty instead.


  Commit: 0ea398ecbe5f7ce815d1ede45fd9b0b9ac3d55b6
      
https://github.com/NixOS/nixpkgs/commit/0ea398ecbe5f7ce815d1ede45fd9b0b9ac3d55b6
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/tools/networking/telnet/default.nix

  Log Message:
  -----------
  telnet: fix broken download


  Commit: f2026c16fd24d95eec8379e4d607d4de411daf21
      
https://github.com/NixOS/nixpkgs/commit/f2026c16fd24d95eec8379e4d607d4de411daf21
  Author: Rob Vermaas <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/servers/search/elasticsearch/default.nix

  Log Message:
  -----------
  elasticsearch: update from 1.0.0 to 1.0.1, potentially fixes CVE-2013-5307, 
CVE-2013-6804


  Commit: 94990a593590970de22bbe4dddc3f53133b0b110
      
https://github.com/NixOS/nixpkgs/commit/94990a593590970de22bbe4dddc3f53133b0b110
  Author: Rob Vermaas <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/servers/http/tomcat/6.0.nix

  Log Message:
  -----------
  tomcat6: update from 6.0.37 to 6.0.39, potentially fixes CVE-2013-4286, 
CVE-2013-4322, CVE-2013-4590, CVE-2014-0033


  Commit: 5f27ed59f092a48d637a597285c2da9a72d00d30
      
https://github.com/NixOS/nixpkgs/commit/5f27ed59f092a48d637a597285c2da9a72d00d30
  Author: Rob Vermaas <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/servers/amqp/rabbitmq-server/default.nix

  Log Message:
  -----------
  rabbitmq_server: update from 3.2.1 to 3.2.4, potentially fixes CVE-2012-3582, 
CVE-2013-4674


  Commit: 8edc5f9999026fe206b34815004488f9b6eb75e0
      
https://github.com/NixOS/nixpkgs/commit/8edc5f9999026fe206b34815004488f9b6eb75e0
  Author: Moritz Ulrich <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/applications/networking/irc/weechat/default.nix
    A pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  weechat: Backport fix for freeze with gnutls 3.2.

Fixes /exit when using gnutls 3.2. This is a temporary solution as 3.1
isn't building right now. The next release of weechat will include this
fix.


  Commit: f3f6f04c7d64030fdaaf97cdd381c23b3faeae0b
      
https://github.com/NixOS/nixpkgs/commit/f3f6f04c7d64030fdaaf97cdd381c23b3faeae0b
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  fix eval after e4961c6


  Commit: 1941168c3d4c03441a92093dfb7be4ae507711ae
      
https://github.com/NixOS/nixpkgs/commit/1941168c3d4c03441a92093dfb7be4ae507711ae
  Author: Vladimír Čunát <[email protected]>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M nixos/modules/services/search/solr.nix
    M pkgs/applications/networking/irc/weechat/default.nix
    A pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
    M pkgs/servers/amqp/rabbitmq-server/default.nix
    M pkgs/servers/http/tomcat/6.0.nix
    M pkgs/servers/search/elasticsearch/default.nix
    M pkgs/tools/networking/telnet/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge branch master into x-updates (fix eval)


Compare: https://github.com/NixOS/nixpkgs/compare/65155c20d585...1941168c3d4c
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to