treewide: remove redundant name attrs and parseDrvName calls
This commit is contained in:
@@ -57,7 +57,6 @@ let
|
||||
attrs
|
||||
// {
|
||||
|
||||
name = "${pname}-${version}";
|
||||
inherit version pname;
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 ? { },
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
let
|
||||
pname = "xonotic";
|
||||
version = "0.8.6";
|
||||
name = "${pname}-${version}";
|
||||
variant =
|
||||
if withSDL && withGLX then
|
||||
""
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
}:
|
||||
|
||||
bundlerEnv rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "bundler-audit";
|
||||
version = (import ./gemset.nix).bundler-audit.version;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user