diff options
Diffstat (limited to 'nixpkgs/pkgs/shells')
24 files changed, 164 insertions, 207 deletions
diff --git a/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix b/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix index e6481aa4da10..ca7361b8a1f5 100644 --- a/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix +++ b/nixpkgs/pkgs/shells/bash/bash-5.0-patches.nix @@ -17,4 +17,5 @@ patch: [ (patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") (patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") (patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") +(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") ] diff --git a/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index 549ef4041428..eeb175a5e789 100644 --- a/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { python3Packages.pexpect python3Packages.pytest bashInteractive - - # use xdist to speed up the test run, just like upstream: - # https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4 - python3Packages.pytest_xdist ]; # - ignore test_gcc on ARM because it assumes -march=native @@ -46,7 +42,7 @@ stdenv.mkDerivation rec { # - ignore test_ls because impure logic # - ignore test_screen because it assumes vt terminals exist checkPhase = '' - pytest -n $NIX_BUILD_CORES . \ + pytest . \ ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ diff --git a/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch b/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch new file mode 100644 index 000000000000..f2e0802f7981 --- /dev/null +++ b/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch @@ -0,0 +1,41 @@ +From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001 +From: Adrian Gierakowski <agierakowski@gmail.com> +Date: Sun, 19 Jul 2020 08:38:05 +0100 +Subject: [PATCH] fix dirent64 et al on darwin + +--- + configure.ac | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/configure.ac b/configure.ac +index b8faca9..cee1e4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then + [klibc has bsd_signal instead of signal])]) + fi + ++dnl TODO: stat64 is deprecated since macOS 10.6 + dnl Check for stat64 (dietlibc/klibc). + AC_CHECK_FUNC(stat64,, [ + AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) +@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [ + AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) + ]) + ++dnl OS X apparently has stat64 but not readdir64. ++AC_CHECK_FUNC(readdir64,, [ ++ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit]) ++]) ++ ++dnl OS X apparently has stat64 but not dirent64. ++AC_CHECK_TYPE(struct dirent64,, [ ++ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit]) ++],[#include <dirent.h>]) ++ + dnl Check if struct stat has st_mtim. + AC_MSG_CHECKING(for stat::st_mtim) + AC_COMPILE_IFELSE( +-- +2.15.1 + diff --git a/nixpkgs/pkgs/shells/dash/default.nix b/nixpkgs/pkgs/shells/dash/default.nix index f4ee68f7444b..030e5695b225 100644 --- a/nixpkgs/pkgs/shells/dash/default.nix +++ b/nixpkgs/pkgs/shells/dash/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11"; + name = "dash-0.5.11.2"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad"; + sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; }; hardeningDisable = [ "format" ]; + # Temporary fix until a proper one is accepted upstream + patches = stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + meta = with stdenv.lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; diff --git a/nixpkgs/pkgs/shells/elvish/default.nix b/nixpkgs/pkgs/shells/elvish/default.nix index 2aa23cd063e8..2cb45f33f7bc 100644 --- a/nixpkgs/pkgs/shells/elvish/default.nix +++ b/nixpkgs/pkgs/shells/elvish/default.nix @@ -2,23 +2,22 @@ buildGoModule rec { pname = "elvish"; - version = "0.13.1"; + version = "0.14.1"; - goPackagePath = "github.com/elves/elvish"; excludedPackages = [ "website" ]; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/buildinfo.Version=${version} - ''; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/elves/elvish/pkg/buildinfo.Version==${version} -X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; src = fetchFromGitHub { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm"; + sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b"; }; - vendorSha256 = null; + vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897"; + + doCheck = false; meta = with stdenv.lib; { description = "A friendly and expressive command shell"; @@ -36,4 +35,4 @@ buildGoModule rec { passthru = { shellPath = "/bin/elvish"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/shells/fish/default.nix b/nixpkgs/pkgs/shells/fish/default.nix index 7cd31f14abdb..3faa7f996575 100644 --- a/nixpkgs/pkgs/shells/fish/default.nix +++ b/nixpkgs/pkgs/shells/fish/default.nix @@ -7,6 +7,7 @@ , gnused , gnugrep , groff +, gawk , man-db , getent , libiconv @@ -165,6 +166,9 @@ let -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} + sed -e "s| awk | ${gawk}/bin/awk |" \ + -i $out/share/fish/functions/{__fish_print_packages.fish,__fish_print_addresses.fish,__fish_describe_command.fish,__fish_complete_man.fish,__fish_complete_convert_options.fish} \ + $out/share/fish/completions/{cwebp,adb,ezjail-admin,grunt,helm,heroku,lsusb,make,p4,psql,rmmod,vim-addons}.fish cat > $out/share/fish/functions/__fish_anypython.fish <<EOF function __fish_anypython diff --git a/nixpkgs/pkgs/shells/ion/default.nix b/nixpkgs/pkgs/shells/ion/default.nix index ca2f7a6d515a..f84f150bc559 100644 --- a/nixpkgs/pkgs/shells/ion/default.nix +++ b/nixpkgs/pkgs/shells/ion/default.nix @@ -18,7 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.all; }; passthru = { diff --git a/nixpkgs/pkgs/shells/liquidprompt/default.nix b/nixpkgs/pkgs/shells/liquidprompt/default.nix index d6d655d1f17a..783c07d16009 100644 --- a/nixpkgs/pkgs/shells/liquidprompt/default.nix +++ b/nixpkgs/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "unstable-2018-05-21"; + version = "1.12.0"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; - rev = "eda83efe4e0044f880370ed5e92aa7e3fdbef971"; - sha256 = "1p7ah3x850ajpq07xvxxd7fx2i67cf0n71ww085g32k9fwij4rd4"; + rev = "v${version}"; + sha256 = "0ibp1bz9s4bp3y5anivg5gp31q78024w39v7hbfw05qy25ax5h60"; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix index 5994e2829ed6..09d2f6aac1a5 100644 --- a/nixpkgs/pkgs/shells/nushell/default.nix +++ b/nixpkgs/pkgs/shells/nushell/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.15.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1s08shhg826hbpcjzlhwj0r5qqckz8rv2xjg22rz1qvsjyhkmv7r"; + sha256 = "08r6f71cy4j22k0mllm134x4dfixaircpaz5arrj93xsbp38nk92"; }; - cargoSha256 = "0lz7119znpxyaj9ac1skfbx0s0dkh3hwk00g0zjn3r6k8fh9gj4d"; + cargoSha256 = "15kvl490abxdv6706zs7pv0q5fhghmdvlfbn19037sldkcsfl86b"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; @@ -39,12 +39,19 @@ rustPlatform.buildRustPackage rec { export HOME=$TMPDIR ''; + checkPhase = '' + runHook preCheck + echo "Running cargo test" + cargo test + runHook postCheck + ''; + meta = with lib; { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 marsam ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ filalex77 johntitor marsam ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; }; passthru = { diff --git a/nixpkgs/pkgs/shells/oil/default.nix b/nixpkgs/pkgs/shells/oil/default.nix index 019a66c77eb7..bce76b4cc825 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.8.pre4"; + version = "0.8.pre6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "07kj86hrvlz9f1gh3qv4hdaz3qnb4a2qf0dnxhd2r0qilrkjanxh"; + sha256 = "1gbc74in78lbkciz7wzjplrm185wn6fz57n66xmazayivqmpvgfm"; }; postPatch = '' diff --git a/nixpkgs/pkgs/shells/rssh/default.nix b/nixpkgs/pkgs/shells/rssh/default.nix deleted file mode 100644 index b2bec51a95ed..000000000000 --- a/nixpkgs/pkgs/shells/rssh/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -# CAVEATS: -# - Have only tested this with rsync, scp, and sftp. cvs support should work, but chroot integration is unlikely to function without further work -# - It is compiled without rdist support because rdist is ludicrously ancient (and not already in nixpkgs) - -{ stdenv, fetchurl, openssh, rsync, cvs }: - -stdenv.mkDerivation rec { - pname = "rssh"; - version = "2.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz"; - sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9"; - }; - - patches = [ - ./fix-config-path.patch - - # Patches from AUR - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh"; - name = "0001-fail-logging.patch"; - sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh"; - name = "0002-info-to-debug.patch"; - sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh"; - name = "0003-man-page-spelling.patch"; - sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh"; - name = "0004-mkchroot.patch"; - sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh"; - name = "0005-mkchroot-arch.patch"; - sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh"; - name = "0006-mkchroot-symlink.patch"; - sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh"; - name = "0007-destdir.patch"; - sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh"; - name = "0008-rsync-protocol.patch"; - sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91"; - }) - ]; - - # Run this after to avoid conflict with patches above - postPatch = '' - sed -i '/chmod u+s/d' Makefile.in - ''; - - - buildInputs = [ openssh rsync cvs ]; - - configureFlags = [ - "--with-sftp-server=${openssh}/libexec/sftp-server" - "--with-scp=${openssh}/bin/scp" - "--with-rsync=${rsync}/bin/rsync" - "--with-cvs=${cvs}/bin/cvs" - ]; - - - meta = with stdenv.lib; { - description = "A restricted shell for use with OpenSSH, allowing only scp and/or sftp"; - longDescription = '' - rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. - ''; - homepage = "http://www.pizzashack.org/rssh/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ arobyn ]; - knownVulnerabilities = [ - "CVE-2019-1000018" - "CVE-2019-3463" - "CVE-2019-3464" - ]; - }; - - passthru = { - shellPath = "/bin/rssh"; - }; -} diff --git a/nixpkgs/pkgs/shells/rssh/fix-config-path.patch b/nixpkgs/pkgs/shells/rssh/fix-config-path.patch deleted file mode 100644 index eecffb376ab3..000000000000 --- a/nixpkgs/pkgs/shells/rssh/fix-config-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur rssh-2.3.4/Makefile.in rssh-2.3.4-fixed/Makefile.in ---- rssh-2.3.4/Makefile.in 2012-11-27 11:19:34.000000000 +1100 -+++ rssh-2.3.4-fixed/Makefile.in 2015-11-11 21:13:58.516651742 +1100 -@@ -186,7 +186,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = nostdinc --ourdefs = -DPATH_RSSH_CONFIG=\"@sysconfdir@/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" -+ourdefs = -DPATH_RSSH_CONFIG=\"/etc/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" - ourflags = @defcflags@ @static@ - AM_CFLAGS = $(ourflags) - nodist_rssh_SOURCES = main.c pathnames.h config.h diff --git a/nixpkgs/pkgs/shells/xonsh/default.nix b/nixpkgs/pkgs/shells/xonsh/default.nix index 192e38b963d3..e775ab04dc1e 100644 --- a/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/nixpkgs/pkgs/shells/xonsh/default.nix @@ -8,17 +8,18 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.18"; + version = "0.9.22"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa"; + sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p"; }; LC_ALL = "en_US.UTF-8"; + postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py diff --git a/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/nixpkgs/pkgs/shells/zsh/antibody/default.nix index c0e87cd6021b..325bae4f9cce 100644 --- a/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "antibody"; - version = "6.0.1"; + version = "6.1.1"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0ix2liy8h48s3n7ykr85ik03kwj45iqwhwn79ap8y21bar00gybs"; + sha256 = "0icag53svzdm7yvzp855fp0f7q0g0jkfmjaa1sj6mmb01c1xgzi1"; }; - vendorSha256 = "072kxr68p9f58w2q98fjcn4wzd5szy5l5sz8sh4ssapljvic2lam"; + vendorSha256 = "0z8fma3v2dph8nv3q4lmv43s6p5sc338xb7kcmnpwcc0iw7b4vyj"; + + doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 11a75090c904..9b1d09471e1c 100644 --- a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.17.2"; + version = "0.17.4"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1h17xdlxhnjqirqwksi8qhx2lyajz7b0hmvb80i7313splhjp6hn"; + sha256 = "09c3f7s2r0cb8g9kgh3xhc8dhr1656g1q9s9i3s5imvknwqii6as"; }; nativeBuildInputs = [ txt2tags ]; diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 37374900a4ec..cc4c7903360f 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,59 +1,68 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-06-18"; + version = "2020-09-20"; pname = "oh-my-zsh"; - rev = "5ffc0d036c587741fd25092e7809dad2b00b3677"; + rev = "93c837fec8e9fe61509b9dff9e909e84f7ebe32d"; - src = fetchgit { inherit rev; - url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "04a9zg3l824wywk0qcm0pc4n4522cqljyix7kh3frc4psqnhh8qr"; + src = fetchFromGitHub { + inherit rev; + owner = "ohmyzsh"; + repo = "ohmyzsh"; + sha256 = "1ww50c1xf64z1m0sy30xaf2adr87cqr5yyv9jrqr227j97vrwj04"; }; - pathsToLink = [ "/share/oh-my-zsh" ]; + installPhase = '' + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template - phases = "installPhase"; + mkdir -p $outdir + cp -r * $outdir + cd $outdir - installPhase = '' - outdir=$out/share/oh-my-zsh - template=templates/zshrc.zsh-template - - mkdir -p $outdir - cp -r $src/* $outdir - cd $outdir - - rm LICENSE.txt - rm -rf .git* - - chmod -R +w templates - - # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ - -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ - $template - - # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source - # them, if found. - cat >> $template <<- EOF - - # Load the variables. - if [ -f ~/.zsh_variables ]; then - . ~/.zsh_variables - fi - - # Load the functions. - if [ -f ~/.zsh_funcs ]; then - . ~/.zsh_funcs - fi - - # Load the aliases. - if [ -f ~/.zsh_aliases ]; then - . ~/.zsh_aliases - fi - EOF + rm LICENSE.txt + rm -rf .git* + + chmod -R +w templates + + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template + + chmod +w oh-my-zsh.sh + + # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to + # modify the directory. + cat >> oh-my-zsh.sh <<- EOF + + # Undefine functions that don't work on Nix. + unfunction uninstall_oh_my_zsh + unfunction upgrade_oh_my_zsh + EOF + + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF + + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi + + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi + + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh index 0146cac8496c..738c0810737a 100755 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh @@ -5,7 +5,6 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" -url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')" if [ ! "null" = "${latestSha}" ]; then latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" diff --git a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix index 5696ed61b975..bfcd3be5e9cf 100644 --- a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "1h04z7rxmca75sxdfjgmiyf1b5z2byfn6k4srls211l0wnva2r5y"; + sha256 = "16q9v4c8lagp4vxm7qhagilqnwf1g4pbds56x5wfj4cwc0x2gclw"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty, minimal and fast ZSH prompt"; - homepage = https://github.com/sindresorhus/pure; + homepage = "https://github.com/sindresorhus/pure"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pacien pablovsky ]; diff --git a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index e1839d5dd07f..7db8cdb33492 100644 --- a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -21,13 +21,15 @@ stdenv.mkDerivation rec { install -D -m644 spaceship.zsh "$out/lib/spaceship-prompt/spaceship.zsh" install -d "$out/share/zsh/themes/" ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/themes/spaceship.zsh-theme" + install -d "$out/share/zsh/site-functions/" + ln -s "$out/lib/spaceship-prompt/spaceship.zsh" "$out/share/zsh/site-functions/prompt_spaceship_setup" ''; meta = with stdenv.lib; { description = "Zsh prompt for Astronauts"; homepage = "https://github.com/denysdovhan/spaceship-prompt/"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix index 03f6146df7c6..89a91ad0508e 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-completions"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "zsh-users"; repo = pname; rev = version; - sha256 = "0rw23m8cqxhcb4yjhbzb9lir60zn1xjy7hn3zv1fzz700f0i6fyk"; + sha256 = "12l9wrx0aysyj62kgp5limglz0nq73w8c415wcshxnxmhyk6sw6d"; }; installPhase= '' diff --git a/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix index 47f590a78f28..3d48467a2465 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix @@ -14,7 +14,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; - goPackagePath = "github.com/b4b4r07/history"; + + doCheck = false; postInstall = '' install -d $out/share @@ -33,4 +34,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix index c424cc334836..6db78f1c0f56 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -4,14 +4,14 @@ # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` stdenv.mkDerivation rec { - pname = "zsh-nix-shell-unstable"; - version = "2019-12-20"; + pname = "zsh-nix-shell"; + version = "0.1.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "a65382a353eaee5a98f068c330947c032a1263bb"; - sha256 = "0l41ac5b7p8yyjvpfp438kw7zl9dblrpd7icjg1v3ig3xy87zv0n"; + rev = "v${version}"; + sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7b6684092bae..5d81ceaba1b2 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1z6abvp642n40biya88n86ff1wiry00dlwawqwxp7q5ds55jhbv1"; + sha256 = "08zg4in70h3kray6lazszzy26gvil9w2cr6xmkbgjsv3k6w3k0jg"; }; 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 13e3bbdc0383..603757c3332b 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.7.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "MichaelAquilina"; repo = pname; rev = version; - sha256 = "1gcxm08ragwrh242ahlq3bpfg5yma2cshwdlj8nrwnd4qwrsflgq"; + sha256 = "1dz48rd66priqhxx7byndqhbmlwxi1nfw8ik25k0z5k7k754brgy"; }; dontBuild = true; |