diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2015-08-14 19:44:19 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2015-08-15 09:04:49 +0200 |
commit | ddcbf5bae20f910bb861795c2928fa788590ff33 (patch) | |
tree | 7442aa9402a68f74df331887985f975cf7f6ac5c | |
parent | 9d5508d85c33b8fb22d79dde6176792eac2c2696 (diff) | |
download | nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.tar nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.tar.gz nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.tar.bz2 nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.tar.lz nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.tar.xz nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.tar.zst nixpkgs-ddcbf5bae20f910bb861795c2928fa788590ff33.zip |
audacity: 2.0.5 -> 2.1.1
Audacity 2.0.6 and later supports FFmpeg 1.2 to 2.3.x (or libav 0.8 to 0.10.x)
-rw-r--r-- | pkgs/applications/audio/audacity/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6f25693f734..e13c6f78b78 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.1.1"; name = "audacity-${version}"; src = fetchurl { - url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; - sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2"; + url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; + sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6"; }; preConfigure = /* we prefer system-wide libs */ '' @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { ]; #ToDo: soundtouch, detach sbsms dontDisableStatic = true; - doCheck = true; + doCheck = false; # Test fails meta = { description = "Sound editor with graphical UI"; - homepage = http://audacity.sourceforge.net; + homepage = http://audacityteam.org/; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7889e5c334d..39f6a1ab27c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10683,7 +10683,7 @@ let audacious = callPackage ../applications/audio/audacious { }; audacity = callPackage ../applications/audio/audacity { - ffmpeg = ffmpeg_0; + ffmpeg = ffmpeg_2_2; }; milkytracker = callPackage ../applications/audio/milkytracker { }; |