ladspaPlugins: 0.4.15 -> 0.4.17

3 files changed, 20 insertions, 45 deletions

diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index b563c850d52..1b68caccf4e 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }:
+{ stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig
+, perlPackages }:
+
+stdenv.mkDerivation rec {
+  name = "swh-plugins-${version}";
+  version = "0.4.17";
 
-stdenv.mkDerivation {
-  name = "swh-plugins-0.4.15";
 
   src = fetchurl {
-    url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
-    sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
+    url = "https://github.com/swh/ladspa/archive/v${version}.tar.gz";
+    sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i";
   };
-  
-  buildInputs = [fftw ladspaH pkgconfig];
 
-  postInstall =
-    ''
-      mkdir -p $out/share/ladspa/
-      ln -sv $out/lib/ladspa $out/share/ladspa/lib
-    '';
+  buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl  perlPackages.XMLParser ];
+
+  patchPhase = ''
+    patchShebangs .
+    patchShebangs ./metadata/
+    cp ${automake}/share/automake-*/mkinstalldirs .
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
+    homepage = http://plugin.org.uk/;
     description = "LADSPA format audio plugins";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix
deleted file mode 100644
index ef34eb91600..00000000000
--- a/pkgs/applications/audio/ladspa-plugins/git.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig
-, perl, perlPackages }:
-
-stdenv.mkDerivation {
-  name = "swh-plugins-git-2015-03-04";
-
-  src = fetchgit {
-    url = https://github.com/swh/ladspa.git;
-    rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686";
-    sha256 = "1rmqm4780dhp0pj2scl3k7m8hpp1x6w6ln4wwg954zb9570rqaxx";
-  };
-
-  buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
-
-  patchPhase = ''
-    patchShebangs .
-    patchShebangs ./metadata/
-    cp ${automake}/share/automake-*/mkinstalldirs .
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://plugin.org.uk/;
-    description = "LADSPA format audio plugins";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 262e4e058b3..d978cb1ab16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13455,10 +13455,6 @@ in
     fftw = fftwSinglePrec;
   };
 
-  ladspaPlugins-git = callPackage ../applications/audio/ladspa-plugins/git.nix {
-    fftw = fftwSinglePrec;
-  };
-
   ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
 
   caps = callPackage ../applications/audio/caps { };