From 9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jan 2016 20:31:44 +0100 Subject: Add version attribute where maintainers |= nckx This will probably be mandatory soon, and is a step in the right direction. Removes the deprecated meta.version, and move some meta sections to the end of the file where I should have put them in the first place. --- pkgs/tools/admin/nxproxy/default.nix | 21 ++++++++-------- pkgs/tools/cd-dvd/dvdisaster/default.nix | 3 +-- pkgs/tools/compression/lz4/default.nix | 3 +-- pkgs/tools/compression/zopfli/default.nix | 3 +-- pkgs/tools/filesystems/duff/default.nix | 9 +++---- pkgs/tools/filesystems/encfs/default.nix | 4 +-- pkgs/tools/filesystems/exfat/default.nix | 3 +-- pkgs/tools/filesystems/gpart/default.nix | 3 +-- pkgs/tools/filesystems/mp3fs/default.nix | 2 +- pkgs/tools/misc/clex/default.nix | 10 ++++---- pkgs/tools/misc/ipad_charge/default.nix | 3 +-- pkgs/tools/misc/ms-sys/default.nix | 3 +-- pkgs/tools/misc/tldr/default.nix | 5 ++-- pkgs/tools/networking/dhcping/default.nix | 7 +++--- pkgs/tools/networking/hans/default.nix | 29 +++++++++++----------- pkgs/tools/networking/ip2location/default.nix | 5 ++-- pkgs/tools/networking/ipv6calc/default.nix | 3 +-- pkgs/tools/networking/netsniff-ng/default.nix | 5 ++-- pkgs/tools/networking/pcapc/default.nix | 3 +-- pkgs/tools/networking/pingtcp/default.nix | 5 ++-- pkgs/tools/package-management/dpkg/default.nix | 5 ++-- .../package-management/packagekit/default.nix | 5 ++-- pkgs/tools/security/eid-mw/default.nix | 5 ++-- pkgs/tools/security/eid-viewer/default.nix | 3 +-- pkgs/tools/system/foremost/default.nix | 3 +-- pkgs/tools/system/gptfdisk/default.nix | 3 +-- pkgs/tools/system/suid-chroot/default.nix | 3 +-- pkgs/tools/text/aha/default.nix | 5 ++-- 28 files changed, 68 insertions(+), 93 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 70e1b55984dd..42bd284e73f2 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,23 +1,14 @@ { stdenv, fetchurl, autoreconfHook, libxcomp }: -let version = "3.5.0.32"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "nxproxy-${version}"; + version = "3.5.0.32"; src = fetchurl { sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; - meta = with stdenv.lib; { - inherit version; - description = "NX compression proxy"; - homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; - }; - buildInputs = [ libxcomp ]; nativeBuildInputs = [ autoreconfHook ]; @@ -28,4 +19,12 @@ stdenv.mkDerivation { makeFlags = [ "exec_prefix=$(out)" ]; enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "NX compression proxy"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; } diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index a98ce2088bd0..7cb1bf7506da 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -3,9 +3,9 @@ , enableSoftening ? true }: -let version = "0.79.5"; in stdenv.mkDerivation rec { name = "dvdisaster-${version}"; + version = "0.79.5"; src = fetchurl { url = "http://dvdisaster.net/downloads/${name}.tar.bz2"; @@ -70,7 +70,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; homepage = http://dvdisaster.net/; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 13236da5ab44..8340ea3fe8b0 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, valgrind }: -let version = "131"; in stdenv.mkDerivation rec { name = "lz4-${version}"; + version = "131"; src = fetchFromGitHub { sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2"; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { patches = [ ./install-on-freebsd.patch ] ; meta = with stdenv.lib; { - inherit version; description = "Extremely fast compression algorithm"; longDescription = '' Very fast lossless compression algorithm, providing compression speed diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 3c455ca5635f..8aeeb3b9e516 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, fetchpatch }: -let version = "1.0.1"; in stdenv.mkDerivation rec { name = "zopfli-${version}"; + version = "1.0.1"; src = fetchFromGitHub { owner = "google"; @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Very good, but slow, deflate or zlib compression"; longDescription = '' diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 1c4d068c4c13..078c80a8b703 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, gettext }: -# The last release (0.5.2) is more than 2 years old and lacks features like -D, -# limiting its usefulness. Upstream appears comatose if not dead. -let version = "2014-07-03"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "duff-${version}"; + # The last release (0.5.2) is more than 2 years old and lacks features like -D, + # limiting its usefulness. Upstream appears comatose if not dead. + version = "2014-07-03"; src = fetchFromGitHub { sha256 = "1k2dx38pjzc5d624vw1cs5ipj9fprsm5vqv55agksc29m63lswnx"; @@ -28,7 +28,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - inherit version; description = "Quickly find duplicate files"; longDescription = '' Duff is a Unix command-line utility for quickly finding duplicates in diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index b21054e478df..158050f6291e 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl , pkgconfig, rlog }: -let version = "1.8.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "encfs-${version}"; + version = "1.8.1"; src = fetchFromGitHub { sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 507c5e7a6c0e..7c483c9258a6 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: -let version = "1.2.3"; in stdenv.mkDerivation rec { name = "exfat-${version}"; + version = "1.2.3"; src = fetchFromGitHub { sha256 = "147s11sqmn5flbvz2hwpl6kdfqi2gnm1c2nsn5fxygyw7qyhpzda"; @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Free exFAT file system implementation"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix index 359ef16c2b84..dfa6fe3234c2 100644 --- a/pkgs/tools/filesystems/gpart/default.nix +++ b/pkgs/tools/filesystems/gpart/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -let version = "0.3"; in stdenv.mkDerivation rec { name = "gpart-${version}"; + version = "0.3"; # GitHub repository 'collating patches for gpart from all distributions': src = fetchFromGitHub { @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Guess PC-type hard disk partitions"; longDescription = '' diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 3b6b3c919cd7..77207cb8b3a1 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: -let version = "0.91"; in stdenv.mkDerivation rec { name = "mp3fs-${version}"; + version = "0.91"; src = fetchurl { url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz"; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 996254a54a25..b9e3fc179d50 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -1,14 +1,18 @@ { stdenv, fetchurl, ncurses }: -let version = "4.6.patch6"; in stdenv.mkDerivation rec { name = "clex-${version}"; + version = "4.6.patch6"; src = fetchurl { sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp"; url = "${meta.homepage}/download/${name}.tar.gz"; }; + buildInputs = [ ncurses ]; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "File manager with full-screen terminal interface"; longDescription = '' @@ -23,8 +27,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ ncurses ]; - - enableParallelBuilding = true; } diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index 73fee38cbf20..9fbc915ad2eb 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libusb1 }: -let version = "2015-02-03"; in stdenv.mkDerivation rec { name = "ipad_charge-${version}"; + version = "2015-02-03"; src = fetchFromGitHub { sha256 = "0f40hqx1dbqpwrhyf42h5982jwqv8j5zp5hwwakz6600hyqvnnz7"; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Apple device USB charging utility for Linux"; longDescription = '' diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index f9512b09ce66..c0b1de6c1e8c 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, gettext }: -let version = "2.5.2"; in stdenv.mkDerivation rec { name = "ms-sys-${version}"; + version = "2.5.2"; src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - inherit version; description = "A program for writing Microsoft compatible boot records"; homepage = http://ms-sys.sourceforge.net/; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 46dbc2a2a224..f223a97520b0 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }: -let version = "1.1.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "tldr-${version}"; + version = "1.1.0"; src = fetchFromGitHub { sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz"; @@ -23,7 +23,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Simplified and community-driven man pages"; longDescription = '' tldr pages gives common use cases for commands, so you don't need to hunt diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 53d87b2e3faf..19c2383c1c28 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl }: -let version = "1.2"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "dhcping-${version}"; + version = "1.2"; src = fetchurl { sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj"; @@ -14,7 +14,6 @@ stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Send DHCP request to find out if a DHCP server is running"; longDescription = '' dhcping sends either a DHCPREQUEST or DHCPINFORM packet to the server @@ -31,4 +30,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - } +} diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index aecc0bb63fa3..0e838a896cb2 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, nettools }: -let version = "0.4.4"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "hans-${version}"; + version = "0.4.4"; src = fetchFromGitHub { sha256 = "1xskffmmdmg1whlrl5wpkv9z29vh0igrbmsz0b45s9v0761a7kis"; @@ -11,8 +11,19 @@ stdenv.mkDerivation { owner = "friedrich"; }; + buildInputs = [ nettools ]; + + postPatch = '' + substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -D -m0755 hans $out/bin/hans + ''; + meta = with stdenv.lib; { - inherit version; description = "Tunnel IPv4 over ICMP"; longDescription = '' Hans makes it possible to tunnel IPv4 through ICMP echo packets, so you @@ -25,16 +36,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ nettools ]; - - postPatch = '' - substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/" - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -D -m0755 hans $out/bin/hans - ''; } diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 18fd2d12131d..22eb31384a19 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl }: -let version = "7.0.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ip2location-${version}"; + version = "7.0.0"; src = fetchurl { sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l"; @@ -14,7 +14,6 @@ stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Look up locations of host names and IP addresses"; longDescription = '' A command-line tool to find the country, region, city,coordinates, diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index a7c844932c96..e41b65d3d25e 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -2,9 +2,9 @@ , geoip ? null, geolite-legacy ? null , ip2location-database ? null }: -let version = "0.99.1"; in stdenv.mkDerivation rec { name = "ipv6calc-${version}"; + version = "0.99.1"; src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - inherit version; description = "Calculate/manipulate (not only) IPv6 addresses"; longDescription = '' ipv6calc is a small utility to manipulate (not only) IPv6 addresses and diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 535a96c1db7c..b83b7927679d 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,9 +2,9 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.6.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; + version = "0.6.0"; # Upstream recommends and supports git src = fetchFromGitHub rec { @@ -41,7 +41,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Swiss army knife for daily Linux network plumbing"; longDescription = '' netsniff-ng is a free Linux networking toolkit. Its gain of performance diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 7da123a377be..66028a973b3c 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libpcap }: -let version = "2015-03-06"; in stdenv.mkDerivation rec { name = "pcapc-${version}"; + version = "2015-03-06"; src = fetchFromGitHub { sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 784639b788c3..4d99eaaeff66 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchgit, cmake }: -let version = "0.0.3"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "pingtcp-${version}"; + version = "0.0.3"; # This project uses git submodules, which fetchFromGitHub doesn't support: src = fetchgit { @@ -27,7 +27,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Measure TCP handshake time"; homepage = https://github.com/LanetNetwork/pingtcp; license = licenses.gpl3; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 7b4486a8d862..f65b25d119d8 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.18.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "dpkg-${version}"; + version = "1.18.4"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index b41afd357513..ae8e1b252c4c 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }: -let version = "1.0.8"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "packagekit-${version}"; + version = "1.0.8"; src = fetchurl { sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l"; @@ -53,7 +53,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "System to facilitate installing and updating packages"; longDescription = '' PackageKit is a system designed to make installing and updating software diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index ff062ab50946..32cf4f9a4e2c 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite , pkgconfig }: -let version = "4.1.13"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "eid-mw-${version}"; + version = "4.1.13"; src = fetchFromGitHub { sha256 = "1fkazhw6gs191w789fnp6mwnxrx9p38b3kh5bngb1ir0zhkgghkq"; @@ -35,7 +35,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; license = licenses.lgpl3; diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index ac6dee4beaa3..d1b29e137df9 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, jre, pcsclite }: -let version = "4.1.9"; in stdenv.mkDerivation rec { name = "eid-viewer-${version}"; + version = "4.1.9"; src = fetchurl { url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz"; @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Belgian electronic identity card (eID) viewer"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; license = licenses.lgpl3; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index af28565f4661..cfac89237795 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl }: -let version = "1.5.7"; in stdenv.mkDerivation rec { name = "foremost-${version}"; + version = "1.5.7"; src = fetchurl { sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Recover files based on their contents"; longDescription = '' Foremost is a console program to recover files based on their headers, diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 9306b0e84cca..264dbf1eb279 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: -let version = "1.0.1"; in stdenv.mkDerivation rec { name = "gptfdisk-${version}"; + version = "1.0.1"; src = fetchurl { # http://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 4aba9f48b764..3d4fe6e18a24 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl }: -let version = "1.0.2"; in stdenv.mkDerivation rec { name = "suid-chroot-${version}"; + version = "1.0.2"; src = fetchurl { sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx"; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Setuid-safe wrapper for chroot"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 152a46cd50c4..7eb1c022a959 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub }: -let version = "0.4.8"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "aha-${version}"; + version = "0.4.8"; src = fetchFromGitHub { sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj"; @@ -16,7 +16,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - inherit version; description = "ANSI HTML Adapter"; longDescription = '' aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. -- cgit 1.4.1