ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

screen: 4.3.1 -> 4.4.0

Browse Source 
Removed the patches which were specific to 4.3, and redundant configure flags
The darwin specific utmp patch seems to have been accepted too, with
`u->ut_time = now` the default.
This commit is contained in:
Rahul Gopinath 2016-06-20 15:13:54 -07:00
parent ca495a53a5
commit 64260e70f2
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/tools/misc/screen/default.nix
View File

@ -1,40 +1,29 @@
{ stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }:
stdenv.mkDerivation rec {
name = "screen-4.3.1";
name = "screen-4.4.0";
src = fetchurl {
url = "mirror://gnu/screen/${name}.tar.gz";
sha256 = "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s";
sha256 = "12r12xwhsg59mlprikbbmn60gh8lqhrvyar7mlxg4fwsfma2lwpg";
};
preConfigure = ''
configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc --enable-colors256"
sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
'';
# TODO: remove when updating the version of screen. Only patches for 4.3.1
patches = [
(fetchpatch {
name = "CVE-2015-6806.patch";
stripLen = 1;
url = "http://git.savannah.gnu.org/cgit/screen.git/patch/?id=b7484c224738247b510ed0d268cd577076958f1b";
sha256 = "160zhpzi80qkvwib78jdvx4jcm2c2h59q5ap7hgnbz4xbkb3k37l";
})
] ++ stdenv.lib.optional stdenv.isDarwin (fetchurl {
url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815";
sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc";
});
configureFlags= [
"--enable-telnet"
"--enable-pam"
"--with-sys-screenrc=/etc/screenrc"
"--enable-colors256"
];
buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam
++ stdenv.lib.optional stdenv.isDarwin utmp;
doCheck = true;
meta = {
meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/screen/;
description = "A window manager that multiplexes a physical terminal";
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
longDescription =
'' GNU Screen is a full-screen window manager that multiplexes a physical
@ -58,7 +47,7 @@ stdenv.mkDerivation rec {
terminal.
'';
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ peti jgeerds ];
platforms = platforms.unix;
maintainers = with maintainers; [ peti jgeerds vrthra ];
};
}