diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:10:38 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:10:38 +0200 |
| commit | 4b706490da936a2d80708a090662af1523de40fa (patch) | |
| tree | 718177c97875d2f81e9647ee23de04c0bb48e613 /pkgs/shells | |
| parent | 896680cd15cb5549c1985eb96d428828f6eaf2f1 (diff) | |
| parent | 3d8e43691731037672c36129cbecb2fe43ffad7e (diff) | |
| download | nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.gz nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.bz2 nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.lz nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.xz nixpkgs-4b706490da936a2d80708a090662af1523de40fa.tar.zst nixpkgs-4b706490da936a2d80708a090662af1523de40fa.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/mksh/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index d817ade9eb6..b2f50c62dc4 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "57"; + version = "58"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "0xdykm1z710wriwd6nc8s8lwk2dwjl63dq96xxaawlid31a1241x"; + sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0"; }; - buildPhase = ''sh ./Build.sh -r -c lto''; + dontConfigure = true; + + buildPhase = ''sh ./Build.sh -r''; installPhase = '' install -D -m 755 mksh $out/bin/mksh diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 016cf7205bd..623d562b16e 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.4.3"; + version = "0.4.4"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = version; - sha256 = "0fq1zlnsj1bb7byli7mwlz7nm2yszwmyx43ccczcv51mjjfivyp3"; + sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf"; }; installPhase = '' |