diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-09 14:33:52 +0100 |
| commit | 20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c (patch) | |
| tree | 3165b4e84ec25ad34e2e40995c3fb10fad17f1d5 /pkgs/shells | |
| parent | 099bb158f91ff67a3c2fa637cb533b44cf17a7da (diff) | |
| parent | f77eb9bb4d5d9ff34c6b1c18274e50d0bdddb652 (diff) | |
| download | nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.gz nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.bz2 nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.lz nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.xz nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.tar.zst nixlib-20f001c01eeddbfd46ba4c5e47a8396a6eb4b08c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/mrsh/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/nushell/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index cc7e3e27be6d..c72f23c143b0 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mrsh"; - version = "2020-07-27"; + version = "2020-11-04"; src = fetchFromGitHub { owner = "emersion"; repo = "mrsh"; - rev = "0da902c0ee6f443fe703498e60f266af7f12537e"; - sha256 = "1yr09ln5p1s48aj8xv2d6dy0pahqvd86fkiwyc6zrjfq80igxf05"; + rev = "1738e41b2a35e5f99b9a1300a5f687478458226a"; + sha256 = "08gak5261d4sd6b2w2kscmdwa4gwcp5drgfyb3swyrj9cl0nlcbn"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index d025ed1ddcd8..20624293e85a 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "19bpxx9pi3cl5y7h5qg4a2pmvwqavm1vciyvsq96kxkc7rq2xwvl"; + sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f"; }; - cargoSha256 = "1ghbzahz8lbk11sjy2kis12w22rjr92aaw451rmc86pk2lsxn0dx"; + cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; |