treewide: remove redundant quotes
This commit is contained in:
@@ -52,7 +52,7 @@ let
|
||||
name
|
||||
else
|
||||
let
|
||||
gem = gems."${pname}";
|
||||
gem = gems.${pname};
|
||||
version = gem.version;
|
||||
in
|
||||
"${pname}-${version}";
|
||||
@@ -70,7 +70,7 @@ let
|
||||
|
||||
maybeCopyAll = pkgname: if pkgname == null then "" else
|
||||
let
|
||||
mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found");
|
||||
mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found");
|
||||
in
|
||||
copyIfBundledByPath mainGem;
|
||||
|
||||
|
||||
@@ -42,21 +42,21 @@ in rec {
|
||||
converge expandDependencies directlyMatchingGems;
|
||||
|
||||
platformMatches = {rubyEngine, version, ...}: attrs: (
|
||||
!(attrs ? "platforms") ||
|
||||
!(attrs ? platforms) ||
|
||||
builtins.length attrs.platforms == 0 ||
|
||||
builtins.any (platform:
|
||||
platform.engine == rubyEngine &&
|
||||
(!(platform ? "version") || platform.version == version.majMin)
|
||||
(!(platform ? version) || platform.version == version.majMin)
|
||||
) attrs.platforms
|
||||
);
|
||||
|
||||
groupMatches = groups: attrs:
|
||||
groups == null || !(attrs ? "groups") ||
|
||||
groups == null || !(attrs ? groups) ||
|
||||
(intersectLists (groups ++ [ "default" ]) attrs.groups) != [];
|
||||
|
||||
applyGemConfigs = attrs:
|
||||
(if gemConfig ? "${attrs.gemName}"
|
||||
then attrs // gemConfig."${attrs.gemName}" attrs
|
||||
(if gemConfig ? ${attrs.gemName}
|
||||
then attrs // gemConfig.${attrs.gemName} attrs
|
||||
else attrs);
|
||||
|
||||
genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
|
||||
@@ -88,6 +88,6 @@ in rec {
|
||||
inherit (attrs.source) type;
|
||||
source = removeAttrs attrs.source ["type"];
|
||||
gemName = name;
|
||||
gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
|
||||
gemPath = map (gemName: gems.${gemName}) (attrs.dependencies or []);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ in
|
||||
postBuild = genStubsScript {
|
||||
inherit lib ruby bundler groups;
|
||||
confFiles = basicEnv.confFiles;
|
||||
binPaths = [ basicEnv.gems."${pname}" ];
|
||||
binPaths = [ basicEnv.gems.${pname} ];
|
||||
} + lib.optionalString (postBuild != null) postBuild;
|
||||
|
||||
meta = { platforms = ruby.meta.platforms; } // meta;
|
||||
|
||||
Reference in New Issue
Block a user