pyrox.dev
lol
Merge pull request #3507 from jochu/nix-update-nzbget
Update nzbget (13.0) and libpar2 (0.4)
+7
-3
pkgs/development/libraries/libpar2/default.nix
+7
-3
pkgs/development/libraries/libpar2/default.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, libsigcxx }:
2
2
3
+
let version = "0.4"; in
4
+
3
5
stdenv.mkDerivation rec {
4
-
name = "libpar2-0.2";
6
+
name = "libpar2-${version}";
5
7
6
8
src = fetchurl {
7
-
url = "mirror://sourceforge/parchive/${name}.tar.gz";
8
-
sha256 = "024r37wi01d1pfkk17l5lk0ci0cc0xhy5z050hzf3cbk1y2bykq7";
9
+
url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz";
10
+
sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i";
9
11
};
10
12
11
13
buildInputs = [ pkgconfig libsigcxx ];
14
+
15
+
patches = [ ./libpar2-0.4-external-verification.patch ];
12
16
13
17
meta = {
14
18
homepage = http://parchive.sourceforge.net/;
+16
pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
+16
pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
···
1
+
diff -aud -U 5 libpar2-0.4-original/par2repairer.h libpar2-0.4-patched/par2repairer.h
2
+
--- libpar2-0.4-original/par2repairer.h 2013-07-18 15:03:10.000000000 +0200
3
+
+++ libpar2-0.4-patched/par2repairer.h 2014-08-06 15:52:59.000000000 +0200
4
+
@@ -94,11 +94,11 @@
5
+
// Perform a sliding window scan of the DiskFile looking for blocks of data that
6
+
// might belong to any of the source files (for which a verification packet was
7
+
// available). If a block of data might be from more than one source file, prefer
8
+
// the one specified by the "sourcefile" parameter. If the first data block
9
+
// found is for a different source file then "sourcefile" is changed accordingly.
10
+
- bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned
11
+
+ virtual bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned
12
+
Par2RepairerSourceFile* &sourcefile, // [in/out] The source file matched
13
+
MatchType &matchtype, // [out] The type of match
14
+
MD5Hash &hashfull, // [out] The full hash of the file
15
+
MD5Hash &hash16k, // [out] The hash of the first 16k
16
+
u32 &count); // [out] The number of blocks found
+2
-2
pkgs/tools/networking/nzbget/default.nix
+2
-2
pkgs/tools/networking/nzbget/default.nix
···
2
2
, gnutls, libgcrypt }:
3
3
4
4
stdenv.mkDerivation rec {
5
-
name = "nzbget-9.0";
5
+
name = "nzbget-13.0";
6
6
7
7
src = fetchurl {
8
8
url = "mirror://sourceforge/nzbget/${name}.tar.gz";
9
-
sha256 = "1r4ys5nmcz1ilkdjdh3r8lawaf96i8spk6hl02h823q9rppvmya0";
9
+
sha256 = "13lgwwrdv6ds25kj6hj0b5laqaf739n7l3j530x3640zyd254vv6";
10
10
};
11
11
12
12
buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ];