diff options
author | Felix Buehler <account@buehler.rocks> | 2022-01-22 18:13:29 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2022-01-22 18:13:29 +0100 |
commit | 027d353491860c8fd232e6bd09d45516b166659a (patch) | |
tree | 5956e8fc01846b05a16869a0e8c234fff3e090f1 /pkgs/os-specific | |
parent | 3562adbcec7f87c260c6aaa0a52b31269450bd4e (diff) | |
download | nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.tar nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.tar.gz nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.tar.bz2 nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.tar.lz nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.tar.xz nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.tar.zst nixpkgs-027d353491860c8fd232e6bd09d45516b166659a.zip |
treewide: rename name to pname&version
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/device-tree/raspberrypi.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/hdapsd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jfbview/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/jool/cli.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/gpio-utils.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/microcode/amd.nix | 3 |
7 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index b4b40f8331f..d9ccb70f1f0 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -1,7 +1,8 @@ { lib, stdenvNoCC, raspberrypifw }: stdenvNoCC.mkDerivation { - name = "raspberrypi-dtbs-${raspberrypifw.version}"; + pname = "raspberrypi-dtbs"; + version = raspberrypifw.version; nativeBuildInputs = [ raspberrypifw ]; # Rename DTBs so u-boot finds them, like linux-rpi.nix diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index c587994ccec..f3ea80348b3 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, linuxPackages }: with lib; stdenv.mkDerivation { - name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; + pname = "rtl8723bs-firmware"; + version = linuxPackages.rtl8723bs.version; inherit (linuxPackages.rtl8723bs) src; dontBuild = true; diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 39f69ef0144..959fa9ac6e8 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl }: -let version = "20141203"; in -stdenv.mkDerivation { - name = "hdapsd-"+version; +stdenv.mkDerivation rec { + pname = "hdapsd"; + version = "20141203"; src = fetchurl { url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index da4135d8a80..eb61ff9d513 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { - name = "${package}-${version}"; + pname = package; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index b1bce496614..4c18f478798 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "jool-cli-${sourceAttrs.version}"; + pname = "jool-cli"; + version = sourceAttrs.version; src = sourceAttrs.src; diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix index e28d838efb3..9c7386f61c1 100644 --- a/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -5,7 +5,8 @@ with lib; assert versionAtLeast linux.version "4.6"; stdenv.mkDerivation { - name = "gpio-utils-${linux.version}"; + pname = "gpio-utils"; + version = linux.version; inherit (linux) src makeFlags; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index cdb2912c4af..0f3d0f18186 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -1,7 +1,8 @@ { lib, stdenv, linux-firmware, libarchive }: stdenv.mkDerivation { - name = "amd-ucode-${linux-firmware.version}"; + pname = "amd-ucode"; + version = linux-firmware.version; src = linux-firmware; |