From 9505b1644166fe0d87f0ad93bb0d07977a760967 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 4 Nov 2020 12:37:45 +0100 Subject: [PATCH 1/4] signal-desktop: 1.37.2 -> 1.37.3 (cherry picked from commit 013dc4c263b2ec35f9736a2a4f6b4fe8a99ea890) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 5603ff13b19a..9656db0bd843 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -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 = [ From d50bb39245c72cf8b1be37e7c6d0d0590a119d44 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 7 Oct 2020 00:49:18 +0200 Subject: [PATCH 2/4] zoneminder: 1.34.16 -> 1.34.22 (cherry picked from commit 4d563ba7efc67d01664344b0c2e207e2bec38feb) --- pkgs/servers/zoneminder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 935993b781ff..3325462e0c75 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -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 = [ From ec5a542c7225b038e7f17d67e573ac43933d76b1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 4 Nov 2020 16:32:56 +0100 Subject: [PATCH 3/4] lean: build olean files (cherry picked from commit 8279979f386322bbba8504ac4dc9931dd5e90d34) --- pkgs/applications/science/logic/lean/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 32a75cabc13f..29b23f4869fe 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -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 \ From 60544f9b174541043cec61c4a8aff994343e4df9 Mon Sep 17 00:00:00 2001 From: Redvers Davies Date: Wed, 4 Nov 2020 04:41:45 +0000 Subject: [PATCH 4/4] mediawiki: 1.34.2 -> 1.34.4 --- pkgs/servers/web-apps/mediawiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index b9e0acfedb8f..eb24f8f716d5 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -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 = ''