jigdo: 0.7.3 -> 0.8.2, refactor
This commit is contained in:
parent
64891e361b
commit
ac30f5f4d6
|
@ -1,31 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, db, gtk2, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jigdo";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz";
|
||||
sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz";
|
||||
sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y";
|
||||
})
|
||||
./sizewidth.patch
|
||||
];
|
||||
|
||||
buildInputs = [ db gtk2 bzip2 ];
|
||||
|
||||
configureFlags = [ "--without-libdb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Download utility that can fetch files from several sources simultaneously";
|
||||
homepage = "http://atterer.org/jigdo/";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
|
@ -1,40 +0,0 @@
|
|||
diff --git i/src/mkimage.cc w/src/mkimage.cc
|
||||
index 02e65b1..b263796 100755
|
||||
--- i/src/mkimage.cc
|
||||
+++ w/src/mkimage.cc
|
||||
@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const {
|
||||
//______________________________________________________________________
|
||||
|
||||
namespace {
|
||||
- const int SIZE_WIDTH = 12;
|
||||
+ const int MKIMAGE_SIZE_WIDTH = 12;
|
||||
}
|
||||
|
||||
ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
|
||||
- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
|
||||
+ s << "image-info " << setw(MKIMAGE_SIZE_WIDTH) << size() << " "
|
||||
<< md5() << ' ' << blockLength() << '\n';
|
||||
return s;
|
||||
}
|
||||
ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
|
||||
- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
|
||||
- << setw(SIZE_WIDTH) << size() << '\n';
|
||||
+ s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
|
||||
+ << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n';
|
||||
return s;
|
||||
}
|
||||
ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
|
||||
- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
|
||||
- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
||||
+ s << "need-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
|
||||
+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
||||
return s;
|
||||
}
|
||||
ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
|
||||
- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
|
||||
- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
||||
+ s << "have-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
|
||||
+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
|
||||
return s;
|
||||
}
|
||||
|
46
pkgs/by-name/ji/jigdo/package.nix
Normal file
46
pkgs/by-name/ji/jigdo/package.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gettext
|
||||
, bzip2
|
||||
, db
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jigdo";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.einval.com/~steve/software/jigdo/download/jigdo-${version}.tar.xz";
|
||||
hash = "sha256-NvKG2T+mtr94hfSJnJl4lNIdo6YhdlkqwWLZxqhkT54=";
|
||||
};
|
||||
|
||||
# unable to parse jigdo-file.sgml
|
||||
postPatch = ''
|
||||
sed \
|
||||
-e "s@.*cd doc.*@@g" \
|
||||
-e "s@.*/man1.*@\t\t:@g" \
|
||||
-i Makefile.in
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
db
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Download utility that can fetch files from several sources simultaneously";
|
||||
homepage = "https://www.einval.com/~steve/software/jigdo/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -33008,8 +33008,6 @@ with pkgs;
|
|||
|
||||
jgmenu = callPackage ../applications/misc/jgmenu { };
|
||||
|
||||
jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
|
||||
|
||||
joe = callPackage ../applications/editors/joe { };
|
||||
|
|
Loading…
Reference in New Issue
Block a user