Merge master into staging-next
This commit is contained in:
commit
a6245e9bdf
@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "opentx";
|
pname = "opentx";
|
||||||
version = "2.3.10";
|
version = "2.3.11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "opentx";
|
owner = "opentx";
|
||||||
repo = "opentx";
|
repo = "opentx";
|
||||||
rev = "release/${version}";
|
rev = "release/${version}";
|
||||||
sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
|
sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
|
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
|
||||||
|
@ -157,9 +157,9 @@ in rec {
|
|||||||
});
|
});
|
||||||
|
|
||||||
terraform_0_14 = pluggable (generic {
|
terraform_0_14 = pluggable (generic {
|
||||||
version = "0.14.4";
|
version = "0.14.5";
|
||||||
sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66";
|
sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r";
|
||||||
vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v";
|
vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs";
|
||||||
patches = [ ./provider-path.patch ];
|
patches = [ ./provider-path.patch ];
|
||||||
passthru = { inherit plugins; };
|
passthru = { inherit plugins; };
|
||||||
});
|
});
|
||||||
|
@ -26,14 +26,14 @@
|
|||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "neochat";
|
pname = "neochat";
|
||||||
version = "1.0";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "invent.kde.org";
|
domain = "invent.kde.org";
|
||||||
owner = "network";
|
owner = "network";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9";
|
sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
|
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "rclone";
|
pname = "rclone";
|
||||||
version = "1.53.3";
|
version = "1.53.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0";
|
sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";
|
vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";
|
||||||
@ -39,6 +39,7 @@ buildGoModule rec {
|
|||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Command line program to sync files and directories to and from major cloud storage";
|
description = "Command line program to sync files and directories to and from major cloud storage";
|
||||||
homepage = "https://rclone.org";
|
homepage = "https://rclone.org";
|
||||||
|
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ danielfullmer marsam ];
|
maintainers = with maintainers; [ danielfullmer marsam ];
|
||||||
};
|
};
|
||||||
|
@ -24,11 +24,11 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "PortfolioPerformance";
|
pname = "PortfolioPerformance";
|
||||||
version = "0.50.0";
|
version = "0.50.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||||
sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8";
|
sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -41,4 +41,3 @@ stdenv.mkDerivation rec {
|
|||||||
maintainers = with maintainers; [ markuskowa ];
|
maintainers = with maintainers; [ markuskowa ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dumb-init";
|
pname = "dumb-init";
|
||||||
version = "1.2.4";
|
version = "1.2.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Yelp";
|
owner = "Yelp";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx";
|
sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ glibc.static ];
|
buildInputs = [ glibc.static ];
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "papirus-icon-theme";
|
pname = "papirus-icon-theme";
|
||||||
version = "20200901";
|
version = "20210101";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "PapirusDevelopmentTeam";
|
owner = "PapirusDevelopmentTeam";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c";
|
sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "libquotient";
|
pname = "libquotient";
|
||||||
version = "0.6.3";
|
version = "0.6.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "quotient-im";
|
owner = "quotient-im";
|
||||||
repo = "libQuotient";
|
repo = "libQuotient";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc=";
|
sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ qtbase qtmultimedia ];
|
buildInputs = [ qtbase qtmultimedia ];
|
||||||
|
@ -11,11 +11,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "colorcet";
|
pname = "colorcet";
|
||||||
version = "2.0.2";
|
version = "2.0.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i";
|
sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -2,27 +2,27 @@
|
|||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, internetarchive
|
, internetarchive
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, youtube-dlc
|
, youtube-dl
|
||||||
, docopt
|
, docopt
|
||||||
, isPy27
|
, isPy27
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "tubeup";
|
pname = "tubeup";
|
||||||
version = "0.0.20";
|
version = "0.0.21";
|
||||||
|
|
||||||
disabled = isPy27;
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
|
sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
|
substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
|
propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
|
||||||
|
|
||||||
pythonImportsCheck = [ "tubeup" ];
|
pythonImportsCheck = [ "tubeup" ];
|
||||||
|
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
{ lib, buildPythonPackage, fetchPypi }:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "youtube_dlc";
|
|
||||||
version = "2020.11.11.post3";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
|
|
||||||
};
|
|
||||||
|
|
||||||
# They are broken
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "youtube_dlc" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "Media downloader supporting various sites such as youtube";
|
|
||||||
description = "https://github.com/blackjack4494/yt-dlc";
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = with maintainers; [ freezeboy ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pack";
|
pname = "pack";
|
||||||
version = "0.15.1";
|
version = "0.16.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "buildpacks";
|
owner = "buildpacks";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c";
|
sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
|
vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pgroonga";
|
pname = "pgroonga";
|
||||||
version = "2.2.7";
|
version = "2.2.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
|
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j";
|
sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lynis";
|
pname = "lynis";
|
||||||
version = "3.0.1";
|
version = "3.0.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CISOfy";
|
owner = "CISOfy";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs";
|
sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
@ -8341,8 +8341,6 @@ in {
|
|||||||
phantomjsSupport = false;
|
phantomjsSupport = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
|
|
||||||
|
|
||||||
yowsup = callPackage ../development/python-modules/yowsup { };
|
yowsup = callPackage ../development/python-modules/yowsup { };
|
||||||
|
|
||||||
yq = callPackage ../development/python-modules/yq { };
|
yq = callPackage ../development/python-modules/yq { };
|
||||||
|
Loading…
Reference in New Issue
Block a user