summaryrefslogtreecommitdiffstats
path: root/pkgs/misc
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-15 12:41:18 +0000
committerJörg Thalheim <Mic92@users.noreply.github.com>2019-08-15 13:41:18 +0100
commit46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch)
tree46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/misc
parentcff9e6429a4341e924594f5e057b03ca8101b314 (diff)
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/brightnessctl/default.nix2
-rw-r--r--pkgs/misc/cups/cups-pk-helper.nix2
-rw-r--r--pkgs/misc/cups/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/brlaser/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/cnijfilter2/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/dymo/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/estudio/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/fxlinuxprint/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/googlecloudprint/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/hll2390dw-cups/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/kyocera/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/kyodialog3/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix4
-rw-r--r--pkgs/misc/cups/drivers/samsung/1.00.36/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/samsung/1.00.37.nix2
-rw-r--r--pkgs/misc/cups/drivers/samsung/4.00.39/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/samsung/4.01.17.nix2
-rw-r--r--pkgs/misc/cups/drivers/zj-58/default.nix1
-rw-r--r--pkgs/misc/cups/filters.nix4
-rw-r--r--pkgs/misc/drivers/epkowa/default.nix4
-rw-r--r--pkgs/misc/drivers/epson-escpr/default.nix2
-rw-r--r--pkgs/misc/drivers/epson-escpr2/default.nix8
-rw-r--r--pkgs/misc/drivers/moltengamepad/default.nix2
-rw-r--r--pkgs/misc/drivers/steamcontroller/default.nix2
-rw-r--r--pkgs/misc/dumb/default.nix2
-rw-r--r--pkgs/misc/emulators/atari++/default.nix2
-rw-r--r--pkgs/misc/emulators/atari800/default.nix4
-rw-r--r--pkgs/misc/emulators/attract-mode/default.nix2
-rw-r--r--pkgs/misc/emulators/blastem/default.nix4
-rw-r--r--pkgs/misc/emulators/cdemu/vhba.nix2
-rw-r--r--pkgs/misc/emulators/citra/default.nix2
-rw-r--r--pkgs/misc/emulators/darcnes/default.nix2
-rw-r--r--pkgs/misc/emulators/desmume/default.nix4
-rw-r--r--pkgs/misc/emulators/dolphin-emu/default.nix2
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix2
-rw-r--r--pkgs/misc/emulators/emulationstation/default.nix2
-rw-r--r--pkgs/misc/emulators/epsxe/default.nix2
-rw-r--r--pkgs/misc/emulators/firebird-emu/default.nix2
-rw-r--r--pkgs/misc/emulators/fs-uae/default.nix4
-rw-r--r--pkgs/misc/emulators/gxemul/default.nix10
-rw-r--r--pkgs/misc/emulators/higan/default.nix2
-rw-r--r--pkgs/misc/emulators/kega-fusion/default.nix2
-rw-r--r--pkgs/misc/emulators/libdsk/default.nix4
-rw-r--r--pkgs/misc/emulators/mednafen/default.nix4
-rw-r--r--pkgs/misc/emulators/mednafen/server.nix2
-rw-r--r--pkgs/misc/emulators/mednaffe/default.nix2
-rw-r--r--pkgs/misc/emulators/mgba/default.nix2
-rw-r--r--pkgs/misc/emulators/mupen64plus/default.nix2
-rw-r--r--pkgs/misc/emulators/nestopia/default.nix2
-rw-r--r--pkgs/misc/emulators/openmsx/default.nix2
-rw-r--r--pkgs/misc/emulators/pcsx2/default.nix2
-rw-r--r--pkgs/misc/emulators/pcsxr/default.nix6
-rw-r--r--pkgs/misc/emulators/ppsspp/default.nix2
-rw-r--r--pkgs/misc/emulators/qmc2/default.nix4
-rw-r--r--pkgs/misc/emulators/retroarch/default.nix2
-rw-r--r--pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix2
-rw-r--r--pkgs/misc/emulators/retrofe/default.nix2
-rw-r--r--pkgs/misc/emulators/rpcs3/default.nix2
-rw-r--r--pkgs/misc/emulators/snes9x-gtk/default.nix2
-rw-r--r--pkgs/misc/emulators/stella/default.nix4
-rw-r--r--pkgs/misc/emulators/vbam/default.nix2
-rw-r--r--pkgs/misc/emulators/yabause/default.nix4
-rw-r--r--pkgs/misc/gnash/default.nix2
-rw-r--r--pkgs/misc/jackaudio/jack1.nix2
-rw-r--r--pkgs/misc/libcardiacarrest/default.nix2
-rw-r--r--pkgs/misc/mnemonicode/default.nix2
-rw-r--r--pkgs/misc/mxt-app/default.nix2
-rw-r--r--pkgs/misc/sailsd/default.nix2
-rw-r--r--pkgs/misc/screensavers/betterlockscreen/default.nix2
-rw-r--r--pkgs/misc/screensavers/electricsheep/default.nix1
-rw-r--r--pkgs/misc/screensavers/i3lock-pixeled/default.nix2
-rw-r--r--pkgs/misc/screensavers/physlock/default.nix2
-rw-r--r--pkgs/misc/screensavers/pipes/default.nix2
-rw-r--r--pkgs/misc/screensavers/rss-glx/default.nix2
-rw-r--r--pkgs/misc/screensavers/xautolock/default.nix2
-rw-r--r--pkgs/misc/seafile-shared/default.nix2
-rw-r--r--pkgs/misc/sndio/default.nix2
-rw-r--r--pkgs/misc/sound-of-sorting/default.nix2
-rw-r--r--pkgs/misc/stabber/default.nix2
-rw-r--r--pkgs/misc/themes/adapta-kde/default.nix2
-rw-r--r--pkgs/misc/themes/adapta/default.nix2
-rw-r--r--pkgs/misc/themes/albatross/default.nix2
-rw-r--r--pkgs/misc/themes/arc-kde/default.nix2
-rw-r--r--pkgs/misc/themes/blackbird/default.nix1
-rw-r--r--pkgs/misc/themes/clearlooks-phenix/default.nix2
-rw-r--r--pkgs/misc/themes/e17gtk/default.nix2
-rw-r--r--pkgs/misc/themes/equilux-theme/default.nix2
-rw-r--r--pkgs/misc/themes/jade1/default.nix2
-rw-r--r--pkgs/misc/themes/numix-solarized/default.nix2
-rw-r--r--pkgs/misc/themes/numix-sx/default.nix2
-rw-r--r--pkgs/misc/themes/numix/default.nix2
-rw-r--r--pkgs/misc/themes/obsidian2/default.nix2
-rw-r--r--pkgs/misc/themes/onestepback/default.nix2
-rw-r--r--pkgs/misc/themes/paper/default.nix2
-rw-r--r--pkgs/misc/themes/solarc/default.nix2
-rw-r--r--pkgs/misc/themes/vertex/default.nix1
-rw-r--r--pkgs/misc/urbit/default.nix2
-rw-r--r--pkgs/misc/xosd/default.nix4
110 files changed, 134 insertions, 138 deletions
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index 6292b8183b28..83bf552b8b78 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, coreutils }:
stdenv.mkDerivation rec {
- name = "brightnessctl-${version}";
+ pname = "brightnessctl";
version = "0.4";
src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index f0be3cad723c..5e7596032b3d 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.2.6";
- name = "cups-pk-helper-${version}";
+ pname = "cups-pk-helper";
src = fetchurl {
url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 11873e6f2a06..011a76220608 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -9,7 +9,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "cups-${version}";
+ pname = "cups";
# After 2.2.6, CUPS requires headers only available in macOS 10.12+
version = if stdenv.isDarwin then "2.2.6" else "2.2.11";
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 08cc222e4a5b..948e5ed72ab1 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, zlib, cups }:
stdenv.mkDerivation rec {
- name = "brlaser-${version}";
+ pname = "brlaser";
version = "4";
src = fetchFromGitHub {
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 2634b7128719..abd50850b182 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -2,7 +2,7 @@
, withDebug ? false }:
stdenv.mkDerivation rec {
- name = "cnijfilter2-${version}";
+ pname = "cnijfilter2";
version = "5.30";
diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
index 27b86ab89198..15e3a1d97a90 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix
@@ -7,7 +7,7 @@
file included in the tarball */
stdenv.mkDerivation rec {
- name = "cnijfilter-${version}";
+ pname = "cnijfilter";
/* important note about versions: cnijfilter packages seem to use
versions in a non-standard way. the version indicates which
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index c8e5ddd09b14..ba8cffc0e654 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -12,7 +12,7 @@ let arch =
else throw "Unsupported system ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation rec {
- name = "cnijfilter-${version}";
+ pname = "cnijfilter";
/* important note about versions: cnijfilter packages seem to use
versions in a non-standard way. the version indicates which
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index 8abda27a5cf2..c2b912007d88 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, cups, ... }:
stdenv.mkDerivation rec {
- name = "cups-dymo-${version}";
+ pname = "cups-dymo";
version = "1.4.0.5";
# exposed version and 'real' version may differ
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index 83093da9c0aa..a2fdd1abc192 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "cups-toshiba-estudio-${version}";
+ pname = "cups-toshiba-estudio";
version = "7.89";
src = fetchurl {
diff --git a/pkgs/misc/cups/drivers/fxl