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: 3ebdd65ad7b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be1d5e83c741
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 5, 2018

  1. reptyr: 0.6.2 -> 0.7.0

    @lopsided98
    lopsided98 committed Dec 5, 2018
    Copy the full SHA
    3c22d57 View commit details

  2. Merge pull request #51552 from lopsided98/reptyr-update 

    reptyr: 0.6.2 -> 0.7.0
    @7c6f434c
    7c6f434c authored Dec 5, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    be1d5e8 View commit details
Showing with 12 additions and 11 deletions.
  1. +12 −11 pkgs/os-specific/linux/reptyr/default.nix
23 changes: 12 additions & 11 deletions pkgs/os-specific/linux/reptyr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 <sys/sysmacros.h>' -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";