Branch: refs/heads/release-14.12
Home: https://github.com/NixOS/nixpkgs
Commit: ff7520eb345666afc0ba1be7e2db91691f984aeb
https://github.com/NixOS/nixpkgs/commit/ff7520eb345666afc0ba1be7e2db91691f984aeb
Author: Eelco Dolstra <[email protected]>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M pkgs/os-specific/linux/kernel/linux-3.14.nix
M pkgs/os-specific/linux/kernel/patches.nix
Log Message:
-----------
linux: 3.14.46 -> 3.14.47
CVE-2014-7822
(cherry picked from commit 5c9f437d2fc1409fd5281458fe66c07817078d77)
Conflicts:
pkgs/os-specific/linux/kernel/linux-3.14.nix
pkgs/os-specific/linux/kernel/patches.nix
Commit: 5390f11ffa2adcefe504353c20b6b324e24602bc
https://github.com/NixOS/nixpkgs/commit/5390f11ffa2adcefe504353c20b6b324e24602bc
Author: Eelco Dolstra <[email protected]>
Date: 2015-07-09 (Thu, 09 Jul 2015)
Changed paths:
M nixos/modules/services/web-servers/apache-httpd/default.nix
Log Message:
-----------
Revert "apache-httpd: Don't set default content encodings"
This reverts commit 6f88c6c21024af48e687fad9870225fe7bed498a since it
breaks existing installations, so it shouldn't be applied to the
stable branch.
Compare: https://github.com/NixOS/nixpkgs/compare/6f88c6c21024...5390f11ffa2a_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
