diff options
Diffstat (limited to 'nixpkgs/pkgs/shells')
-rw-r--r-- | nixpkgs/pkgs/shells/bash/4.4.nix | 3 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/bash/5.0.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch | 29 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch | 31 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/fish/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/mrsh/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/oil/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/tcsh/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/xonsh/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix | 31 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix | 4 |
14 files changed, 122 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/shells/bash/4.4.nix b/nixpkgs/pkgs/shells/bash/4.4.nix index 121368abf4c..7ca57ac0156 100644 --- a/nixpkgs/pkgs/shells/bash/4.4.nix +++ b/nixpkgs/pkgs/shells/bash/4.4.nix @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" ]; + patchFlags = [ "-p0" "-T" ]; patches = upstreamPatches + ++ [ ./pgrp-pipe-4.4.patch ] ++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html ++ optional stdenv.hostPlatform.isMusl (fetchurl { diff --git a/nixpkgs/pkgs/shells/bash/5.0.nix b/nixpkgs/pkgs/shells/bash/5.0.nix index a06b08a5599..05aaf39b340 100644 --- a/nixpkgs/pkgs/shells/bash/5.0.nix +++ b/nixpkgs/pkgs/shells/bash/5.0.nix @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" ]; + patchFlags = [ "-p0" "-T" ]; - patches = upstreamPatches; + patches = upstreamPatches + ++ [ ./pgrp-pipe-5.0.patch ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") diff --git a/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch b/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch new file mode 100644 index 00000000000..ea3d7bdf92b --- /dev/null +++ b/nixpkgs/pkgs/shells/bash/pgrp-pipe-4.4.patch @@ -0,0 +1,29 @@ +diff -u ./configure ../bash-4.4-fixed/configure +--- ./configure 2016-09-07 22:57:01.000000000 +0200 ++++ ../bash-4.4-fixed/configure 2020-01-08 14:10:26.316858174 +0100 +@@ -16064,10 +16064,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; + powerux*) LOCAL_LIBS="-lgen" ;; +diff -u ./configure.ac ../bash-4.4-fixed/configure.ac +--- ./configure.ac 2016-09-07 22:56:28.000000000 +0200 ++++ ../bash-4.4-fixed/configure.ac 2016-09-07 22:56:28.000000000 +0200 +@@ -1092,9 +1092,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; + powerux*) LOCAL_LIBS="-lgen" ;; diff --git a/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch b/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch new file mode 100644 index 00000000000..2a9fa6f33c3 --- /dev/null +++ b/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.0.patch @@ -0,0 +1,31 @@ +diff -u ./configure ../bash-5.0-fixed/configure +--- ./configure 2019-01-02 15:43:31.000000000 +0100 ++++ ../bash-5.0-fixed/configure 2020-01-08 14:18:21.017296179 +0100 +@@ -16312,11 +16312,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[0123]*) : ;; +- *) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[67]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; +diff -u ./configure.ac ../bash-5.0-fixed/configure.ac +--- ./configure.ac 2019-01-02 15:39:11.000000000 +0100 ++++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100 +@@ -1108,10 +1108,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[[0123]]*) : ;; +- *) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; diff --git a/nixpkgs/pkgs/shells/fish/default.nix b/nixpkgs/pkgs/shells/fish/default.nix index 1ef3c4b6fd9..5f59c33af0d 100644 --- a/nixpkgs/pkgs/shells/fish/default.nix +++ b/nixpkgs/pkgs/shells/fish/default.nix @@ -3,6 +3,7 @@ groff, man-db, getent, libiconv, pcre2, gettext, ncurses, python3, cmake + , fetchpatch , writeText @@ -107,6 +108,15 @@ let patchShebangs ./build_tools/git_version_gen.sh ''; + patches = [ + # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion. + # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0) + (fetchpatch { + url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch"; + sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw"; + }) + ]; + # Required binaries during execution # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/shells/mrsh/default.nix b/nixpkgs/pkgs/shells/mrsh/default.nix index 9036e085429..bbd56e510b7 100644 --- a/nixpkgs/pkgs/shells/mrsh/default.nix +++ b/nixpkgs/pkgs/shells/mrsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, readline }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, readline }: stdenv.mkDerivation rec { pname = "mrsh"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://mrsh.sh"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/shells/oil/default.nix b/nixpkgs/pkgs/shells/oil/default.nix index 13b36bf54ad..81c86284394 100644 --- a/nixpkgs/pkgs/shells/oil/default.nix +++ b/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.7.pre9"; + version = "0.7.pre11"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1j17yxpjqv37vbl3qhnwl3gdmb33n9c6g6byxcc8mhbvbw91zi5i"; + sha256 = "0885cw07gkaggd5cvl58v6kw1z6la2xgdh1s88y0dynx95qv4i4c"; }; postPatch = '' diff --git a/nixpkgs/pkgs/shells/tcsh/default.nix b/nixpkgs/pkgs/shells/tcsh/default.nix index f13919e52e7..110beb82804 100644 --- a/nixpkgs/pkgs/shells/tcsh/default.nix +++ b/nixpkgs/pkgs/shells/tcsh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { - history mechanism - job control ''; - homepage = http://www.tcsh.org/; + homepage = https://www.tcsh.org/; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/shells/xonsh/default.nix b/nixpkgs/pkgs/shells/xonsh/default.nix index 58dd629929f..0e2490ff434 100644 --- a/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/nixpkgs/pkgs/shells/xonsh/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; - homepage = http://xon.sh/; + homepage = https://xon.sh/; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt vrthra ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index e53ee1394ed..86e786668e1 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-01-04"; + version = "2020-01-30"; pname = "oh-my-zsh"; - rev = "78b07e92fd4a3a5e1f92ee4e3d680c39b72c2245"; + rev = "dcffc895806f5c2aaade3fce09772e1c9f52504e"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1s5vr89dxgm1g3jcqybx4an80x0gmda4lh8y36r2dafxwmb09qmk"; + sha256 = "08qaxwfvm66iyidxrf6z7m7yahx3ksrnw4v0ld2sf5nxracmmlmh"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 4e00fee3d27..8c9c65c24e4 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "zsh-autosuggestions"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c"; + sha256 = "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6"; }; buildInputs = [ zsh ]; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix new file mode 100644 index 00000000000..b5b66af6ca3 --- /dev/null +++ b/nixpkgs/pkgs/shells/zsh/zsh-bd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub}: + +stdenv.mkDerivation rec { + pname = "zsh-bd"; + version = "2018-07-04"; + + src = fetchFromGitHub { + owner = "Tarrasch"; + repo = pname; + rev = "d4a55e661b4c9ef6ae4568c6abeff48bdf1b1af7"; + sha256 = "020f8nq86g96cps64hwrskppbh2dapfw2m9np1qbs5pgh16z4fcb"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/zsh-bd + cp {.,$out/share/zsh-bd}/bd.zsh + cd $out/share/zsh-bd + ln -s bd{,.plugin}.zsh + ''; + + meta = { + description = "Jump back to a specific directory, without doing `cd ../../..` "; + homepage = "https://github.com/Tarrasch/zsh-bd"; + license = stdenv.lib.licenses.free; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + }; +} diff --git a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index d5081476efb..5b649a3923e 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation { pname = "powerlevel10k"; - version = "unstable-2019-12-19"; + version = "1.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; - rev = "8ef2b737d1f6099966a1eb16bdfc90d67b367f22"; - sha256 = "02b25klkyyhpdbf2vwzzbrd8hnfjpckbpjy6532ir6jqp2n2ivpj"; + rev = "c21961b53c137253020aeffca2b132fdd6bcb116"; + sha256 = "1jp6jhw5kb10d76zkxdv8c04s51ilmjka336bgnllya9nyqaqpxp"; }; patches = [ diff --git a/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix index becc4c57e4b..91cf34268ac 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-you-should-use"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "1xzq7xmmx4rg53pd69d0s9n561q4z35hlbb2sq2xd76gk3x6fars"; + sha256 = "1gcxm08ragwrh242ahlq3bpfg5yma2cshwdlj8nrwnd4qwrsflgq"; }; dontBuild = true; |