alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixed tailor expression

Browse source 
svn path=/nixpkgs/trunk/; revision=11941
This commit is contained in:
Michael Raskin 2008-05-31 07:26:13 +00:00
parent 18d227c98d
commit 47e9ed0386
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/tailor/0.9.31.nix
View file

@ -5,11 +5,11 @@ rec {
sha256 = "1apzd6mfmhgmxffzgzwsr17gnyqj6bycn783l9105cihsfcv9v3j"; sha256 = "1apzd6mfmhgmxffzgzwsr17gnyqj6bycn783l9105cihsfcv9v3j";
}; };
buildInputs = [python]; buildInputs = [python makeWrapper];
configureFlags = []; configureFlags = [];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["installPythonPackage"]; phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
name = "tailor-" + version; name = "tailor-" + version;
meta = { meta = {

6
pkgs/servers/samba/default.nix
View file

@ -1,11 +1,11 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "samba-3.0.28a"; name = "samba-3.0.30";
src = fetchurl { src = fetchurl {
url = http://us3.samba.org/samba/ftp/stable/samba-3.0.28a.tar.gz; url = http://www.samba.org/samba/ftp/stable/samba-3.0.30.tar.gz;
sha256 = "1pnrh4qlapsqgdrzq4v5vxv622wcxghi5cp0n4f87c8pc2rfrjcx"; sha256 = "0lzs53424fblg9g6z3nsan3dxi3bnn5h4zs31ji2bavai4xrsy51";
}; };
buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam]; buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam];

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

@ -4138,6 +4138,15 @@ let pkgs = rec {
propagatedBuildInputs = []; propagatedBuildInputs = [];
}; };
perlYAML = import ../development/perl-modules/generic perl {
name = "YAML-0.66";
src = fetchurl {
url = http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-0.66.tar.gz;
sha256 = "1pcjf6y3l88ypa52mkk349jglabm53mhxda4p5awc1jl67lx3ngw";
};
propagatedBuildInputs = [];
};
perlYAMLSyck = import ../development/perl-modules/generic perl { perlYAMLSyck = import ../development/perl-modules/generic perl {
name = "YAML-Syck-1.04"; name = "YAML-Syck-1.04";
src = fetchurl { src = fetchurl {
@ -6298,6 +6307,7 @@ let pkgs = rec {
tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.31") { tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.31") {
python = python25; python = python25;
inherit makeWrapper;
} null; } null;
/* does'nt work yet i686-linux only (32bit version) /* does'nt work yet i686-linux only (32bit version)

6
pkgs/top-level/builder-defs.nix
View file

@ -305,6 +305,12 @@ args: with args; with stringsWithDeps; with lib;
done done
'') ["minInit" "addInputs" "defEnsureDir"]; '') ["minInit" "addInputs" "defEnsureDir"];
wrapBinContentsPython = (makeManyWrappers
''$out/bin/*''
(''--prefix PYTHONPATH : $(toPythonPath $out)'' +
''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}'')
);
doPropagate = FullDepEntry (" doPropagate = FullDepEntry ("
ensureDir \$out/nix-support ensureDir \$out/nix-support
echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs