diff options
author | Felix Buehler <account@buehler.rocks> | 2022-01-10 23:30:11 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2022-01-17 20:52:59 +0100 |
commit | 6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd (patch) | |
tree | e16cd3bdba0b9c5c1a6fb56219d685383fd53e5c | |
parent | 2ac65dd85b7fbe81b88e3c2a80d351aba4c4a9d8 (diff) | |
download | nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.tar nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.tar.gz nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.tar.bz2 nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.tar.lz nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.tar.xz nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.tar.zst nixpkgs-6cbf83ba01e4a71f2f24ff0dc20139d3a39134bd.zip |
treewide: rename name to pname&version
-rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libevdevc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libgestures/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/net-tools/mptcp.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pommed-light/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/statifier/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sysvinit/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/tmon/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/unstick/default.nix | 4 |
11 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 045f80ce9ac..6d1763a0d0f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,7 +12,8 @@ with lib; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { - name = "perf-linux-${kernel.version}"; + pname = "perf-linux"; + version = kernel.version; inherit (kernel) src; diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index 23d323f84b8..15f7251f996 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib }: stdenv.mkDerivation rec { - name = "kmod-debian-aliases-${version}.conf"; + pname = "kmod-debian-aliases.conf"; version = "22-1.1"; src = fetchurl { diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/os-specific/linux/libevdevc/default.nix index 2417ef6da9d..4998ee3e6b5 100644 --- a/pkgs/os-specific/linux/libevdevc/default.nix +++ b/pkgs/os-specific/linux/libevdevc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { - name = "libevdevc"; + pname = "libevdevc"; version = "2.0.1"; src = fetchFromGitHub { owner = "hugegreenbug"; diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/os-specific/linux/libgestures/default.nix index bface8118be..1454c0c78a5 100644 --- a/pkgs/os-specific/linux/libgestures/default.nix +++ b/pkgs/os-specific/linux/libgestures/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }: stdenv.mkDerivation rec { - name = "libgestures-${version}"; + pname = "libgestures"; version = "2.0.1"; src = fetchFromGitHub { owner = "hugegreenbug"; diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix index 577b7c25311..b4ce59a7c68 100644 --- a/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -1,7 +1,7 @@ { lib, nettools, fetchFromGitHub }: nettools.overrideAttrs(oa: rec { - name = "net-tools-mptcp"; + pname = "net-tools-mptcp"; version = "0.95"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 0797656f653..e86658ccb0a 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -10,13 +10,12 @@ }: stdenv.mkDerivation rec { - pkgname = "pommed-light"; + pname = "pommed-light"; version = "1.51lw"; - name = "${pkgname}-${version}"; src = fetchFromGitHub { owner = "bytbox"; - repo = pkgname; + repo = "pommed-light"; rev = "v${version}"; sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy"; }; diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 5afb399fc16..eefd95d1153 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,8 +1,8 @@ { lib, multiStdenv, fetchurl }: -let version = "1.7.4"; in -multiStdenv.mkDerivation { - name = "statifier-${version}"; +multiStdenv.mkDerivation rec { + pname = "statifier"; + version = "1.7.4"; src = fetchurl { url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 5f4f6069bcc..091584a93cf 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, withoutInitTools ? false }: -let version = "3.01"; in - -stdenv.mkDerivation { - name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version; +stdenv.mkDerivation rec { + pname = if withoutInitTools then "sysvtools" else "sysvinit"; + version = "3.01"; src = fetchurl { url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index 5a14d3d2ee3..3a2697e0a71 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, kernel, ncurses }: stdenv.mkDerivation { - name = "tmon-${kernel.version}"; + pname = "tmon"; + version = kernel.version; inherit (kernel) src; diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index a0b748be214..1d4166e4083 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { - name = "uclibc-ng-${version}"; + pname = "uclibc-ng"; inherit version; src = fetchurl { diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix index 7d839f8acdb..7856456a3c3 100644 --- a/pkgs/os-specific/linux/unstick/default.nix +++ b/pkgs/os-specific/linux/unstick/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }: stdenv.mkDerivation rec { - name = "unstick"; + pname = "unstick"; version = "0.1.0"; src = fetchFromGitHub { owner = "kwohlfahrt"; - repo = name; + repo = "unstick"; rev = "effee9aa242ca12dc94cc6e96bc073f4cc9e8657"; sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv"; }; |