diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-03-22 00:58:51 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-03-22 00:59:15 +0100 |
commit | c0a35241f0a54f3859564b66ea71d4901ab2978f (patch) | |
tree | a2ba38db26bf09c217c3f2f91d3eb783696e21f2 | |
parent | bf9f211ae39f05c57913e368ba19a5a724f2eb1f (diff) | |
download | nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.tar nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.tar.gz nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.tar.bz2 nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.tar.lz nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.tar.xz nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.tar.zst nixlib-c0a35241f0a54f3859564b66ea71d4901ab2978f.zip |
mcelog: 133 -> 134
trigger: Avoid warning from earlier merge
-rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 2 | ||||
-rw-r--r-- | 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 c4634de5d3f2..5e2883f9fb3c 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 a30558092c32..40368d1c08ff 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"; |