Merge pull request #130502 from SuperSandro2000/fix-collection29
Fix collection29
This commit is contained in:
commit
64cdc97f4d
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "thinkingrock-binary-2.2.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thinkingrock-binary";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz";
|
||||
url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${version}/tr-${version}.tar.gz";
|
||||
sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
|
||||
};
|
||||
|
||||
|
@ -23,13 +23,13 @@ in {
|
||||
] mkPlugin);
|
||||
|
||||
femon = stdenv.mkDerivation rec {
|
||||
|
||||
name = "vdr-femon-2.4.0";
|
||||
pname = "vdr-femon";
|
||||
version = "2.4.0";
|
||||
|
||||
buildInputs = [ vdr ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz";
|
||||
url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz";
|
||||
sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp";
|
||||
};
|
||||
|
||||
@ -48,7 +48,6 @@ in {
|
||||
};
|
||||
|
||||
vaapidevice = stdenv.mkDerivation {
|
||||
|
||||
pname = "vdr-vaapidevice";
|
||||
version = "20190525";
|
||||
|
||||
@ -84,7 +83,8 @@ in {
|
||||
|
||||
|
||||
markad = stdenv.mkDerivation rec {
|
||||
name = "vdr-markad-2017-03-13";
|
||||
pname = "vdr-markad";
|
||||
version = "unstable-2017-03-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.vdr-developer.org/vdr-plugin-markad.git";
|
||||
@ -176,18 +176,16 @@ in {
|
||||
|
||||
};
|
||||
|
||||
vnsiserver = let
|
||||
name = "vnsiserver";
|
||||
vnsiserver = stdenv.mkDerivation rec {
|
||||
pname = "vdr-vnsiserver";
|
||||
version = "1.8.0";
|
||||
in stdenv.mkDerivation {
|
||||
name = "vdr-${name}-${version}";
|
||||
|
||||
buildInputs = [ vdr ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-${name}";
|
||||
repo = "vdr-plugin-vnsiserver";
|
||||
owner = "FernetMenta";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw";
|
||||
@ -204,7 +202,8 @@ in {
|
||||
};
|
||||
|
||||
text2skin = stdenv.mkDerivation {
|
||||
name = "vdr-text2skin-1.3.4-20170702";
|
||||
pname = "vdr-text2skin";
|
||||
version = "1.3.4-20170702";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
|
||||
@ -308,7 +307,6 @@ in {
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vdr-fritzbox";
|
||||
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
||||
${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto
|
||||
'';
|
||||
|
||||
docheck = true;
|
||||
checkphase = ''
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
grep -q WithAnnotations $out/withannotations.pb.c || (echo "error: WithAnnotations not found in $out/withannotations.pb.c"; exit 1)
|
||||
grep -q WithAnnotations $out/withannotations.pb.h || (echo "error: WithAnnotations not found in $out/withannotations.pb.h"; exit 1)
|
||||
grep -q "pb_byte_t uuid\[16\]" $out/withannotations.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withannotations.pb.h"; exit 1)
|
||||
|
@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
||||
${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto
|
||||
'';
|
||||
|
||||
docheck = true;
|
||||
checkphase = ''
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
grep -q WithOptions $out/withoptions.pb.c || (echo "error: WithOptions not found in $out/withoptions.pb.c"; exit 1)
|
||||
grep -q WithOptions $out/withoptions.pb.h || (echo "error: WithOptions not found in $out/withoptions.pb.h"; exit 1)
|
||||
grep -q "pb_byte_t uuid\[16\]" $out/withoptions.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withoptions.pb.h"; exit 1)
|
||||
|
@ -1,7 +1,8 @@
|
||||
{ stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libpressureaudio-${apulse.version}";
|
||||
pname = "libpressureaudio";
|
||||
version = apulse.version;
|
||||
|
||||
src = libpulseaudio.src;
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "zsh-autoenv";
|
||||
version = "2017-12-16";
|
||||
version = "unstable-2017-12-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tarrasch";
|
||||
|
Loading…
Reference in New Issue
Block a user