Browse Source

gnu: Rename "libapr" to "apr" and "libaprutil" to "apr-util".

* gnu/packages/apr.scm: Rename file from libapr.scm.
* gnu/packages/patches/apr-skip-getservbyname-test.patch: Rename file
    from libapr-skip-getservbyname-test.patch.
* gnu-system.am (GNU_SYSTEM_MODULES): Rename module libapr to apr.
* gnu-system.am (dist_patch_DATA): Rename patch file.
* gnu/packages/apr.scm (apr): Rename from libapr.
* gnu/packages/apr.scm (apr-util): Rename from libaprutil, change
    input name.
* gnu/packages/version-control.scm (subversion): Change input name.
gn-latest-20200428
Andreas Enge 8 years ago
parent
commit
2b24faa295
4 changed files with 14 additions and 14 deletions
  1. +2
    -2
      gnu-system.am
  2. +9
    -9
      gnu/packages/apr.scm
  3. +0
    -0
      gnu/packages/patches/apr-skip-getservbyname-test.patch
  4. +3
    -3
      gnu/packages/version-control.scm

+ 2
- 2
gnu-system.am View File

@ -24,6 +24,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages.scm \
gnu/packages/acl.scm \
gnu/packages/algebra.scm \
gnu/packages/apr.scm \
gnu/packages/aspell.scm \
gnu/packages/attr.scm \
gnu/packages/autotools.scm \
@ -87,7 +88,6 @@ GNU_SYSTEM_MODULES = \
gnu/packages/ld-wrapper.scm \
gnu/packages/less.scm \
gnu/packages/lesstif.scm \
gnu/packages/libapr.scm \
gnu/packages/libdaemon.scm \
gnu/packages/libevent.scm \
gnu/packages/libffi.scm \
@ -173,6 +173,7 @@ GNU_SYSTEM_MODULES = \
patchdir = $(guilemoduledir)/gnu/packages/patches
dist_patch_DATA = \
gnu/packages/patches/apr-skip-getservbyname-test.patch \
gnu/packages/patches/automake-skip-amhello-tests.patch \
gnu/packages/patches/bigloo-gc-shebangs.patch \
gnu/packages/patches/binutils-ld-new-dtags.patch \
@ -196,7 +197,6 @@ dist_patch_DATA = \
gnu/packages/patches/guile-default-utf8.patch \
gnu/packages/patches/guile-linux-syscalls.patch \
gnu/packages/patches/guile-relocatable.patch \
gnu/packages/patches/libapr-skip-getservbyname-test.patch \
gnu/packages/patches/libevent-dns-tests.patch \
gnu/packages/patches/libtool-skip-tests.patch \
gnu/packages/patches/m4-gets-undeclared.patch \


gnu/packages/libapr.scm → gnu/packages/apr.scm View File


gnu/packages/patches/libapr-skip-getservbyname-test.patch → gnu/packages/patches/apr-skip-getservbyname-test.patch View File


+ 3
- 3
gnu/packages/version-control.scm View File

@ -27,7 +27,7 @@
#:use-module (guix build utils)
#:use-module ((gnu packages gettext)
#:renamer (symbol-prefix-proc 'guix:))
#:use-module (gnu packages libapr)
#:use-module (gnu packages apr)
#:use-module (gnu packages nano)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
@ -77,8 +77,8 @@ from a command line or use a GUI application.")
"11inl9n1riahfnbk1fax0dysm2swakzhzhpmm2zvga6fikcx90zw"))))
(build-system gnu-build-system)
(inputs
`(("libapr" ,libapr)
("libaprutil" ,libaprutil)
`(("apr" ,apr)
("apr-util" ,apr-util)
("perl" ,perl)
("python" ,python)
("sqlite" ,sqlite)


Loading…
Cancel
Save