Branch: refs/heads/release-14.04
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0276eb144c1625624c60a6fb105731c3c300f178
      
https://github.com/NixOS/nixpkgs/commit/0276eb144c1625624c60a6fb105731c3c300f178
  Author: Eelco Dolstra <[email protected]>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M pkgs/os-specific/linux/kernel/linux-3.12.nix

  Log Message:
  -----------
  linux: Update to 3.12.21

(cherry picked from commit 246edc3df2ade0701aabc53e41d6c8c85f51ac24)


  Commit: 06d781bea33a0285ee5b7db75f3c0457c31ccec5
      
https://github.com/NixOS/nixpkgs/commit/06d781bea33a0285ee5b7db75f3c0457c31ccec5
  Author: Austin Seipp <[email protected]>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M pkgs/servers/sql/mariadb/default.nix

  Log Message:
  -----------
  mariadb: 10.0.10 -> 10.0.11

Also, enable the TokuDB plugin, as it now builds (there were some bugs
in the non-GA release that prevented that).

Signed-off-by: Austin Seipp <[email protected]>
(cherry picked from commit 463ed1bb640efcd3b3714a67e94800a6003eb320)


  Commit: 2e8ce570e79a2066f927e645287a3484bc3b86ab
      
https://github.com/NixOS/nixpkgs/commit/2e8ce570e79a2066f927e645287a3484bc3b86ab
  Author: Austin Seipp <[email protected]>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M pkgs/os-specific/linux/kernel/linux-3.10.nix
    M pkgs/os-specific/linux/kernel/linux-3.2.nix
    M pkgs/os-specific/linux/kernel/linux-3.4.nix
    A pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/os-specific/linux/kernel/patches.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  kernel/grsec: updates; add mainline package for brave souls

Signed-off-by: Austin Seipp <[email protected]>
(cherry picked from commit b43421221ff3ea7069de175845be80075f31d2a8)

Conflicts:
        pkgs/top-level/all-packages.nix


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

Reply via email to