Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
@@ -1,35 +1,30 @@
|
||||
{ buildRubyGem, fetchFromGitHub, lib, bundler, ruby, nix, nix-prefetch-git }:
|
||||
{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix,
|
||||
nix-prefetch-git }:
|
||||
|
||||
buildRubyGem rec {
|
||||
inherit ruby;
|
||||
inherit (bundler) ruby;
|
||||
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "bundix";
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manveru";
|
||||
repo = "bundix";
|
||||
rev = version;
|
||||
sha256 = "1gh90yxm4k27jdjdl3r31fcg4sk7k54jlbw1zfm1p9q3i7k8x4i7";
|
||||
sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v";
|
||||
};
|
||||
|
||||
buildInputs = [bundler];
|
||||
buildInputs = [ ruby bundler ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \
|
||||
--replace \
|
||||
"'nix-instantiate'" \
|
||||
"'${nix.out}/bin/nix-instantiate'" \
|
||||
--replace \
|
||||
"'nix-hash'" \
|
||||
"'${nix.out}/bin/nix-hash'" \
|
||||
--replace \
|
||||
"'nix-prefetch-url'" \
|
||||
"'${nix.out}/bin/nix-prefetch-url'" \
|
||||
--replace \
|
||||
"'nix-prefetch-git'" \
|
||||
"'${nix-prefetch-git}/bin/nix-prefetch-git'"
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/bundix \
|
||||
--prefix PATH : "${nix.out}/bin" \
|
||||
--prefix PATH : "${nix-prefetch-git.out}/bin" \
|
||||
--prefix PATH : "${bundler.out}/bin" \
|
||||
--set GEM_HOME "${bundler}/${bundler.ruby.gemPath}" \
|
||||
--set GEM_PATH "${bundler}/${bundler.ruby.gemPath}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -41,7 +36,7 @@ buildRubyGem rec {
|
||||
The output is then usable by the bundlerEnv derivation to list all the
|
||||
dependencies of a ruby package.
|
||||
'';
|
||||
homepage = "https://github.com/manveru/bundix";
|
||||
homepage = https://github.com/manveru/bundix;
|
||||
license = "MIT";
|
||||
maintainers = with lib.maintainers; [ manveru zimbatm ];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
155
pkgs/development/ruby-modules/bundled-common/default.nix
Normal file
155
pkgs/development/ruby-modules/bundled-common/default.nix
Normal file
@@ -0,0 +1,155 @@
|
||||
{ stdenv, runCommand, ruby, lib
|
||||
, defaultGemConfig, buildRubyGem, buildEnv
|
||||
, makeWrapper
|
||||
, bundler
|
||||
}@defs:
|
||||
|
||||
{
|
||||
name ? null
|
||||
, pname ? null
|
||||
, mainGemName ? null
|
||||
, gemdir ? null
|
||||
, gemfile ? null
|
||||
, lockfile ? null
|
||||
, gemset ? null
|
||||
, ruby ? defs.ruby
|
||||
, gemConfig ? defaultGemConfig
|
||||
, postBuild ? null
|
||||
, document ? []
|
||||
, meta ? {}
|
||||
, groups ? ["default"]
|
||||
, ignoreCollisions ? false
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
assert name == null -> pname != null;
|
||||
|
||||
with import ./functions.nix { inherit lib gemConfig; };
|
||||
|
||||
let
|
||||
gemFiles = bundlerFiles args;
|
||||
|
||||
importedGemset = import gemFiles.gemset;
|
||||
|
||||
filteredGemset = filterGemset { inherit ruby groups; } importedGemset;
|
||||
|
||||
configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
|
||||
applyGemConfigs (attrs // { inherit ruby; gemName = name; })
|
||||
);
|
||||
|
||||
hasBundler = builtins.hasAttr "bundler" filteredGemset;
|
||||
|
||||
bundler =
|
||||
if hasBundler then gems.bundler
|
||||
else defs.bundler.override (attrs: { inherit ruby; });
|
||||
|
||||
gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
|
||||
|
||||
name' = if name != null then
|
||||
name
|
||||
else
|
||||
let
|
||||
gem = gems."${pname}";
|
||||
version = gem.version;
|
||||
in
|
||||
"${pname}-${version}";
|
||||
|
||||
pname' = if pname != null then
|
||||
pname
|
||||
else
|
||||
name;
|
||||
|
||||
copyIfBundledByPath = { bundledByPath ? false, ...}@main:
|
||||
(if bundledByPath then
|
||||
assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
|
||||
else ""
|
||||
);
|
||||
|
||||
maybeCopyAll = pkgname: if pkgname == null then "" else
|
||||
let
|
||||
mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found");
|
||||
in
|
||||
copyIfBundledByPath mainGem;
|
||||
|
||||
# We have to normalize the Gemfile.lock, otherwise bundler tries to be
|
||||
# helpful by doing so at run time, causing executables to immediately bail
|
||||
# out. Yes, I'm serious.
|
||||
confFiles = runCommand "gemfile-and-lockfile" {} ''
|
||||
mkdir -p $out
|
||||
${maybeCopyAll mainGemName}
|
||||
cp ${gemFiles.gemfile} $out/Gemfile || ls -l $out/Gemfile
|
||||
cp ${gemFiles.lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock
|
||||
'';
|
||||
|
||||
buildGem = name: attrs: (
|
||||
let
|
||||
gemAttrs = composeGemAttrs ruby gems name attrs;
|
||||
in
|
||||
if gemAttrs.type == "path" then
|
||||
pathDerivation gemAttrs
|
||||
else
|
||||
buildRubyGem gemAttrs
|
||||
);
|
||||
|
||||
envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
|
||||
|
||||
basicEnv = buildEnv {
|
||||
inherit ignoreCollisions;
|
||||
|
||||
name = name';
|
||||
|
||||
paths = envPaths;
|
||||
pathsToLink = [ "/lib" ];
|
||||
|
||||
postBuild = genStubsScript (defs // args // {
|
||||
inherit confFiles bundler groups;
|
||||
binPaths = envPaths;
|
||||
}) + lib.optionalString (postBuild != null) postBuild;
|
||||
|
||||
meta = { platforms = ruby.meta.platforms; } // meta;
|
||||
|
||||
passthru = rec {
|
||||
inherit ruby bundler gems confFiles envPaths;
|
||||
|
||||
wrappedRuby = stdenv.mkDerivation {
|
||||
name = "wrapped-ruby-${pname'}";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
for i in ${ruby}/bin/*; do
|
||||
makeWrapper "$i" $out/bin/$(basename "$i") \
|
||||
--set BUNDLE_GEMFILE ${confFiles}/Gemfile \
|
||||
--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \
|
||||
--set BUNDLE_FROZEN 1 \
|
||||
--set GEM_HOME ${basicEnv}/${ruby.gemPath} \
|
||||
--set GEM_PATH ${basicEnv}/${ruby.gemPath}
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
env = let
|
||||
irbrc = builtins.toFile "irbrc" ''
|
||||
if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
|
||||
require ENV["OLD_IRBRC"]
|
||||
end
|
||||
require 'rubygems'
|
||||
require 'bundler/setup'
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname'}-interactive-environment";
|
||||
nativeBuildInputs = [ wrappedRuby basicEnv ];
|
||||
shellHook = ''
|
||||
export OLD_IRBRC=$IRBRC
|
||||
export IRBRC=${irbrc}
|
||||
'';
|
||||
buildCommand = ''
|
||||
echo >&2 ""
|
||||
echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
|
||||
echo >&2 ""
|
||||
exit 1
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
basicEnv
|
||||
75
pkgs/development/ruby-modules/bundled-common/functions.nix
Normal file
75
pkgs/development/ruby-modules/bundled-common/functions.nix
Normal file
@@ -0,0 +1,75 @@
|
||||
{ lib, gemConfig, ... }:
|
||||
rec {
|
||||
bundlerFiles = {
|
||||
gemfile ? null
|
||||
, lockfile ? null
|
||||
, gemset ? null
|
||||
, gemdir ? null
|
||||
, ...
|
||||
}: {
|
||||
inherit gemdir;
|
||||
|
||||
gemfile =
|
||||
if gemfile == null then assert gemdir != null; gemdir + "/Gemfile"
|
||||
else gemfile;
|
||||
|
||||
lockfile =
|
||||
if lockfile == null then assert gemdir != null; gemdir + "/Gemfile.lock"
|
||||
else lockfile;
|
||||
|
||||
gemset =
|
||||
if gemset == null then assert gemdir != null; gemdir + "/gemset.nix"
|
||||
else gemset;
|
||||
};
|
||||
|
||||
filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
|
||||
|
||||
platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
|
||||
!(attrs ? "platforms") ||
|
||||
builtins.length attrs.platforms == 0 ||
|
||||
builtins.any (platform:
|
||||
platform.engine == rubyEngine &&
|
||||
(!(platform ? "version") || platform.version == version.majMin)
|
||||
) attrs.platforms
|
||||
);
|
||||
|
||||
groupMatches = groups: attrs: (
|
||||
!(attrs ? "groups") ||
|
||||
builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups
|
||||
);
|
||||
|
||||
applyGemConfigs = attrs:
|
||||
(if gemConfig ? "${attrs.gemName}"
|
||||
then attrs // gemConfig."${attrs.gemName}" attrs
|
||||
else attrs);
|
||||
|
||||
genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
|
||||
${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
|
||||
"${ruby}/bin/ruby" \
|
||||
"${confFiles}/Gemfile" \
|
||||
"$out/${ruby.gemPath}" \
|
||||
"${bundler}/${ruby.gemPath}" \
|
||||
${lib.escapeShellArg binPaths} \
|
||||
${lib.escapeShellArg groups}
|
||||
'';
|
||||
|
||||
pathDerivation = { gemName, version, path, ... }:
|
||||
let
|
||||
res = {
|
||||
type = "derivation";
|
||||
bundledByPath = true;
|
||||
name = gemName;
|
||||
version = version;
|
||||
outPath = path;
|
||||
outputs = [ "out" ];
|
||||
out = res;
|
||||
outputName = "out";
|
||||
};
|
||||
in res;
|
||||
|
||||
composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // {
|
||||
inherit ruby;
|
||||
gemName = name;
|
||||
gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
|
||||
});
|
||||
}
|
||||
50
pkgs/development/ruby-modules/bundled-common/test.nix
Normal file
50
pkgs/development/ruby-modules/bundled-common/test.nix
Normal file
@@ -0,0 +1,50 @@
|
||||
{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs:
|
||||
let
|
||||
testConfigs = {
|
||||
inherit lib;
|
||||
gemConfig = defaultGemConfig;
|
||||
};
|
||||
functions = (import ./functions.nix testConfigs);
|
||||
in
|
||||
builtins.concatLists [
|
||||
( test.run "All set, no gemdir" (functions.bundlerFiles {
|
||||
gemfile = test/Gemfile;
|
||||
lockfile = test/Gemfile.lock;
|
||||
gemset = test/gemset.nix;
|
||||
}) {
|
||||
gemfile = should.equal test/Gemfile;
|
||||
lockfile = should.equal test/Gemfile.lock;
|
||||
gemset = should.equal test/gemset.nix;
|
||||
})
|
||||
|
||||
( test.run "Just gemdir" (functions.bundlerFiles {
|
||||
gemdir = test/.;
|
||||
}) {
|
||||
gemfile = should.equal test/Gemfile;
|
||||
lockfile = should.equal test/Gemfile.lock;
|
||||
gemset = should.equal test/gemset.nix;
|
||||
})
|
||||
|
||||
( test.run "Gemset and dir" (functions.bundlerFiles {
|
||||
gemdir = test/.;
|
||||
gemset = test/extraGemset.nix;
|
||||
}) {
|
||||
gemfile = should.equal test/Gemfile;
|
||||
lockfile = should.equal test/Gemfile.lock;
|
||||
gemset = should.equal test/extraGemset.nix;
|
||||
})
|
||||
|
||||
( test.run "Filter empty gemset" {} (set: functions.filterGemset {inherit ruby; groups = ["default"]; } set == {}))
|
||||
( let gemSet = { test = { groups = ["x" "y"]; }; };
|
||||
in
|
||||
test.run "Filter matches a group" gemSet (set: functions.filterGemset {inherit ruby; groups = ["y" "z"];} set == gemSet))
|
||||
( let gemSet = { test = { platforms = []; }; };
|
||||
in
|
||||
test.run "Filter matches empty platforms list" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
|
||||
( let gemSet = { test = { platforms = [{engine = ruby.rubyEngine; version = ruby.version.majMin;}]; }; };
|
||||
in
|
||||
test.run "Filter matches on platform" gemSet (set: functions.filterGemset {inherit ruby; groups = [];} set == gemSet))
|
||||
( let gemSet = { test = { groups = ["x" "y"]; }; };
|
||||
in
|
||||
test.run "Filter excludes based on groups" gemSet (set: functions.filterGemset {inherit ruby; groups = ["a" "b"];} set == {}))
|
||||
]
|
||||
48
pkgs/development/ruby-modules/bundler-app/default.nix
Normal file
48
pkgs/development/ruby-modules/bundler-app/default.nix
Normal file
@@ -0,0 +1,48 @@
|
||||
{ lib, stdenv, callPackage, runCommand, ruby }@defs:
|
||||
|
||||
# Use for simple installation of Ruby tools shipped in a Gem.
|
||||
# Start with a Gemfile that includes `gem <toolgem>`
|
||||
# > nix-shell -p bundler bundix
|
||||
# (shell)> bundle lock
|
||||
# (shell)> bundix
|
||||
# Then use rubyTool in the default.nix:
|
||||
|
||||
# rubyTool { pname = "gemifiedTool"; gemdir = ./.; exes = ["gemified-tool"]; }
|
||||
# The 'exes' parameter ensures that a copy of e.g. rake doesn't polute the system.
|
||||
{
|
||||
# use the name of the name in question; its version will be picked up from the gemset
|
||||
pname
|
||||
# gemdir is the location of the Gemfile{,.lock} and gemset.nix; usually ./.
|
||||
, gemdir
|
||||
# Exes is the list of executables provided by the gems in the Gemfile
|
||||
, exes ? []
|
||||
# Scripts are ruby programs depend on gems in the Gemfile (e.g. scripts/rails)
|
||||
, scripts ? []
|
||||
, ruby ? defs.ruby
|
||||
, gemfile ? null
|
||||
, lockfile ? null
|
||||
, gemset ? null
|
||||
, preferLocalBuild ? false
|
||||
, allowSubstitutes ? false
|
||||
, meta ? {}
|
||||
, postBuild ? ""
|
||||
}@args:
|
||||
|
||||
let
|
||||
basicEnv = (callPackage ../bundled-common {}) args;
|
||||
|
||||
cmdArgs = removeAttrs args [ "pname" "postBuild" ]
|
||||
// { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
|
||||
in
|
||||
runCommand basicEnv.name cmdArgs ''
|
||||
mkdir -p $out/bin;
|
||||
${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
|
||||
${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
|
||||
"--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
|
||||
"--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
|
||||
"--set BUNDLE_FROZEN 1 "+
|
||||
"--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
|
||||
"--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+
|
||||
"--run \"cd $srcdir\";\n") scripts)}
|
||||
${postBuild}
|
||||
''
|
||||
@@ -1,9 +1,6 @@
|
||||
{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
|
||||
, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv
|
||||
, git
|
||||
, makeWrapper
|
||||
, bundler
|
||||
, tree
|
||||
, linkFarm, git, makeWrapper, bundler, tree
|
||||
}@defs:
|
||||
|
||||
{ name ? null
|
||||
@@ -12,143 +9,54 @@
|
||||
, gemfile ? null
|
||||
, lockfile ? null
|
||||
, gemset ? null
|
||||
, groups ? ["default"]
|
||||
, ruby ? defs.ruby
|
||||
, gemConfig ? defaultGemConfig
|
||||
, postBuild ? null
|
||||
, document ? []
|
||||
, meta ? {}
|
||||
, groups ? ["default"]
|
||||
, ignoreCollisions ? false
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
let
|
||||
drvName =
|
||||
if name != null then name
|
||||
else if pname != null then "${toString pname}-${mainGem.version}"
|
||||
else throw "bundlerEnv: either pname or name must be set";
|
||||
inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
|
||||
|
||||
mainGem =
|
||||
if pname == null then null
|
||||
else gems."${pname}" or (throw "bundlerEnv: gem ${pname} not found");
|
||||
basicEnv = (callPackage ../bundled-common {}) (args // { inherit pname name; mainGemName = pname; });
|
||||
|
||||
gemfile' =
|
||||
if gemfile == null then gemdir + "/Gemfile"
|
||||
else gemfile;
|
||||
inherit (basicEnv) envPaths;
|
||||
# Idea here is a mkDerivation that gen-bin-stubs new stubs "as specified" -
|
||||
# either specific executables or the bin/ for certain gem(s), but
|
||||
# incorporates the basicEnv as a requirement so that its $out is in our path.
|
||||
|
||||
lockfile' =
|
||||
if lockfile == null then gemdir + "/Gemfile.lock"
|
||||
else lockfile;
|
||||
# When stubbing the bins for a gem, we should use the gem expression
|
||||
# directly, which means that basicEnv should somehow make it available.
|
||||
|
||||
gemset' =
|
||||
if gemset == null then gemdir + "/gemset.nix"
|
||||
else gemset;
|
||||
# Different use cases should use different variations on this file, rather
|
||||
# than the expression trying to deduce a use case.
|
||||
|
||||
importedGemset = import gemset';
|
||||
|
||||
filteredGemset = (lib.filterAttrs (name: attrs:
|
||||
if (builtins.hasAttr "groups" attrs)
|
||||
then (builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups)
|
||||
else true
|
||||
) importedGemset);
|
||||
|
||||
applyGemConfigs = attrs:
|
||||
(if gemConfig ? "${attrs.gemName}"
|
||||
then attrs // gemConfig."${attrs.gemName}" attrs
|
||||
else attrs);
|
||||
|
||||
configuredGemset = lib.flip lib.mapAttrs filteredGemset (name: attrs:
|
||||
applyGemConfigs (attrs // { inherit ruby; gemName = name; })
|
||||
);
|
||||
|
||||
hasBundler = builtins.hasAttr "bundler" filteredGemset;
|
||||
|
||||
bundler =
|
||||
if hasBundler then gems.bundler
|
||||
else defs.bundler.override (attrs: { inherit ruby; });
|
||||
|
||||
gems = lib.flip lib.mapAttrs configuredGemset (name: attrs:
|
||||
buildRubyGem ((removeAttrs attrs ["source"]) // attrs.source // {
|
||||
inherit ruby;
|
||||
gemName = name;
|
||||
gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
|
||||
}));
|
||||
|
||||
# We have to normalize the Gemfile.lock, otherwise bundler tries to be
|
||||
# helpful by doing so at run time, causing executables to immediately bail
|
||||
# out. Yes, I'm serious.
|
||||
confFiles = runCommand "gemfile-and-lockfile" {} ''
|
||||
mkdir -p $out
|
||||
cp ${gemfile'} $out/Gemfile
|
||||
cp ${lockfile'} $out/Gemfile.lock
|
||||
'';
|
||||
|
||||
envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
|
||||
|
||||
binPaths = if mainGem != null then [ mainGem ] else envPaths;
|
||||
|
||||
bundlerEnv = buildEnv {
|
||||
inherit ignoreCollisions;
|
||||
|
||||
name = drvName;
|
||||
|
||||
paths = envPaths;
|
||||
pathsToLink = [ "/lib" ];
|
||||
|
||||
postBuild = ''
|
||||
${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
|
||||
"${ruby}/bin/ruby" \
|
||||
"${confFiles}/Gemfile" \
|
||||
"$out/${ruby.gemPath}" \
|
||||
"${bundler}/${ruby.gemPath}" \
|
||||
${lib.escapeShellArg binPaths} \
|
||||
${lib.escapeShellArg groups}
|
||||
'' + lib.optionalString (postBuild != null) postBuild;
|
||||
|
||||
meta = { platforms = ruby.meta.platforms; } // meta;
|
||||
|
||||
passthru = rec {
|
||||
inherit ruby bundler gems;
|
||||
|
||||
wrappedRuby = stdenv.mkDerivation {
|
||||
name = "wrapped-ruby-${drvName}";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
for i in ${ruby}/bin/*; do
|
||||
makeWrapper "$i" $out/bin/$(basename "$i") \
|
||||
--set BUNDLE_GEMFILE ${confFiles}/Gemfile \
|
||||
--set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
|
||||
--set BUNDLE_FROZEN 1 \
|
||||
--set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
|
||||
--set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
env = let
|
||||
irbrc = builtins.toFile "irbrc" ''
|
||||
if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
|
||||
require ENV["OLD_IRBRC"]
|
||||
end
|
||||
require 'rubygems'
|
||||
require 'bundler/setup'
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
name = "interactive-${drvName}-environment";
|
||||
nativeBuildInputs = [ wrappedRuby bundlerEnv ];
|
||||
shellHook = ''
|
||||
export OLD_IRBRC="$IRBRC"
|
||||
export IRBRC=${irbrc}
|
||||
'';
|
||||
buildCommand = ''
|
||||
echo >&2 ""
|
||||
echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
|
||||
echo >&2 ""
|
||||
exit 1
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
# The basicEnv should be put into passthru so that e.g. nix-shell can use it.
|
||||
in
|
||||
bundlerEnv
|
||||
if pname == null then
|
||||
basicEnv // { inherit name basicEnv; }
|
||||
else
|
||||
(buildEnv {
|
||||
inherit ignoreCollisions;
|
||||
|
||||
name = basicEnv.name;
|
||||
|
||||
paths = envPaths;
|
||||
pathsToLink = [ "/lib" ];
|
||||
|
||||
postBuild = genStubsScript {
|
||||
inherit lib ruby bundler groups;
|
||||
confFiles = basicEnv.confFiles;
|
||||
binPaths = [ basicEnv.gems."${pname}" ];
|
||||
} + lib.optionalString (postBuild != null) postBuild;
|
||||
|
||||
meta = { platforms = ruby.meta.platforms; } // meta;
|
||||
passthru = basicEnv.passthru // {
|
||||
inherit basicEnv;
|
||||
inherit (basicEnv) env;
|
||||
};
|
||||
})
|
||||
|
||||
33
pkgs/development/ruby-modules/bundler-env/test.nix
Normal file
33
pkgs/development/ruby-modules/bundler-env/test.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs:
|
||||
let
|
||||
bundlerEnv = callPackage ./default.nix stubs // {
|
||||
basicEnv = callPackage ../bundled-common stubs;
|
||||
};
|
||||
|
||||
justName = bundlerEnv {
|
||||
name = "test-0.1.2";
|
||||
gemset = ./test/gemset.nix;
|
||||
};
|
||||
|
||||
pnamed = bundlerEnv {
|
||||
pname = "test";
|
||||
gemdir = ./test;
|
||||
gemset = ./test/gemset.nix;
|
||||
gemfile = ./test/Gemfile;
|
||||
lockfile = ./test/Gemfile.lock;
|
||||
};
|
||||
in
|
||||
builtins.concatLists [
|
||||
(test.run "bundlerEnv { name }" justName {
|
||||
name = should.equal "test-0.1.2";
|
||||
})
|
||||
(test.run "bundlerEnv { pname }" pnamed
|
||||
[
|
||||
(should.haveKeys [ "name" "env" "postBuild" ])
|
||||
{
|
||||
name = should.equal "test-0.1.2";
|
||||
env = should.beASet;
|
||||
postBuild = should.havePrefix "/nix/store";
|
||||
}
|
||||
])
|
||||
]
|
||||
10
pkgs/development/ruby-modules/bundler-env/test/gemset.nix
Normal file
10
pkgs/development/ruby-modules/bundler-env/test/gemset.nix
Normal file
@@ -0,0 +1,10 @@
|
||||
{
|
||||
test = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.2";
|
||||
};
|
||||
}
|
||||
@@ -251,7 +251,7 @@ in
|
||||
|
||||
substituteInPlace lib/sup/crypto.rb \
|
||||
--replace 'which gpg2' \
|
||||
'${which}/bin/which gpg2'
|
||||
'${which}/bin/which gpg'
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -87,6 +87,7 @@ stdenv.mkDerivation (attrs // {
|
||||
++ lib.optional stdenv.isDarwin darwin.libobjc
|
||||
++ buildInputs;
|
||||
|
||||
#name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
|
||||
name = attrs.name or "${namePrefix}${gemName}-${version}";
|
||||
|
||||
inherit src;
|
||||
|
||||
6
pkgs/development/ruby-modules/runtests.sh
Executable file
6
pkgs/development/ruby-modules/runtests.sh
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -o xtrace
|
||||
cd $(dirname $0)
|
||||
find . -name text.nix
|
||||
testfiles=$(find . -name test.nix)
|
||||
nix-build -E "with import <nixpkgs> {}; callPackage testing/driver.nix { testFiles = [ $testfiles ]; }" --show-trace && cat result
|
||||
28
pkgs/development/ruby-modules/testing/assertions.nix
Normal file
28
pkgs/development/ruby-modules/testing/assertions.nix
Normal file
@@ -0,0 +1,28 @@
|
||||
{ test, lib, ...}:
|
||||
{
|
||||
equal = expected: actual:
|
||||
if actual == expected then
|
||||
(test.passed "= ${toString expected}") else
|
||||
(test.failed (
|
||||
"expected '${toString expected}'(${builtins.typeOf expected})"
|
||||
+ " != "+
|
||||
"actual '${toString actual}'(${builtins.typeOf actual})"
|
||||
));
|
||||
|
||||
beASet = actual:
|
||||
if builtins.isAttrs actual then
|
||||
(test.passed "is a set") else
|
||||
(test.failed "is not a set, was ${builtins.typeOf actual}: ${toString actual}");
|
||||
|
||||
haveKeys = expected: actual:
|
||||
if builtins.all
|
||||
(ex: builtins.any (ac: ex == ac) (builtins.attrNames actual))
|
||||
expected then
|
||||
(test.passed "has expected keys") else
|
||||
(test.failed "keys differ: expected: [${lib.concatStringsSep ";" expected}] actual: [${lib.concatStringsSep ";" (builtins.attrNames actual)}]");
|
||||
|
||||
havePrefix = expected: actual:
|
||||
if lib.hasPrefix expected actual then
|
||||
(test.passed "has prefix '${expected}'") else
|
||||
(test.failed "prefix '${expected}' not found in '${actual}'");
|
||||
}
|
||||
20
pkgs/development/ruby-modules/testing/driver.nix
Normal file
20
pkgs/development/ruby-modules/testing/driver.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
/*
|
||||
Run with:
|
||||
nix-build -E 'with import <nixpkgs> { }; callPackage ./test.nix {}' --show-trace; and cat result
|
||||
|
||||
Confusingly, the ideal result ends with something like:
|
||||
error: build of ‘/nix/store/3245f3dcl2wxjs4rci7n069zjlz8qg85-test-results.tap.drv’ failed
|
||||
*/
|
||||
{ writeText, lib, callPackage, testFiles, stdenv, ruby }@defs:
|
||||
let
|
||||
testTools = rec {
|
||||
test = import ./testing.nix;
|
||||
stubs = import ./stubs.nix defs;
|
||||
should = import ./assertions.nix { inherit test lib; };
|
||||
};
|
||||
|
||||
tap = import ./tap-support.nix;
|
||||
|
||||
results = builtins.concatLists (map (file: callPackage file testTools) testFiles);
|
||||
in
|
||||
writeText "test-results.tap" (tap.output results)
|
||||
33
pkgs/development/ruby-modules/testing/stubs.nix
Normal file
33
pkgs/development/ruby-modules/testing/stubs.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{ stdenv, lib, ruby, callPackage, ... }:
|
||||
let
|
||||
real = {
|
||||
inherit (stdenv) mkDerivation;
|
||||
};
|
||||
mkDerivation = {name, ...}@argSet:
|
||||
derivation {
|
||||
inherit name;
|
||||
text = (builtins.toJSON (lib.filterAttrs ( n: v: builtins.any (x: x == n) ["name" "system"]) argSet));
|
||||
builder = stdenv.shell;
|
||||
args = [ "-c" "echo $(<$textPath) > $out"];
|
||||
system = stdenv.system;
|
||||
passAsFile = ["text"];
|
||||
};
|
||||
fetchurl = {url?"", urls ? [],...}: "fetchurl:${if urls == [] then url else builtins.head urls}";
|
||||
|
||||
stdenv' = stdenv // {
|
||||
inherit mkDerivation;
|
||||
stubbed = true;
|
||||
};
|
||||
ruby' = ruby // {
|
||||
stdenv = stdenv';
|
||||
stubbed = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
ruby = ruby';
|
||||
buildRubyGem = callPackage ../gem {
|
||||
inherit fetchurl;
|
||||
ruby = ruby';
|
||||
};
|
||||
stdenv = stdenv';
|
||||
}
|
||||
21
pkgs/development/ruby-modules/testing/tap-support.nix
Normal file
21
pkgs/development/ruby-modules/testing/tap-support.nix
Normal file
@@ -0,0 +1,21 @@
|
||||
with builtins;
|
||||
let
|
||||
withIndexes = list: genList (idx: (elemAt list idx) // {index = idx;}) (length list);
|
||||
|
||||
testLine = report: "${okStr report} ${toString (report.index + 1)} ${report.description}" + testDirective report + testYaml report;
|
||||
|
||||
# These are part of the TAP spec, not yet implemented.
|
||||
#c.f. https://github.com/NixOS/nixpkgs/issues/27071
|
||||
testDirective = report: "";
|
||||
testYaml = report: "";
|
||||
|
||||
okStr = { result, ...}: if result == "pass" then "ok" else "not ok";
|
||||
in
|
||||
{
|
||||
output = reports: ''
|
||||
TAP version 13
|
||||
1..${toString (length reports)}'' + (foldl' (l: r: l + "\n" + r) "" (map testLine (withIndexes reports))) + ''
|
||||
|
||||
# Finished at ${toString currentTime}
|
||||
'';
|
||||
}
|
||||
62
pkgs/development/ruby-modules/testing/testing.nix
Normal file
62
pkgs/development/ruby-modules/testing/testing.nix
Normal file
@@ -0,0 +1,62 @@
|
||||
with builtins;
|
||||
let
|
||||
/*
|
||||
underTest = {
|
||||
x = {
|
||||
a = 1;
|
||||
b = "2";
|
||||
};
|
||||
};
|
||||
|
||||
tests = [
|
||||
(root: false)
|
||||
{
|
||||
x = [
|
||||
(set: true)
|
||||
{
|
||||
a = (a: a > 1);
|
||||
b = (b: b == "3");
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
results = run "Examples" underTest tests;
|
||||
*/
|
||||
|
||||
passed = desc: {
|
||||
result = "pass";
|
||||
description = desc;
|
||||
};
|
||||
|
||||
failed = desc: {
|
||||
result = "failed";
|
||||
description = desc;
|
||||
};
|
||||
|
||||
prefixName = name: res: {
|
||||
inherit (res) result;
|
||||
description = "${name}: ${res.description}";
|
||||
};
|
||||
|
||||
run = name: under: tests: if isList tests then
|
||||
(concatLists (map (run name under) tests))
|
||||
else if isAttrs tests then
|
||||
(concatLists (map (
|
||||
subName: run (name + "." + subName) (if hasAttr subName under then getAttr subName under else "<MISSING!>") (getAttr subName tests)
|
||||
) (attrNames tests)))
|
||||
else if isFunction tests then
|
||||
let
|
||||
res = tests under;
|
||||
in
|
||||
if isBool res then
|
||||
[
|
||||
(prefixName name (if tests under then passed "passed" else failed "failed"))
|
||||
]
|
||||
else
|
||||
[ (prefixName name res) ]
|
||||
else [
|
||||
failed (name ": not a function, list or set")
|
||||
];
|
||||
in
|
||||
{ inherit run passed failed; }
|
||||
Reference in New Issue
Block a user