BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'nix-run' of git://github.com/rickynils/nixpkgs"

Browse source 
nix-run's functionality is subsumed by nix-shell -p.

This reverts commit 3cc2b243c7, reversing
changes made to 4d5d6aed29.
This commit is contained in:
Shea Levy 2014-03-15 08:15:22 -04:00
parent ec0116f99d
commit a330e244ad
3 changed files with 0 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/my-env-run/default.nix
View file

@ -1,6 +0,0 @@
{ writeScript, bash, myEnvFun }: args:
let env = myEnvFun args; in writeScript "envrun-${args.name}" ''
#!${bash}/bin/bash
${env}/bin/load-env-${args.name}
''

72
pkgs/misc/nix-run/default.nix
View file

@ -1,72 +0,0 @@
{ stdenv, bash, writeScript }:
let
nix-run = writeScript "nix-run" ''
#!${bash}/bin/bash
# Runs nix-build and executes the result
# All arguments before "--" are given to nix-build,
# and all arguments after "--" are given to the
# executed command. stdin is redirected to the executed
# command.
out=$(mktemp)
rm "$out"
# parse args into args1 and args2, separated by --
# args1 goes to nix-build, args2 goes to the built command
args1=("$@")
args2=()
for i in "''${!args1[@]}"; do
if [ "''${args1[$i]}" == "--" ]; then
args2=("''${args1[@]:$((i+1))}")
args1=("''${args1[@]:0:$((i))}")
break
fi
done
if nix-build -o "$out" "''${args1[@]}" >/dev/null; then
target=$(readlink -m "$out")
unlink "$out"
if test -f "$target" && test -x "$target"; then
exec "$target" "''${args2[@]}" <&0
else
echo "nix-run: No executable target produced by nix-build"
exit 1
fi
else
echo "nix-run: nix-build failed"
exit 1
fi
'';
in stdenv.mkDerivation {
name = "nix-run";
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/bin
ln -s ${nix-run} $out/bin/nix-run
'';
meta = {
description = ''
Wrapper around nix-build that automatically executes the binary
produced by the provided Nix expression.
'';
longDescription = ''
nix-run invokes nix-build with any options given to it. It then
expects one executable file to be produced by nix-build. If this
is the case, that file is executed with any options that is given
to nix-run after a <literal>--</literal> option separator. If no
executable file is produced by nix-build, nix-run will exit with
an error. An example invocation of nix-run is <literal>nix-run -A
myattr mynix.nix -- -o opt</literal>. nix-run will then build the
attribute <literal>myattr</literal> from the Nix expression given
in the file <literal>mynix.nix</literal>. If a single executable
file is produced, that file is executed with the option
<literal>-o opt</literal>.
'';
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = stdenv.lib.platforms.linux;
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -10554,12 +10554,6 @@ let
inherit (stdenv) mkDerivation;
};
myEnvRun = import ../build-support/my-env-run {
inherit writeScript bash myEnvFun;
};
nix-run = callPackage ../misc/nix-run { };
# patoline requires a rather large ocaml compilation environment.
# this is why it is build as an environment and not just a normal package.
# remark : the emacs mode is also installed, but you have to adjust your load-path.