diff options
author | Felix Buehler <account@buehler.rocks> | 2021-07-27 16:21:24 +0200 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-07-27 17:54:21 +0200 |
commit | 051fcdbe8b4070f4e6796cb5c27b0cc4456d2863 (patch) | |
tree | 7ea2eb757ad3a861b98a05524091f07eb945dd01 /pkgs/tools/system | |
parent | 5ecd15039104f7f91ac4f2eb2af93835df80b91e (diff) |
tools/{security/system}: replace name with pname&version
Diffstat (limited to 'pkgs/tools/system')
23 files changed, 67 insertions, 46 deletions
diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index fbe396f1fdf41..9a363eb8706e0 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.6.4"; + pname = "acct"; + version = "6.6.4"; src = fetchurl { - url = "mirror://gnu/acct/${name}.tar.gz"; + url = "mirror://gnu/acct/acct-${version}.tar.gz"; sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"; }; diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix index ac2fb338d3d2f..61be7e5a4a92e 100644 --- a/pkgs/tools/system/actkbd/default.nix +++ b/pkgs/tools/system/actkbd/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "actkbd-0.2.8"; + pname = "actkbd"; + version = "0.2.8"; src = fetchurl { - url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2"; + url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-${version}.tar.bz2"; sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm"; }; diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index 79bb3f79a998d..ddea8881ca704 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "bar-1.11.1"; +stdenv.mkDerivation rec { + pname = "bar"; + version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/project/clpbar/clpbar/bar-1.11.1/bar_1.11.1.tar.gz"; + url = "mirror://sourceforge/project/clpbar/clpbar/bar-${version}/bar_${version}.tar.gz"; sha256 = "00v5cb6vzizyyhflgr62d3k8dqc0rg6wdgfyyk11c0s0r32mw3zs"; }; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index d1b8d2d6afd9e..8f8421781e36f 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, vim, sendmailPath ? "/usr/sbin/sendmail"}: -stdenv.mkDerivation { - name = "cron-4.1"; +stdenv.mkDerivation rec { + pname = "cron"; + version = "4.1"; + src = fetchurl { - url = "ftp://ftp.isc.org/isc/cron/cron_4.1.shar"; + url = "ftp://ftp.isc.org/isc/cron/cron_${version}.shar"; sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index e5d5026e62909..7dc6e1fc12371 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dcfldd-1.3.4-1"; + pname = "dcfldd"; + version = "1.3.4-1"; src = fetchurl { - url = "mirror://sourceforge/dcfldd/${name}.tar.gz"; + url = "mirror://sourceforge/dcfldd/dcfldd-${version}.tar.gz"; sha256 = "1y6mwsvm75f5jzxsjjk0yhf8xnpmz6y8qvcxfandavx59lc3l57m"; }; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 7e96a4c01f7ce..6191947ac32fa 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ddrescue-1.25"; + pname = "ddrescue"; + version = "1.25"; src = fetchurl { - url = "mirror://gnu/ddrescue/${name}.tar.lz"; + url = "mirror://gnu/ddrescue/ddrescue-${version}.tar.lz"; sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf"; }; diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 6c8e9c56cdc97..41b28e6fca0d4 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -6,7 +6,6 @@ let in stdenv.mkDerivation rec { pname = "ddrescueview"; version = "${versionBase}${versionSuffix}"; - name = "ddrescueview-0.4alpha4"; src = fetchurl { name = "ddrescueview-${versionBase}${versionSuffix}.tar.xz"; diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 94a6b34ff53ef..4073034a9b920 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "dog-1.7"; +stdenv.mkDerivation rec { + pname = "dog"; + version = "1.7"; src = fetchurl { - url = "http://archive.debian.org/debian/pool/main/d/dog/dog_1.7.orig.tar.gz"; + url = "http://archive.debian.org/debian/pool/main/d/dog/dog_${version}.orig.tar.gz"; sha256 = "3ef25907ec5d1dfb0df94c9388c020b593fbe162d7aaa9bd08f35d2a125af056"; }; diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 4ad654783dfcd..e12fedd6eec99 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { - name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html + pname = "gnufdisk"; + version = "2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html src = fetchurl { - url = "mirror://gnu/fdisk/${name}.tar.gz"; + url = "mirror://gnu/fdisk/gnufdisk-${version}.tar.gz"; sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"; }; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index d9c639ab1c419..5fc242d533b8f 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, libxml2, intltool, gettext }: stdenv.mkDerivation rec { - name = "gdmap-0.8.1"; + pname = "gdmap"; + version = "0.8.1"; src = fetchurl { - url = "mirror://sourceforge/gdmap/${name}.tar.gz"; + url = "mirror://sourceforge/gdmap/gdmap-${version}.tar.gz"; sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index 374bcf0e31469..15b658c9916bd 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gt5-1.4.0"; + pname = "gt5"; + version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/gt5/${name}.tar.gz"; + url = "mirror://sourceforge/gt5/gt5-${version}.tar.gz"; sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq"; }; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index 5e9796396a9ce..f4de055a60a80 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "idle3-tools-0.9.1"; +stdenv.mkDerivation rec { + pname = "idle3-tools"; + version = "0.9.1"; src = fetchurl { - url = "mirror://sourceforge/idle3-tools/idle3-tools-0.9.1.tgz"; + url = "mirror://sourceforge/idle3-tools/idle3-tools-${version}.tgz"; sha256 = "00ia7xq9yldxyl9gz0mr4xa568nav14p0fnv82f2rbbkg060cy4p"; }; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index 2df4acba9b583..cc986d453569a 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchFromGitHub, bash }: stdenv.mkDerivation rec { - name = "incron-0.5.12"; + pname = "incron"; + version = "0.5.12"; src = fetchFromGitHub { owner = "ar-"; repo = "incron"; - rev = name; + rev = "${pname}-${version}"; sha256 = "11d5f98cjafiv9h9zzzrw2s06s2fvdg8gp64km7mdprd2xmy6dih"; }; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index e7d6130ffa603..416fab94ddc90 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }: let - pkgname = "ipmitool"; + pname = "ipmitool"; version = "1.8.18"; in stdenv.mkDerivation { - name = "${pkgname}-${version}"; + inherit pname version; src = fetchurl { - url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m"; }; diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/tools/system/loadwatch/default.nix index 80f808214bc19..722e5a9afde15 100644 --- a/pkgs/tools/system/loadwatch/default.nix +++ b/pkgs/tools/system/loadwatch/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, ... }: stdenv.mkDerivation { - name = "loadwatch-1.1-1-g6d2544c"; + pname = "loadwatch"; + version = "1.1-1-g6d2544c"; src = fetchgit { url = "git://woffs.de/git/fd/loadwatch.git"; sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 798e3b3e8831f..4c12c9eb27da1 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,7 +1,8 @@ { lib, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { - name = "localtime-2017-11-07"; + pname = "localtime"; + version = "2017-11-07"; src = fetchFromGitHub { owner = "Stebalien"; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index b8175b51483d2..485df4231ecfa 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, guile, which, ed, libtool }: stdenv.mkDerivation rec { - name = "mcron-1.0.6"; + pname = "mcron"; + version = "1.0.6"; src = fetchurl { - url = "mirror://gnu/mcron/${name}.tar.gz"; + url = "mirror://gnu/mcron/mcron-${version}.tar.gz"; sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy"; }; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 8a2a3406c3e88..9e176677c7610 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -6,10 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.27.2"; + pname = "monit"; + version = "5.27.2"; src = fetchurl { - url = "${meta.homepage}dist/${name}.tar.gz"; + url = "${meta.homepage}dist/monit-${version}.tar.gz"; sha256 = "sha256-2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw="; }; diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index d5fd86f231ab9..173de5f607fed 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: stdenv.mkDerivation { - name = "opencl-info-2014-02-21"; + pname = "opencl-info"; + version = "2014-02-21"; src = fetchFromGitHub { owner = "marchv"; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 8c017c42d7a38..95fd4f52c3935 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "pciutils-3.7.0"; # with release-date database + pname = "pciutils"; + version = "3.7.0"; # with release-date database src = fetchurl { - url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; + url = "mirror://kernel/software/utils/pciutils/pciutils-${version}.tar.xz"; sha256 = "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x"; }; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 9afb1933e17fb..685697f861ff0 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "rowhammer-test-20150811"; + pname = "rowhammer-test"; + version = "20150811"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 5533c9a57ff50..1c0bedff474e4 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "safecopy-1.7"; + pname = "safecopy"; + version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/project/safecopy/safecopy/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/safecopy/safecopy/safecopy-${version}/safecopy-${version}.tar.gz"; sha256 = "1zf4kk9r8za9pn4hzy1y3j02vrhl1rxfk5adyfq0w0k48xfyvys2"; }; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index d0084e1f4d8ae..31c58bbbaafb3 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.45"; + pname = "sg3_utils"; + version = "1.45"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/${name}.tgz"; + url = "http://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb"; }; |