diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/os-specific | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
download | nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2 nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/os-specific')
172 files changed, 222 insertions, 228 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 4d33fc0f3f8..ba5002c8c48 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -4,7 +4,7 @@ let # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { version = "10.12"; - name = "MacOS_SDK-${version}"; + pname = "MacOS_SDK"; # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by: # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix index 28dcbdcb4a2..6a0c819a0a3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/pure.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "551.1"; - name = "objc4-${version}"; + pname = "objc4"; src = fetchapplesource { inherit version; diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix index 9dd1205c114..12b35812651 100644 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, Carbon, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { - name = "chunkwm-${version}"; + pname = "chunkwm"; version = "0.4.9"; src = fetchzip { url = "http://github.com/koekeishiya/chunkwm/archive/v${version}.tar.gz"; diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index a9051fd1279..5c63b8e0dfb 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -2,7 +2,6 @@ stdenv.mkDerivation rec { pname = "duti"; - name = "${pname}-${version}"; version = "1.5.4pre"; src = fetchFromGitHub { owner = "moretension"; diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 190c0ae2213..e374bd2f11c 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "goku-${version}"; + pname = "goku"; version = "0.1.11"; src = fetchurl { diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index 3ff03aace4e..be855498307 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "iproute2mac-${version}"; + pname = "iproute2mac"; src = fetchFromGitHub { owner = "brona"; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index fb7bb12a493..90f92b0b644 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: stdenv.mkDerivation rec { - name = "khd-${version}"; + pname = "khd"; version = "3.0.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index 3076392ecb2..c3fa76f5096 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "kwm-${version}"; + pname = "kwm"; version = "4.0.5"; src = fetchzip { diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 0b59ecb2299..cb81c2e8149 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.0"; - name = "lsusb-${version}"; + pname = "lsusb"; src = fetchFromGitHub { owner = "jlhonora"; diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index 75f1113e9f0..12bf02bf89f 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "m-cli-${version}"; + pname = "m-cli"; version = "0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index 960e0677da1..23b5ded1fe6 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, icu, libuuid, tzdata }: stdenv.mkDerivation rec { - name = "opencflite-${version}"; + pname = "opencflite"; version = "476.19.0"; src = fetchurl { - url = "mirror://sourceforge/opencflite/${name}.tar.gz"; + url = "mirror://sourceforge/opencflite/${pname}-${version}.tar.gz"; sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; }; diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index 404e752c279..77e63c779b9 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -17,7 +17,6 @@ let in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "osxfuse"; inherit version; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index aa7bfb5c3be..19ab34145e8 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { - name = "qes-${version}"; + pname = "qes"; version = "0.0.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 631c59523e2..9f5f8aa4422 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "reattach-to-user-namespace-${version}"; + pname = "reattach-to-user-namespace"; version = "2.7"; src = fetchurl { diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index 713847313c2..ba5d3e9255b 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, Carbon }: stdenv.mkDerivation rec { - name = "skhd-${version}"; + pname = "skhd"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index b18c603a911..9efa230d3b7 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "smimesign-${version}"; + pname = "smimesign"; version = "v0.0.13"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index fcbcfe00a3e..50c6d4fd2f4 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "trash-${version}"; + pname = "trash"; src = fetchFromGitHub { owner = "ali-rantakari"; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 37de98780b6..cc7317f5520 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpi-${version}"; + pname = "acpi"; version = "1.7"; src = fetchurl { - url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/acpiclient/${version}/${pname}-${version}.tar.gz"; sha256 = "01ahldvf0gc29dmbd5zi4rrnrw2i1ajnf30sx2vyaski3jv099fp"; }; diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 14b10e6752b..743e8f3576b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -3,11 +3,11 @@ # some use gtk2, some gtk3 (and some even fltk13). stdenv.mkDerivation rec { - name = "alsa-tools-${version}"; + pname = "alsa-tools"; version = "1.1.7"; src = fetchurl { - url = "mirror://alsa/tools/${name}.tar.bz2"; + url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; }; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 09c430bcd53..6f23d190318 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}: stdenv.mkDerivation rec { - name = "alsa-utils-${version}"; + pname = "alsa-utils"; version = "1.1.9"; src = fetchurl { - url = "mirror://alsa/utils/${name}.tar.bz2"; + url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; sha256 = "0fi11b7r8hg1bdjw74s8sqx8rc4qb310jaj9lsia9labvfyjrpsx"; }; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b03636d6f7f..aed0ed374a7 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -5,7 +5,7 @@ # services.udev.packages = [ pkgs.android-udev-rules ]; stdenv.mkDerivation rec { - name = "android-udev-rules-${version}"; + pname = "android-udev-rules"; version = "20190315"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 5d002bf72ea..5144add3a37 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; - name = "atop-${version}"; + pname = "atop"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index a2ebc0cdc53..7f5cd206f32 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "bpftrace-${version}"; + pname = "bpftrace"; version = "0.9.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index d77539fb89e..44c2cfff5a2 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cachefilesd-${version}"; + pname = "cachefilesd"; version = "0.10.10"; src = fetchurl { - url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2"; sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd"; }; diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 0c32c3f5e62..0149398bfa3 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -1,7 +1,7 @@ { stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "can-isotp-${version}"; + pname = "can-isotp"; version = "20180629"; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 616c99c8f46..7913c703b5b 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "can-utils-${version}"; + pname = "can-utils"; # There are no releases (source archives or git tags), so use the date of the # latest commit in git master as version number. version = "20170830"; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 674b695b1ee..b724112af88 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, flex, libsepol }: stdenv.mkDerivation rec { - name = "checkpolicy-${version}"; + pname = "checkpolicy"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index ba66bd309bc..ea6a6e77572 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -2,11 +2,11 @@ , kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { - name = "cifs-utils-${version}"; + pname = "cifs-utils"; version = "6.9"; src = fetchurl { - url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; + url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2"; sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q"; }; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 1af37c2168d..ad30f52d145 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,7 +67,7 @@ assert journalSupport -> systemd != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "conky-${version}"; + pname = "conky"; version = "1.11.3"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 755e88b46cb..20c441ffae2 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -3,11 +3,11 @@ , libnetfilter_cthelper, systemd }: stdenv.mkDerivation rec { - name = "conntrack-tools-${version}"; + pname = "conntrack-tools"; version = "1.4.5"; src = fetchurl { - url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; }; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index d813376da8e..8ea3e3445cc 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "linuxconsoletools-${version}"; + pname = "linuxconsoletools"; version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2"; + url = "mirror://sourceforge/linuxconsole/${pname}-${version}.tar.bz2"; sha256 = "0d2r3j916fl2y7pk1y82b9fvbr10dgs1gw7rqwzfpispdidb1mp9"; }; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 940913d6a6c..84c113c648c 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }: stdenv.mkDerivation rec { - name = "crda-${version}"; + pname = "crda"; version = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 0821fbdc15c..354eea40b24 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -3,11 +3,11 @@ , which, python, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "criu-${version}"; + pname = "criu"; version = "3.12"; src = fetchurl { - url = "https://download.openvz.org/criu/${name}.tar.bz2"; + url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; sha256 = "1z0fpym8fi2jqx99himqs8pm5l4mzrswjqxcyfwjmbabzb77dwhf"; }; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 82b0bb2f356..5f5005d8b97 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -2,7 +2,7 @@ , dbus, linuxHeaders, systemd }: stdenv.mkDerivation rec { - name = "dbus-broker-${version}"; + pname = "dbus-broker"; version = "21"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index e8c1e9bfe5e..5896262ac21 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation rec { - name = "directvnc-${version}"; + pname = "directvnc"; version = "0.7.7.2015-04-16"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 2ea939ccdb0..7ce5535313c 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -10,7 +10,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ]; in stdenv.mkDerivation rec { - name = "displaylink-${version}"; + pname = "displaylink"; version = "4.4.24"; src = requireFile rec { diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 534e5735447..1d67b16a492 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bash, perl, python }: stdenv.mkDerivation rec { - name = "dmtcp-${version}"; + pname = "dmtcp"; version = "2.5.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 936dbf719a8..f5b7e44a3fb 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "dropwatch"; version = "1.5"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "nhorman"; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index 9d92575b668..23bd39ff388 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ebtables-${version}"; + pname = "ebtables"; version = "2.0.10-4"; src = fetchurl { diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 0e8377141ed..55f42f3e3ff 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip, ncurses }: stdenv.mkDerivation rec { - name = "eventstat-${version}"; + pname = "eventstat"; version = "0.04.06"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 28a92d31eaa..6aaaaec1b13 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "extrace-${version}"; + pname = "extrace"; version = "0.7"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 94ea85f433d..b99f719f836 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3, which }: stdenv.mkDerivation rec { - name = "fatrace-${version}"; + pname = "fatrace"; version = "0.13"; src = fetchurl { - url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/fatrace/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0hrh45bpzncw0jkxw3x2smh748r65k2yxvfai466043bi5q0d2vx"; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 2637beb517a..959c0c74618 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, b43FirmwareCutter }: stdenv.mkDerivation rec { - name = "b43-firmware-${version}"; + pname = "b43-firmware"; version = "6.30.163.46"; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index a57a6f1d70f..4d5271a9ddf 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -4,7 +4,7 @@ # this packages as they expect the firmware to be named "BCM.hcd" # see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865 stdenv.mkDerivation rec { - name = "broadcom-bt-firmware-${version}"; + pname = "broadcom-bt-firmware"; version = "12.0.1.1012"; src = fetchurl { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract bt-fw-converter ]; unpackCmd = '' - mkdir -p ${name} - cabextract $src --directory ${name} + mkdir -p ${pname}-${version} + cabextract $src --directory ${pname}-${version} ''; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix index 8927e1a28e7..9a99881be46 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages, bluez }: stdenv.mkDerivation rec { - name = "bt-fw-converter-${version}"; + pname = "bt-fw-converter"; version = "2017-02-19"; rev = "2d8b34402df01c6f7f4b8622de9e8b82fadf4153"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl perlPackages.RegexpGrammars bluez ]; unpackCmd = '' - mkdir -p ${name} - cp $src ${name}/bt-fw-converter.pl + mkdir -p ${pname}-${version} + cp $src ${pname}-${version}/bt-fw-converter.pl ''; installPhase = '' diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index c251e3963e7..380444f0269 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "firmware-linux-nonfree-${version}"; + pname = "firmware-linux-nonfree"; version = "2019-07-17"; src = fetchgit { diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index b60ce6f1b4a..421a3300f7b 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openelec-dvb-firmware-${version}"; + pname = "openelec-dvb-firmware"; version = "0.0.51"; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index e64c4c09ebd..26ed2020635 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "raspberrypi-wireless-firmware-${version}"; + pname = "raspberrypi-wireless-firmware"; version = "2018-08-20"; srcs = [ diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 4685f675717..321ce8ffc06 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "raspberrypi-tools-${version}"; + pname = "raspberrypi-tools"; version = "2018-10-03"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 0a6364f07df..0abd458aa8f 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "flashbench-${version}"; + pname = "flashbench"; version = "2012-06-06"; src = fetchgit { diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 5b398bcec9a..4ebb9d6e950 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "fnotifystat-${version}"; + pname = "fnotifystat"; version = "0.02.02"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index 8432f72e0c9..adcab03ac13 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "forkstat-${version}"; + pname = "forkstat"; version = "0.02.10"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index a091b2f17c5..09774016ef2 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { inherit (kernel) version src; - name = "freefall-${version}"; + pname = "freefall"; postPatch = '' cd tools/laptop/freefall diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index da787d84d79..35e1972b574 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -3,7 +3,7 @@ # Don't use this for anything important yet! buildGoPackage rec { - name = "fscrypt-${version}"; + pname = "fscrypt"; version = "0.2.4"; goPackagePath = "github.com/google/fscrypt"; diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix index 8622dc001a8..ecab0350d78 100644 --- a/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/pkgs/os-specific/linux/fscryptctl/default.nix @@ -3,7 +3,7 @@ # Don't use this for anything important yet! stdenv.mkDerivation rec { - name = "fscryptctl-unstable-${version}"; + pname = "fscryptctl-unstable"; version = "2017-10-23"; goPackagePath = "github.com/google/fscrypt"; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 915431c0cb1..4d283d5dc0c 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ftop-${version}"; + pname = "ftop"; version = "1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${name}.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ftop/${pname}-${version}.tar.bz2"; sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; }; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 4531de86b1b..07252b8bc31 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -2,7 +2,7 @@ , json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { - name = "fwts-${version}"; + pname = "fwts"; version = "19.07.00"; src = fetchzip { diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/os-specific/linux/gfxtablet/default.nix index 9fc052c5ac1..56fa4f1d7d6 100644 --- a/pkgs/os-specific/linux/gfxtablet/default.nix +++ b/pkgs/os-specific/linux/gfxtablet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4"; - name = "gfxtablet-uinput-driver-${version}"; + pname = "gfxtablet-uinput-driver"; buildInputs = [ linuxHeaders diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index fc308285dd6..03018c98818 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }: stdenv.mkDerivation rec { - name = "google-authenticator-libpam-${version}"; + pname = "google-authenticator-libpam"; version = "1.06"; src = fetchurl { diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix index d56253c6ced..0325461763a 100644 --- a/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gpu-switch-unstable-${version}"; + pname = "gpu-switch-unstable"; version = "2017-04-28"; src = fetchFromGitHub { owner = "0xbb"; diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix index 7f64ed22771..bea70da995b 100644 --- a/pkgs/os-specific/linux/gradm/default.nix +++ b/pkgs/os-specific/linux/gradm/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gradm-${version}"; + pname = "gradm"; version = "3.1-201608131257"; src = fetchurl { - url = "http://grsecurity.net/stable/${name}.tar.gz"; + url = "http://grsecurity.net/stable/${pname}-${version}.tar.gz"; sha256 = "0y5565rhil5ciprwz7nx4s4ah7dsxx7zrkg42dbq0mcg8m316xrb"; }; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index acafa0376f5..8e6db2a5774 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -6,7 +6,7 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { version = "2.0.6"; - name = "guvcview-${version}"; + pname = "guvcview"; src = fetchurl { url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 7629a20473b..e90470cd589 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: stdenv.mkDerivation rec { - name = "hostapd-${version}"; + pname = "hostapd"; version = "2.8"; src = fetchurl { - url = "https://w1.fi/releases/${name}.tar.gz"; + url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; sha256 = "1c74rrazkhy4lr7pwgwa2igzca7h9l4brrs7672kiv7fwqmm57wj"; }; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index dfca87e2716..38335682ddb 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "hwdata-${version}"; + pname = "hwdata"; version = "0.316"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index f89747dc200..36ca1eb16b4 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -2,7 +2,7 @@ let daemons = stdenv.mkDerivation rec { - name = "hyperv-daemons-bin-${version}"; + pname = "hyperv-daemons-bin"; inherit (kernel) src version; nativeBuildInputs = [ makeWrapper ]; @@ -55,7 +55,7 @@ let ''; in stdenv.mkDerivation rec { - name = "hyperv-daemons-${version}"; + pname = "hyperv-daemons"; inherit (kernel) version; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 5b061183356..1b87619faa3 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, read-edid }: stdenv.mkDerivation rec { - name = "i2c-tools-${version}"; + pname = "i2c-tools"; version = "4.1"; src = fetchurl { - url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz"; + url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp"; }; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index ac5f9fc5ba3..2f792cb7ea7 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -2,7 +2,7 @@ , withGui ? false, qtbase }: stdenv.mkDerivation rec { - name = "i7z-${version}"; + pname = "i7z"; version = "0.27.3"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/os-specific/linux/ifenslave/default.nix index b9390d1d589..1b22c1eafd3 100644 --- a/pkgs/os-specific/linux/ifenslave/default.nix +++ b/pkgs/os-specific/linux/ifenslave/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifenslave-${version}"; + pname = "ifenslave"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 6de3b19afd7..69ec6560d83 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "ima-evm-utils-${version}"; + pname = "ima-evm-utils"; version = "1.1"; src = fetchgit { diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index cd0fc01384b..c6248ee9083 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation rec { - name = "input-utils-${version}"; + pname = "input-utils"; version = "1.3"; src = fetchurl { diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 38069981723..1f67208db8b 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, rpmextract, ncurses5, numactl, zlib }: stdenv.mkDerivation rec { - name = "intel-ocl-${version}"; + pname = "intel-ocl"; version = "5.0-63503"; src = fetchzip { diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index a9be26a2026..5a0555f6680 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libnetfilter_conntrack, ncurses }: stdenv.mkDerivation rec { - name = "iptstate-${version}"; + pname = "iptstate"; version = "2.2.6"; src = fetchurl { - url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"; }; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index 67a123a3764..f5d80dc5258 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }: stdenv.mkDerivation rec { - name = "ipvsadm-${version}"; + pname = "ipvsadm"; version = "1.30"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/ipvsadm/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz"; sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm"; }; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index e606e3db6ee..8dc9e2694d4 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { - name = "irqbalance-${version}"; + pname = "irqbalance"; version = "1.6.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index a37e65f8cb5..3386a7f9206 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "kbd-${version}"; + pname = "kbd"; version = "2.0.4"; src = fetchurl { - url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; }; diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix index 32c9f690680..e6e89811894 100644 --- a/pkgs/os-specific/linux/kbd/keymaps.nix +++ b/pkgs/os-specific/linux/kbd/keymaps.nix @@ -2,7 +2,7 @@ { dvp = stdenv.mkDerivation rec { - name = "dvp-${version}"; + pname = "dvp"; version = "1.2.1"; src = fetchurl { @@ -19,7 +19,7 @@ }; neo = stdenv.mkDerivation rec { - name = "neo-${version}"; + pname = "neo"; version = "2476"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 44a63c9f1ec..6df3e4fffe7 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "kbdlight-${version}"; + pname = "kbdlight"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 8adb862a265..326afdfff46 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "kexec-tools-${version}"; + pname = "kexec-tools"; version = "2.0.19"; src = fetchurl { urls = [ - "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" - "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" + "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz" + "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz" ]; sha256 = "03jyi4c47ywclycf3a253xpqs7p6ys8inz9q66b8m3xc6nrh307d"; }; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 1d9497a7edd..7d6ee61030c 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "keyutils-${version}"; + pname = "keyutils"; version = "1.6"; src = fetchurl { - url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/keyutils/${pname}-${version}.tar.bz2"; sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"; }; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 8cae61d56a9..8e224c8f33b 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { - name = "klibc-${version}"; + pname = "klibc"; version = "2.0.4"; src = fetchurl { diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 949c8135df7..fef7a3236b3 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.3.110"; - name = "libaio-${version}"; + pname = "libaio"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz"; + url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz"; sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0"; }; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index a23c0cb0926..1294bd3d268 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -5,7 +5,7 @@ with builtins; stdenv.mkDerivation rec { - name = "libbpf-${version}"; + pname = "libbpf"; version = "0.0.3pre114_${substring 0 7 src.rev}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 981e928ba65..d0fc97d0dd3 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -3,13 +3,13 @@ assert python2 != null || python3 != null -> swig != null; stdenv.mkDerivation rec { - name = "libcap-ng-${version}"; + pname = "libcap-ng"; # When updating make sure to test that the version with # all of the python bindings still works version = "0.7.9"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; + url = "${meta.homepage}/${pname}-${version}.tar.gz"; sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa"; }; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 87f354aa75d..9c730bb9659 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, attr, perl, pam }: stdenv.mkDerivation rec { - name = "libcap-${version}"; + pname = "libcap"; version = "2.27"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${name}.tar.xz"; + url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; }; @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { postInstall = '' rm "$lib"/lib/*.a - mkdir -p "$doc/share/doc/${name}" - cp License "$doc/share/doc/${name}/" + mkdir -p "$doc/share/doc/${pname}-${version}" + cp License "$doc/share/doc/${pname}-${version}/" '' + stdenv.lib.optionalString (pam != null) '' mkdir -p "$pam/lib/security" mv "$lib"/lib/security "$pam/lib" diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 1e920247a75..026b43fc615 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, pam, yacc, flex }: stdenv.mkDerivation rec { - name = "libcgroup-${version}"; + pname = "libcgroup"; version = "0.41"; src = fetchurl { - url = "mirror://sourceforge/libcg/${name}.tar.bz2"; + url = "mirror://sourceforge/libcg/${pname}-${version}.tar.bz2"; sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4"; }; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 34d10d3aa5f..0789d53b434 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -2,7 +2,7 @@ , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, swig ? null, python}: stdenv.mkDerivation rec { - name = "libnl-${version}"; + pname = "libnl"; version = "3.4.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 5dab4b34f46..a09bb2a6ceb 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -2,7 +2,7 @@ , glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }: stdenv.mkDerivation rec { - name = "libratbag-${version}"; + pname = "libratbag"; version = "0.9.905"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 51e1a322094..028c008eccf 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -8,7 +8,7 @@ assert enablePython -> swig != null && python != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "libselinux-${version}"; + pname = "libselinux"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 59f5f11d076..4fe323ee23d 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libsemanage-${version}"; + pname = "libsemanage"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f16c241a0a1..e96ea01cce4 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - name = "libsepol-${version}"; + pname = "libsepol"; version = "2.7"; se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 874faf7799b..d0ae1852853 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { - name = "libsmbios-${version}"; + pname = "libsmbios"; version = "2.4.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix index c0c6ad54579..ecdc658f2f1 100644 --- a/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { - name = "libudev0-shim-${version}"; + pname = "libudev0-shim"; version = "1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index 879e85a0c94..5cccc82b843 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { pname = "libwebcam"; version = "0.2.5"; - name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/source/${pname}-src-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 1856c8861cc..6a0dd34d021 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2"; - name = "light-${version}"; + pname = "light"; src = fetchFromGitHub { owner = "haikarainen"; repo = "light"; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 0536ba064a3..b9e58cb5a4c 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -5,7 +5,7 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { - name = "lm-sensors-${version}"; + pname = "lm-sensors"; version = "3.5.0"; src = fetchzip { diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 3c7ceb1270c..74abd12868d 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lockdep-${version}"; + pname = "lockdep"; version = "4.1.2"; fullver = "4.1.2"; diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix index c215d940194..9aa1698b766 100644 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -4,7 +4,7 @@ # up-to-date so we simply use that instead of having to maintain our own rules stdenv.mkDerivation rec { - name = "logitech-udev-rules-${version}"; + pname = "logitech-udev-rules"; inherit (solaar) version; buildCommand = '' diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index a61d8574cc0..5928b77a988 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-${version}"; + pname = "lxc"; version = "3.2.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index c335031f2e5..ec76cda9769 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, texinfo }: stdenv.mkDerivation rec { - name = "macchanger-${version}"; + pname = "macchanger"; version = "1.7.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 9528b9be7f7..8b62ce76409 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "mbpfan-${version}"; + pname = "mbpfan"; version = "2.1.1"; src = fetchFromGitHub { owner = "dgraziotin"; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 394dbf63f17..659f875bc2b 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, utillinux }: stdenv.mkDerivation rec { - name = "mcelog-${version}"; + pname = "mcelog"; version = "162"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index 485272b1401..c81a0c9097a 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, autoreconfHook }: stdenv.mkDerivation rec { - name = "iucode-tool-${version}"; + pname = "iucode-tool"; version = "2.3.1"; src = fetchFromGitLab { diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index b65486cb2fe..0edf322cce5 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -2,7 +2,7 @@ , glib, readline, pcre, systemd, udev }: stdenv.mkDerivation rec { - name = "miraclecast-${version}"; + pname = "miraclecast"; version = "1.0-20190403"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 533cd90a2d3..a7f0a332beb 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "mmc-utils-${version}"; + pname = "mmc-utils"; version = "2018-03-27"; src = fetchgit { diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index ac083e545fe..766c01eed3f 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, busybox, systemd }: stdenv.mkDerivation rec { - name = "molly-guard-${version}"; + pname = "molly-guard"; version = "0.6.3"; src = fetchurl { diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix index 128f3eac263..f7b81bd3915 100644 --- a/pkgs/os-specific/linux/msr-tools/default.nix +++ b/pkgs/os-specific/linux/msr-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "msr-tools-${version}"; + pname = "msr-tools"; version = "1.3"; src = fetchurl { - url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip"; + url = "https://01.org/sites/default/files/downloads/msr-tools/${pname}-${version}.zip"; sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr"; }; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 078f894f73e..afe07a5c4db 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }: stdenv.mkDerivation rec { - name = "multipath-tools-${version}"; + pname = "multipath-tools"; version = "0.8.2"; src = fetchurl { - name = "${name}.tar.gz"; + name = "${pname}-${version}.tar.gz"; url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz"; sha256 = "0x6cjlb9mjrmpaqk5v6v47qz6n9zyqmw13i7pq5x6ppwyqdxhn5s"; }; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 42f745b02e3..3cd8f224ce4 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "net-tools-${version}"; + pname = "net-tools"; version = "1.60_p20170221182432"; src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.xz"; + url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; }; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 7984e357c82..fd8c42c9be7 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "nfs-utils-${version}"; + pname = "nfs-utils"; version = "2.3.4"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; + url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq"; }; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index b4878ff4eac..87ae0cc1e26 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "0.9.0"; - name = "nftables-${version}"; + pname = "nftables"; src = fetchurl { - url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; }; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 5f425c9685c..cb6dd4ab946 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, ncurses }: stdenv.mkDerivation rec { - name = "nmon-${version}"; + pname = "nmon"; version = "16k"; src = fetchurl { diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 2db2e12bb96..4417ffb569b 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "numactl-${version}"; + pname = "numactl"; version = "2.0.12"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 4bf1e41bd57..4194a679698 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nvme-cli-${version}"; + pname = "nvme-cli"; version = "1.8.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index bead5f84eac..4040d70260c 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "odp-dpdk-${version}"; + pname = "odp-dpdk"; version = "1.19.0.0_DPDK_17.11"; src = fetchurl { - url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz"; + url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px"; }; diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 93cf33979f4..70f46519375 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ofp-${version}"; + pname = "ofp"; version = "2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index a2644fcbc3f..274e960a89b 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "open-iscsi-${version}"; + pname = "open-iscsi"; version = "2.0.877"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 21d32af3ba8..7b34c1029ba 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -1,7 +1,7 @@ { stdenv, openssl, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "open-isns-${version}"; + pname = "open-isns"; version = "0.99"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index a2a272f1b3a..bf26b9e2b28 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,10 +8,10 @@ let _kernel = kernel; in stdenv.mkDerivation rec { version = "2.5.4"; - name = "openvswitch-${version}"; + pname = "openvswitch"; src = fetchurl { - url = "http://openvswitch.org/releases/${name}.tar.gz"; + url = "http://openvswitch.org/releases/${pname}-${version}.tar.gz"; sha256 = "1lji87wg953lqcdf02f1zv2m54vhd2x9jd03bb91lnlb4qlhifiv"; }; diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index e1525a951a9..5d7357cb838 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "pagemon-${version}"; + pname = "pagemon"; version = "0.01.16"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1f2a7d3edf2..d1a035d7448 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4 }: stdenv.mkDerivation rec { - name = "linux-pam-${version}"; + pname = "linux-pam"; version = "1.3.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index 10856bb52c9..a1c91516ce0 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }: stdenv.mkDerivation rec { - name = "pam_pgsql-${version}"; + pname = "pam_pgsql"; version = "0.7.3.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 72846e185eb..6e9ab379dbc 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libu2f-host, libu2f-server, pam }: stdenv.mkDerivation rec { - name = "pam_u2f-${version}"; + pname = "pam_u2f"; version = "1.0.8"; src = fetchurl { - url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; sha256 = "16awjzx348imjz141fzzldy00qpdmw2g37rnq430w5mnzak078jj"; }; diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 8fdd2356c30..754f6bcac33 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { - name = "paxctl-${version}"; + pname = "paxctl"; version = "0.9"; src = fetchurl { - url = "https://pax.grsecurity.net/${name}.tar.gz"; + url = "https://pax.grsecurity.net/${pname}-${version}.tar.gz"; sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index c1500e51ac3..e01f84576ce 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, paxctl }: stdenv.mkDerivation rec { - name = "paxtest-${version}"; + pname = "paxtest"; version = "0.9.15"; src = fetchurl { - url = "https://www.grsecurity.net/~spender/${name}.tar.gz"; + url = "https://www.grsecurity.net/~spender/${pname}-${version}.tar.gz"; sha256 = "0zv6vlaszlik98gj9200sv0irvfzrvjn46rnr2v2m37x66288lym"; }; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 6365175290a..9b9e563f803 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "201902"; - name = "pcm-${version}"; + pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index 1155a793b01..f3e63133d1e 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python, wafHook }: stdenv.mkDerivation rec { - name = "pflask-${version}"; + pname = "pflask"; version = "git-2015-12-17"; rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 523f7382a2c..62aa18fa643 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "pipework-${version}"; + pname = "pipework"; version = "2017-08-22"; src = fetchFromGitHub { owner = "jpetazzo"; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index a7bb4a81510..0d92c7c6909 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -16,7 +16,7 @@ let }; in stdenv.mkDerivation rec { - name = "pktgen-${version}"; + pname = "pktgen"; version = "3.5.0"; src = fetchurl { diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 2092a50041f..b074c6d7244 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "plymouth-${version}"; + pname = "plymouth"; version = "0.9.4"; src = fetchurl { - url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/plymouth/releases/${pname}-${version}.tar.xz"; sha256 = "0l8kg7b2vfxgz9gnrn0v2w4jvysj2cirp0nxads5sy05397pl6aa"; }; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index cd0e277b2c6..0981a0b5a4b 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -8,7 +8,7 @@ assert stdenv.lib.hasSuffix "/" mediaDir; stdenv.mkDerivation rec { - name = "pmount-${version}"; + pname = "pmount"; version = "0.9.23"; src = fetchurl { diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index a7cac46ae6a..fb507d4da48 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gettext, libsepol, libselinux, libsemanage }: stdenv.mkDerivation rec { - name = "policycoreutils-${version}"; + pname = "policycoreutils"; version = "2.7"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 1a4919a5d9d..3daab3917e8 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { version = "${prl_major}.2.1-41615"; prl_major = "12"; - name = "prl-tools-${version}"; + pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index aa7d0ec4604..0185d3022bc 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { - name = "procdump-${version}"; + pname = "procdump"; version = "1.0.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 1ed85bc94cb..1f39a99ea0b 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "procps-${version}"; + pname = "procps"; version = "3.3.15"; # The project's releases are on SF, but git repo on gitlab. diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index b6c16948339..844ce769aea 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }: stdenv.mkDerivation rec { - name = "pscircle-${version}"; + pname = "pscircle"; version = "1.3.0"; src = fetchFromGitLab { diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 68e51afdf1b..413b7d5dcbd 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "psmisc"; version = "23.2"; - name = "${pname}-${version}"; src = fetchFromGitLab { owner = pname; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index 36ad73c48d6..c013a0107ea 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -2,7 +2,7 @@ , ncurses, libdrm, libpciaccess, libxcb }: stdenv.mkDerivation rec { - name = "radeontop-${version}"; + pname = "radeontop"; version = "2019-06-03"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 3e57bbc11bd..815005ae290 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, cmake, libx86 }: stdenv.mkDerivation rec { - name = "read-edid-${version}"; + pname = "read-edid"; version = "3.0.2"; src = fetchurl { - url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz"; + url = "http://www.polypux.org/projects/read-edid/${pname}-${version}.tar.gz"; sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; }; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index bd25dc65ec8..c078fb18c4e 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; - name = "reptyr-${version}"; + pname = "reptyr"; src = fetchFromGitHub { owner = "nelhage"; diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 8c7b75a881f..b1afbfea0de 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: stdenv.mkDerivation rec { - name = "rewritefs-${version}"; + pname = "rewritefs"; version = "2017-08-14"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index ecaa4e89d49..1f5b31d0deb 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "roccat-tools-${version}"; + pname = "roccat-tools"; version = "5.9.0"; src = fetchurl { - url = "mirror://sourceforge/roccat/${name}.tar.bz2"; + url = "mirror://sourceforge/roccat/${pname}-${version}.tar.bz2"; sha256 = "12j02rzbz3iqxprz8cj4kcfcdgnqlva142ci177axqmckcq6crvg"; }; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index b29b1f639cf..447f9127d60 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -5,7 +5,7 @@ with lib; let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi"; in stdenv.mkDerivation rec { - name = "rtlwifi_new-${version}"; + pname = "rtlwifi_new"; version = "2018-02-17"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index 2c02ef924c3..316c9800079 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "schedtool-${version}"; + pname = "schedtool"; version = "1.3.0"; src = fetchFromGitHub { owner = "freequaos"; repo = "schedtool"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp"; }; diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index a8d5112c63b..5517f163b3e 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "sdparm-${version}"; + pname = "sdparm"; version = "1.10"; src = fetchurl { - url = "http://sg.danny.cz/sg/p/${name}.tar.xz"; + url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz"; sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx"; }; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 527c94de46b..b8f80a0124c 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; with python3.pkgs; stdenv.mkDerivation rec { - name = "selinux-python-${version}"; + pname = "selinux-python"; version = "2.7"; se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 71d2ee6e80a..99bbfbe7287 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; with python3.pkgs; stdenv.mkDerivation rec { - name = "selinux-sandbox-${version}"; + pname = "selinux-sandbox"; version = "2.7"; se_release = "20170804"; diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix index 10ba1a3c7d0..178d102381e 100644 --- a/pkgs/os-specific/linux/semodule-utils/default.nix +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libsepol }: stdenv.mkDerivation rec { - name = "semodule-utils-${version}"; + pname = "semodule-utils"; version = "2.7"; inherit (libsepol) se_release se_url; src = fetchurl { - url = "${se_url}/${se_release}/${name}.tar.gz"; + url = "${se_url}/${se_release}/${pname}-${version}.tar.gz"; sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; }; diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix index 4067e5f70e2..53250b345e8 100644 --- a/pkgs/os-specific/linux/sepolgen/default.nix +++ b/pkgs/os-specific/linux/sepolgen/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libsepol, python }: stdenv.mkDerivation rec { - name = "sepolgen-${version}"; + pname = "sepolgen"; version = "1.2.2"; inherit (libsepol) se_release se_url; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 6b808f0d6a6..ccc0df59d10 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "shadow-${version}"; + pname = "shadow"; version = "4.6"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index de12b3719af..f40652922d8 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "smem-${version}"; + pname = "smem"; version = "1.5"; src = fetchurl { diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index 55336e3b2a0..15520b236be 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "smemstat-${version}"; + pname = "smemstat"; version = "0.02.04"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index 449edf481a9..6f2e6306003 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "speedometer-${version}"; + pname = "speedometer"; version = "2.8"; src = fetchurl { diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 80c5c1f650b..3dbdb99549a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -11,11 +11,11 @@ let docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in stdenv.mkDerivation rec { - name = "sssd-${version}"; + pname = "sssd"; version = "1.16.4"; src = fetchurl { - url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; + url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz"; sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index c7543aee933..db362613d37 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "syscall_limiter-${version}"; + pname = "syscall_limiter"; version = "2017-01-23"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index cf1f2f242f4..ce2bd1fa99f 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sysdig-${version}"; + pname = "sysdig"; version = "0.26.2"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index b7f1af618fe..45f4d60e4e3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "242"; - name = "systemd-${version}"; + pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 5df7bb827aa..309d69ebad5 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -4,7 +4,7 @@ let vanillaVersion = "7.6.q"; patchLevel = "26"; in stdenv.mkDerivation rec { - name = "tcp-wrappers-${version}"; + pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; src = fetchurl { diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index faf47c96a5e..299ac8ad220 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "thunderbolt-${version}"; + pname = "thunderbolt"; version = "0.9.3"; src = fetchFromGitHub { owner = "01org"; diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index 3c833de8b0c..47b89f138c5 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }: stdenv.mkDerivation rec { - name = "tiptop-${version}"; + pname = "tiptop"; version = "2.3.1"; src = fetchurl { - url = "${meta.homepage}/releases/${name}.tar.gz"; + url = "${meta.homepage}/releases/${pname}-${version}.tar.gz"; sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index 53b6cbc3401..dfcf4c9937b 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { pname = "tiscamera"; version = "0.9.1"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "TheImagingSource"; repo = pname; - rev = "v-${name}"; + rev = "v-${pname}-${version}"; sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87"; }; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 880fd61ec2c..9fde8406024 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "tomb-${version}"; + pname = "tomb"; version = "2.6"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index b4e584f2979..bb6d51669e6 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -2,7 +2,7 @@ # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { - name = "tpacpi-bat-${version}"; + pname = "tpacpi-bat"; version = "3.1"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 3133602b44e..e6571b46ee0 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }: stdenv.mkDerivation rec { - name = "trace-cmd-${version}"; + pname = "trace-cmd"; version = "2.8.3"; src = fetchgit (import ./src.nix); diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index 739bd447192..d4f83eb8caf 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "untie-${version}"; + pname = "untie"; version = "0.3"; src = fetchurl { - url = "http://guichaz.free.fr/untie/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/untie/files/${pname}-${version}.tar.bz2"; sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m"; }; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 3df0023bd67..64d18fe075a 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -13,12 +13,12 @@ assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { version = "0.7.4"; - name = "usbguard-${version}"; + pname = "usbguard"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { - url = "${repo}/releases/download/${name}/${name}.tar.gz"; + url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k"; }; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index 1a40ec50c99..19f59d00680 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.3.0"; - name = "uvcdynctrl-${version}"; + pname = "uvcdynctrl"; src = fetchFromGitHub { owner = "cshorler"; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index ede9fa68280..9bb6fcdd0a0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -7,11 +7,11 @@ # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) mkDerivation rec { - name = "v4l-utils-${version}"; + pname = "v4l-utils"; version = "1.16.6"; src = fetchurl { - url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/v4l-utils/${pname}-${version}.tar.bz2"; sha256 = "1bkqlrizx0j2rd6ybam2x17bjrpwzl4v4szmnzm3cmixis3w3npr"; }; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 02e08bec7ad..570eb4ca4ef 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast kernel.version "3.10"; stdenv.mkDerivation rec { - name = "wireguard-${version}"; + pname = "wireguard"; inherit (wireguard-tools) src version; preConfigure = '' diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 61f48758676..935b1635e29 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -6,10 +6,10 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "2.8"; - name = "wpa_supplicant-${version}"; + pname = "wpa_supplicant"; src = fetchurl { - url = "https://w1.fi/releases/${name}.tar.gz"; + url = "https://w1.fi/releases/${pname}-${version}.tar.gz"; sha256 = "15ixzm347n8w6gdvi3j3yks3i15qmp6by9ayvswm34d929m372d6"; }; diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 7911a2172ba..1c2aaa8ee01 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.30"; - name = "x86info-${version}"; + pname = "x86info"; src = fetchurl { - url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz"; + url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz"; sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; }; diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix index 5f7bca097bf..440a797a723 100644 --- a/pkgs/os-specific/linux/xsensors/default.nix +++ b/pkgs/os-specific/linux/xsensors/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }: stdenv.mkDerivation rec { - name = "xsensors-${version}"; + pname = "xsensors"; version = "0.70"; src = fetchurl { url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz"; diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 3738760bb29..a6c74d029c5 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -5,7 +5,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "cygwin-setup-${version}"; + pname = "cygwin-setup"; version = "20131101"; src = fetchcvs { |