Merge pull request #147917 from Stunkymonkey/treewide-pname-version-2
commitfd58133e8e526cf12cc2a8e23d22a1c81ce3f21b
authorSandro <sandro.jaeckel@gmail.com>
dateWed 1 Dec 2021, 18:15 (5 years ago)
parent6daa4a522dffe2
pkgs/tools/X11/dex/default.nix+2−3
@@ -1,13 +1,12 @@
11{ lib, stdenv, fetchFromGitHub, python3 }:
22
33stdenv.mkDerivation rec {
4− program = "dex";
5− name = "${program}-${version}";
4+ pname = "dex";
65 version = "0.9.0";
76
87 src = fetchFromGitHub {
98 owner = "jceb";
10− repo = program;
9+ repo = pname;
1110 rev = "v${version}";
1211 sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86";
1312 };
pkgs/tools/X11/sct/default.nix+2−1
@@ -1,7 +1,8 @@
11{ lib, stdenv, fetchurl, libX11, libXrandr }:
22
33stdenv.mkDerivation rec {
4− name = "sct";
4+ pname = "sct";
5+ version = "unstable-2015-11-16";
56
67 src = fetchurl {
78 url = "http://www.tedunangst.com/flak/files/sct.c";
pkgs/tools/X11/virtualgl/default.nix+2−1
@@ -4,7 +4,8 @@
44}:
55
66stdenv.mkDerivation {
7− name = "virtualgl-${lib.getVersion virtualglLib}";
7+ pname = "virtualgl";
8+ version = lib.getVersion virtualglLib;
89
910 paths = [ virtualglLib ];
1011
pkgs/tools/misc/byobu/default.nix+1−1
@@ -7,7 +7,7 @@ let
77in
88stdenv.mkDerivation rec {
99 version = "5.133";
10− name = "byobu-" + version;
10+ pname = "byobu";
1111
1212 src = fetchurl {
1313 url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
pkgs/tools/misc/cpuminer-multi/default.nix+3−6
@@ -1,17 +1,14 @@
11{ lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake
22, aesni ? stdenv.hostPlatform.aesSupport }:
33
4−let
5− rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4";
6− date = "20160316";
7−in
84stdenv.mkDerivation {
9− name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}";
5+ pname = "cpuminer-multi";
6+ version = "unstable-2016-03-16";
107
118 src = fetchFromGitHub {
129 owner = "hyc";
1310 repo = "cpuminer-multi";
14− inherit rev;
11+ rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4";
1512 sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v";
1613 };
1714
pkgs/tools/misc/fx_cast/default.nix+1−1
@@ -21,7 +21,7 @@
2121 };
2222in
2323stdenv.mkDerivation rec {
24− name = "fx_cast_bridge-${version}";
24+ pname = "fx_cast_bridge";
2525 version = "0.1.2";
2626
2727 src = pkgs.fetchFromGitHub {
pkgs/tools/misc/heimdall/default.nix+8−8
@@ -2,10 +2,9 @@
22, enableGUI ? false, qtbase ? null
33}:
44
5−let version = "1.4.2"; in
6−
7−mkDerivation {
8− name = "heimdall-${if enableGUI then "gui-" else ""}${version}";
5+mkDerivation rec {
6+ pname = "heimdall${lib.optionalString enableGUI "-gui"}";
7+ version = "1.4.2";
98
109 src = fetchFromGitHub {
1110 owner = "Benjamin-Dobell";
@@ -15,7 +14,8 @@ mkDerivation {
1514 };
1615
1716 buildInputs = [
18− zlib libusb1
17+ zlib
18+ libusb1
1919 ] ++ lib.optional enableGUI qtbase;
2020 nativeBuildInputs = [ cmake ];
2121
@@ -44,10 +44,10 @@ mkDerivation {
4444 '';
4545
4646 meta = with lib; {
47− homepage = "http://www.glassechidna.com.au/products/heimdall/";
47+ homepage = "http://www.glassechidna.com.au/products/heimdall/";
4848 description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices";
49− license = licenses.mit;
49+ license = licenses.mit;
5050 maintainers = with maintainers; [ peterhoeg ];
51− platforms = platforms.unix;
51+ platforms = platforms.unix;
5252 };
5353}
pkgs/tools/misc/jugglinglab/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }:
22stdenv.mkDerivation rec {
33 version = "1.2.1";
4− name = "jugglinglab";
4+ pname = "jugglinglab";
55 src = fetchFromGitHub {
66 owner = "jkboyce";
77 repo = "jugglinglab";
pkgs/tools/misc/loadlibrary/default.nix+1−1
@@ -4,7 +4,7 @@
44# support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386.
55
66stdenv_32bit.mkDerivation rec {
7− name = "loadlibrary-${version}";
7+ pname = "loadlibrary";
88 version = "20170525-${lib.strings.substring 0 7 rev}";
99 rev = "721b084c088d779075405b7f20c77c2578e2a961";
1010 src = fetchFromGitHub {
pkgs/tools/misc/logstash/6.x.nix+2−2
@@ -11,10 +11,10 @@ with lib;
1111
1212let this = stdenv.mkDerivation rec {
1313 version = elk6Version;
14− name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
14+ pname = "logstash${optionalString (!enableUnfree) "-oss"}";
1515
1616 src = fetchurl {
17− url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
17+ url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz";
1818 sha256 =
1919 if enableUnfree
2020 then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053"
pkgs/tools/misc/opencorsairlink/default.nix+2−2
@@ -1,8 +1,8 @@
11{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }:
22
33stdenv.mkDerivation rec {
4− name = "OpenCorsairLink-${version}";
5− version = "2019-12-23";
4+ pname = "OpenCorsairLink";
5+ version = "unstable-2019-12-23";
66
77 buildInputs = [ libusb1 ];
88 nativeBuildInputs = [ pkg-config ];
pkgs/tools/misc/ponysay/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }:
22
33stdenv.mkDerivation rec {
4− name = "ponysay";
4+ pname = "ponysay";
55 version = "unstable-2021-03-27";
66
77 src = fetchFromGitHub {
pkgs/tools/misc/veikk-linux-driver-gui/default.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, mkDerivation, fetchFromGitHub, gnumake, qmake }:
22
33mkDerivation rec {
4− name = "veikk-linux-driver-gui";
4+ pname = "veikk-linux-driver-gui";
55 version = "2.0";
66
77 src = fetchFromGitHub {
88 owner = "jlam55555";
9− repo = name;
9+ repo = pname;
1010 rev = "v${version}";
1111 sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j";
1212 };
pkgs/tools/misc/x11idle/default.nix+1−2
@@ -1,9 +1,8 @@
11{ lib, stdenv, fetchurl, libXScrnSaver, libX11 }:
22
33stdenv.mkDerivation rec {
4−
54 version = "9.2.4";
6− name = "x11idle-org-${version}";
5+ pname = "x11idle-org";
76
87 src = fetchurl {
98 url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c";
pkgs/tools/networking/atinout/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchgit, ronn, mount }:
22
33stdenv.mkDerivation rec {
4− name = "atinout-${version}";
4+ pname = "atinout";
55 version = "0.9.2-alpha";
66
77 NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0";
pkgs/tools/networking/bacnet-stack/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
4− name = "bacnet-stack";
4+ pname = "bacnet-stack";
55 version = "1.0.0";
66
77 src = fetchFromGitHub {
pkgs/tools/networking/netboot/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, bison, lzo, db4 }:
22
33stdenv.mkDerivation rec {
4− name = "netboot";
4+ pname = "netboot";
55 version = "0.10.2";
66
77 src = fetchurl {
pkgs/tools/networking/ngrok-2/default.nix+2−2
@@ -16,8 +16,8 @@ let versions = lib.importJSON ./versions.json;
1616
1717in
1818stdenv.mkDerivation {
19− name = "ngrok-${version}";
20− version = version;
19+ pname = "ngrok";
20+ inherit version;
2121
2222 # run ./update
2323 src = fetchurl { inherit sha256 url; };
pkgs/tools/networking/prettyping/default.nix+2−3
@@ -1,12 +1,11 @@
11{ stdenv, lib, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
4− name = "${program}-${version}";
5− program = "prettyping";
4+ pname = "prettyping";
65 version = "1.0.1";
76 src = fetchFromGitHub {
87 owner = "denilsonsa";
9− repo = program;
8+ repo = pname;
109 rev = "v${version}";
1110 sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf";
1211 };
pkgs/tools/networking/redsocks/default.nix+3−6
@@ -1,15 +1,12 @@
11{ lib, stdenv, fetchFromGitHub, libevent }:
22
3−let
4− pkg = "redsocks";
3+stdenv.mkDerivation rec {
4+ pname = "redsocks";
55 version = "0.5";
6−in
7−stdenv.mkDerivation {
8− name = "${pkg}-${version}";
96
107 src = fetchFromGitHub {
118 owner = "darkk";
12− repo = pkg;
9+ repo = "redsocks";
1310 rev = "release-${version}";
1411 sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm";
1512 };
pkgs/tools/networking/rp-pppoe/default.nix+4−4
@@ -1,9 +1,10 @@
11{ lib, stdenv, fetchurl, ppp } :
22let
3− version = "3.12";
43in
5−stdenv.mkDerivation {
6− name = "rp-pppoe-" + version;
4+stdenv.mkDerivation rec {
5+ pname = "rp-pppoe";
6+ version = "3.12";
7+
78 src = fetchurl {
89 url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
910 sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80";
@@ -11,7 +12,6 @@ stdenv.mkDerivation {
1112
1213 buildInputs = [ ppp ];
1314
14−
1515 preConfigure = ''
1616 cd src
1717 export PPPD=${ppp}/sbin/pppd
pkgs/tools/networking/tdns-cli/default.nix+3−3
@@ -1,17 +1,17 @@
11{ lib, fetchFromGitHub, rustPlatform }:
22
33rustPlatform.buildRustPackage rec {
4− name = "tdns-cli";
4+ pname = "tdns-cli";
55 version = "0.0.5";
66
77 src = fetchFromGitHub {
88 owner = "rotty";
9− repo = name;
9+ repo = pname;
1010 rev = "v${version}";
1111 sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh";
1212 };
1313
14− cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg";
14+ cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I=";
1515
1616 meta = with lib; {
1717 description = "DNS tool that aims to replace dig and nsupdate";
pkgs/tools/networking/toxvpn/default.nix+1−1
@@ -11,7 +11,7 @@
1111}:
1212
1313stdenv.mkDerivation {
14− name = "toxvpn";
14+ pname = "toxvpn";
1515 version = "unstable-2019-09-09";
1616
1717 src = fetchFromGitHub {
pkgs/tools/networking/waitron/default.nix+2−2
@@ -2,8 +2,8 @@
22{ lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
33
44buildGoPackage rec {
5− name = "waitron-unstable-${version}";
6− version = "2020-01-24";
5+ pname = "waitron";
6+ version = "unstable-2020-01-24";
77 rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6";
88
99 goPackagePath = "github.com/ns1/waitron";
pkgs/tools/package-management/disnix/dydisnix/default.nix+1−1
@@ -4,7 +4,7 @@
44
55stdenv.mkDerivation rec {
66 version = "unstable-2020-11-02";
7− name = "dydisnix-${version}";
7+ pname = "dydisnix";
88
99 src = fetchFromGitHub {
1010 owner = "svanderburg";
pkgs/tools/package-management/nox/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, python3Packages, fetchurl, git }:
22
33python3Packages.buildPythonApplication rec {
4− name = "nox-${version}";
4+ pname = "nox";
55 version = "0.0.6";
66 namePrefix = "";
77
pkgs/tools/security/gnupg/1compat.nix+2−1
@@ -1,7 +1,8 @@
11{ stdenv, gnupg, coreutils, writeScript }:
22
33stdenv.mkDerivation {
4− name = "gnupg1compat-${gnupg.version}";
4+ pname = "gnupg1compat";
5+ version = gnupg.version;
56
67 builder = writeScript "gnupg1compat-builder" ''
78 PATH=${coreutils}/bin
pkgs/tools/security/srm/default.nix+2−3
@@ -1,12 +1,11 @@
11{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
4−
5− name = "srm-" + version;
4+ pname = "srm";
65 version = "1.2.15";
76
87 src = fetchurl {
9− url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz";
8+ url = "mirror://sourceforge/project/srm/${version}/srm-${version}.tar.gz";
109 sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm";
1110 };
1211
pkgs/tools/system/ipmiutil/default.nix+2−3
@@ -1,12 +1,11 @@
11{ lib, stdenv, fetchurl, openssl }:
22
33stdenv.mkDerivation rec {
4− baseName = "ipmiutil";
4+ pname = "ipmiutil";
55 version = "3.1.6";
6− name = "${baseName}-${version}";
76
87 src = fetchurl {
9− url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
8+ url = "mirror://sourceforge/project/ipmiutil/pmiutil-${version}.tar.gz";
109 sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548";
1110 };
1211
pkgs/tools/text/grin/default.nix+2−3
@@ -1,14 +1,13 @@
11{ lib, fetchFromGitHub, python2Packages }:
22
33python2Packages.buildPythonApplication rec {
4− program = "grin";
4+ pname = "grin";
55 version = "1.2.1";
6− name = "${program}-${version}";
76 namePrefix = "";
87
98 src = fetchFromGitHub {
109 owner = "rkern";
11− repo = program;
10+ repo = pname;
1211 rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f";
1312 sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd";
1413 };
pkgs/tools/text/mecab/default.nix+2−1
@@ -4,7 +4,8 @@ let
44 mecab-base = import ./base.nix { inherit fetchurl; };
55in
66stdenv.mkDerivation (mecab-base // {
7− name = "mecab-${mecab-base.version}";
7+ pname = "mecab";
8+ version = mecab-base.version;
89
910 postInstall = ''
1011 sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc"
pkgs/tools/text/mecab/nodic.nix+2−1
@@ -4,5 +4,6 @@ let
44 mecab-base = import ./base.nix { inherit fetchurl; };
55in
66stdenv.mkDerivation (mecab-base // {
7− name = "mecab-nodic-${mecab-base.version}";
7+ pname = "mecab-nodic";
8+ version = mecab-base.version;
89})
pkgs/tools/text/papertrail/default.nix+2−1
@@ -9,7 +9,8 @@ let
99 gemset = ./gemset.nix;
1010 };
1111in stdenv.mkDerivation {
12− name = "papertrail-${(import ./gemset.nix).papertrail.version}";
12+ pname = "papertrail";
13+ version = (import ./gemset.nix).papertrail.version;
1314
1415 dontUnpack = true;
1516
pkgs/tools/text/sgml/jade/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, stdenv, fetchurl, gnum4 }:
22
33stdenv.mkDerivation rec {
4− name = "jade-${version}-${debpatch}";
4+ pname = "jade";
55 version = "1.2.1";
66 debpatch = "47.3";
77
pkgs/tools/text/smu/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, lib, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
4− name = "smu";
4+ pname = "smu";
55 version = "1.5";
66
77 src = fetchFromGitHub {
pkgs/tools/virtualization/ec2-utils/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, lib, rpmextract, fetchurl, python2, tree }:
22
33stdenv.mkDerivation {
4− name = "ec2-utils";
4+ pname = "ec2-utils";
55 version = "0.5.1";
66
77 # The url can be determined by booting an "Amazon Linux 2" and running:
pkgs/tools/wayland/swaycwd/default.nix+2−3
@@ -4,13 +4,12 @@
44, enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ]
55}:
66nimPackages.buildNimPackage rec{
7−
8− name = "swaycwd";
7+ pname = "swaycwd";
98 version = "0.0.2";
109
1110 src = fetchFromGitLab {
1211 owner = "cab404";
13− repo = name;
12+ repo = pname;
1413 rev = "v${version}";
1514 hash = "sha256-OZWOPtOqcX+fVQCxWntrn98EzFu70WH55rfYCPDMSKk=";
1615 };