Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.
2016-02-03 16:54:03 +01:00
parent c979012631 53e0f8b1cd
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
--- 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