egg2nix: Update to 0.2.

Also regenerate chicken-eggs.nix - the changeset is quite big, but
subsequent changes will be smaller as egg2nix now sorts its output.
This commit is contained in:
Moritz Ulrich 2014-10-18 02:07:38 +02:00
parent f46e83da86
commit 6ff97809c5
3 changed files with 225 additions and 300 deletions

View File

@ -1,361 +1,296 @@
{ pkgs, stdenv }: { pkgs, stdenv }:
rec { rec {
inherit (pkgs) eggDerivation fetchegg; inherit (pkgs) eggDerivation fetchegg;
versions = eggDerivation { base64 = eggDerivation {
name = "versions-1.15"; name = "base64-3.3.1";
src = fetchegg { src = fetchegg {
name = "versions"; name = "base64";
version = "1.15"; version = "3.3.1";
sha256 = "0qs9yq0jvz9cfd2vwvf1ya8wxxxqghhai57x0w3ywi0h4afbqivm"; sha256 = "0wmldiwwg1jpcn07wb906nc53si5j7sa83wgyq643xzqcx4v4x1d";
};
buildInputs = [
];
}; };
buildInputs = [ blob-utils = eggDerivation {
eggdoc name = "blob-utils-1.0.3";
];
};
src = fetchegg {
name = "blob-utils";
version = "1.0.3";
sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
};
matchable = eggDerivation { buildInputs = [
name = "matchable-3.3"; setup-helper
string-utils
src = fetchegg { ];
name = "matchable";
version = "3.3";
sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
}; };
buildInputs = [ check-errors = eggDerivation {
name = "check-errors-1.13.0";
];
};
src = fetchegg {
name = "check-errors";
version = "1.13.0";
sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
};
http-client = eggDerivation { buildInputs = [
name = "http-client-0.7.1"; setup-helper
];
src = fetchegg {
name = "http-client";
version = "0.7.1";
sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr";
}; };
buildInputs = [ defstruct = eggDerivation {
intarweb name = "defstruct-1.6";
uri-common
message-digest
md5
string-utils
sendfile
];
};
src = fetchegg {
name = "defstruct";
version = "1.6";
sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li";
};
sxml-transforms = eggDerivation { buildInputs = [
name = "sxml-transforms-1.4.1";
];
src = fetchegg {
name = "sxml-transforms";
version = "1.4.1";
sha256 = "1igm3h1nm1i5mwm2akk105v5k96azjm1vnl637l3l5w2yycc76a2";
}; };
buildInputs = [ http-client = eggDerivation {
name = "http-client-0.7.1";
];
};
src = fetchegg {
name = "http-client";
version = "0.7.1";
sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr";
};
eggdoc = eggDerivation { buildInputs = [
name = "eggdoc-1.3.1"; intarweb
uri-common
src = fetchegg { message-digest
name = "eggdoc"; md5
version = "1.3.1"; string-utils
sha256 = "17ypr5sl2vnnzqxipybmjkm7d5wlsbp7fyq25qr6phgil8axafww"; sendfile
];
}; };
buildInputs = [ intarweb = eggDerivation {
sxml-transforms name = "intarweb-1.3";
];
};
src = fetchegg {
name = "intarweb";
version = "1.3";
sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h";
};
sendfile = eggDerivation { buildInputs = [
name = "sendfile-1.7.29"; defstruct
uri-common
src = fetchegg { base64
name = "sendfile"; ];
version = "1.7.29";
sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k";
}; };
buildInputs = [ lookup-table = eggDerivation {
name = "lookup-table-1.13.5";
];
};
src = fetchegg {
name = "lookup-table";
version = "1.13.5";
sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
};
setup-helper = eggDerivation { buildInputs = [
name = "setup-helper-1.5.4"; setup-helper
check-errors
src = fetchegg { miscmacros
name = "setup-helper"; record-variants
version = "1.5.4"; synch
sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj"; ];
}; };
buildInputs = [ matchable = eggDerivation {
name = "matchable-3.3";
];
};
src = fetchegg {
name = "matchable";
version = "3.3";
sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
};
check-errors = eggDerivation { buildInputs = [
name = "check-errors-1.13.0";
];
src = fetchegg {
name = "check-errors";
version = "1.13.0";
sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
}; };
buildInputs = [ md5 = eggDerivation {
setup-helper name = "md5-3.1.0";
];
};
src = fetchegg {
name = "md5";
version = "3.1.0";
sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a";
};
synch = eggDerivation { buildInputs = [
name = "synch-2.1.2"; message-digest
];
src = fetchegg {
name = "synch";
version = "2.1.2";
sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
}; };
buildInputs = [ message-digest = eggDerivation {
setup-helper name = "message-digest-3.1.0";
check-errors
];
};
src = fetchegg {
name = "message-digest";
version = "3.1.0";
sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
};
record-variants = eggDerivation { buildInputs = [
name = "record-variants-0.5.1"; setup-helper
miscmacros
src = fetchegg { check-errors
name = "record-variants"; variable-item
version = "0.5.1"; blob-utils
sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; string-utils
];
}; };
buildInputs = [ miscmacros = eggDerivation {
name = "miscmacros-2.96";
];
};
src = fetchegg {
name = "miscmacros";
version = "2.96";
sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
};
miscmacros = eggDerivation { buildInputs = [
name = "miscmacros-2.96";
];
src = fetchegg {
name = "miscmacros";
version = "2.96";
sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
}; };
buildInputs = [ record-variants = eggDerivation {
name = "record-variants-0.5.1";
];
};
src = fetchegg {
name = "record-variants";
version = "0.5.1";
sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
};
lookup-table = eggDerivation { buildInputs = [
name = "lookup-table-1.13.5";
];
src = fetchegg {
name = "lookup-table";
version = "1.13.5";
sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
}; };
buildInputs = [ sendfile = eggDerivation {
setup-helper name = "sendfile-1.7.29";
check-errors
miscmacros
record-variants
synch
];
};
src = fetchegg {
name = "sendfile";
version = "1.7.29";
sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k";
};
string-utils = eggDerivation { buildInputs = [
name = "string-utils-1.2.4";
];
src = fetchegg {
name = "string-utils";
version = "1.2.4";
sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
}; };
buildInputs = [ setup-helper = eggDerivation {
setup-helper name = "setup-helper-1.5.4";
miscmacros
lookup-table
check-errors
];
};
src = fetchegg {
name = "setup-helper";
version = "1.5.4";
sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj";
};
blob-utils = eggDerivation { buildInputs = [
name = "blob-utils-1.0.3";
];
src = fetchegg {
name = "blob-utils";
version = "1.0.3";
sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
}; };
buildInputs = [ string-utils = eggDerivation {
setup-helper name = "string-utils-1.2.4";
string-utils
];
};
src = fetchegg {
name = "string-utils";
version = "1.2.4";
sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
};
variable-item = eggDerivation { buildInputs = [
name = "variable-item-1.3.1"; setup-helper
miscmacros
src = fetchegg { lookup-table
name = "variable-item"; check-errors
version = "1.3.1"; ];
sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
}; };
buildInputs = [ synch = eggDerivation {
setup-helper name = "synch-2.1.2";
check-errors
];
};
src = fetchegg {
name = "synch";
version = "2.1.2";
sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
};
message-digest = eggDerivation { buildInputs = [
name = "message-digest-3.1.0"; setup-helper
check-errors
src = fetchegg { ];
name = "message-digest";
version = "3.1.0";
sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
}; };
buildInputs = [ uri-common = eggDerivation {
setup-helper name = "uri-common-1.4";
miscmacros
check-errors
variable-item
blob-utils
string-utils
];
};
src = fetchegg {
name = "uri-common";
version = "1.4";
sha256 = "01ds1gixcn4rz657x3hr4rhw2496hsjff42ninw0k39l8i1cbh7c";
};
md5 = eggDerivation { buildInputs = [
name = "md5-3.1.0"; uri-generic
defstruct
src = fetchegg { matchable
name = "md5"; ];
version = "3.1.0";
sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a";
}; };
buildInputs = [ uri-generic = eggDerivation {
message-digest name = "uri-generic-2.41";
];
};
src = fetchegg {
name = "uri-generic";
version = "2.41";
sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac";
};
defstruct = eggDerivation { buildInputs = [
name = "defstruct-1.6"; matchable
defstruct
src = fetchegg { ];
name = "defstruct";
version = "1.6";
sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li";
}; };
buildInputs = [ variable-item = eggDerivation {
name = "variable-item-1.3.1";
];
};
src = fetchegg {
name = "variable-item";
version = "1.3.1";
sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
};
uri-generic = eggDerivation { buildInputs = [
name = "uri-generic-2.41"; setup-helper
check-errors
src = fetchegg { ];
name = "uri-generic";
version = "2.41";
sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac";
}; };
buildInputs = [
matchable
defstruct
];
};
uri-common = eggDerivation {
name = "uri-common-1.4";
src = fetchegg {
name = "uri-common";
version = "1.4";
sha256 = "01ds1gixcn4rz657x3hr4rhw2496hsjff42ninw0k39l8i1cbh7c";
};
buildInputs = [
uri-generic
defstruct
matchable
];
};
base64 = eggDerivation {
name = "base64-3.3.1";
src = fetchegg {
name = "base64";
version = "3.3.1";
sha256 = "0wmldiwwg1jpcn07wb906nc53si5j7sa83wgyq643xzqcx4v4x1d";
};
buildInputs = [
];
};
intarweb = eggDerivation {
name = "intarweb-1.3";
src = fetchegg {
name = "intarweb";
version = "1.3";
sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h";
};
buildInputs = [
defstruct
uri-common
base64
];
};
} }

View File

@ -1,6 +1,4 @@
( ;; Eggs used by egg2nix
;; Eggs used by egg2nix matchable
versions http-client
matchable
http-client
)

View File

@ -5,23 +5,15 @@
eggDerivation { eggDerivation {
src = fetchurl { src = fetchurl {
url = "https://github.com/the-kenny/egg2nix/archive/0.1.tar.gz"; url = "https://github.com/the-kenny/egg2nix/archive/0.2.tar.gz";
sha256 = "0x1vg70rwvd4dbgp8wynlff36cnq1h9ncpag0xgn5jq0miqfr57j"; sha256 = "051nsy30diapcl687pyfrvcyqh5h55fijqjhykra2nah30bmf0k0";
}; };
name = "egg2nix-0.1"; name = "egg2nix-0.2";
buildInputs = with chickenEggs; [ buildInputs = with chickenEggs; [
versions matchable http-client matchable http-client
]; ];
installPhase = ''
mkdir -p $out/bin/
mv egg2nix.scm $out/bin/egg2nix
chmod +x $out/bin/egg2nix
runHook postInstall #important - wraps the stuff in $out/bin/
'';
meta = { meta = {
description = "Generate nix-expression from Chicken Scheme eggs"; description = "Generate nix-expression from Chicken Scheme eggs";
homepage = https://github.com/the-kenny/egg2nix; homepage = https://github.com/the-kenny/egg2nix;