diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-20 13:22:26 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-11-20 13:22:26 +0000 |
commit | 93e4acab1be695c402ab2335843af408a3446006 (patch) | |
tree | 668d1afa23f17632d5873e8d506f270f8484bbc6 /strata | |
parent | 87df3c1fca6771141fd045785e8118289e6503d6 (diff) | |
parent | b56462082d9216db0403dac0e6c1833d4d29b4be (diff) | |
download | definitions-93e4acab1be695c402ab2335843af408a3446006.tar.gz |
Merge branch 'baserock/richardipsum/pip-v2'
Reviewed by:
Adam Coldrick <adam.coldrick@codethink.co.uk> (v1)
Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'strata')
-rw-r--r-- | strata/core.morph | 6 | ||||
-rw-r--r-- | strata/python-tools.morph | 12 | ||||
-rw-r--r-- | strata/webtools.morph | 7 |
3 files changed, 16 insertions, 9 deletions
diff --git a/strata/core.morph b/strata/core.morph index 0a8122fd..37133fee 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -279,9 +279,9 @@ chunks: - texinfo-tarball - name: python-setuptools morph: strata/core/python-setuptools.morph - repo: upstream:python-setuptools - ref: 05b07a427a1eae2a51d527f7ac5135a8fd215d77 - unpetrify-ref: baserock/morph + repo: upstream:python-setuptools-bitbucket + ref: 0aa6a4de5931d02876428388678802db2371fd37 + unpetrify-ref: baserock/master build-depends: - cpython - name: pyyaml diff --git a/strata/python-tools.morph b/strata/python-tools.morph new file mode 100644 index 00000000..8b82c775 --- /dev/null +++ b/strata/python-tools.morph @@ -0,0 +1,12 @@ +name: python-tools +kind: stratum +description: "A stratum for non-essential python tools: +useful python tools that we don't want to include in core." +build-depends: +- morph: strata/core.morph +chunks: +- name: pip + repo: upstream:pip + ref: d4b691b743a91500cf49119d28a805db8313f129 + unpetrify-ref: master + build-depends: [] diff --git a/strata/webtools.morph b/strata/webtools.morph index 8df32e9c..39175747 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -1,6 +1,6 @@ name: webtools kind: stratum -description: pip, node and other fun things +description: web things build-depends: - morph: strata/tools.morph - morph: strata/pcre-utils.morph @@ -22,11 +22,6 @@ chunks: ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 unpetrify-ref: baserock/release_1_28 build-depends: [] -- name: pip - repo: upstream:pip.git - ref: d4b691b743a91500cf49119d28a805db8313f129 - unpetrify-ref: master - build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx |