diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9a336576d3a9..68990b11ef0f 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom +{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv +, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: stdenv.mkDerivation rec { - name = "ingen-svn-${rev}"; - rev = "5675"; + name = "ingen-unstable-${rev}"; + rev = "2016-10-29"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ingen"; - rev = rev; - sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ingen.git"; + rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; + sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; }; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig - python raul serd sord-svn sratom suil + boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig + python raul serd sord sratom suil ]; configurePhase = '' diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix new file mode 100644 index 000000000000..034282c4f3a5 --- /dev/null +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lv2-unstable-${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.interpreter} waf configure --prefix=$out"; + + buildPhase = "${python.interpreter} waf"; + + installPhase = "${python.interpreter} 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/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 6af09bd51795..7530d82a7e31 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { - name = "ganv-svn-${rev}"; - rev = "5675"; + name = "ganv-unstable-${rev}"; + rev = "2016-10-15"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ganv"; - rev = rev; - sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ganv.git"; + rev = "31685d283e9b811b61014f820c42807f4effa071"; + sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - buildInputs = [ graphviz gtkmm2 pkgconfig python ]; + buildInputs = [ graphviz gtk2 gtkmm2 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 = "An interactive Gtk canvas widget for graph-based interfaces"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac69528d809..f3b7dd83a76b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9023,6 +9023,7 @@ in lilv-svn = callPackage ../development/libraries/audio/lilv/lilv-svn.nix { }; lv2 = callPackage ../development/libraries/audio/lv2 { }; + lv2Unstable = callPackage ../development/libraries/audio/lv2/unstable.nix { }; lvtk = callPackage ../development/libraries/audio/lvtk { };