summaryrefslogtreecommitdiff
path: root/strata/core.morph
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-20 13:22:26 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-11-20 13:22:26 +0000
commit93e4acab1be695c402ab2335843af408a3446006 (patch)
tree668d1afa23f17632d5873e8d506f270f8484bbc6 /strata/core.morph
parent87df3c1fca6771141fd045785e8118289e6503d6 (diff)
parentb56462082d9216db0403dac0e6c1833d4d29b4be (diff)
downloaddefinitions-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/core.morph')
-rw-r--r--strata/core.morph6
1 files changed, 3 insertions, 3 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