From c0a35241f0a54f3859564b66ea71d4901ab2978f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 22 Mar 2016 00:58:51 +0100 Subject: [PATCH] mcelog: 133 -> 134 trigger: Avoid warning from earlier merge --- pkgs/development/interpreters/guile/default.nix | 2 ++ pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index c4634de5d3f..5e2883f9fb3 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -40,6 +40,8 @@ # don't have "libgcc_s.so.1" on darwin LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + configureFlags = [ "--with-libreadline-prefix" ]; + postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a30558092c3..40368d1c08f 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "133"; + version = "134"; src = fetchFromGitHub { - sha256 = "1qj9jz67bd834sgqcxhyhn9fzxg8y9vfw7gmza5ikmjm6yi6mmfr"; + sha256 = "1kah9fcbc8m7sncylcd2n4xcbm5dwgyzplm3d7zwgkdg6xgxjlc7"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen";