Commit 59b52db7 authored by Ben Siraphob's avatar Ben Siraphob
Browse files

treewide: remove redundant name attrs and parseDrvName calls

parent 887e5eee
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ let
      attrs
      // {

        name = "${pname}-${version}";
        inherit version pname;

        buildInputs =
+2 −4
Original line number Diff line number Diff line
@@ -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;
+1 −6
Original line number Diff line number Diff line
@@ -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 ? { },
+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@
let
  pname = "xonotic";
  version = "0.8.6";
  name = "${pname}-${version}";
  variant =
    if withSDL && withGLX then
      ""
+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@
}:

bundlerEnv rec {
  name = "${pname}-${version}";
  pname = "bundler-audit";
  version = (import ./gemset.nix).bundler-audit.version;