diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:38:38 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:38:38 +0100 |
| commit | 6d059becd396ca8722904081cff7225bc64d5a44 (patch) | |
| tree | e723580f3aa9aeec12d407dbea2c4a0fa1808c95 /pkgs/shells | |
| parent | bfa5af85b733defd158965fe91d60fd3f7a8a666 (diff) | |
| parent | 59ab29fe88b06b31de5bea7ac11492a9dbc0c680 (diff) | |
| download | nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.gz nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.bz2 nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.lz nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.xz nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.zst nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.zip | |
Merge gcc-9 into staging (#68029)
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/ksh/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 80059e448c9..108d1a58758 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,16 +1,24 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: +{ stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch +, libiconv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ksh"; - version = "93v"; + version = "2020.0.0"; src = fetchFromGitHub { owner = "att"; repo = "ast"; - rev = "b8d88244ae87857e7bbd6da230ffbbc51165df70"; - sha256 = "12kf14n8vz36hnsy3wp6lnyv1841p7hcq25y1d78w532dil69lx9"; + rev = version; + sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; }; + patches = [ + (fetchpatch { + url = "https://github.com/att/ast/commit/11983a71f5e29df578b7e2184400728b4e3f451d.patch"; + sha256 = "1n9558c4v2qpgpjb1vafs29n3qn3z0770wr1ayc0xjf5z5j4g3kv"; + }) + ]; + nativeBuildInputs = [ meson ninja which python ]; buildInputs = [ libiconv ]; |