Merge remote-tracking branch 'upstream/release-20.09' into staging-20.09

This commit is contained in:
Robert Hensing
2020-11-05 10:53:05 +01:00
4 changed files with 13 additions and 9 deletions

View File

@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.37.2"; # Please backport all updates to the stable channel.
version = "1.37.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3";
sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid";
};
nativeBuildInputs = [

View File

@@ -15,9 +15,13 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
enableParallelBuilding = true;
preConfigure = ''
cd src
'';
cmakeDir = "../src";
# Running the tests is required to build the *.olean files for the core
# library.
doCheck = true;
postPatch = "patchShebangs .";
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/bin/leanpkg \

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediawiki";
version = "1.34.2";
version = "1.34.4";
src = with stdenv.lib; fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "1mi46a14b2080x6mh61mb49xq0ky27g0lbm3gqgvkgckc1zmbp0f";
sha256 = "09sj7xsfsnki8pw1hx5dwikwqgr9pcwhfpklsszsdywdj35wqs9b";
};
prePatch = ''

View File

@@ -78,13 +78,13 @@ let
in stdenv.mkDerivation rec {
pname = "zoneminder";
version = "1.34.16";
version = "1.34.22";
src = fetchFromGitHub {
owner = "ZoneMinder";
repo = "zoneminder";
rev = version;
sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE=";
sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
};
patches = [