From 59b52db7591eb6797ce39a1e327e751bd303d120 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 1 Apr 2026 20:29:09 -0700 Subject: [PATCH] treewide: remove redundant name attrs and parseDrvName calls --- pkgs/development/beam-modules/rebar3-release.nix | 1 - pkgs/development/idris-modules/build-builtin-package.nix | 6 ++---- pkgs/development/ruby-modules/gem/default.nix | 7 +------ pkgs/games/xonotic/default.nix | 1 - pkgs/tools/security/bundler-audit/default.nix | 1 - 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index e1af791cfa5a..27ce041c8797 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -57,7 +57,6 @@ let attrs // { - name = "${pname}-${version}"; inherit version pname; buildInputs = diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index a5fd167e6a52..e8b49854443b 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -3,12 +3,10 @@ # deps: The dependencies of the package { idris, build-idris-package }: pname: deps: -let - inherit (builtins.parseDrvName idris.name) version; -in build-idris-package { - inherit pname version; + inherit pname; + inherit (idris) version; inherit (idris) src; noPrelude = true; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index bf792f83cd13..a759f10138f3 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -39,12 +39,7 @@ lib.makeOverridable ( platform ? "ruby", ruby ? defs.ruby, stdenv ? ruby.stdenv, - namePrefix ? ( - let - rubyName = builtins.parseDrvName ruby.name; - in - "${rubyName.name}${lib.versions.majorMinor rubyName.version}-" - ), + namePrefix ? "${ruby.pname}${lib.versions.majorMinor (toString ruby.version)}-", nativeBuildInputs ? [ ], buildInputs ? [ ], meta ? { }, diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index a0de27407762..8c5f4a7f3975 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -38,7 +38,6 @@ let pname = "xonotic"; version = "0.8.6"; - name = "${pname}-${version}"; variant = if withSDL && withGLX then "" diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/tools/security/bundler-audit/default.nix index 8db9959c2ad3..b56b9046849c 100644 --- a/pkgs/tools/security/bundler-audit/default.nix +++ b/pkgs/tools/security/bundler-audit/default.nix @@ -6,7 +6,6 @@ }: bundlerEnv rec { - name = "${pname}-${version}"; pname = "bundler-audit"; version = (import ./gemset.nix).bundler-audit.version;