diff options
author | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
commit | 203846b9de3bc67e77c93be9d111408286a17d5d (patch) | |
tree | 3306a68a635fad0de834440c25f7e1b69b1e4b10 /pkgs/applications/audio | |
parent | 6539901c7f5eeb18cf5e9a493c230a912ff27f82 (diff) | |
parent | b54009fdfb7951bb5423c4fabcb28b70581b5ba8 (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/audio')
5 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index e2adf9e131c7e..0ff83a9023ef7 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "eq10q-2-${version}"; - version = "beta7.1"; + name = "eq10q-${version}"; + version = "2.0"; src = fetchurl { url = "mirror://sourceforge/project/eq10q/${name}.tar.gz"; - sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; + sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h"; }; buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 9300d7461fec2..4f285552576c6 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, unzip, puredata }: stdenv.mkDerivation rec { - name = "puremapping-20160130"; + name = "puremapping-${version}"; + version = "20160130"; src = fetchurl { - url = "http://www.chnry.net/data/puremapping-20160130-generic.zip"; + url = "http://www.chnry.net/data/puremapping-${version}-generic.zip"; name = "puremapping"; sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 68996e9e6e4cd..7cd244c9ea4f5 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { for i in ${puredata}/include/pd/*; do ln -s $i . done - patchShebangs ./bootstrap.sh ./configure --enable-lpt=no --prefix=$out ''; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index cca4538422f41..e4fb83439e0d5 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: +{ stdenv, fetchFromGitHub, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: stdenv.mkDerivation rec { - name = "plugin-torture-git-${version}"; - version = "2013-10-03"; + name = "plugin-torture-${version}"; + version = "5"; - src = fetchgit { - url = "https://github.com/cth103/plugin-torture"; - rev = "9ee06016982bdfbaa215cd0468cc6ada6367462a"; - sha256 = "0ynzfs3z95lbw4l1w276as2a37zxp0cw6pi3lbikr0qk0r7j5j10"; + src = fetchFromGitHub { + owner = "cth103"; + repo = "plugin-torture"; + rev = "v${version}"; + sha256 = "1mlgxjsyaz86wm4k32ll2w5nghjffnsdqlm6kjv02a4dpb2bfrih"; }; buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp plugin-torture $out/bin/ - cp README $out/bin/ + cp find-safe-plugins $out/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 8fddcccd51cd8..daa017d1ccbdc 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "puredata-${version}"; - version = "0.45-4"; + version = "0.47-1"; src = fetchurl { - url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz"; - sha256 = "1ls2ap5yi2zxvmr247621g4jx0hhfds4j5704a050bn2n3l0va2p"; + url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; + sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67"; }; patchPhase = '' |