From e5610bf14d622e0ff079b605cfec84abb138f075 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 29 May 2021 03:59:43 +0200 Subject: [PATCH 1/4] openmpt123: Add maintainer, 0.5.8 -> 0.5.9 (cherry picked from commit dfc39e61f4223a8be7161b7c94b10a47810e9879) --- pkgs/applications/audio/openmpt123/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index a5ea91141c3..5d188889516 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,19 +1,16 @@ { config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: -let - version = "0.5.8"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openmpt123"; - inherit version; + version = "0.5.9"; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-KeLCEXS3P2fyul7naAjWLxgrEw5PcE7i2a6Cg5gtis0="; + sha256 = "0h86p8mnpm98vc4v6jbvrmm02fch7dnn332i26fg3a2s1738m04d"; }; enableParallelBuilding = true; - doCheck = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] @@ -21,11 +18,13 @@ in stdenv.mkDerivation { configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; + doCheck = true; + meta = with lib; { description = "A cross-platform command-line based module file player"; homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; }; } From 2d2c39dcc362f375b181a1facbd365626776571f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Jul 2021 08:43:49 +0000 Subject: [PATCH 2/4] openmpt123: 0.5.9 -> 0.5.10 (cherry picked from commit 4cb042ecb50b5bf8af767bf910f0adfaa541e546) --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5d188889516..3bfb1a5a4da 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "openmpt123"; - version = "0.5.9"; + version = "0.5.10"; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "0h86p8mnpm98vc4v6jbvrmm02fch7dnn332i26fg3a2s1738m04d"; + sha256 = "sha256-Waj6KNi432nLf6WXK9+TEIHatOHhFWxpoaU7ZcK+n/o="; }; enableParallelBuilding = true; From 7c42b2adaebe93f643bebcce8493fddc97b878b4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 8 Sep 2021 13:01:15 +0200 Subject: [PATCH 3/4] openmpt123: 0.5.10 -> 0.5.11 (cherry picked from commit 68178096c65de75036508e47b965043bed33d4a1) Excluding treewide renaming of this package. --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 3bfb1a5a4da..fff007b8c7b 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "openmpt123"; - version = "0.5.10"; + version = "0.5.11"; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-Waj6KNi432nLf6WXK9+TEIHatOHhFWxpoaU7ZcK+n/o="; + sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4"; }; enableParallelBuilding = true; From ff224c89bd023336b09a19e72150558925544744 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 4 Jul 2021 14:11:50 -0700 Subject: [PATCH 4/4] firefox: increase silent timeout to 14400s (4h) Fixes: #129115 Replaces: #129212 (cherry picked from commit 919e2a98ac1090be9be5ed673bc5c402f347bae7) --- pkgs/applications/networking/browsers/firefox/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index dc89b57fd94..ed1351cf8d6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -21,6 +21,7 @@ rec { badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; }; tests = [ nixosTests.firefox ];