diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-13 15:11:31 -0700 |
| commit | 333f145d7604f07e3b2164b459b46e075fea81f4 (patch) | |
| tree | cb9bb91bafeafe64c97fa1054223c0d69cf18848 /pkgs/shells | |
| parent | d253b3d875d2bae84afbc141754b286e18e2fb7d (diff) | |
| parent | 7e3c95a0b813394b1a41b73e078d3ffd9e951979 (diff) | |
| download | nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.gz nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.bz2 nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.lz nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.xz nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.tar.zst nixpkgs-333f145d7604f07e3b2164b459b46e075fea81f4.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/xonsh/default.nix | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 119a3593cec..2460c511850 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "1pgnz5lapm4qk48a13k9698jaswybzlbz2nyc621d852ldf0vhn6"; + sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7"; }; buildInputs = [ ncurses libiconv ]; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 3849c96ec13..6b33f5833d8 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python3Packages}: +{stdenv, fetchFromGitHub, python3Packages}: python3Packages.buildPythonPackage rec { name = "xonsh-${version}"; @@ -16,9 +16,11 @@ python3Packages.buildPythonPackage rec { propagatedBuildInputs = [ python3Packages.ply ]; - src = fetchurl { - url = "https://github.com/scopatz/xonsh/archive/${version}.zip"; - sha256 = "0p2d7p892w77ii8yy51vpw7jlz2y53k8g61m7l8bar3hr3qrl306"; + src = fetchFromGitHub { + owner = "scopatz"; + repo = "xonsh"; + rev = version; + sha256 = "04qnjqpz5y38g22irpph13j2a4hy7mk9pqvqz1mfimaf8zgmyh1n"; }; meta = with stdenv.lib; { |