public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Starting migrating old builderDefs packages to builderDefsPackage style.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13591
This commit is contained in:
Michael Raskin 2008-12-04 21:01:26 +00:00
parent 2b2bb11f32
commit d49a6f0641
3 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/tools/security/bmrsa/11.nix
View File

@ -1,13 +1,26 @@
args : with args; with builderDefs; args :
let localDefs = builderDefs.passthru.function (rec { let
src = /* put a fetchurl here */ lib = args.lib;
fetchurl { fetchurl = args.fetchurl;
url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip; FullDepEntry = args.FullDepEntry;
version = lib.getAttr ["version"] "" args;
buildInputs = with args; [
unzip
];
in
rec {
src = fetchurl {
url = "http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa${version}.zip";
sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
}; };
buildInputs = [unzip]; inherit buildInputs;
configureFlags = []; configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doMakeInstall"];
doUnpack = FullDepEntry ('' doUnpack = FullDepEntry (''
mkdir bmrsa mkdir bmrsa
cd bmrsa cd bmrsa
@ -16,17 +29,10 @@ args : with args; with builderDefs;
ensureDir $out/bin ensureDir $out/bin
echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile
'') ["minInit" "addInputs" "defEnsureDir"]; '') ["minInit" "addInputs" "defEnsureDir"];
});
in with localDefs;
stdenv.mkDerivation rec {
name = "bmrsa-"+version; name = "bmrsa-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs
[doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "RSA utility";
RSA utility.
";
inherit src;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -556,8 +556,8 @@ let
inherit fetchurl stdenv python wxPython26; inherit fetchurl stdenv python wxPython26;
}; };
bmrsa = composedArgsAndFun (selectVersion ../tools/security/bmrsa "11") { bmrsa = builderDefsPackage (selectVersion ../tools/security/bmrsa "11") {
inherit builderDefs unzip; inherit unzip;
}; };
bogofilter = import ../tools/misc/bogofilter { bogofilter = import ../tools/misc/bogofilter {

14
pkgs/top-level/template-composing-builder.nix
View File

@ -1,10 +1,10 @@
args : a :
let let
lib = args.lib; lib = a.lib;
fetchurl = args.fetchurl; fetchurl = a.fetchurl;
version = lib.getAttr ["version"] "" args; version = lib.getAttr ["version"] "" a;
buildInputs = with args; [ buildInputs = with a; [
]; ];
in in
@ -14,8 +14,8 @@ rec {
inherit buildInputs; inherit buildInputs;
configureFlags = []; configureFlags = [];
/* doConfigure should be specified separately */ /* doConfigure should be removed if not needed */
phaseNames = ["doMakeInstall"]; phaseNames = ["doConfigure" "doMakeInstall"];
name = "${abort "Specify name"}-" + version; name = "${abort "Specify name"}-" + version;
meta = { meta = {