From 4beab2264b3c20e3f5b97df4fb139004ed00c263 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sat, 15 Aug 2015 10:33:24 +0200
Subject: [PATCH 1/4] ardour: simplify version handling

---
 pkgs/applications/audio/ardour/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 2338af6ec99..593ca89451a 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -17,10 +17,6 @@ let
   # Version to build.
   tag = "4.1";
 
-  # Version info that is built into the binary. Keep in sync with 'tag'. The
-  # last 8 digits is a (fake) commit id.
-  revision = "4.1-fe672c8";
-
 in
 
 stdenv.mkDerivation rec {
@@ -42,7 +38,7 @@ stdenv.mkDerivation rec {
     ];
 
   patchPhase = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
     sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
     patchShebangs ./tools/
   '';

From 3d37dcc9eb8f057f01927fc837e3692405139597 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sat, 15 Aug 2015 21:28:02 +0200
Subject: [PATCH 2/4] ardour: 4.1 -> 4.2

---
 pkgs/applications/audio/ardour/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 593ca89451a..e47dbfb856b 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -15,7 +15,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "4.1";
+  tag = "4.2";
 
 in
 

From e31e28602ff9168387de1c215415ef2b4f696d8d Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sat, 15 Aug 2015 21:59:31 +0200
Subject: [PATCH 3/4] rkrlv2: initial version at beta

---
 pkgs/applications/audio/rkrlv2/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/audio/rkrlv2/default.nix

diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
new file mode 100644
index 00000000000..9c41c88b012
--- /dev/null
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, pkgs, fetchFromGitHub,
+automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile
+}:
+
+stdenv.mkDerivation rec {
+  repo = "rkrlv2";
+  name = "${repo}-b1.0";
+
+  src = fetchFromGitHub {
+    owner = "ssj71";
+    inherit repo;
+    rev = "a315f5aefe63be7e34663596b8b050410a9b7e72";
+    sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
+  };
+
+  buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
+
+  meta = {
+    description = "Rakarrak effects ported to LV2";
+    homepage = https://github.com/ssj71/rkrlv2;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.joelmo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23413feea81..56ded529983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2850,6 +2850,8 @@ let
 
   rkflashtool = callPackage ../tools/misc/rkflashtool { };
 
+  rkrlv2 = callPackage ../applications/audio/rkrlv2 {};
+
   rmlint = callPackage ../tools/misc/rmlint {
     inherit (pythonPackages) sphinx;
   };

From bf5eece51d0a75984f6868cd6a779e8ce33f61df Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sun, 16 Aug 2015 18:00:35 +0200
Subject: [PATCH 4/4] Make fetchFromGitHub return an additional attr rev

This means it is more consistent with fetchgit which returns rev.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56ded529983..0f2fbc8da5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -398,7 +398,7 @@ let
     inherit name sha256;
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
     meta.homepage = "https://github.com/${owner}/${repo}/";
-  };
+  } // { inherit rev; };
 
   fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;