Merge pull request #7678 from magnetophon/ingen-master

update ingen

7 files changed, 79 insertions, 17 deletions

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index d4abbbe00834..40ba278f7a00 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
-, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv-svn
+, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
 , suil
 }:
 
 stdenv.mkDerivation  rec {
   name = "ingen-svn-${rev}";
-  rev = "5490";
+  rev = "5675";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/ingen";
     rev = rev;
-    sha256 = "09h2mrkzpwzhhyqy21xr7jhfbl82gmqfyj0lzhnjsrab8z56yzk6";
+    sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86";
   };
 
   buildInputs = [
-    boost ganv glibmm gtk gtkmm jack2 lilv lv2 makeWrapper pkgconfig
-    python raul serd sord sratom suil
+    boost ganv glibmm gtk gtkmm jack2 lilv-svn lv2 makeWrapper pkgconfig
+    python raul serd sord-svn sratom suil
   ];
 
-  configurePhase = "python waf configure --prefix=$out";
+  configurePhase = ''
+    sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
+    python waf configure --prefix=$out
+  '';
 
   propagatedBuildInputs = [ rdflib ];
 
diff --git a/pkgs/development/libraries/audio/lilv/lilv-svn.nix b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
new file mode 100644
index 000000000000..0b02774bc172
--- /dev/null
+++ b/pkgs/development/libraries/audio/lilv/lilv-svn.nix
@@ -0,0 +1,28 @@
+{ 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 f03f6b3d3710..cda126218ba6 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lv2-${version}";
-  version = "1.10.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "http://lv2plug.in/spec/${name}.tar.bz2";
-    sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378";
+    sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks";
   };
 
   buildInputs = [ gtk libsndfile pkgconfig python ];
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 269e7472280f..789846c15e7d 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "raul-svn-${rev}";
-  rev = "5449";
+  rev = "5675";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/raul";
     rev = rev;
-    sha256 = "02ph1hikp1iynwbxbiaf28brkwig7n4lsb3djaivnf14arg5vmzx";
+    sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4";
   };
 
   buildInputs = [ boost gtk pkgconfig python ];
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 6639f2e498ba..eef89e9cff63 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, graphviz, gtk, gtkmm, pkgconfig, python }:
+{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
-  name = "ganv-${version}";
-  version = "1.4.2";
+  name = "ganv-svn-${rev}";
+  rev = "5675";
 
-  src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l";
+  src = fetchsvn {
+    url = "http://svn.drobilla.net/lad/trunk/ganv";
+    rev = rev;
+    sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj";
   };
 
   buildInputs = [ graphviz gtk gtkmm pkgconfig python ];
diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix
new file mode 100644
index 000000000000..290e85d81c7e
--- /dev/null
+++ b/pkgs/development/libraries/sord/sord-svn.nix
@@ -0,0 +1,28 @@
+{ 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 926cbe3f649f..f08ecfeb5bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7540,6 +7540,7 @@ let
   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 { };
 
@@ -7651,6 +7652,7 @@ let
   soqt = callPackage ../development/libraries/soqt { };
 
   sord = callPackage ../development/libraries/sord {};
+  sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {};
 
   soundtouch = callPackage ../development/libraries/soundtouch {};