diff options
author | William A. Kennington III <william@wkennington.com> | 2015-08-07 13:40:39 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-08-07 13:40:39 -0700 |
commit | 4624985561321d04aede0163c326a2c3d4c38d30 (patch) | |
tree | 391d62e16f20e4d9679de3a64792e329824b3171 /pkgs/tools/misc | |
parent | 793cbaedf40d5ef63a688a0328bdfb85986b0eef (diff) | |
parent | 590e11bc534b90ce8de3eb27753761f2d5af1612 (diff) | |
download | nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.gz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.bz2 nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.lz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.xz nixlib-4624985561321d04aede0163c326a2c3d4c38d30.tar.zst nixlib-4624985561321d04aede0163c326a2c3d4c38d30.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/debbindiff/default.nix | 46 | ||||
-rw-r--r-- | pkgs/tools/misc/diffoscope/default.nix | 56 | ||||
-rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 6 |
3 files changed, 59 insertions, 49 deletions
diff --git a/pkgs/tools/misc/debbindiff/default.nix b/pkgs/tools/misc/debbindiff/default.nix deleted file mode 100644 index f5fcb37324ee..000000000000 --- a/pkgs/tools/misc/debbindiff/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchgit, pythonPackages, docutils -, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext -, gnupg, gzip, pdftk, poppler_utils, rpm, squashfsTools, unzip, vim, xz -}: - -pythonPackages.buildPythonPackage rec { - name = "debbindiff-${version}"; - version = "26"; - - namePrefix = ""; - - src = fetchgit { - url = "git://anonscm.debian.org/reproducible/debbindiff.git"; - rev = "refs/tags/${version}"; - sha256 = "18637gc7c92mwcpx3dvh6xild0sb9bwsgfcrjplmh7s8frvlvkv6"; - }; - - postPatch = '' - # Different pkg name in debian - sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@" - - # Upstream doesn't provide a PKG-INFO file - sed -i setup.py -e "/'rpm',/d" - ''; - - # Still missing these tools: ghc javap showttf sng - propagatedBuildInputs = (with pythonPackages; [ debian magic ]) ++ - [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg - gzip pdftk poppler_utils rpm squashfsTools unzip vim xz ]; - - doCheck = false; # Calls 'mknod' in squashfs tests, which needs root - - postInstall = '' - mv $out/bin/debbindiff.py $out/bin/debbindiff - mkdir -p $out/share/man/man1 - ${docutils}/bin/rst2man.py debian/debbindiff.1.rst $out/share/man/man1/debbindiff.1 - ''; - - meta = with stdenv.lib; { - description = "Highlight differences between two builds of Debian packages, and even other kind of files"; - homepage = https://wiki.debian.org/ReproducibleBuilds; - license = licenses.gpl3Plus; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix new file mode 100644 index 000000000000..e6c672d83441 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchgit, pythonPackages, docutils +, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext +, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz +}: + +pythonPackages.buildPythonPackage rec { + name = "diffoscope-${version}"; + version = "29"; + + namePrefix = ""; + + src = fetchgit { + url = "git://anonscm.debian.org/reproducible/diffoscope.git"; + rev = "refs/tags/${version}"; + sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf"; + }; + + postPatch = '' + # Different pkg name in debian + sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@" + + # Upstream doesn't provide a PKG-INFO file + sed -i setup.py -e "/'rpm',/d" + ''; + + # Still missing these tools: ghc javap showttf sng + propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++ + [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg + gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ]; + + doCheck = false; # Calls 'mknod' in squashfs tests, which needs root + + postInstall = '' + mv $out/bin/diffoscope.py $out/bin/diffoscope + mkdir -p $out/share/man/man1 + ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1 + ''; + + meta = with stdenv.lib; { + description = "Perform in-depth comparison of files, archives, and directories"; + longDescription = '' + diffoscope will try to get to the bottom of what makes files or directories + different. It will recursively unpack archives of many kinds and transform + various binary formats into more human readable form to compare them. It can + compare two tarballs, ISO images, or PDF just as easily. The differences can + be shown in a text or HTML report. + + diffoscope is developed as part of the "reproducible builds" Debian + project and was formerly known as "debbindiff". + ''; + homepage = https://wiki.debian.org/ReproducibleBuilds; + license = licenses.gpl3Plus; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index abe6a8adc146..d07e99e26604 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.5.2"; + version = "0.6.0"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { - url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz"; - sha256 = "02k6ijj0z0r08l50ignm2ngd4ax84l0r1wshh1is0wcfr70d94h9"; + url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; + sha256 = "1mb0pws5vsgnmyp5dp5m5jvgl6jcvdamxjz7wmgvxkw6n1vrcahd"; }; propagatedBuildInputs = with pythonPackages; [ |