nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-21.11 into staging-next-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-02-14 00:10:14 +00:00
committed by GitHub
parent 75098e6519 b61bf7a96a
commit fbb8dd1ea9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@@ -18,13 +18,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-23";
version = "7.1.0-24";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
sha256 = "sha256-NNdtJvgExAFPgJxkSDq8N/UqCbuMRw2N5hPnWGszJtI=";
hash = "sha256-tTdtVUQDBfVS3Rze1KKKR4wL8t8+ka5Ku9qcl+DP6Eo=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with lib;
let
version = "3.4.11";
version = "3.4.12";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0yajwz26jbz3ls28mdir5asr06938c11m2816gpm2fncway2gqm0";
sha256 = "sha256-iBoTMD4mO33H/jN1NMilQdSRRVIoeHm+0wu+dsW/aMo=";
};
cmakeFlags = [

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

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

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

@@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
version = "2.5.0";
version = "2.5.2";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl libkrb5 ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "timescaledb";
# some branches are named like tags which confuses git
rev = "refs/tags/${version}";
sha256 = "0j8fbhf69q0074c02ilzdrhwc1ciyw6dq48217xxv274df2lcxzd";
sha256 = "sha256-eq2dljS8+0fRcA7hQr5yOV1FXtMyaajjYFqpw+DYt1A=";
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]