Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fddd8869e65c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 107d931b4431
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 27, 2017

  1. mcelog: 148 -> 153

    @peterhoeg
    peterhoeg committed Jul 27, 2017
    Copy the full SHA
    354c979 View commit details

  2. mcelog: use .service file from upstream

    @peterhoeg
    peterhoeg committed Jul 27, 2017
    Copy the full SHA
    f5c0607 View commit details

  3. Merge pull request #27677 from peterhoeg/u/mcelog 

    mcelog: 148 -> 153
    @grahamc
    grahamc authored Jul 27, 2017
    Copy the full SHA
    107d931 View commit details
Showing with 22 additions and 18 deletions.
  1. +11 −13 nixos/modules/hardware/mcelog.nix
  2. +11 −5 pkgs/os-specific/linux/mcelog/default.nix
24 changes: 11 additions & 13 deletions nixos/modules/hardware/mcelog.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with lib;

{
meta.maintainers = [ maintainers.grahamc ];
meta.maintainers = with maintainers; [ grahamc ];
options = {

hardware.mcelog = {
@@ -19,19 +19,17 @@ with lib;
};

config = mkIf config.hardware.mcelog.enable {
systemd.services.mcelog = {
description = "Machine Check Exception Logging Daemon";
wantedBy = [ "multi-user.target" ];

serviceConfig = {
ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
SuccessExitStatus = [ 0 15 ];

ProtectHome = true;
PrivateNetwork = true;
PrivateTmp = true;
systemd = {
packages = [ pkgs.mcelog ];

services.mcelog = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ProtectHome = true;
PrivateNetwork = true;
PrivateTmp = true;
};
};
};
};

}
16 changes: 11 additions & 5 deletions pkgs/os-specific/linux/mcelog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "mcelog-${version}";
version = "148";
version = "153";

src = fetchFromGitHub {
sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
rev = "v${version}";
repo = "mcelog";
owner = "andikleen";
owner = "andikleen";
repo = "mcelog";
rev = "v${version}";
sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa";
};

postPatch = ''
@@ -28,6 +28,12 @@ stdenv.mkDerivation rec {

installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];

postInstall = ''
mkdir -p $out/lib/systemd/system
substitute mcelog.service $out/lib/systemd/system/mcelog.service \
--replace /usr/sbin $out/bin
'';

meta = with stdenv.lib; {
description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
longDescription = ''