Merge remote-tracking branch 'origin/master' into haskell-updates.

This commit is contained in:
Peter Simons 2020-07-03 12:37:15 +02:00
commit 6c526ae225
6 changed files with 14 additions and 14 deletions

View file

@ -59,13 +59,13 @@ assert remoteSupport -> curl != null;
stdenv.mkDerivation rec {
pname = "deadbeef";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "DeaDBeeF-Player";
repo = "deadbeef";
rev = version;
sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig";
sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll";
};
buildInputs = with stdenv.lib; [ jansson ]

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "teams";
version = "1.3.00.5153";
version = "1.3.00.16851";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
sha256 = "13c7fmij0gcg6mrjjj2mhs21q7fzdssscwhihzyrmbmj64cd0a69";
sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
# Includes runtimeDependencies in the RPATH of the included Node modules
# so that dynamic loading works. We cannot use directly runtimeDependencies
# here, since the libraries from runtimeDependencies are not propagated
# here, since the libraries from runtimeDependencies are not propagated
# to the dynamically loadable node modules because of a condition in
# autoPatchElfHook since *.node modules have Type: DYN (Shared object file)
# autoPatchElfHook since *.node modules have Type: DYN (Shared object file)
# instead of EXEC or INTERP it expects.
# Fixes: https://github.com/NixOS/nixpkgs/issues/85449
postFixup = ''

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "git-extras";
version = "5.1.0";
version = "6.0.0";
src = fetchzip {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
sha256 = "0ja8ds9gpibrnwcf8n6cpbggwkbks0ik3z9vfx5h1yf3ln1nycky";
sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g";
};
nativeBuildInputs = [ unixtools.column which ];

View file

@ -2,7 +2,7 @@
let
pname = "spleen";
version = "1.7.0";
version = "1.8.0";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@ -19,7 +19,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d"
'';
sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg";
sha256 = "0vaawnav4k2gpwsgxn5rmkd8wyxnwsrbd0ksp749sb7rwfd3nphc";
meta = with lib; {
description = "Monospaced bitmap fonts";

View file

@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
pname = "postfix";
version = "3.5.3";
version = "3.5.4";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "0xcd9pmv2p4znn6bqvka19h5h2lw90inyxrm5020acd0yaf0i0g3";
sha256 = "10b8g6xv90shhfx17cjw7p40gphwi02az1y2dd8a4sjm4z6b2bzw";
};
nativeBuildInputs = [ makeWrapper m4 ];

View file

@ -4,7 +4,7 @@
# Archive support
, bzip2, zziplib
# Codecs
, audiofile, faad2, ffmpeg_3, flac, fluidsynth, game-music-emu
, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu
, libmad, libmikmod, mpg123, libopus, libvorbis, lame
# Filters
, libsamplerate
@ -46,7 +46,7 @@ let
# Decoder plugins
audiofile = [ audiofile ];
faad = [ faad2 ];
ffmpeg = [ ffmpeg_3 ];
ffmpeg = [ ffmpeg ];
flac = [ flac ];
fluidsynth = [ fluidsynth ];
gme = [ game-music-emu ];