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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-30 06:21:40 +00:00
committed by GitHub
parent 17a8c9c4bf 51b608413c
commit c6548b2832
41 changed files with 1362 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/croc/test-local-relay.nix
+2 -2
View File
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
# wait for things to settle
sleep 1
# receive
MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple)
# receive, as of croc 9 --overwrite is required for noninteractive use
MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple)
# compare
[ "$MSG" = "$MSG2" ] && touch $out
'';
pkgs/tools/networking/minidlna/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
{ lib, stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
let version = "1.3.0"; in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
export makeFlags="INSTALLPREFIX=$out"
'';
buildInputs = [ ffmpeg_3 flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
postInstall = ''
mkdir -p $out/share/man/man{5,8}