lilv and sord: remove svn versions and deploy release version

This commit is contained in:
Bart Brouns 2016-11-01 02:00:07 +01:00
parent 1b8ad96858
commit 5abcc7d22a
14 changed files with 40 additions and 126 deletions

View File

@ -2,8 +2,8 @@
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: , perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
let let
@ -38,12 +38,12 @@ stdenv.mkDerivation rec {
sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq"; sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq";
}; };
buildInputs = buildInputs =
[ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK
]; ];
patchPhase = '' patchPhase = ''

View File

@ -2,8 +2,8 @@
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: , perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }:
let let
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
[ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK
]; ];
# ardour's wscript has a "tarball" target but that required the git revision # ardour's wscript has a "tarball" target but that required the git revision

View File

@ -2,8 +2,8 @@
, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper
, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom , perl, pkgconfig, python2, rubberband, serd, sord, sratom
, taglib, vampSDK, dbus, fftw, pango, suil, libarchive }: , taglib, vampSDK, dbus, fftw, pango, suil, libarchive }:
let let
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
[ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn makeWrapper pango perl pkgconfig python2 rubberband serd sord
sratom suil taglib vampSDK libarchive sratom suil taglib vampSDK libarchive
]; ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv { stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv
, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
, suil , suil
}: }:
@ -14,21 +14,21 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig
python raul serd sord sratom suil python raul serd sord sratom suil
]; ];
configurePhase = '' configurePhase = ''
sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
python waf configure --prefix=$out ${python.interpreter} waf configure --prefix=$out
''; '';
propagatedBuildInputs = [ rdflib ]; propagatedBuildInputs = [ rdflib ];
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = '' installPhase = ''
python waf install ${python.interpreter} waf install
for program in ingenams ingenish for program in ingenams ingenish
do do
wrapProgram $out/bin/$program \ wrapProgram $out/bin/$program \

View File

@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ lv2 pkgconfig python serd sord sratom ]; buildInputs = [ lv2 pkgconfig python serd sord sratom ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = "python waf install"; installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/lilv; homepage = http://drobilla.net/software/lilv;

View File

@ -1,28 +0,0 @@
{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord-svn, sratom }:
stdenv.mkDerivation rec {
name = "lilv-svn-${rev}";
rev = "5675";
src = fetchsvn {
url = "http://svn.drobilla.net/lad/trunk/lilv";
rev = rev;
sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
};
buildInputs = [ lv2 pkgconfig python serd sord-svn sratom ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/lilv;
description = "A C library to make the use of LV2 plugins";
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

View File

@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2 libsndfile pkgconfig python ]; buildInputs = [ gtk2 libsndfile pkgconfig python ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = "python waf install"; installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://lv2plug.in; homepage = http://lv2plug.in;

View File

@ -1,28 +0,0 @@
{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "lv2-git-${version}";
version = "2016-10-23";
src = fetchgit {
url = "http://lv2plug.in/git/cgit.cgi/lv2.git";
rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12";
sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm";
};
buildInputs = [ gtk2 libsndfile pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://lv2plug.in;
description = "A plugin standard for audio systems";
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, boost, gtk, pkgconfig, python }: { stdenv, fetchgit, boost, gtk2, pkgconfig, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "raul-git-${rev}"; name = "raul-unstable-${rev}";
rev = "2016-09-20"; rev = "2016-09-20";
src = fetchgit { src = fetchgit {
@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj"; sha256 = "1lby508fb0n8ks6iz959sh18fc37br39d6pbapwvbcw5nckdrxwj";
}; };
buildInputs = [ boost gtk pkgconfig python ]; buildInputs = [ boost gtk2 pkgconfig python ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = "python waf install"; installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A C++ utility library primarily aimed at audio/musical applications"; description = "A C++ utility library primarily aimed at audio/musical applications";

View File

@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ lv2 pkgconfig python serd sord ]; buildInputs = [ lv2 pkgconfig python serd sord ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = "python waf install"; installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sratom; homepage = http://drobilla.net/software/sratom;

View File

@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pcre pkgconfig python ]; buildInputs = [ pcre pkgconfig python ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = "python waf install"; installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/serd; homepage = http://drobilla.net/software/serd;

View File

@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig python serd ]; buildInputs = [ pkgconfig python serd ];
configurePhase = "python waf configure --prefix=$out"; configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "python waf"; buildPhase = "${python.interpreter} waf";
installPhase = "python waf install"; installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sord; homepage = http://drobilla.net/software/sord;

View File

@ -1,28 +0,0 @@
{ stdenv, fetchsvn, pkgconfig, python, serd }:
stdenv.mkDerivation rec {
name = "sord-svn-${rev}";
rev = "327";
src = fetchsvn {
url = "http://svn.drobilla.net/sord/trunk";
rev = rev;
sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
};
buildInputs = [ pkgconfig python serd ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sord;
description = "A lightweight C library for storing RDF data in memory";
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

View File

@ -9303,7 +9303,6 @@ in
libsmf = callPackage ../development/libraries/audio/libsmf { }; libsmf = callPackage ../development/libraries/audio/libsmf { };
lilv = callPackage ../development/libraries/audio/lilv { }; lilv = callPackage ../development/libraries/audio/lilv { };
lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { };
lv2 = callPackage ../development/libraries/audio/lv2 { }; lv2 = callPackage ../development/libraries/audio/lv2 { };
lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { };
@ -9433,7 +9432,6 @@ in
soqt = callPackage ../development/libraries/soqt { }; soqt = callPackage ../development/libraries/soqt { };
sord = callPackage ../development/libraries/sord {}; sord = callPackage ../development/libraries/sord {};
sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {};
soundtouch = callPackage ../development/libraries/soundtouch {}; soundtouch = callPackage ../development/libraries/soundtouch {};