[jhbuild] core-deps: build pygments instead of using a sysdep
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] core-deps: build pygments instead of using a sysdep
- Date: Wed, 4 Sep 2019 19:12:43 +0000 (UTC)
commit 7e40e51adfc7f5f1c59ae6d2250c12eaeb586895
Author: Christoph Reiter <reiter christoph gmail com>
Date: Wed Sep 4 20:08:48 2019 +0200
core-deps: build pygments instead of using a sysdep
It's fast to build and doesn't have any deps. One external dep less that
the user has to provide.
.gitlab-ci.yml | 2 +-
modulesets/gnome-suites-core-deps-latest.modules | 11 +++++++++++
modulesets/gnome-sysdeps-latest.modules | 7 -------
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 926c73c3..6cb71b8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,5 +19,5 @@ ubuntu-19.04-glib:
- export PATH=$HOME/.local/bin:$PATH
- sudo apt-file update
- jhbuild --no-interact --exit-on-error sysdeps --install --assume-yes glib
- - sudo apt install -y zlib1g-dev docbook-xml docbook-xsl python3-setuptools python3-pygments python3-dev
+ - sudo apt install -y zlib1g-dev docbook-xml docbook-xsl python3-setuptools python3-dev
- jhbuild --no-interact --exit-on-error build glib
\ No newline at end of file
diff --git a/modulesets/gnome-suites-core-deps-latest.modules
b/modulesets/gnome-suites-core-deps-latest.modules
index dd9ec667..3fd7806c 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -65,6 +65,8 @@
href="https://download.savannah.gnu.org/releases/"/>
<repository type="tarball" name="gnome-download"
href="https://download.gnome.org/"/>
+<repository type="tarball" name="pypi.org"
+ href="https://pypi.org/packages/source/"/>
<include href="gnome-sysdeps-latest.modules"/>
@@ -1703,6 +1705,15 @@
</dependencies>
</cmake>
+ <distutils id="python3-pygments" python3="1">
+ <branch repo="pypi.org"
+ version="2.4.2"
+ module="p/pygments/Pygments-${version}.tar.gz"
+ checkoutdir="python3-pygments-${version}"
+ hash="sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297">
+ </branch>
+ </distutils>
+
<distutils id="meson" python3="1">
<branch repo="github-tar"
version="0.51.2"
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index ad8513b9..d5998b35 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -1096,13 +1096,6 @@
version="3.2"/>
</systemmodule>
- <systemmodule id="python3-pygments">
- <branch repo="system"/>
- <systemdependencies>
- <dep type="python3" name="pygments"/>
- </systemdependencies>
- </systemmodule>
-
<systemmodule id="ragel">
<branch repo="system"/>
<systemdependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]