Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-03-18 13:35:59 +01:00
206 changed files with 3936 additions and 1371 deletions
+3 -3
View File
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "cicero-tui";
version = "0.1.4";
version = "0.2.0";
src = fetchFromGitHub {
owner = "eyeplum";
repo = "cicero-tui";
rev = "v${version}";
sha256 = "1bz2y37qf9c3fxc73chb42rffdivp5krczhgd9rnwq5r6n6bdgq7";
sha256 = "sha256-TNNPTKLO5qjSeCxWb7bB4yV1J4Seu+tBKNs0Oav/pPE=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
freetype
];
cargoSha256 = "04359gf9mirczqwh8jv3rf0cc4pp05r8ncqyz0n8r7x5qv77kgcp";
cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco=";
meta = with lib; {
description = "Unicode tool with a terminal user interface";
+1 -1
View File
@@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec {
url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
};
buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
prePatch = ''
touch Makefile.PL
'';
+2 -2
View File
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.03.03";
version = "2021.03.14";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f";
sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];