Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-03 18:18:51 +00:00
committed by GitHub
90 changed files with 1869 additions and 3429 deletions

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch
{ lib, stdenv, meson, ninja, fetchFromGitHub, which, python3, fetchpatch
, libiconv }:
stdenv.mkDerivation rec {
@@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ meson ninja which python ];
nativeBuildInputs = [ meson ninja which python3 ];
buildInputs = [ libiconv ];
strictDeps = true;
meta = with lib; {
description = "KornShell Command And Programming Language";
longDescription = ''