colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-21 06:45:45 +00:00 committed by GitHub
commit df8b20163b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 105 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/opentx/default.nix
View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "opentx";
version = "2.3.10";
version = "2.3.11";
src = fetchFromGitHub {
owner = "opentx";
repo = "opentx";
rev = "release/${version}";
sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq";
sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU=";
};
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];

6
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -157,9 +157,9 @@ in rec {
});
terraform_0_14 = pluggable (generic {
version = "0.14.4";
sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66";
vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v";
version = "0.14.5";
sha256 = "0drf049zghpm3ajrn006w621s7bw5r1s8gl77nd1cj2zcw2nzn1r";
vendorSha256 = "0z9mkilazrkpbccnkws4hcc49djdwzn0cdbgqkm9bnp9fyg3rfvs";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});

4
pkgs/applications/networking/instant-messengers/neochat/default.nix
View File

@ -26,14 +26,14 @@
mkDerivation rec {
pname = "neochat";
version = "1.0";
version = "1.0.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9";
sha256 = "sha256-xGqGFJHyoZXHLv/n3UGr/KVbgs5Gc9kKKWIuKMr9DtQ=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

5
pkgs/applications/networking/sync/rclone/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "rclone";
version = "1.53.3";
version = "1.53.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0";
sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d";
};
vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";
@ -39,6 +39,7 @@ buildGoModule rec {
meta = with lib; {
description = "Command line program to sync files and directories to and from major cloud storage";
homepage = "https://rclone.org";
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
license = licenses.mit;
maintainers = with maintainers; [ danielfullmer marsam ];
};

4
pkgs/applications/office/portfolio/default.nix
View File

@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.50.0";
version = "0.50.2";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "1jq4if5hx3fwag1dz38sj87av2na1kv4c36hai1gyz9w5qhjv7j8";
sha256 = "sha256-n5tLYrqqM0KUQrlJWZtKGClKONAz3EXBAlEqIrdPBpI=";
};
nativeBuildInputs = [

3
pkgs/applications/science/chemistry/molden/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace '-I/usr/X11R6/include' "" \
--replace '/usr/local/' $out/ \
--replace 'sudo' "" \
--replace '-C surf depend' '-C surf'
--replace '-C surf depend' '-C surf'
sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
'';
@ -41,4 +41,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ markuskowa ];
};
}

