JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #149678 from Stunkymonkey/treewide-pname-version-4

Browse Source 
treewide: use pname&version instead of name
This commit is contained in:
Felix Bühler 2021-12-25 13:56:08 +01:00 committed by GitHub
commit a112ff84eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/v86d/default.nix
View File

@ -5,14 +5,16 @@
, klibc
}:
stdenv.mkDerivation rec {
name = "v86d-${version}-${kernel.version}";
version = "0.1.10";
let
pversion = "0.1.10";
in stdenv.mkDerivation rec {
pname = "v86d";
version = "${pversion}-${kernel.version}";
src = fetchFromGitHub {
owner = "mjanusz";
repo = "v86d";
rev = "v86d-${version}";
rev = "v86d-${pversion}";
hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA=";
};

4
pkgs/os-specific/linux/vendor-reset/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, kernel, lib }:
stdenv.mkDerivation rec {
name = "vendor-reset-${version}-${kernel.version}";
version = "unstable-2021-02-16";
pname = "vendor-reset";
version = "unstable-2021-02-16-${kernel.version}";
src = fetchFromGitHub {
owner = "gnif";

3
pkgs/os-specific/linux/virtualbox/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, virtualbox, kernel }:
stdenv.mkDerivation {
name = "virtualbox-modules-${virtualbox.version}-${kernel.version}";
pname = "virtualbox-modules";
version = "${virtualbox.version}-${kernel.version}";
src = virtualbox.modsrc;
hardeningDisable = [
"fortify" "pic" "stackprotector"

3
pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, kernel }:
stdenv.mkDerivation {
name = "x86_energy_perf_policy-${kernel.version}";
pname = "x86_energy_perf_policy";
version = kernel.version;
src = kernel.src;

5
pkgs/servers/openafs/1.8/module.nix
View File

@ -23,8 +23,9 @@ let
in
stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
pname = "openafs";
version = "${version}-${kernel.modDirVersion}";
inherit src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;

5
pkgs/servers/openafs/1.9/module.nix
View File

@ -10,8 +10,9 @@ let
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
pname = "openafs";
version = "${version}-${kernel.modDirVersion}";
inherit src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;

2
pkgs/shells/zsh/zsh-better-npm-completion/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "zsh-better-npm-completion";
pname = "zsh-better-npm-completion";
version = "unstable-2019-11-19";
src = fetchFromGitHub {

6
pkgs/shells/zsh/zsh-deer/default.nix
View File

@ -1,10 +1,8 @@
{ lib, stdenv, fetchFromGitHub, perl }:
let
stdenv.mkDerivation rec {
pname = "deer";
version = "1.4";
name = "deer-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchFromGitHub {
owner = "Vifon";