From 3c22d57743d3eab7b18a38afe68b975f53d20dfd Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 4 Dec 2018 23:18:09 -0500 Subject: [PATCH] reptyr: 0.6.2 -> 0.7.0 --- pkgs/os-specific/linux/reptyr/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 37f1362e14ea..bd25dc65ec85 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -1,31 +1,32 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, python2 }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.7.0"; name = "reptyr-${version}"; + src = fetchFromGitHub { owner = "nelhage"; repo = "reptyr"; rev = "reptyr-${version}"; - sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8"; + sha256 = "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj"; }; - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. - postPatch = '' - sed 1i'#include ' -i platform/linux/linux.c - ''; + makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; - # Needed with GCC 7 - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ]; + doCheck = true; - makeFlags = ["PREFIX=$(out)"]; meta = { platforms = [ "i686-linux" "x86_64-linux" "i686-freebsd" "x86_64-freebsd" - ] ++ lib.platforms.arm; + "armv5tel-linux" + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + ]; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.mit; description = "Reparent a running program to a new terminal";