From 5abcc7d22ad33d820b882a6888dbec06cc7a378f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 1 Nov 2016 02:00:07 +0100 Subject: [PATCH] lilv and sord: remove svn versions and deploy release version --- pkgs/applications/audio/ardour/ardour3.nix | 10 +++---- pkgs/applications/audio/ardour/ardour4.nix | 8 +++--- pkgs/applications/audio/ardour/default.nix | 8 +++--- pkgs/applications/audio/ingen/default.nix | 12 ++++---- .../libraries/audio/lilv/default.nix | 6 ++-- .../libraries/audio/lilv/lilv-svn.nix | 28 ------------------- .../libraries/audio/lv2/default.nix | 6 ++-- .../libraries/audio/lv2/lv2-git.nix | 28 ------------------- .../libraries/audio/raul/default.nix | 12 ++++---- .../libraries/audio/sratom/default.nix | 6 ++-- pkgs/development/libraries/serd/default.nix | 6 ++-- pkgs/development/libraries/sord/default.nix | 6 ++-- pkgs/development/libraries/sord/sord-svn.nix | 28 ------------------- pkgs/top-level/all-packages.nix | 2 -- 14 files changed, 40 insertions(+), 126 deletions(-) delete mode 100644 pkgs/development/libraries/audio/lilv/lilv-svn.nix delete mode 100644 pkgs/development/libraries/audio/lv2/lv2-git.nix delete mode 100644 pkgs/development/libraries/sord/sord-svn.nix diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 13fea9a99afe..0db951049703 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: let @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq"; }; - buildInputs = + buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK ]; patchPhase = '' diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix index b6123f40ee1d..e6a0ff66b3ca 100644 --- a/pkgs/applications/audio/ardour/ardour4.nix +++ b/pkgs/applications/audio/ardour/ardour4.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: let @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + 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 diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index ab228766e136..5e9e71f42cb5 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper +, perl, pkgconfig, python2, rubberband, serd, sord, sratom , taglib, vampSDK, dbus, fftw, pango, suil, libarchive }: let @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK libarchive ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 68990b11ef0f..439d75f88489 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv -, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv +, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { }; 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 ]; configurePhase = '' sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript - python waf configure --prefix=$out + ${python.interpreter} waf configure --prefix=$out ''; propagatedBuildInputs = [ rdflib ]; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; installPhase = '' - python waf install + ${python.interpreter} waf install for program in ingenams ingenish do wrapProgram $out/bin/$program \ diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index c8601377ad16..101322f3f531 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { 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; { homepage = http://drobilla.net/software/lilv; diff --git a/pkgs/development/libraries/audio/lilv/lilv-svn.nix b/pkgs/development/libraries/audio/lilv/lilv-svn.nix deleted file mode 100644 index 0b02774bc172..000000000000 --- a/pkgs/development/libraries/audio/lilv/lilv-svn.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 34301412f566..dafd39efee98 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { 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; { homepage = http://lv2plug.in; diff --git a/pkgs/development/libraries/audio/lv2/lv2-git.nix b/pkgs/development/libraries/audio/lv2/lv2-git.nix deleted file mode 100644 index e3230a86e575..000000000000 --- a/pkgs/development/libraries/audio/lv2/lv2-git.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 444b3ea4e867..94102c385497 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, boost, gtk, pkgconfig, python }: +{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }: stdenv.mkDerivation rec { - name = "raul-git-${rev}"; + name = "raul-unstable-${rev}"; rev = "2016-09-20"; src = fetchgit { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { 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; { description = "A C++ utility library primarily aimed at audio/musical applications"; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 71d7de79fe5b..816baa5221e6 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { 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; { homepage = http://drobilla.net/software/sratom; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 3fcfb7afa861..d68503298fc0 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { 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; { homepage = http://drobilla.net/software/serd; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 021a7fe17410..01ea4c4a1626 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { 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; { homepage = http://drobilla.net/software/sord; diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix deleted file mode 100644 index 290e85d81c7e..000000000000 --- a/pkgs/development/libraries/sord/sord-svn.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69192cd6d3a9..004dd547be2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9303,7 +9303,6 @@ in libsmf = callPackage ../development/libraries/audio/libsmf { }; lilv = callPackage ../development/libraries/audio/lilv { }; - lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; @@ -9433,7 +9432,6 @@ in soqt = callPackage ../development/libraries/soqt { }; sord = callPackage ../development/libraries/sord {}; - sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {}; soundtouch = callPackage ../development/libraries/soundtouch {};