lol

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.

+224 -299
+216 -281
pkgs/development/tools/egg2nix/chicken-eggs.nix
··· 1 1 { pkgs, stdenv }: 2 2 rec { 3 - inherit (pkgs) eggDerivation fetchegg; 4 - 5 - versions = eggDerivation { 6 - name = "versions-1.15"; 7 - 8 - src = fetchegg { 9 - name = "versions"; 10 - version = "1.15"; 11 - sha256 = "0qs9yq0jvz9cfd2vwvf1ya8wxxxqghhai57x0w3ywi0h4afbqivm"; 12 - }; 13 - 14 - buildInputs = [ 15 - eggdoc 16 - ]; 17 - }; 3 + inherit (pkgs) eggDerivation fetchegg; 18 4 5 + base64 = eggDerivation { 6 + name = "base64-3.3.1"; 19 7 20 - matchable = eggDerivation { 21 - name = "matchable-3.3"; 8 + src = fetchegg { 9 + name = "base64"; 10 + version = "3.3.1"; 11 + sha256 = "0wmldiwwg1jpcn07wb906nc53si5j7sa83wgyq643xzqcx4v4x1d"; 12 + }; 22 13 23 - src = fetchegg { 24 - name = "matchable"; 25 - version = "3.3"; 26 - sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990"; 14 + buildInputs = [ 15 + 16 + ]; 27 17 }; 28 18 29 - buildInputs = [ 30 - 31 - ]; 32 - }; 19 + blob-utils = eggDerivation { 20 + name = "blob-utils-1.0.3"; 33 21 22 + src = fetchegg { 23 + name = "blob-utils"; 24 + version = "1.0.3"; 25 + sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml"; 26 + }; 34 27 35 - http-client = eggDerivation { 36 - name = "http-client-0.7.1"; 37 - 38 - src = fetchegg { 39 - name = "http-client"; 40 - version = "0.7.1"; 41 - sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr"; 28 + buildInputs = [ 29 + setup-helper 30 + string-utils 31 + ]; 42 32 }; 43 33 44 - buildInputs = [ 45 - intarweb 46 - uri-common 47 - message-digest 48 - md5 49 - string-utils 50 - sendfile 51 - ]; 52 - }; 34 + check-errors = eggDerivation { 35 + name = "check-errors-1.13.0"; 53 36 54 - 55 - sxml-transforms = eggDerivation { 56 - name = "sxml-transforms-1.4.1"; 37 + src = fetchegg { 38 + name = "check-errors"; 39 + version = "1.13.0"; 40 + sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi"; 41 + }; 57 42 58 - src = fetchegg { 59 - name = "sxml-transforms"; 60 - version = "1.4.1"; 61 - sha256 = "1igm3h1nm1i5mwm2akk105v5k96azjm1vnl637l3l5w2yycc76a2"; 43 + buildInputs = [ 44 + setup-helper 45 + ]; 62 46 }; 63 47 64 - buildInputs = [ 65 - 66 - ]; 67 - }; 48 + defstruct = eggDerivation { 49 + name = "defstruct-1.6"; 68 50 69 - 70 - eggdoc = eggDerivation { 71 - name = "eggdoc-1.3.1"; 51 + src = fetchegg { 52 + name = "defstruct"; 53 + version = "1.6"; 54 + sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li"; 55 + }; 72 56 73 - src = fetchegg { 74 - name = "eggdoc"; 75 - version = "1.3.1"; 76 - sha256 = "17ypr5sl2vnnzqxipybmjkm7d5wlsbp7fyq25qr6phgil8axafww"; 57 + buildInputs = [ 58 + 59 + ]; 77 60 }; 78 61 79 - buildInputs = [ 80 - sxml-transforms 81 - ]; 82 - }; 62 + http-client = eggDerivation { 63 + name = "http-client-0.7.1"; 83 64 65 + src = fetchegg { 66 + name = "http-client"; 67 + version = "0.7.1"; 68 + sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr"; 69 + }; 84 70 85 - sendfile = eggDerivation { 86 - name = "sendfile-1.7.29"; 87 - 88 - src = fetchegg { 89 - name = "sendfile"; 90 - version = "1.7.29"; 91 - sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k"; 71 + buildInputs = [ 72 + intarweb 73 + uri-common 74 + message-digest 75 + md5 76 + string-utils 77 + sendfile 78 + ]; 92 79 }; 93 80 94 - buildInputs = [ 95 - 96 - ]; 97 - }; 81 + intarweb = eggDerivation { 82 + name = "intarweb-1.3"; 98 83 84 + src = fetchegg { 85 + name = "intarweb"; 86 + version = "1.3"; 87 + sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h"; 88 + }; 99 89 100 - setup-helper = eggDerivation { 101 - name = "setup-helper-1.5.4"; 102 - 103 - src = fetchegg { 104 - name = "setup-helper"; 105 - version = "1.5.4"; 106 - sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj"; 90 + buildInputs = [ 91 + defstruct 92 + uri-common 93 + base64 94 + ]; 107 95 }; 108 96 109 - buildInputs = [ 110 - 111 - ]; 112 - }; 113 - 97 + lookup-table = eggDerivation { 98 + name = "lookup-table-1.13.5"; 114 99 115 - check-errors = eggDerivation { 116 - name = "check-errors-1.13.0"; 100 + src = fetchegg { 101 + name = "lookup-table"; 102 + version = "1.13.5"; 103 + sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb"; 104 + }; 117 105 118 - src = fetchegg { 119 - name = "check-errors"; 120 - version = "1.13.0"; 121 - sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi"; 106 + buildInputs = [ 107 + setup-helper 108 + check-errors 109 + miscmacros 110 + record-variants 111 + synch 112 + ]; 122 113 }; 123 114 124 - buildInputs = [ 125 - setup-helper 126 - ]; 127 - }; 115 + matchable = eggDerivation { 116 + name = "matchable-3.3"; 128 117 129 - 130 - synch = eggDerivation { 131 - name = "synch-2.1.2"; 118 + src = fetchegg { 119 + name = "matchable"; 120 + version = "3.3"; 121 + sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990"; 122 + }; 132 123 133 - src = fetchegg { 134 - name = "synch"; 135 - version = "2.1.2"; 136 - sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00"; 124 + buildInputs = [ 125 + 126 + ]; 137 127 }; 138 128 139 - buildInputs = [ 140 - setup-helper 141 - check-errors 142 - ]; 143 - }; 129 + md5 = eggDerivation { 130 + name = "md5-3.1.0"; 144 131 132 + src = fetchegg { 133 + name = "md5"; 134 + version = "3.1.0"; 135 + sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a"; 136 + }; 145 137 146 - record-variants = eggDerivation { 147 - name = "record-variants-0.5.1"; 148 - 149 - src = fetchegg { 150 - name = "record-variants"; 151 - version = "0.5.1"; 152 - sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; 138 + buildInputs = [ 139 + message-digest 140 + ]; 153 141 }; 154 142 155 - buildInputs = [ 156 - 157 - ]; 158 - }; 143 + message-digest = eggDerivation { 144 + name = "message-digest-3.1.0"; 159 145 146 + src = fetchegg { 147 + name = "message-digest"; 148 + version = "3.1.0"; 149 + sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s"; 150 + }; 160 151 161 - miscmacros = eggDerivation { 162 - name = "miscmacros-2.96"; 163 - 164 - src = fetchegg { 165 - name = "miscmacros"; 166 - version = "2.96"; 167 - sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc"; 152 + buildInputs = [ 153 + setup-helper 154 + miscmacros 155 + check-errors 156 + variable-item 157 + blob-utils 158 + string-utils 159 + ]; 168 160 }; 169 161 170 - buildInputs = [ 171 - 172 - ]; 173 - }; 162 + miscmacros = eggDerivation { 163 + name = "miscmacros-2.96"; 174 164 175 - 176 - lookup-table = eggDerivation { 177 - name = "lookup-table-1.13.5"; 178 - 179 - src = fetchegg { 180 - name = "lookup-table"; 181 - version = "1.13.5"; 182 - sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb"; 183 - }; 184 - 185 - buildInputs = [ 186 - setup-helper 187 - check-errors 188 - miscmacros 189 - record-variants 190 - synch 191 - ]; 192 - }; 193 - 194 - 195 - string-utils = eggDerivation { 196 - name = "string-utils-1.2.4"; 197 - 198 - src = fetchegg { 199 - name = "string-utils"; 200 - version = "1.2.4"; 201 - sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1"; 202 - }; 203 - 204 - buildInputs = [ 205 - setup-helper 206 - miscmacros 207 - lookup-table 208 - check-errors 209 - ]; 210 - }; 211 - 165 + src = fetchegg { 166 + name = "miscmacros"; 167 + version = "2.96"; 168 + sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc"; 169 + }; 212 170 213 - blob-utils = eggDerivation { 214 - name = "blob-utils-1.0.3"; 215 - 216 - src = fetchegg { 217 - name = "blob-utils"; 218 - version = "1.0.3"; 219 - sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml"; 171 + buildInputs = [ 172 + 173 + ]; 220 174 }; 221 175 222 - buildInputs = [ 223 - setup-helper 224 - string-utils 225 - ]; 226 - }; 176 + record-variants = eggDerivation { 177 + name = "record-variants-0.5.1"; 227 178 228 - 229 - variable-item = eggDerivation { 230 - name = "variable-item-1.3.1"; 179 + src = fetchegg { 180 + name = "record-variants"; 181 + version = "0.5.1"; 182 + sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; 183 + }; 231 184 232 - src = fetchegg { 233 - name = "variable-item"; 234 - version = "1.3.1"; 235 - sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n"; 185 + buildInputs = [ 186 + 187 + ]; 236 188 }; 237 189 238 - buildInputs = [ 239 - setup-helper 240 - check-errors 241 - ]; 242 - }; 190 + sendfile = eggDerivation { 191 + name = "sendfile-1.7.29"; 243 192 244 - 245 - message-digest = eggDerivation { 246 - name = "message-digest-3.1.0"; 193 + src = fetchegg { 194 + name = "sendfile"; 195 + version = "1.7.29"; 196 + sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k"; 197 + }; 247 198 248 - src = fetchegg { 249 - name = "message-digest"; 250 - version = "3.1.0"; 251 - sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s"; 199 + buildInputs = [ 200 + 201 + ]; 252 202 }; 253 203 254 - buildInputs = [ 255 - setup-helper 256 - miscmacros 257 - check-errors 258 - variable-item 259 - blob-utils 260 - string-utils 261 - ]; 262 - }; 204 + setup-helper = eggDerivation { 205 + name = "setup-helper-1.5.4"; 263 206 207 + src = fetchegg { 208 + name = "setup-helper"; 209 + version = "1.5.4"; 210 + sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj"; 211 + }; 264 212 265 - md5 = eggDerivation { 266 - name = "md5-3.1.0"; 267 - 268 - src = fetchegg { 269 - name = "md5"; 270 - version = "3.1.0"; 271 - sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a"; 213 + buildInputs = [ 214 + 215 + ]; 272 216 }; 273 217 274 - buildInputs = [ 275 - message-digest 276 - ]; 277 - }; 218 + string-utils = eggDerivation { 219 + name = "string-utils-1.2.4"; 278 220 221 + src = fetchegg { 222 + name = "string-utils"; 223 + version = "1.2.4"; 224 + sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1"; 225 + }; 279 226 280 - defstruct = eggDerivation { 281 - name = "defstruct-1.6"; 282 - 283 - src = fetchegg { 284 - name = "defstruct"; 285 - version = "1.6"; 286 - sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li"; 227 + buildInputs = [ 228 + setup-helper 229 + miscmacros 230 + lookup-table 231 + check-errors 232 + ]; 287 233 }; 288 234 289 - buildInputs = [ 290 - 291 - ]; 292 - }; 235 + synch = eggDerivation { 236 + name = "synch-2.1.2"; 293 237 294 - 295 - uri-generic = eggDerivation { 296 - name = "uri-generic-2.41"; 238 + src = fetchegg { 239 + name = "synch"; 240 + version = "2.1.2"; 241 + sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00"; 242 + }; 297 243 298 - src = fetchegg { 299 - name = "uri-generic"; 300 - version = "2.41"; 301 - sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac"; 244 + buildInputs = [ 245 + setup-helper 246 + check-errors 247 + ]; 302 248 }; 303 249 304 - buildInputs = [ 305 - matchable 306 - defstruct 307 - ]; 308 - }; 250 + uri-common = eggDerivation { 251 + name = "uri-common-1.4"; 309 252 253 + src = fetchegg { 254 + name = "uri-common"; 255 + version = "1.4"; 256 + sha256 = "01ds1gixcn4rz657x3hr4rhw2496hsjff42ninw0k39l8i1cbh7c"; 257 + }; 310 258 311 - uri-common = eggDerivation { 312 - name = "uri-common-1.4"; 313 - 314 - src = fetchegg { 315 - name = "uri-common"; 316 - version = "1.4"; 317 - sha256 = "01ds1gixcn4rz657x3hr4rhw2496hsjff42ninw0k39l8i1cbh7c"; 259 + buildInputs = [ 260 + uri-generic 261 + defstruct 262 + matchable 263 + ]; 318 264 }; 319 265 320 - buildInputs = [ 321 - uri-generic 322 - defstruct 323 - matchable 324 - ]; 325 - }; 266 + uri-generic = eggDerivation { 267 + name = "uri-generic-2.41"; 326 268 269 + src = fetchegg { 270 + name = "uri-generic"; 271 + version = "2.41"; 272 + sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac"; 273 + }; 327 274 328 - base64 = eggDerivation { 329 - name = "base64-3.3.1"; 330 - 331 - src = fetchegg { 332 - name = "base64"; 333 - version = "3.3.1"; 334 - sha256 = "0wmldiwwg1jpcn07wb906nc53si5j7sa83wgyq643xzqcx4v4x1d"; 275 + buildInputs = [ 276 + matchable 277 + defstruct 278 + ]; 335 279 }; 336 280 337 - buildInputs = [ 338 - 339 - ]; 340 - }; 281 + variable-item = eggDerivation { 282 + name = "variable-item-1.3.1"; 341 283 284 + src = fetchegg { 285 + name = "variable-item"; 286 + version = "1.3.1"; 287 + sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n"; 288 + }; 342 289 343 - intarweb = eggDerivation { 344 - name = "intarweb-1.3"; 345 - 346 - src = fetchegg { 347 - name = "intarweb"; 348 - version = "1.3"; 349 - sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h"; 290 + buildInputs = [ 291 + setup-helper 292 + check-errors 293 + ]; 350 294 }; 351 - 352 - buildInputs = [ 353 - defstruct 354 - uri-common 355 - base64 356 - ]; 357 - }; 358 - 359 295 } 360 296 361 -
+4 -6
pkgs/development/tools/egg2nix/chicken-eggs.scm
··· 1 - ( 2 - ;; Eggs used by egg2nix 3 - versions 4 - matchable 5 - http-client 6 - ) 1 + ;; Eggs used by egg2nix 2 + matchable 3 + http-client 4 +
+4 -12
pkgs/development/tools/egg2nix/default.nix
··· 5 5 6 6 eggDerivation { 7 7 src = fetchurl { 8 - url = "https://github.com/the-kenny/egg2nix/archive/0.1.tar.gz"; 9 - sha256 = "0x1vg70rwvd4dbgp8wynlff36cnq1h9ncpag0xgn5jq0miqfr57j"; 8 + url = "https://github.com/the-kenny/egg2nix/archive/0.2.tar.gz"; 9 + sha256 = "051nsy30diapcl687pyfrvcyqh5h55fijqjhykra2nah30bmf0k0"; 10 10 }; 11 11 12 - name = "egg2nix-0.1"; 12 + name = "egg2nix-0.2"; 13 13 buildInputs = with chickenEggs; [ 14 - versions matchable http-client 14 + matchable http-client 15 15 ]; 16 - 17 - installPhase = '' 18 - mkdir -p $out/bin/ 19 - mv egg2nix.scm $out/bin/egg2nix 20 - chmod +x $out/bin/egg2nix 21 - 22 - runHook postInstall #important - wraps the stuff in $out/bin/ 23 - ''; 24 16 25 17 meta = { 26 18 description = "Generate nix-expression from Chicken Scheme eggs";