public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-09-12 00:03:34 +00:00 committed by GitHub
parent e4d6c52ebf 3130b7418d
commit 74cd4669ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/audio/openmpt123/default.nix
View File

@ -1,19 +1,16 @@
{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac { config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }: , usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let stdenv.mkDerivation rec {
version = "0.5.8";
in stdenv.mkDerivation {
pname = "openmpt123"; pname = "openmpt123";
inherit version; version = "0.5.11";
src = fetchurl { src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "sha256-KeLCEXS3P2fyul7naAjWLxgrEw5PcE7i2a6Cg5gtis0="; sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ]
@ -21,11 +18,13 @@ in stdenv.mkDerivation {
configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio";
doCheck = true;
meta = with lib; { meta = with lib; {
description = "A cross-platform command-line based module file player"; description = "A cross-platform command-line based module file player";
homepage = "https://lib.openmpt.org/libopenmpt/"; homepage = "https://lib.openmpt.org/libopenmpt/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

1
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -21,6 +21,7 @@ rec {
badPlatforms = lib.platforms.darwin; badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". 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. # 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; license = lib.licenses.mpl20;
}; };
tests = [ nixosTests.firefox ]; tests = [ nixosTests.firefox ];