diff options
| author | Felix Buehler <account@buehler.rocks> | 2021-12-07 20:40:23 +0100 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2021-12-24 15:51:27 +0100 |
| commit | b5e0221e44c6367f7150cb65a4de78e8f29586b9 (patch) | |
| tree | 0588a5058790a50ec4b0b8fc76204748e7aaa864 /pkgs/os-specific | |
| parent | e5a24a242d9f011fe44f3389f7ba0131c32194a9 (diff) | |
| download | nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.tar nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.tar.gz nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.tar.bz2 nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.tar.lz nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.tar.xz nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.tar.zst nixpkgs-b5e0221e44c6367f7150cb65a4de78e8f29586b9.zip | |
treewide: use pname&version instead of name
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/v86d/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/vendor-reset/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/virtualbox/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/x86_energy_perf_policy/default.nix | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 254abb5838e..dbc98344c5e 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -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="; }; diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index 8f1bde7ecbd..e1395bd33c0 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix index f795d36207a..3aae58933c8 100644 --- a/pkgs/os-specific/linux/virtualbox/default.nix +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -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" diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix index 4b57ed4ceae..d636f928f24 100644 --- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix +++ b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix @@ -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; |