1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-12-18 18:01:03 +00:00 committed by GitHub
commit 2add1758ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 60 additions and 54 deletions

View file

@ -996,18 +996,18 @@ called with `callPackage` and passed `python` or `pythonPackages` (possibly
specifying an interpreter version), like this:
```nix
{ lib, python3Packages }:
{ lib, python3 }:
python3Packages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "luigi";
version = "2.7.9";
src = python3Packages.fetchPypi {
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
};
propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ];
meta = with lib; {
...

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.8.2";
version = "2.8.3";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YMVB9nKsHYy65McYs1w/ETy+1b8GkjuWFk6PZs4HFko=";
sha256 = "sha256-Ht+EDCoPn1dA8VHTEiq5xPm34lcsiug8jQHvQdCG2yg=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";

View file

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.2.4";
version = "3.2.6";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "sha256-kwvZvIu+uACI2vBBy9eVuLLJlv1evUJ/4gI6rx1NW/g=";
sha256 = "0cwzhk1w2wpf33cqbnrzckqy91b58qqpnkmh5nxv02z6fl7psmbh";
};
postPatch = ''

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "sacc";
version = "1.04";
version = "1.05";
src = fetchurl {
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz";
sha512 = "1rjxs77a5k2mgpwr2ln1czn64fmss9yw59g0k60r25c2ny2la6ddfcl5zclawcikk346na6m96jrfwssmka0axr2spwpl61wm0lijnk";
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz";
sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1";
};
inherit patches;

View file

@ -9,11 +9,11 @@ let
in
buildPythonApplication rec {
pname = "todoman";
version = "4.0.1";
version = "4.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "ec88f8009321e77deb0ae682f7d036c139edf4175f8413011b532905c6e7d2b1";
sha256 = "ce3caa481d923e91da9b492b46509810a754e2d3ef857f5d20bc5a8e362b50c8";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View file

@ -1,7 +1,7 @@
{ stdenv, buildGoModule, fetchFromGitHub, lib }:
{ stdenv, pkgsBuildBuild, fetchFromGitHub, lib }:
let
generator = buildGoModule rec {
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20211119143108";
src = fetchFromGitHub {

View file

@ -4,7 +4,8 @@
}:
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, libunwind
, openssl
@ -42,9 +43,8 @@ in stdenv.mkDerivation rec {
inherit pname version;
# Some of these dependencies are `dlopen()`ed.
rpath = lib.makeLibraryPath [
rpath = lib.makeLibraryPath ([
stdenv.cc.cc
lttng-ust_2_12
zlib
curl
@ -52,7 +52,9 @@ in stdenv.mkDerivation rec {
libunwind
libuuid
openssl
];
] ++ lib.optionals stdenv.isLinux [
lttng-ust_2_12
]);
src = fetchurl {
url = builtins.getAttr type urls;

View file

@ -41,10 +41,14 @@ let
stdenv.mkDerivation ({
name = "aspell-dict-${shortName}";
buildInputs = [aspell which];
strictDeps = true;
nativeBuildInputs = [ aspell which ];
dontAddPrefix = true;
configurePlatforms = [ ];
preBuild = "makeFlagsArray=(dictdir=$out/lib/aspell datadir=$out/lib/aspell)";
meta = {

View file

@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
stdenv.mkDerivation rec {
pname = "mpich";
version = "3.4.2";
version = "3.4.3";
src = fetchurl {
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
sha256 = "1gw7qpb27mhsj7ip0hhljshgpwvz2hmyhizhlp6793afp2lbw6aw";
sha256 = "1msg5i2mcmjix5pvpa84dwmlqpqm3206frl1060k342i62gxhm41";
};
configureFlags = [

View file

@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ];
nativeBuildInputs = [ pkg-config autoconf automake gtk-doc libtool gobject-introspection ];
buildInputs = [ glib libsoup ];
preConfigure = "./autogen.sh";
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
meta = with lib; {
description = "Project for mocking web service APIs which use HTTP or HTTPS";

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation (attrs // {
nim_builder --phase:configure
runHook postConfigure
'' else
buildPhase;
configurePhase;
buildPhase = if isNull buildPhase then ''
runHook preBuild

View file

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "django-jinja";
version = "2.9.1";
version = "2.10.0";
meta = {
description = "Simple and nonobstructive jinja2 integration with Django";
@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "6c1fc68b0f4b1fb21b208a3e5dc19a3b11bab2812c06f827d5fdbd24001a1910";
sha256 = "ae6a3fdf1ffa7a9ef6fd2f0a59c1a68c96b29f7f00f5166375658ef392f1ed32";
};
buildInputs = [ django pytz tox ];

View file

@ -12,11 +12,11 @@ buildPythonPackage (rec {
# there's a clear path forward. See
# https://github.com/elastic/elasticsearch-py/issues/1639 for more
# info.
version = "7.16.0";
version = "7.16.1";
src = fetchPypi {
inherit pname version;
sha256 = "d7f8665715ad80e3e99e42388bcc49c1b06162f72acfa1f8febe2baf5570b0ed";
sha256 = "c024ee2e7e2509c842c4e3c5e2b99a92ceecfde06d6dac2d32a19bf566c3e175";
};
# Check is disabled because running them destroy the content of the local cluster!

View file

@ -20,12 +20,12 @@
buildPythonPackage rec {
pname = "myfitnesspal";
version = "1.16.5";
version = "1.16.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-v7lYaZLHxQs3/2uJnj+9y0xCXfPO1C38jLwzF7IMbb0=";
sha256 = "ac07369ede3ca4c6d673e02f2b9e0893b17d079f3085e36fdfdbdd1cba9f37db";
};
propagatedBuildInputs = [

View file

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "pubnub";
version = "5.4.0";
version = "5.5.0";
src = fetchFromGitHub {
owner = pname;
repo = "python";
rev = "v${version}";
sha256 = "sha256-FyDsTqDQTI/Xxu4Sl4eHqwmgwN+ip+8WKGJs/h/kl2Y=";
sha256 = "133sis24jd40yq4sgp8lmg2kac5wiiccisjpkhm50rb9wdbpn6kh";
};
propagatedBuildInputs = [

View file

@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "pypandoc";
version = "1.6.4";
version = "1.7.0";
src = fetchFromGitHub {
owner = "NicklasTegner";
repo = pname;
rev = "v${version}";
sha256 = "0rssjig3nwdi4qvsjq7v7k8jyv6l9szfl5dp1a8s54c4j4dw37nh";
sha256 = "00r88qcvc9jpi8jvd6rpizz9gm33aq8hc3mf8lrarrjiq2fsxmk9";
};
patches = [

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "tableaudocumentapi";
version = "0.7";
version = "0.9";
src = fetchPypi {
inherit pname version;
sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0";
sha256 = "0c7d01f01758dd6e50ff2fc915c6087c0da17298635e6635581aaf25c934d6ce";
};
# tests not inclued with release

View file

@ -24,13 +24,13 @@ let
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
in buildPythonPackage rec {
pname = "torchvision";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "pytorch";
repo = "vision";
rev = "v${version}";
sha256 = "05dg835mmpzf7k2jn101l7x7cnra1kldwbgf19zblym5lfn21zhf";
sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i";
};
nativeBuildInputs = [ libpng ninja which ]

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.10.1";
version = "1.11.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MpAYJSDAbyh4aGW+hRrny5+bXZ96cNcUhqJkgY8bdD8=";
sha256 = "sha256-9J49+1fI3wmHQqYgdoGgaAuVMA9eG7wrFe7dQEectvI=";
};
vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU=";
vendorSha256 = "sha256-+zJEB9FyVvxHdwR/dAn56jrMbgVBhlbziVFe2WCQFfE=";
doCheck = false;

View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.22.7";
sha256 = "0sszg3k5jd26hymqhs5328kvnxsb3x78sg4gpna9lrvh92s26snc";
version = "12.22.8";
sha256 = "0g0ihjzbd02izhmb4jzkdsr5788982wy8q2b4a1h04q8l4fwp197";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

View file

@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "17.2.0";
sha256 = "16k5kqanfvsnickkrv0vz072qg4ddzrk4is56yvdg2f1brxwqirb";
version = "17.3.0";
sha256 = "00sx046xmh75va7jh810npphnz3yrixifjhlj0jqysal93kc9r74";
patches = [
./disable-darwin-v8-system-instrumentation.patch
# Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL.

View file

@ -2,11 +2,11 @@
, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }:
stdenv.mkDerivation rec {
version = "3.3.8";
version = "3.3.9";
pname = "shairport-sync";
src = fetchFromGitHub {
sha256 = "sha256-YxTJ3XEbBgOQqUJGGsjba2PjyTudWZiH9FqXlnvlsp0=";
sha256 = "sha256-JLgnsLjswj0qus1Vd5ZtPQbbIp3dp2pI7OfQG4JrdW8=";
rev = version;
repo = "shairport-sync";
owner = "mikebrady";

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
version = "2.5.4";
version = "2.5.5";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "sha256-OMzLRgpTUIosmlAdMiNplOx/Oj28gcqamsOPJdoFkN0=";
sha256 = "sha256-Y7gYUe7vFC672f3U8QOA8NdGcZ2zGp0UjnvKFOci/vs=";
stripRoot = false;
};
vendorSha256 = "sha256-BSempfKgRCj87XM8qPNEUs+sMILVS6bWwWgf7wWQviI=";
vendorSha256 = "sha256-fiODtiw7mxMshdwywW4esBYM1GEa2CS7+X80KxkzImE=";
doCheck = false;

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.06.06";
version = "2021.12.17";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1hqan9h55x9gfdakw554vic68w9gpvhblchwxlw265zxp56hxjrw";
sha256 = "sha256-nzuZyLd4RVFltFJfIVBehsf/Vl86wxnhlzPYEBlBNd8=";
};
patches = [