git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #148702 from Stunkymonkey/treewide-pname-version-3

treewide: use pname&version instead of name

commit3f47d85f942b9cece1b28c106f60e7ecef7d261d authorJörg Thalheim <Mic92@users.noreply.github.com> dateSun 5 Dec 2021, 17:27 (5 years ago) parent8ae27718d0267d
17 files changed+49−62
compare with master
unifiedsplit
pkgs/development/tools/misc/kibana/6.x.nix+2−2 pkgs/os-specific/linux/autofs/default.nix+3−5 pkgs/os-specific/linux/gogoclient/default.nix+4−7 pkgs/os-specific/linux/wpa_supplicant/gui.nix+2−1 pkgs/servers/ma1sd/default.nix+4−4 pkgs/tools/X11/xgeometry-select/default.nix+3−4 pkgs/tools/audio/alsaequal/default.nix+1−1 pkgs/tools/bluetooth/bluez-tools/default.nix+3−4 pkgs/tools/cd-dvd/xorriso/default.nix+2−2 pkgs/tools/filesystems/hfsprogs/default.nix+6−7 pkgs/tools/filesystems/nixpart/0.4/lvm2.nix+3−6 pkgs/tools/filesystems/wiimms-iso-tools/default.nix+1−1 pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix+1−1 pkgs/tools/security/afl/qemu.nix+5−5 pkgs/tools/security/nmap/default.nix+1−1 pkgs/tools/security/open-ecard/default.nix+5−6 pkgs/tools/system/lshw/default.nix+3−5
pkgs/development/tools/misc/kibana/6.x.nix+2−2
@@ -27,11 +27,11 @@ let
2727 };
2828
2929in stdenv.mkDerivation rec {
30− name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
30+ pname = "kibana${optionalString (!enableUnfree) "-oss"}";
3131 version = elk6Version;
3232
3333 src = fetchurl {
34− url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
34+ url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz";
3535 sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
3636 };
3737
pkgs/os-specific/linux/autofs/default.nix+3−5
@@ -1,14 +1,12 @@
11{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
22, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
33
4−let
4+stdenv.mkDerivation rec {
55 version = "5.1.6";
6− name = "autofs-${version}";
7−in stdenv.mkDerivation {
8− inherit name;
6+ pname = "autofs";
97
108 src = fetchurl {
11− url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
9+ url = "mirror://kernel/linux/daemons/autofs/v5/autofs-${version}.tar.xz";
1210 sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx";
1311 };
1412
pkgs/os-specific/linux/gogoclient/default.nix+4−7
@@ -1,11 +1,8 @@
11{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
22
3−let baseName = "gogoclient";
4− version = "1.2";
5−in
6−
73stdenv.mkDerivation rec {
8− name = "${baseName}-${version}";
4+ pname = "gogoclient";
5+ version = "1.2";
96
107 src = fetchurl {
118 #url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz";
@@ -21,9 +18,9 @@ stdenv.mkDerivation rec {
2118 buildInputs = [openssl];
2219
2320 preFixup = ''
24− mkdir -p $out/share/${name}
21+ mkdir -p $out/share/gogoclient-${version}
2522 chmod 444 $out/bin/gogoc.conf
26− mv $out/bin/gogoc.conf $out/share/${name}/gogoc.conf.sample
23+ mv $out/bin/gogoc.conf $out/share/gogoclient-${version}/gogoc.conf.sample
2724 rm $out/bin/gogoc.conf.sample
2825
2926 substituteInPlace "$out/template/linux.sh" \
pkgs/os-specific/linux/wpa_supplicant/gui.nix+2−1
@@ -1,7 +1,8 @@
11{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
22
33mkDerivation {
4− name = "wpa_gui-${wpa_supplicant.version}";
4+ pname = "wpa_gui";
5+ version = wpa_supplicant.version;
56
67 inherit (wpa_supplicant) src;
78
pkgs/servers/ma1sd/default.nix+4−4
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
22
33let
4− name = "ma1sd-${version}";
4+ pname = "ma1sd";
55 version = "2.4.0";
66 rev = version;
77
@@ -14,8 +14,8 @@ let
1414
1515
1616 deps = stdenv.mkDerivation {
17− name = "${name}-deps";
18− inherit src;
17+ pname = "${pname}-deps";
18+ inherit src version;
1919 nativeBuildInputs = [ gradle_6 perl git ];
2020
2121 buildPhase = ''
@@ -40,7 +40,7 @@ let
4040
4141in
4242stdenv.mkDerivation {
43− inherit name src version;
43+ inherit pname src version;
4444 nativeBuildInputs = [ gradle_6 perl makeWrapper ];
4545 buildInputs = [ jre ];
4646
pkgs/tools/X11/xgeometry-select/default.nix+3−4
@@ -1,8 +1,7 @@
11{ lib, stdenv, fetchurl, libX11 }:
22
33stdenv.mkDerivation rec {
4− name = "${baseName}-${version}";
5− baseName = "xgeometry-select";
4+ pname = "xgeometry-select";
65 version = "0.1";
76
87 src = fetchurl {
@@ -15,12 +14,12 @@ stdenv.mkDerivation rec {
1514 buildInputs = [ libX11 ];
1615
1716 buildPhase = ''
18− gcc -Wall -lX11 ${src} -o ${baseName}
17+ gcc -Wall -lX11 ${src} -o xgeometry-select
1918 '';
2019
2120 installPhase = ''
2221 mkdir -p $out/bin
23− mv -v ${baseName} $out/bin
22+ mv -v xgeometry-select $out/bin
2423 '';
2524
2625 meta = with lib; {
pkgs/tools/audio/alsaequal/default.nix+1−1
@@ -3,7 +3,7 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "alsaequal";
6+ pname = "alsaequal";
77 version = "0.6";
88
99 src = fetchurl {
pkgs/tools/bluetooth/bluez-tools/default.nix+3−4
@@ -2,14 +2,13 @@
22, fetchFromGitHub, glib, pkg-config }:
33
44stdenv.mkDerivation rec {
5− date = "2016-12-12";
6− name = "bluez-tools-${date}";
7− rev = "97efd29";
5+ version = "unstable-2016-12-12";
6+ pname = "bluez-tools";
87
98 src = fetchFromGitHub {
10− inherit rev;
119 owner = "khvzak";
1210 repo = "bluez-tools";
11+ rev = "97efd293491ad7ec96a655665339908f2478b3d1";
1312 sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6";
1413 };
1514
pkgs/tools/cd-dvd/xorriso/default.nix+2−2
@@ -1,11 +1,11 @@
11{ fetchurl, lib, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }:
22
33stdenv.mkDerivation rec {
4− name = "xorriso-${version}";
4+ pname = "xorriso";
55 version = "1.5.4.pl02";
66
77 src = fetchurl {
8− url = "mirror://gnu/xorriso/${name}.tar.gz";
8+ url = "mirror://gnu/xorriso/xorriso-${version}.tar.gz";
99 sha256 = "sha256-Psc5PUqdy/X3QwnCikFfVSJ+xidwuVrpk6yNejsVKXI=";
1010 };
1111
pkgs/tools/filesystems/hfsprogs/default.nix+6−7
@@ -1,12 +1,11 @@
11{ lib, stdenv, fetchurl, openssl, libbsd }:
22
3−let version = "332.25";
4− package_name = "hfsprogs"; in
5−stdenv.mkDerivation {
6− name = "${package_name}-${version}";
3+stdenv.mkDerivation rec {
4+ version = "332.25";
5+ pname = "hfsprogs";
76 srcs = [
87 (fetchurl {
9− url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz";
8+ url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz";
109 sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
1110 })
1211 (fetchurl {
@@ -29,13 +28,13 @@ stdenv.mkDerivation {
2928 installPhase = ''
3029 # Create required package directories
3130 install -m 755 -d "$out/bin"
32− install -m 755 -d "$out/share/${package_name}"
31+ install -m 755 -d "$out/share/hfsprogs"
3332 install -m 755 -d "$out/share/man/man8/"
3433 # Copy executables
3534 install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus"
3635 install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus"
3736 # Copy shared data
38− install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata"
37+ install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/hfsprogs/hfsbootdata"
3938 # Copy man pages
4039 install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8"
4140 install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8"
pkgs/tools/filesystems/nixpart/0.4/lvm2.nix+3−6
@@ -1,14 +1,11 @@
11{ lib, stdenv, fetchurl, fetchpatch, pkg-config, systemd, util-linux, coreutils }:
22
3−let
4− v = "2.02.106";
5−in
6−
73stdenv.mkDerivation {
8− name = "lvm2-${v}";
4+ pname = "lvm2";
5+ version = "2.02.106";
96
107 src = fetchurl {
11− url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz";
8+ url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
129 sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
1310 };
1411
pkgs/tools/filesystems/wiimms-iso-tools/default.nix+1−1
@@ -1,7 +1,7 @@
11{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}:
22
33stdenv.mkDerivation rec {
4− name = "wiimms-iso-tools";
4+ pname = "wiimms-iso-tools";
55 version = "3.02a";
66
77 src = fetchurl {
pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix+1−1
@@ -13,7 +13,7 @@ let
1313 sha256 = "10bdjn481jsh32vll7r756l392anz44h6207vjqwby3rplk31np1";
1414 };
1515in clangStdenv.mkDerivation rec {
16− name = "fcitx-mozc-${version}";
16+ pname = "fcitx-mozc";
1717 version = "2.23.2815.102";
1818
1919 src = fetchFromGitHub {
pkgs/tools/security/afl/qemu.nix+5−5
@@ -5,23 +5,23 @@
55with lib;
66
77let
8− qemuName = "qemu-2.10.0";
98 cpuTarget = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux-user"
109 else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user"
1110 else throw "afl: no support for ${stdenv.hostPlatform.system}!";
1211in
13−stdenv.mkDerivation {
14− name = "afl-${qemuName}";
12+stdenv.mkDerivation rec {
13+ pname = "afl-qemu";
14+ version = "2.10.0";
1515
1616 srcs = [
1717 (fetchurl {
18− url = "http://wiki.qemu.org/download/${qemuName}.tar.bz2";
18+ url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
1919 sha256 = "0j3dfxzrzdp1w21k21fjvmakzc6lcha1rsclaicwqvbf63hkk7vy";
2020 })
2121 afl.src
2222 ];
2323
24− sourceRoot = qemuName;
24+ sourceRoot = "qemu-${version}";
2525
2626 postUnpack = ''
2727 cp ${afl.src.name}/types.h $sourceRoot/afl-types.h
pkgs/tools/security/nmap/default.nix+1−1
@@ -11,7 +11,7 @@
1111with lib;
1212
1313stdenv.mkDerivation rec {
14− name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
14+ pname = "nmap${optionalString graphicalSupport "-graphical"}";
1515 version = "7.92";
1616
1717 src = fetchurl {
pkgs/tools/security/open-ecard/default.nix+5−6
@@ -2,7 +2,6 @@
22
33let
44 version = "1.2.4";
5−
65 srcs = {
76 richclient = fetchurl {
87 url = "https://jnlp.openecard.org/richclient-${version}-20171212-0958.jar";
@@ -18,8 +17,8 @@ let
1817 };
1918 };
2019in stdenv.mkDerivation rec {
21− appName = "open-ecard";
22− name = "${appName}-${version}";
20+ pname = "open-ecard";
21+ inherit version;
2322
2423 src = srcs.richclient;
2524
@@ -28,12 +27,12 @@ in stdenv.mkDerivation rec {
2827 nativeBuildInputs = [ makeWrapper ];
2928
3029 desktopItem = makeDesktopItem {
31− name = appName;
30+ name = pname;
3231 desktopName = "Open eCard App";
3332 genericName = "eCard App";
3433 comment = "Client side implementation of the eCard-API-Framework";
3534 icon = "oec_logo_bg-transparent.svg";
36− exec = appName;
35+ exec = pname;
3736 categories = "Utility;Security;";
3837 };
3938
@@ -47,7 +46,7 @@ in stdenv.mkDerivation rec {
4746 cp ${srcs.logo} $out/share/pixmaps/oec_logo_bg-transparent.svg
4847
4948 mkdir -p $out/bin
50− makeWrapper ${jre}/bin/java $out/bin/${appName} \
49+ makeWrapper ${jre}/bin/java $out/bin/${pname} \
5150 --add-flags "-cp $out/share/java/cifs-${version}.jar" \
5251 --add-flags "-jar $out/share/java/richclient-${version}.jar" \
5352 --suffix LD_LIBRARY_PATH ':' ${lib.getLib pcsclite}/lib
pkgs/tools/system/lshw/default.nix+3−5
@@ -2,14 +2,12 @@
22, withGUI ? false, gtk2, pkg-config, sqlite # compile GUI
33}:
44
5−let numVersion = "02.18"; # :(
6−in
75stdenv.mkDerivation rec {
8− name = "lshw-${numVersion}b";
9− version = numVersion;
6+ pname = "lshw";
7+ version = "B.02.18";
108
119 src = fetchurl {
12− url = "https://ezix.org/software/files/lshw-B.${version}.tar.gz";
10+ url = "https://ezix.org/software/files/lshw-${version}.tar.gz";
1311 sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
1412 };
1513