diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
commit | 57fd764a391a6215165c377e1936204f297905c9 (patch) | |
tree | e93f78b2cb4718187f5b693e3655499ee6ba485a /pkgs/tools | |
parent | a88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f (diff) | |
parent | e657e2c455d17fddd6d79eb93a1d08836a2e2b28 (diff) |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/lzop/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/enblend-enfuse/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/debian-patches.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/debian-patches.txt | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngcrush/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/gnused/4.2.nix | 28 |
8 files changed, 42 insertions, 35 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index ccd0d755e8ce2..cb322e82f3986 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gnutar-1.26"; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index c15a34ca6f6ef..383b7a0e079c5 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lzo}: stdenv.mkDerivation { - name = "lzop-1.02rc1"; + name = "lzop-1.03"; src = fetchurl { - url = http://www.lzop.org/download/lzop-1.02rc1.tar.gz; - sha256 = "1dc32bfd82b130727bcec1de3b8a7cf090b78b3f14981d375ceb862b1e0e6873"; + url = http://www.lzop.org/download/lzop-1.03.tar.gz; + sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1"; }; buildInputs = [ lzo ]; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 807b0a8ed7956..f1759d7a7820c 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -13,6 +13,22 @@ stdenv.mkDerivation rec { buildNativeInputs = [ perl pkgconfig ]; + patches = + let + prefix = "http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff"; + in map fetchurl [ + { + url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx"; + name = "ftbfs-libpng15.patch"; + sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg"; + } + { + url = "${prefix}/101796703d73/src/vigra_impex/png.cxx"; + name = "ftbfs-libpng15.patch"; + sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005"; + } + ]; + meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix new file mode 100644 index 0000000000000..d72974445e6d6 --- /dev/null +++ b/pkgs/tools/graphics/plotutils/debian-patches.nix @@ -0,0 +1,14 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2"; +in +[ + { + url = "${prefix}/10_repair_postscript"; + sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p"; + } + { + url = "${prefix}/25_libpng15"; + sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0"; + } +] diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/tools/graphics/plotutils/debian-patches.txt new file mode 100644 index 0000000000000..8694be8edd798 --- /dev/null +++ b/pkgs/tools/graphics/plotutils/debian-patches.txt @@ -0,0 +1,3 @@ +plotutils/2.6-2 +10_repair_postscript +25_libpng15 diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index e7263fcf11e7f..bb250b9d85233 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [libpng]; + patches = map fetchurl (import ./debian-patches.nix); + configureFlags = "--enable-libplotter"; # required for pstoedit doCheck = true; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 08a7e6b2c426c..7293c0db66d66 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.17"; + name = "pngcrush-1.7.22"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2"; + sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp"; }; configurePhase = '' diff --git a/pkgs/tools/text/gnused/4.2.nix b/pkgs/tools/text/gnused/4.2.nix deleted file mode 100644 index 7a75f50d122ab..0000000000000 --- a/pkgs/tools/text/gnused/4.2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "gnused-4.2.1"; - - src = fetchurl { - url = "mirror://gnu/sed/sed-4.2.1.tar.bz2"; - sha256 = "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra"; - }; - - doCheck = true; - - meta = { - homepage = http://www.gnu.org/software/sed/; - description = "GNU sed, a batch stream editor"; - - longDescription = '' - Sed (stream editor) isn't really a true text editor or text - processor. Instead, it is used to filter text, i.e., it takes - text input and performs some operation (or set of operations) on - it and outputs the modified text. Sed is typically used for - extracting part of a file using pattern matching or substituting - multiple occurrences of a string within a file. - ''; - - license = "GPLv3+"; - }; -} |