diff options
author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/shells | |
parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/rc/default.nix | 42 | ||||
-rw-r--r-- | pkgs/shells/tcsh/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/tcsh/tcsh.glibc-2.24.patch | 21 |
3 files changed, 64 insertions, 1 deletions
diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix new file mode 100644 index 000000000000..298c4a1c32f4 --- /dev/null +++ b/pkgs/shells/rc/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, autoreconfHook +, ncurses #acinclude.m4 wants headers for tgetent(). +, historySupport ? false +, readline ? null +}: + +stdenv.mkDerivation rec { + name = "rc-${version}"; + version = "1.7.4"; + + src = fetchurl { + url = "http://static.tobold.org/rc/rc-${version}.tar.gz"; + sha256 = "1n5zz6d6z4z6s3fwa0pscqqawy561k4xfnmi91i626hcvls67ljy"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses ] + ++ stdenv.lib.optionals (readline != null) [ readline ]; + + configureFlags = [ + "--enable-def-interp=${stdenv.shell}" #183 + ] ++ stdenv.lib.optionals historySupport [ "--with-history" ] + ++ stdenv.lib.optionals (readline != null) [ "--with-edit=readline" ]; + + prePatch = '' + substituteInPlace configure.ac \ + --replace "date -I" "echo 2015-05-13" #reproducible-build + ''; + + passthru = { + shellPath = "/bin/rc"; + }; + + meta = with stdenv.lib; { + description = "The Plan 9 shell"; + longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell."; + homepage = http://tobold.org/article/rc; + license = with licenses; zlib; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 419acd8d61d2..027025100144 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0jaw51382pqyb6d1kgfg8ir0wd3p5qr2bmg8svcmjhlyp3h73qhj"; }; - patches = [ ./avoid-gcc5-wrong-optimisation.patch ]; + patches = [ ./avoid-gcc5-wrong-optimisation.patch ./tcsh.glibc-2.24.patch ]; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/tcsh/tcsh.glibc-2.24.patch b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch new file mode 100644 index 000000000000..267d89c8f1be --- /dev/null +++ b/pkgs/shells/tcsh/tcsh.glibc-2.24.patch @@ -0,0 +1,21 @@ +Proposed patch from Debian bug tracker by Aurelien Jarno <aurel32@debian.org> + +diff --git a/sh.proc.c b/sh.proc.c +index ad07250..5c68409 100644 +--- a/sh.proc.c ++++ b/sh.proc.c +@@ -47,11 +47,11 @@ RCSID("$tcsh$") + # define HZ 16 + #endif /* aiws */ + +-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) +-# if !defined(__ANDROID__) ++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__) ++# if !defined(__ANDROID__) && !defined(__GLIBC__) + # define BSDWAIT + # endif +-#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ ++#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */ + #ifndef WTERMSIG + # define WTERMSIG(w) (((union wait *) &(w))->w_termsig) + # ifndef BSDWAIT |