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/desktops/xfce | |
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/desktops/xfce')
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 79f0800ff34..2782decf6c4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xfce4-hardware-monitor-plugin"; version = "1.6.0"; src = fetchurl { - url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; + url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2"; sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 7134d29c9ff..f67ba7af8aa 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { - name = "vala-panel-appmenu-xfce-${version}"; + pname = "vala-panel-appmenu-xfce"; version = "0.6.94"; src = "${fetchFromGitHub { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 694f6772282..144291da86d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -3,7 +3,7 @@ xfce, libwnck3, libdbusmenu, gobject-introspection }: stdenv.mkDerivation rec { - name = "xfce4-vala-panel-appmenu-plugin-${version}"; + pname = "xfce4-vala-panel-appmenu-plugin"; version = "0.6.94"; src = fetchFromGitHub { |