Merge pull request #157756 from Stunkymonkey/treewide-pname-version-10

treewide: rename name to pname&version
This commit is contained in:
Felix Bühler 2022-02-03 23:54:01 +01:00 committed by GitHub
commit 386d6b266d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 23 additions and 29 deletions

View File

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-webbrowser-${version}";
pname = "ocaml${ocaml.version}-webbrowser";
version = "0.6.1";
src = fetchurl {
url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";

View File

@ -3,7 +3,7 @@
} :
buildPythonPackage rec {
name = "i-pi";
pname = "i-pi";
version = "2.4.0";
src = fetchFromGitHub {

View File

@ -4,9 +4,9 @@ let
skeinRepo = callPackage ./skeinrepo.nix { inherit src version; };
in
stdenv.mkDerivation rec {
name = "skein-${version}.jar";
pname = "skein.jar";
inherit src;
inherit version src;
nativeBuildInputs = [ maven ];

View File

@ -1,9 +1,9 @@
{ autoPatchelfHook, lib, maven, stdenv, src, version }:
stdenv.mkDerivation rec {
name = "skein-${version}-maven-repo";
pname = "skein-maven-repo";
inherit src;
inherit version src;
nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook;

View File

@ -1,14 +1,11 @@
{ lib, stdenv, fetchurl }:
let
name = "cccc";
stdenv.mkDerivation rec {
pname = "cccc";
version = "3.1.4";
in
stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tar.gz";
url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz";
sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7";
};

View File

@ -10,12 +10,12 @@ let
in
stdenv.mkDerivation rec {
name = "ikos";
pname = "ikos";
version = "3.0";
src = fetchFromGitHub {
owner = "NASA-SW-VnV";
repo = name;
repo = "ikos";
rev = "v${version}";
sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f";
};

View File

@ -1,10 +1,8 @@
{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }:
let
name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
in stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation {
pname = "qcachegrind";
version = kcachegrind.version;
src = kcachegrind.src;

View File

@ -12,7 +12,7 @@ let
];
in
buildBazelPackage rec {
name = "bazel-watcher-${version}";
pname = "bazel-watcher";
version = "0.14.0";
src = fetchFromGitHub {

View File

@ -114,10 +114,10 @@ stdenv'.mkDerivation rec {
bashTools = callPackage ./bash-tools-test.nix {};
};
name = "bazel-${version}";
pname = "bazel";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2";
};

View File

@ -2,7 +2,7 @@
makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep,
nixosTests }:
buildGoModule rec {
name = "buildkite-agent-${version}";
pname = "buildkite-agent";
version = "3.33.3";
src = fetchFromGitHub {

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "gocd-agent-${version}-${rev}";
pname = "gocd-agent";
version = "19.3.0";
rev = "8959";

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "gocd-server-${version}-${rev}";
pname = "gocd-server";
version = "19.3.0";
rev = "8959";

View File

@ -1,16 +1,15 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "corgi-${rev}";
rev = "v0.2.4";
pname = "corgi";
version = "0.2.4";
goPackagePath = "github.com/DrakeW/corgi";
src = fetchFromGitHub {
inherit rev;
owner = "DrakeW";
repo = "corgi";
rev = "v${version}";
sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn";
};