From d362c6ff98ed3d2ce7b37ff2f9f53f9abcab156a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sun, 3 May 2015 17:45:52 +0200
Subject: [PATCH 1/2] update ingen
---
pkgs/applications/audio/ingen/default.nix | 9 ++++++---
pkgs/development/libraries/audio/lilv/default.nix | 13 +++++++------
pkgs/development/libraries/audio/lv2/default.nix | 4 ++--
pkgs/development/libraries/audio/raul/default.nix | 4 ++--
pkgs/development/libraries/ganv/default.nix | 13 +++++++------
pkgs/development/libraries/sord/default.nix | 13 +++++++------
6 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index d4abbbe0083..af94e1e7e23 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -5,12 +5,12 @@
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 = [
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
python raul serd sord 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/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 9f3307742ec..39e32d193cd 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord, sratom }:
stdenv.mkDerivation rec {
- name = "lilv-${version}";
- version = "0.20.0";
+ name = "lilv-svn-${rev}";
+ rev = "5675";
- src = fetchurl {
- url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
+ src = fetchsvn {
+ url = "http://svn.drobilla.net/lad/trunk/lilv";
+ rev = rev;
+ sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index f03f6b3d371..cda126218ba 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 269e7472280..789846c15e7 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 6639f2e498b..eef89e9cff6 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/default.nix b/pkgs/development/libraries/sord/default.nix
index 96a19bf37cc..290e85d81c7 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, python, serd }:
+{ stdenv, fetchsvn, pkgconfig, python, serd }:
stdenv.mkDerivation rec {
- name = "sord-${version}";
- version = "0.12.2";
+ name = "sord-svn-${rev}";
+ rev = "327";
- src = fetchurl {
- url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
+ src = fetchsvn {
+ url = "http://svn.drobilla.net/sord/trunk";
+ rev = rev;
+ sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
};
buildInputs = [ pkgconfig python serd ];
From 9bf7b293e606ef1a45cbc9fa14f7650e49164580 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 4 May 2015 11:58:12 +0200
Subject: [PATCH 2/2] make lilv and sord svn versions separate.
---
pkgs/applications/audio/ingen/default.nix | 8 +++---
.../libraries/audio/lilv/default.nix | 13 ++++-----
.../libraries/audio/lilv/lilv-svn.nix | 28 +++++++++++++++++++
pkgs/development/libraries/sord/default.nix | 13 ++++-----
pkgs/development/libraries/sord/sord-svn.nix | 28 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
6 files changed, 74 insertions(+), 18 deletions(-)
create mode 100644 pkgs/development/libraries/audio/lilv/lilv-svn.nix
create mode 100644 pkgs/development/libraries/sord/sord-svn.nix
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index af94e1e7e23..40ba278f7a0 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,5 +1,5 @@
-{ 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
}:
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
};
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 = ''
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 39e32d193cd..9f3307742ec 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchsvn, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
stdenv.mkDerivation rec {
- name = "lilv-svn-${rev}";
- rev = "5675";
+ name = "lilv-${version}";
+ version = "0.20.0";
- src = fetchsvn {
- url = "http://svn.drobilla.net/lad/trunk/lilv";
- rev = rev;
- sha256 = "1wr61sivgbh0j271ix058sncsrgh9p2rh7af081s2z9ml8szgraq";
+ src = fetchurl {
+ url = "http://download.drobilla.net/${name}.tar.bz2";
+ sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];
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 00000000000..0b02774bc17
--- /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/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 290e85d81c7..96a19bf37cc 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchsvn, pkgconfig, python, serd }:
+{ stdenv, fetchurl, pkgconfig, python, serd }:
stdenv.mkDerivation rec {
- name = "sord-svn-${rev}";
- rev = "327";
+ name = "sord-${version}";
+ version = "0.12.2";
- src = fetchsvn {
- url = "http://svn.drobilla.net/sord/trunk";
- rev = rev;
- sha256 = "09lf6xmwfg8kbmz1b7d3hrpz0qqr8prdjqrp91aw70cgclx2pwc4";
+ src = fetchurl {
+ url = "http://download.drobilla.net/${name}.tar.bz2";
+ sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx";
};
buildInputs = [ pkgconfig python serd ];
diff --git a/pkgs/development/libraries/sord/sord-svn.nix b/pkgs/development/libraries/sord/sord-svn.nix
new file mode 100644
index 00000000000..290e85d81c7
--- /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 920bbc00621..7380dd7c222 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7550,6 +7550,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 { };
@@ -7661,6 +7662,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 {};