diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/shells | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/mksh/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 4e1570a3838c..dc5f437977c4 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, groff }: -let version = "52"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "mksh-${version}"; + version = "52"; src = fetchurl { urls = [ @@ -30,7 +30,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "MirBSD Korn Shell"; longDescription = '' The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI |