From 22dffe27f394427505d1c9006dcb6aebc6b9f85b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 29 Nov 2021 19:24:13 +0100 Subject: pkgs/tools: use pname&version instead of name --- pkgs/tools/X11/dex/default.nix | 5 ++--- pkgs/tools/X11/sct/default.nix | 3 ++- pkgs/tools/X11/virtualgl/default.nix | 3 ++- pkgs/tools/misc/byobu/default.nix | 2 +- pkgs/tools/misc/cpuminer-multi/default.nix | 9 +++------ pkgs/tools/misc/fx_cast/default.nix | 2 +- pkgs/tools/misc/heimdall/default.nix | 16 ++++++++-------- pkgs/tools/misc/jugglinglab/default.nix | 2 +- pkgs/tools/misc/loadlibrary/default.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 4 ++-- pkgs/tools/misc/opencorsairlink/default.nix | 4 ++-- pkgs/tools/misc/ponysay/default.nix | 2 +- pkgs/tools/misc/veikk-linux-driver-gui/default.nix | 4 ++-- pkgs/tools/misc/x11idle/default.nix | 3 +-- pkgs/tools/networking/atinout/default.nix | 2 +- pkgs/tools/networking/bacnet-stack/default.nix | 2 +- pkgs/tools/networking/netboot/default.nix | 2 +- pkgs/tools/networking/ngrok-2/default.nix | 4 ++-- pkgs/tools/networking/prettyping/default.nix | 5 ++--- pkgs/tools/networking/redsocks/default.nix | 9 +++------ pkgs/tools/networking/rp-pppoe/default.nix | 8 ++++---- pkgs/tools/networking/tdns-cli/default.nix | 6 +++--- pkgs/tools/networking/toxvpn/default.nix | 2 +- pkgs/tools/networking/waitron/default.nix | 4 ++-- .../tools/package-management/disnix/dydisnix/default.nix | 2 +- pkgs/tools/package-management/nox/default.nix | 2 +- pkgs/tools/security/gnupg/1compat.nix | 3 ++- pkgs/tools/security/srm/default.nix | 5 ++--- pkgs/tools/system/ipmiutil/default.nix | 5 ++--- pkgs/tools/text/grin/default.nix | 5 ++--- pkgs/tools/text/mecab/default.nix | 3 ++- pkgs/tools/text/mecab/nodic.nix | 3 ++- pkgs/tools/text/papertrail/default.nix | 3 ++- pkgs/tools/text/sgml/jade/default.nix | 2 +- pkgs/tools/text/smu/default.nix | 2 +- pkgs/tools/virtualization/ec2-utils/default.nix | 2 +- pkgs/tools/wayland/swaycwd/default.nix | 5 ++--- 37 files changed, 70 insertions(+), 77 deletions(-) diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index dd1953d783a..c0d1c5e6e4a 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - program = "dex"; - name = "${program}-${version}"; + pname = "dex"; version = "0.9.0"; src = fetchFromGitHub { owner = "jceb"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86"; }; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 0d74206155a..5b361e924eb 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libX11, libXrandr }: stdenv.mkDerivation rec { - name = "sct"; + pname = "sct"; + version = "unstable-2015-11-16"; src = fetchurl { url = "http://www.tedunangst.com/flak/files/sct.c"; diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index fe5ac9410a6..05c0f1c69b4 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation { - name = "virtualgl-${lib.getVersion virtualglLib}"; + pname = "virtualgl"; + version = lib.getVersion virtualglLib; paths = [ virtualglLib ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index ffe3fd0fe16..23df93172e9 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { version = "5.133"; - name = "byobu-" + version; + pname = "byobu"; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index fac8fbcfee9..3fbdcfae0fe 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake , aesni ? stdenv.hostPlatform.aesSupport }: -let - rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; - date = "20160316"; -in stdenv.mkDerivation { - name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}"; + pname = "cpuminer-multi"; + version = "unstable-2016-03-16"; src = fetchFromGitHub { owner = "hyc"; repo = "cpuminer-multi"; - inherit rev; + rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; }; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index b94b16d7bf5..1e140ecc028 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -21,7 +21,7 @@ }; in stdenv.mkDerivation rec { - name = "fx_cast_bridge-${version}"; + pname = "fx_cast_bridge"; version = "0.1.2"; src = pkgs.fetchFromGitHub { diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 3dcefa8b2d0..19bc90779d8 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -2,10 +2,9 @@ , enableGUI ? false, qtbase ? null }: -let version = "1.4.2"; in - -mkDerivation { - name = "heimdall-${if enableGUI then "gui-" else ""}${version}"; +mkDerivation rec { + pname = "heimdall${lib.optionalString enableGUI "-gui"}"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; @@ -15,7 +14,8 @@ mkDerivation { }; buildInputs = [ - zlib libusb1 + zlib + libusb1 ] ++ lib.optional enableGUI qtbase; nativeBuildInputs = [ cmake ]; @@ -44,10 +44,10 @@ mkDerivation { ''; meta = with lib; { - homepage = "http://www.glassechidna.com.au/products/heimdall/"; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; - license = licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index f9038da04b5..7b52091104c 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: stdenv.mkDerivation rec { version = "1.2.1"; - name = "jugglinglab"; + pname = "jugglinglab"; src = fetchFromGitHub { owner = "jkboyce"; repo = "jugglinglab"; diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index e6d19fc6d40..a299a85b6b8 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -4,7 +4,7 @@ # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. stdenv_32bit.mkDerivation rec { - name = "loadlibrary-${version}"; + pname = "loadlibrary"; version = "20170525-${lib.strings.substring 0 7 rev}"; rev = "721b084c088d779075405b7f20c77c2578e2a961"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 1c7ab29cbc8..b35e5a4aea4 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -11,10 +11,10 @@ with lib; let this = stdenv.mkDerivation rec { version = elk6Version; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; sha256 = if enableUnfree then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053" diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 14f955be1cd..1c18cb82c59 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { - name = "OpenCorsairLink-${version}"; - version = "2019-12-23"; + pname = "OpenCorsairLink"; + version = "unstable-2019-12-23"; buildInputs = [ libusb1 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index e75481fcc2c..2fb48f05850 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay"; + pname = "ponysay"; version = "unstable-2021-03-27"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix index a833846dd00..1c7dfd20330 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchFromGitHub, gnumake, qmake }: mkDerivation rec { - name = "veikk-linux-driver-gui"; + pname = "veikk-linux-driver-gui"; version = "2.0"; src = fetchFromGitHub { owner = "jlam55555"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; }; diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index cd1c11dbdb6..ee64f69897d 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, libXScrnSaver, libX11 }: stdenv.mkDerivation rec { - version = "9.2.4"; - name = "x11idle-org-${version}"; + pname = "x11idle-org"; src = fetchurl { url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c"; diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 93535531d91..6fad1174bbf 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, ronn, mount }: stdenv.mkDerivation rec { - name = "atinout-${version}"; + pname = "atinout"; version = "0.9.2-alpha"; NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index a4f2ef36360..9e47993df60 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "bacnet-stack"; + pname = "bacnet-stack"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index fdd1857ef10..cfd768e40ab 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot"; + pname = "netboot"; version = "0.10.2"; src = fetchurl { diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index f1f8545c96d..5366a2c3a9c 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -16,8 +16,8 @@ let versions = lib.importJSON ./versions.json; in stdenv.mkDerivation { - name = "ngrok-${version}"; - version = version; + pname = "ngrok"; + inherit version; # run ./update src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix index 43f32ddb9fb..16311f5b996 100644 --- a/pkgs/tools/networking/prettyping/default.nix +++ b/pkgs/tools/networking/prettyping/default.nix @@ -1,12 +1,11 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "${program}-${version}"; - program = "prettyping"; + pname = "prettyping"; version = "1.0.1"; src = fetchFromGitHub { owner = "denilsonsa"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf"; }; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index b609cce90bc..9b8989f30c2 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchFromGitHub, libevent }: -let - pkg = "redsocks"; +stdenv.mkDerivation rec { + pname = "redsocks"; version = "0.5"; -in -stdenv.mkDerivation { - name = "${pkg}-${version}"; src = fetchFromGitHub { owner = "darkk"; - repo = pkg; + repo = "redsocks"; rev = "release-${version}"; sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index fd3a563c209..572625651e9 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, ppp } : let - version = "3.12"; in -stdenv.mkDerivation { - name = "rp-pppoe-" + version; +stdenv.mkDerivation rec { + pname = "rp-pppoe"; + version = "3.12"; + src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; @@ -11,7 +12,6 @@ stdenv.mkDerivation { buildInputs = [ ppp ]; - preConfigure = '' cd src export PPPD=${ppp}/sbin/pppd diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 9f1ac89ce8e..a38456bcc76 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "tdns-cli"; + pname = "tdns-cli"; version = "0.0.5"; src = fetchFromGitHub { owner = "rotty"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg"; + cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c5aaec66d9e..57a5510bd43 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation { - name = "toxvpn"; + pname = "toxvpn"; version = "unstable-2019-09-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 8364cd5763d..c37d82024fe 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -2,8 +2,8 @@ { lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "waitron-unstable-${version}"; - version = "2020-01-24"; + pname = "waitron"; + version = "unstable-2020-01-24"; rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; goPackagePath = "github.com/ns1/waitron"; diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index 924ed825281..0c95e41f8c9 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "unstable-2020-11-02"; - name = "dydisnix-${version}"; + pname = "dydisnix"; src = fetchFromGitHub { owner = "svanderburg"; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index c949b443e36..b215a8e1d28 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,7 +1,7 @@ { lib, python3Packages, fetchurl, git }: python3Packages.buildPythonApplication rec { - name = "nox-${version}"; + pname = "nox"; version = "0.0.6"; namePrefix = ""; diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 371a7ca67af..6625a456795 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -1,7 +1,8 @@ { stdenv, gnupg, coreutils, writeScript }: stdenv.mkDerivation { - name = "gnupg1compat-${gnupg.version}"; + pname = "gnupg1compat"; + version = gnupg.version; builder = writeScript "gnupg1compat-builder" '' PATH=${coreutils}/bin diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 587d7782e76..8e4b3e69731 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - - name = "srm-" + version; + pname = "srm"; version = "1.2.15"; src = fetchurl { - url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/srm/${version}/srm-${version}.tar.gz"; sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index a11890dabd6..2166a671ab1 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - baseName = "ipmiutil"; + pname = "ipmiutil"; version = "3.1.6"; - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; + url = "mirror://sourceforge/project/ipmiutil/pmiutil-${version}.tar.gz"; sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548"; }; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 5d89619001b..ceeed3d6f76 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,14 +1,13 @@ { lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - program = "grin"; + pname = "grin"; version = "1.2.1"; - name = "${program}-${version}"; namePrefix = ""; src = fetchFromGitHub { owner = "rkern"; - repo = program; + repo = pname; rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f"; sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd"; }; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index c579dcb8a17..04293d29efb 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -4,7 +4,8 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-${mecab-base.version}"; + pname = "mecab"; + version = mecab-base.version; postInstall = '' sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/tools/text/mecab/nodic.nix index 1cbc31be4ee..be9003623e0 100644 --- a/pkgs/tools/text/mecab/nodic.nix +++ b/pkgs/tools/text/mecab/nodic.nix @@ -4,5 +4,6 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-nodic-${mecab-base.version}"; + pname = "mecab-nodic"; + version = mecab-base.version; }) diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index c3d005a97e0..afc9d2d89e7 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -9,7 +9,8 @@ let gemset = ./gemset.nix; }; in stdenv.mkDerivation { - name = "papertrail-${(import ./gemset.nix).papertrail.version}"; + pname = "papertrail"; + version = (import ./gemset.nix).papertrail.version; dontUnpack = true; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index c599375bc1c..b58b4c62947 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { - name = "jade-${version}-${debpatch}"; + pname = "jade"; version = "1.2.1"; debpatch = "47.3"; diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index 854e70c7622..02a29a91f47 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "smu"; + pname = "smu"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix index 1605bcfa43b..28321910842 100644 --- a/pkgs/tools/virtualization/ec2-utils/default.nix +++ b/pkgs/tools/virtualization/ec2-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, rpmextract, fetchurl, python2, tree }: stdenv.mkDerivation { - name = "ec2-utils"; + pname = "ec2-utils"; version = "0.5.1"; # The url can be determined by booting an "Amazon Linux 2" and running: diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix index d8fec3fd15c..9214f38b330 100644 --- a/pkgs/tools/wayland/swaycwd/default.nix +++ b/pkgs/tools/wayland/swaycwd/default.nix @@ -4,13 +4,12 @@ , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] }: nimPackages.buildNimPackage rec{ - - name = "swaycwd"; + pname = "swaycwd"; version = "0.0.2"; src = fetchFromGitLab { owner = "cab404"; - repo = name; + repo = pname; rev = "v${version}"; hash = "sha256-OZWOPtOqcX+fVQCxWntrn98EzFu70WH55rfYCPDMSKk="; }; -- cgit 1.4.1