4
pkgs/applications/virtualization/dumb-init/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dumb-init";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "Yelp";
repo = pname;
rev = "v${version}";
sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx";
sha256 = "sha256-aRh0xfmp+ToXIYjYaducTpZUHndZ5HlFZpFhzJ3yKgs=";
};
buildInputs = [ glibc.static ];

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20200901";
version = "20210101";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c";
sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE=";
};
nativeBuildInputs = [

8
pkgs/development/compilers/bigloo/default.nix
View File

@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
# Fix absolute paths.
sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \
-e 's=/tmp=$TMPDIR=g' -i autoconf/* \
[Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \
*/*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \
comptime/Cc/cc.scm gc/install-*
[Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \
*/*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \
comptime/Cc/cc.scm gc/install-*
# Make sure we don't change string lengths in the generated
# C files.
sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \
-i comptime/Cc/cc.c
-i comptime/Cc/cc.c
'';
checkTarget = "test";

4
pkgs/development/libraries/libquotient/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "libquotient";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
sha256 = "sha256-RYEcFClRdAippG0kspNi9QZIzZAuU4++9LOQTZcqpVc=";
sha256 = "sha256-bWqZiRv/mJzw+WY+7dLIzYBu8jhglBqgTjiXyQ1y6IQ=";
};
buildInputs = [ qtbase qtmultimedia ];

4
pkgs/development/python-modules/colorcet/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "colorcet";
version = "2.0.2";
version = "2.0.6";
src = fetchPypi {
inherit pname version;
sha256 = "1vkx00im4s6zhr2m1j9r0a5vmhkl488b4xpzxb1pidbl19wi6j2i";
sha256 = "efa44b6f4078261e62d0039c76aba17ac8d3ebaf0bc2291a111aee3905313433";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyregion/default.nix
View File

@ -33,8 +33,8 @@ buildPythonPackage rec {
name = "conftest-astropy-3-fix.patch";
url = "https://github.com/astropy/pyregion/pull/136.patch";
sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m";
})
];
})
];
nativeBuildInputs = [ astropy-helpers ];

8
pkgs/development/python-modules/tubeup/default.nix
View File

@ -2,27 +2,27 @@
, buildPythonPackage
, internetarchive
, fetchPypi
, youtube-dlc
, youtube-dl
, docopt
, isPy27
}:
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.20";
version = "0.0.21";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
sha256 = "326a499be032bee7f7ed921d85abff4b3b4dcd2c3d6ad694f08ef98dbcef19b6";
};
postPatch = ''
substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
'';
propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
pythonImportsCheck = [ "tubeup" ];

23
pkgs/development/python-modules/youtube-dlc/default.nix
View File

@ -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 ];
};
}

6
pkgs/development/tools/buildpack/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pack";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c";
sha256 = "sha256-fNPgdMwqQq2Gh/rkf6KHEd34rnQqhw7Jf1L34oVorqM=";
};
vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7";
vendorSha256 = "sha256-U38j5fxECKjYr5pqaNk0+Z0opQNqiYV2+6dIEaHUVF8=";
nativeBuildInputs = [ installShellFiles ];

2
pkgs/development/tools/dtools/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
installPhase = ''
$makeCmd INSTALL_DIR=$out install
'';
'';
meta = with stdenv.lib; {
description = "Ancillary tools for the D programming language compiler";

2
pkgs/development/tools/gtk-mac-bundler/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/bin
substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
--subst-var-by PATH $out/share
chmod a+x $out/bin/gtk-mac-bundler

28
pkgs/development/tools/ocaml/obelisk/default.nix
View File

@ -1,20 +1,20 @@
{ lib, fetchurl, ocamlPackages }:
ocamlPackages.buildDunePackage rec {
pname = "obelisk";
version = "0.5.2";
useDune2 = true;
src = fetchurl {
url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
};
pname = "obelisk";
version = "0.5.2";
useDune2 = true;
src = fetchurl {
url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
};
buildInputs = with ocamlPackages; [ menhir re ];
buildInputs = with ocamlPackages; [ menhir re ];
meta = {
description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Lelio-Brun/Obelisk";
};
meta = {
description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Lelio-Brun/Obelisk";
};
}

4
pkgs/servers/sql/postgresql/ext/pgroonga.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
version = "2.2.7";
version = "2.2.8";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
sha256 = "1rd3cxap9rqpg5y8y48r5bd7rki3lck6qsrb0bqdqm9xffnibw8j";
sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/tools/networking/guardian-agent/default.nix
View File

@ -30,9 +30,9 @@ buildGoPackage rec {
'';
postFixup = ''
wrapProgram $out/bin/sga-guard \
--prefix PATH : "$out/bin" \
--prefix PATH : "${autossh}/bin"
wrapProgram $out/bin/sga-guard \
--prefix PATH : "$out/bin" \
--prefix PATH : "${autossh}/bin"
'';
meta = with lib; {

4
pkgs/tools/security/lynis/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lynis";
version = "3.0.1";
version = "3.0.3";
src = fetchFromGitHub {
owner = "CISOfy";
repo = pname;
rev = version;
sha256 = "0lsb455rimr1cjxqcgy819xjxf1faas8wlx2x0pxhn5yha9w9sfs";
sha256 = "sha256-+RkzsBcQhHrfY8gEiJK3ptDeulJzA3IuVXiYEpyAsmk=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

2
pkgs/top-level/python-packages.nix
View File

@ -8341,8 +8341,6 @@ in {
phantomjsSupport = false;
};
youtube-dlc = callPackage ../development/python-modules/youtube-dlc { };
yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq { };