JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3507 from jochu/nix-update-nzbget

Browse Source 
Update nzbget (13.0) and libpar2 (0.4)
This commit is contained in:
Eelco Dolstra 2014-08-09 19:19:52 +02:00
commit a1a96d8744
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libpar2/default.nix
View File

@ -1,15 +1,19 @@
{ stdenv, fetchurl, pkgconfig, libsigcxx }:
let version = "0.4"; in
stdenv.mkDerivation rec {
name = "libpar2-0.2";
name = "libpar2-${version}";
src = fetchurl {
url = "mirror://sourceforge/parchive/${name}.tar.gz";
sha256 = "024r37wi01d1pfkk17l5lk0ci0cc0xhy5z050hzf3cbk1y2bykq7";
url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz";
sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
};
buildInputs = [ pkgconfig libsigcxx ];
patches = [ ./libpar2-0.4-external-verification.patch ];
meta = {
homepage = http://parchive.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;

16
pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch Normal file
View File

@ -0,0 +1,16 @@
diff -aud -U 5 libpar2-0.4-original/par2repairer.h libpar2-0.4-patched/par2repairer.h
--- libpar2-0.4-original/par2repairer.h 2013-07-18 15:03:10.000000000 +0200
+++ libpar2-0.4-patched/par2repairer.h 2014-08-06 15:52:59.000000000 +0200
@@ -94,11 +94,11 @@
// Perform a sliding window scan of the DiskFile looking for blocks of data that
// might belong to any of the source files (for which a verification packet was
// available). If a block of data might be from more than one source file, prefer
// the one specified by the "sourcefile" parameter. If the first data block
// found is for a different source file then "sourcefile" is changed accordingly.
- bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned
+ virtual bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned
Par2RepairerSourceFile* &sourcefile, // [in/out] The source file matched
MatchType &matchtype, // [out] The type of match
MD5Hash &hashfull, // [out] The full hash of the file
MD5Hash &hash16k, // [out] The hash of the first 16k
u32 &count); // [out] The number of blocks found

4
pkgs/tools/networking/nzbget/default.nix
View File

@ -2,11 +2,11 @@
, gnutls, libgcrypt }:
stdenv.mkDerivation rec {
name = "nzbget-9.0";
name = "nzbget-13.0";
src = fetchurl {
url = "mirror://sourceforge/nzbget/${name}.tar.gz";
sha256 = "1r4ys5nmcz1ilkdjdh3r8lawaf96i8spk6hl02h823q9rppvmya0";
sha256 = "13lgwwrdv6ds25kj6hj0b5laqaf739n7l3j530x3640zyd254vv6";
};
buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ];