diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:41:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:41:13 +0100 |
| commit | f08e3e38d4bf983480fcde77911136bab70d8e80 (patch) | |
| tree | 6286ff43b53a5df79fcfcf31d22443a18f0455ee /pkgs/shells | |
| parent | bdfb1bd01b2da393a3cdf567764a79e418f2b62e (diff) | |
| parent | 129c73802fdddacb20cf194bd2968d73ebced590 (diff) | |
| download | nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.gz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.bz2 nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.lz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.xz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.zst nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/ion/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/shells/powershell/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 2bd37659387..2010f34ef7e 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -23,4 +23,8 @@ buildRustPackage rec { platforms = platforms.all; broken = stdenv.isDarwin; }; + + passthru = { + shellPath = "/bin/ion"; + }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 05fef442c31..430648cc16d 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "09kcyvhnhf5qsaivgrw58l9jh48rx40i9lkf10cpmk7jvqxgqyks"; + rev = "f9da7f7d58da3ead2aaba6a519c554d1b199c158"; # 0.7.1 on crates.io + sha256 = "0k662wq2m3xfnzkkrsiv5h2m9y3l44fr3gab933ggrdgj2xydqnh"; }; cargoSha256 = "0bdxlbl33kilp9ai40dvdzlx9vcl8r21br82r5ljs2pg521jd66p"; @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.nushell.sh/"; license = licenses.mit; maintainers = with maintainers; [ filalex77 marsam ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; passthru = { diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 6ec2319a49d..faab933ae25 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -44,4 +44,8 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; }; + passthru = { + shellPath = "/bin/pwsh"; + }; + } diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 7ada25ee4dd..ac4594be05a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-12-29"; + version = "2020-01-01"; pname = "oh-my-zsh"; - rev = "d56d6dc145e20dbea9c45f7aa1c09f8e2b5859a1"; + rev = "ca627655dbd1d110dbea34ec4a8c1964a1da83d2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1plzmyk4j3zb4xxrys2w19r18nqhgp267pa3s0ipizr9bi1ijqdm"; + sha256 = "1hr7qaad8mr8bvx54ql5q97da6fhppdgk087mc5flygky6vf4yp6"; }; pathsToLink = [ "/share/oh-my-zsh" ]; |