diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/dcraw/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/editres/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/escrotum/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/exiftags/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/graphics/fgallery/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/icoutils/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/jbig2enc/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/graphics/leela/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/graphics/optipng/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngcheck/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngcrush/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngnq/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngout/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngtoico/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/graphics/pstoedit/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/transfig/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/graphics/xcftools/default.nix | 7 |
19 files changed, 61 insertions, 41 deletions
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 488fdb2b26794..35657cf8fc539 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { - name = "dcraw-9.28.0"; + pname = "dcraw"; + version = "9.28.0"; src = fetchurl { - url = "https://www.dechifro.org/dcraw/archive/${name}.tar.gz"; + url = "https://www.dechifro.org/dcraw/archive/dcraw-${version}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 3a55524dc00d6..c9c1544c9a0e0 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libXt, libXaw, libXres, utilmacros }: stdenv.mkDerivation rec { - name = "editres-1.0.7"; + pname = "editres"; + version = "1.0.7"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.gz"; + url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19"; }; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index decb92615f979..6a0a2b2683d96 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -2,7 +2,8 @@ }: with python2Packages; buildPythonApplication { - name = "escrotum-2019-06-10"; + pname = "escrotum"; + version = "unstable-2019-06-10"; src = fetchFromGitHub { owner = "Roger"; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index afe8a5ecbcc3a..6823f6bc20ebf 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "exiftags-1.01"; +stdenv.mkDerivation rec { + pname = "exiftags"; + version = "1.01"; src = fetchurl { - url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; + url = "https://johnst.org/sw/exiftags/exiftags-${version}.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 28deabb98d148..484a11e322a25 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -9,10 +9,11 @@ # } stdenv.mkDerivation rec { - name = "fgallery-1.8.2"; + pname = "fgallery"; + version = "1.8.2"; src = fetchurl { - url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/fgallery-${version}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 9fe41d91db21c..62b4ab6b303ed 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.32.3"; + pname = "icoutils"; + version = "0.32.3"; src = fetchurl { - url = "mirror://savannah/icoutils/${name}.tar.bz2"; + url = "mirror://savannah/icoutils/icoutils-${version}.tar.bz2"; sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index a4b396c3d2328..c04862610b69f 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: -stdenv.mkDerivation { - name = "jbig2enc-0.28"; +stdenv.mkDerivation rec { + pname = "jbig2enc"; + version = "0.28"; src = fetchurl { - url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; + url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index cf10c92286ca9..e50716f7a5cfc 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, poppler }: stdenv.mkDerivation { - name = "leela-12.fe7a35a"; + pname = "leela"; + version = "12.fe7a35a"; src = fetchFromGitHub { owner = "TrilbyWhite"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 30b69c862c35f..dea9aa6d97ed7 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.92.0"; + pname = "netpbm"; + version = "10.92.0"; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 72caf6f86aecd..65ebd8ddbd12c 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -7,10 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = "optipng-0.7.7"; + pname = "optipng"; + version = "0.7.7"; src = fetchurl { - url = "mirror://sourceforge/optipng/${name}.tar.gz"; + url = "mirror://sourceforge/optipng/optipng-${version}.tar.gz"; sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg"; }; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 001b4cd174b4d..57cfe988b0b7f 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -6,10 +6,11 @@ # I'm only interested in making pstoedit convert to svg stdenv.mkDerivation rec { - name = "plotutils-2.6"; + pname = "plotutils"; + version = "2.6"; src = fetchurl { - url = "mirror://gnu/plotutils/${name}.tar.gz"; + url = "mirror://gnu/plotutils/plotutils-${version}.tar.gz"; sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 579dcad4ccb4c..266b85c54c54c 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-3.0.2"; + pname = "pngcheck"; + version = "3.0.2"; src = fetchurl { - url = "mirror://sourceforge/png-mng/${name}.tar.gz"; + url = "mirror://sourceforge/png-mng/pngcheck-${version}.tar.gz"; sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 18a156ea504bd..16c710ceb79f6 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.8.13"; + pname = "pngcrush"; + version = "1.8.13"; src = fetchurl { - url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; + url = "mirror://sourceforge/pmt/pngcrush-${version}-nolib.tar.xz"; sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index bec86e20ce3d9..81f33c65af648 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpng, zlib }: stdenv.mkDerivation rec { - name = "pngnq-1.1"; + pname = "pngnq"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/pngnq/${name}.tar.gz"; + url = "mirror://sourceforge/pngnq/pngnq-${version}.tar.gz"; sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index d1d069c7ff78a..c2de8a4fb2aed 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -5,11 +5,12 @@ let else if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in -stdenv.mkDerivation { - name = "pngout-20150319"; +stdenv.mkDerivation rec { + pname = "pngout"; + version = "20150319"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; + url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index 7eabfb89d5a6b..7abf94f0a3e14 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libpng }: -stdenv.mkDerivation { - name = "pngtoico-1.0"; +stdenv.mkDerivation rec { + pname = "pngtoico"; + version = "1.0"; src = fetchurl { - url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-${version}.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 57e16a4925a78..dd5b51041b1f6 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "pstoedit-3.75"; + pname = "pstoedit"; + version = "3.75"; src = fetchurl { - url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; + url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp"; }; diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index a6c9cd988c071..617ecbf90ee98 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: -stdenv.mkDerivation { - name = "transfig-3.2.4"; +stdenv.mkDerivation rec { + pname = "transfig"; + version = "3.2.4"; + src = fetchurl { - url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.${version}.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index c1b12ca5fe726..e83e3c13ae3f6 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libpng, perl, gettext }: -stdenv.mkDerivation { - name = "xcftools-1.0.7"; +stdenv.mkDerivation rec { + pname = "xcftools"; + version = "1.0.7"; src = fetchurl { - url = "http://henning.makholm.net/xcftools/xcftools-1.0.7.tar.gz"; + url = "http://henning.makholm.net/xcftools/xcftools-${version}.tar.gz"; sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy"; }; |