diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2015-03-26 15:08:30 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-31 13:00:18 +0100 |
| commit | 15708549ae011f204089150864766b734aa62cac (patch) | |
| tree | 1913fb00b1a79536f1ee595733380fb7299f1069 | |
| parent | 3388b2e893e9c8f4d4ceec5703eca22a2e0f7643 (diff) | |
| download | definitions-15708549ae011f204089150864766b734aa62cac.tar.gz | |
Fix and update nano.
Nano was broken; its binary not ending up in the systems.
Here we fix that, update to 2.4.0 (which has full undo/redo
functionality), and provide useful default config (enabling
syntax highlighting, etc).
Nano has also been moved from core to devtools. This stops
morph from wanting to rebuild the world when you update Nano.
Change-Id: I702b070cde6731fde04fc8a0810e2191e0bd4e6d
| -rw-r--r-- | strata/core.morph | 9 | ||||
| -rw-r--r-- | strata/core/nano.morph | 4 | ||||
| -rw-r--r-- | strata/devtools.morph | 5 | ||||
| -rw-r--r-- | strata/devtools/nano.morph | 16 |
4 files changed, 21 insertions, 13 deletions
diff --git a/strata/core.morph b/strata/core.morph index cae24f3f..d36f9a1c 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -240,15 +240,6 @@ chunks: - git - libtool-tarball - pkg-config -- name: nano - morph: strata/core/nano.morph - repo: upstream:nano-tarball - ref: 8b74abeb02c01ddc768c465a826360cf33cec063 - unpetrify-ref: baserock/morph - build-depends: - - ncurses - - automake - - gettext-tarball - name: bc repo: upstream:bc-tarball ref: 0956d119432ff6a2e85bae1fa336df799cad70b0 diff --git a/strata/core/nano.morph b/strata/core/nano.morph deleted file mode 100644 index 6a55dc2d..00000000 --- a/strata/core/nano.morph +++ /dev/null @@ -1,4 +0,0 @@ -name: nano -kind: chunk -pre-configure-commands: -- autoreconf -ivf diff --git a/strata/devtools.morph b/strata/devtools.morph index ed8bb852..5fb93c1d 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -9,6 +9,11 @@ build-depends: - morph: strata/core.morph - morph: strata/python-core.morph chunks: +- name: nano + morph: strata/devtools/nano.morph + repo: upstream:nano-tarball + ref: fb040ea36cb8e2158ccd9100600652f94ae90af1 + unpetrify-ref: baserock/morph - name: vim morph: strata/devtools/vim.morph repo: upstream:vim diff --git a/strata/devtools/nano.morph b/strata/devtools/nano.morph new file mode 100644 index 00000000..3eeee120 --- /dev/null +++ b/strata/devtools/nano.morph @@ -0,0 +1,16 @@ +name: nano +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" --sysconfdir=/etc +post-install-commands: +- | + cat <<EOF >> nanorc + set smooth + include /usr/share/nano/c.nanorc + include /usr/share/nano/patch.nanorc + include /usr/share/nano/python.nanorc + include /usr/share/nano/sh.nanorc + EOF +- mkdir -p "$DESTDIR"/etc +- install -m 644 nanorc "$DESTDIR"/etc/nanorc |