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/misc/drivers | |
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/misc/drivers')
-rw-r--r-- | pkgs/misc/drivers/epkowa/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-escpr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/epson-escpr2/default.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/drivers/moltengamepad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/steamcontroller/default.nix | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index d865a8906cf..a232552712d 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -200,7 +200,7 @@ let fwdir = symlinkJoin { }; in let iscan-data = stdenv.mkDerivation rec { - name = "iscan-data-${version}"; + pname = "iscan-data"; version = "1.39.0-1"; src = fetchurl { @@ -216,7 +216,7 @@ let iscan-data = stdenv.mkDerivation rec { }; in stdenv.mkDerivation rec { - name = "iscan-${version}"; + pname = "iscan"; version = "2.30.3-1"; src = fetchurl { diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index ce95ca00e11..c65c13e886f 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cups }: stdenv.mkDerivation rec { - name = "epson-escpr-${version}"; + pname = "epson-escpr"; version = "1.6.16"; src = fetchurl { diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 9ce6f5d7b01..2110de6e4c1 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { - name = "epson-inkjet-printer-escpr2-${version}"; + pname = "epson-inkjet-printer-escpr2"; version = "1.0.29"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm"; + url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${pname}-${version}-1lsb3.2.src.rpm"; sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5"; }; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { unpackPhase = '' rpm2cpio $src | cpio -idmv - tar xvf ${name}-1lsb3.2.tar.gz - cd ${name} + tar xvf ${pname}-${version}-1lsb3.2.tar.gz + cd ${pname}-${version} ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 31b13baf796..fb6b4956ef1 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, udev }: stdenv.mkDerivation rec { - name = "moltengamepad-git-${version}"; + pname = "moltengamepad-git"; version = "2016-05-04"; src = fetchFromGitHub { diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index d44c90d198a..366535b51c6 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - name = "steamcontroller-${version}"; + pname = "steamcontroller"; version = "2017-08-11"; src = fetchFromGitHub { |