nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-21.11 into staging-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-02-24 00:12:30 +00:00
committed by GitHub
parent 679d696e25 eae4700c20
commit b48ddd35d4
8 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/php/7.4.nix
View File

@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "7.4.27";
sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563";
version = "7.4.28";
sha256 = "sha256-IIUIaoY0RLDjlUfeGklp/RxAoMGI61j6spOLZJsMS1g=";
});
in

4
pkgs/development/interpreters/php/8.0.nix
View File

@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.14";
sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v";
version = "8.0.16";
sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk=";
});
in

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

@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "matrix_common";
version = "1.0.0";
version = "1.1.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4=";
sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY=";
};
propagatedBuildInputs = [ attrs ];

4
pkgs/servers/matrix-synapse/default.nix
View File

@@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.52.0";
version = "1.53.0";
src = fetchPypi {
inherit pname version;
sha256 = "091z3rwd10n59andfy1pfjrf6q3n3yrjqrws13lqc02w23aaxzin";
sha256 = "0pp9l3191rg9iildknm1s1phi896y7zh7b3a6m16f6bmchmn8jz3";
};
buildInputs = [ openssl ];

4
pkgs/servers/nosql/cassandra/3.0.nix
View File

@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "3.0.24";
sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz";
version = "3.0.26";
sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i";
generation = "3_0";
})

4
pkgs/servers/nosql/cassandra/3.11.nix
View File

@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "3.11.10";
sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv";
version = "3.11.12";
sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw";
generation = "3_11";
})

1
pkgs/servers/nosql/cassandra/generic.nix
View File

@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
$out/LICENSE.txt \
$out/NEWS.txt \
$out/NOTICE.txt \
$out/javadoc \
$out/share/doc/${pname}-${version}
if [[ -d $out/doc ]]; then

8
pkgs/tools/system/netdata/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper
, CoreFoundation, IOKit, libossp_uuid
, nixosTests
, curl, libcap, libuuid, lm_sensors, zlib
, curl, libcap, libuuid, lm_sensors, zlib, protobuf
, withCups ? false, cups
, withDBengine ? true, libuv, lz4, judy
, withIpmi ? (!stdenv.isDarwin), freeipmi
@@ -16,19 +16,19 @@ with lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
version = "1.32.1";
version = "1.33.1";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "sha256-DbuR3x7d6synJELOxI+frK4LY9zFgPKmY7hGY8B5z7o=";
sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8=";
fetchSubmodules = true;
};
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
buildInputs = [ curl.dev zlib.dev ]
buildInputs = [ curl.dev zlib.dev protobuf ]
++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ]
++ optionals withCups [ cups ]