From 63cd05ce5ae308c496b848f6b11bcb3fdbdf5cb2 Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Tue, 27 Apr 2021 09:00:04 -0600 Subject: [PATCH] snap: Switch to deb packages of nodejs and python3-pygments node/14/stable snap package is not available on ppc64el and s390x. nodejs deb package currently at 10.19.0~dfsg-3ubuntu1 in Ubuntu 20.04 LTS (base: core20) --- snap/snapcraft.yaml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e87a5ab8f..ecf7063ef 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -72,10 +72,14 @@ parts: node: plugin: nil - stage-snaps: - - node/14/stable + stage-packages: + - nodejs + organize: + usr/bin/: bin/ + usr/lib/: lib/ prime: - bin/node + - lib/*/lib*.so* pandoc: plugin: nil @@ -90,17 +94,21 @@ parts: - bin/pandoc pygments: - plugin: python - python-packages: [Pygments] + plugin: nil + stage-packages: + - python3-pygments + organize: + usr/bin/: bin/ + usr/lib/: lib/ prime: - bin/pygmentize - lib/python*/site-packages/Pygments-*.dist-info/* - lib/python*/site-packages/pygments/* - - usr/bin/python* - - -usr/bin/python*m - - usr/lib/python*/* - - -usr/lib/python*/distutils/* - - -usr/lib/python*/email/* - - -usr/lib/python*/lib2to3/* - - -usr/lib/python*/tkinter/* - - -usr/lib/python*/unittest/* + - bin/python* + - -bin/python*m + - lib/python*/* + - -lib/python*/distutils/* + - -lib/python*/email/* + - -lib/python*/lib2to3/* + - -lib/python*/tkinter/* + - -lib/python*/unittest/*