diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-25 13:52:36 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-25 13:52:36 +0000 |
commit | 0daba7224548aaf590f02d802b0af24d69781bfe (patch) | |
tree | 99608ddd223959c14b3ce5581df9e80eb1e70d33 /pkgs/applications | |
parent | c26b778f34dc4df0cb4fbe51334326673285cf76 (diff) |
* Updated cdparanoia to 10.2.
svn path=/nixpkgs/branches/kde-4.7/; revision=27938
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/audio/cdparanoia/fix.patch | 46 |
2 files changed, 7 insertions, 53 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 6fa69beee20ee..6bd9e0b376e9d 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "cdparanoia-III-alpha9.8"; +stdenv.mkDerivation rec { + name = "cdparanoia-III-10.2"; + src = fetchurl { - url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz; - md5 = "7218e778b5970a86c958e597f952f193"; + url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz"; + sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = [./fix.patch]; - meta = { homepage = http://xiph.org/paranoia; + description = "A tool and library for reading digital audio from CDs"; }; } diff --git a/pkgs/applications/audio/cdparanoia/fix.patch b/pkgs/applications/audio/cdparanoia/fix.patch deleted file mode 100644 index 4a1c526c7d8c6..0000000000000 --- a/pkgs/applications/audio/cdparanoia/fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -*** cdparanoia-III-alpha9.8/interface/utils.h Thu Apr 20 00:41:04 2000 ---- cdparanoia-III-alpha9.8-old/interface/utils.h Wed Jan 19 21:44:08 2005 -*************** -*** 110,117 **** - case CDDA_MESSAGE_LOGIT: - d->errorbuf=catstring(d->errorbuf,s); - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - } ---- 110,115 ---- -*************** -*** 125,132 **** - case CDDA_MESSAGE_LOGIT: - d->messagebuf=catstring(d->messagebuf,s); - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - } ---- 123,128 ---- -*************** -*** 167,174 **** - } - } - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - if(malloced)free(buffer); ---- 163,168 ---- -*************** -*** 203,210 **** - if(!malloced)*messages=catstring(*messages,"\n"); - } - break; -- case CDDA_MESSAGE_FORGETIT: -- default: - } - } - if(malloced)free(buffer); ---- 197,202 ---- |