1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-16 15:20:35 +02:00
Commit Graph

114 Commits

Author SHA1 Message Date
Ludovic Courtès
2a50c9598b gnu: Reference the inherited ‘arguments’ value.
This commit was made by running this command:

  sed -e's/substitute-keyword-arguments (package-arguments [a-zA-Z0-9-]\+)/substitute-keyword-arguments arguments/g' -i gnu/packages/*.scm

… and then:

  1. reverting changes from ‘gnu/packages/rust.scm’ and
     ‘gnu/packages/java.scm’ since they would incur derivation changes and/or
     breakage;
  2. reverting the change for ‘gcc-final’ in ‘gnu/packages/commencement.scm’;
  3. reverting the change for ‘onnx-optimizer’, ‘openquest’, and ‘certbot’,
     which use ‘substitute-keyword-arguments’ for arguments that are not
     inherited (and thus ‘arguments’ would be unbound);
  4. reverting the change for ‘insight-toolkit-legacy’ and ‘wine64-staging’
     which make bogus assumptions about inherited arguments.

Change-Id: I122a7cf517b6b63cae38944b5d33ade4b1f5a89c
2026-03-20 13:27:15 +01:00
Andreas Enge
67bdb3c7d2 gnu: openldap: Update to 2.6.10.
* gnu/packages/openldap.scm (openldap): Update to 2.6.10.

Change-Id: If1780df8012da2af24a177d1d1fdeaf251c78528
2026-02-12 21:29:38 +01:00
Andreas Enge
2b728aab94 gnu: openldap: Refresh input.
* gnu/packages/openldap.scm (openldap)[inputs]: Remove bdb-5.3; add bdb.

Change-Id: Ifcd07dd22b64353feb1b865c2ade29d5fadeaf67
2026-02-12 21:29:38 +01:00
Nicolas Graves
42d8ae015f gnu: 389-ds-base: Switch to pyproject.
* gnu/packages/openldap.scm (389-ds-base):
[arguments]<#:imported-modules, #:modules>: Switch to
pyproject-build-system.
<#:phases>: Use site-packages in phase
'fix-install-location-of-python-tools.

Change-Id: Idf2865bddc06a4cf38fa106b9ca1576320d98fff
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2026-02-07 12:28:49 +01:00
Nicolas Graves
4a98c20de1 gnu: python-bonsai: Update to 1.5.4.
* gnu/packages/openldap.scm (python-bonsai): Update to 1.5.4.
[source]: Switch to git-fetch.
[build-system]: Switch to pyproject-build-system.
[arguments]<#:tests?>: Enable them.
<#:test-flags>: Ignore failing tests.
[native-inputs]: Add python-pytest, python-setuptools.

Change-Id: I056193ef6d61cf3f95a545fae6478dc9eda26a0d
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-12-31 17:11:48 +00:00
Hugo Buddelmeijer
dc6f47a44b gnu: python-ldap: Update to 3.4.5 and fix CVE-2025-61911, CVE-2025-61912.
* gnu/packages/openldap.scm (python-ldap): Update to 3.4.5.
[source]: Switch to git-fetch.
[build-system]: Switch to pyproject-build-system.
[arguments]<#:phases>: Use gexps.
[native-inputs]: Add python-pytest and python-setuptools.

Change-Id: Ib4ec662293d44c4be29fd67adbd592902f7c9e12
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #4699
2025-12-11 16:01:17 +01:00
Ludovic Courtès
ad461613d9 gnu: Use self-references to inputs for #:disallowed-references.
This allows ‘package-input-rewriting’ to operate as expected on these
packages.  Failing that, rewritten packages would still carry references to
non-rewritten packages in #:disallowed-references.

* gnu/packages/admin.scm (wpa-supplicant-gui): Use ‘this-package-native-input’
for #:disallowed-references.
* gnu/packages/fontutils.scm (freetype): Likewise.
* gnu/packages/glib.scm (glib-minimal): Likewise.
* gnu/packages/gnome.scm (cogl, gnome-shell): Likewise.
* gnu/packages/groff.scm (groff-minimal): Likewise.
* gnu/packages/gstreamer.scm (gstreamer): Likewise.
* gnu/packages/gtk.scm (gtk+): Likewise.
* gnu/packages/inkscape.scm (inkscape/pinned): Likewise.
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk10)
(openjdk11): Likewise.
* gnu/packages/linux.scm (f2fs-tools/static): Likewise.
* gnu/packages/man.scm (man-db): Likewise.
* gnu/packages/openldap.scm (389-ds-base): Likewise.
* gnu/packages/qt.scm (qtbase-5): Likewise.
* gnu/packages/rrdtool.scm (rrdtool): Likewise.
* gnu/packages/rust.scm (rust-bootstrapped-package): Likewise.
* gnu/packages/statistics.scm (r-with-tests): Likewise.
(r-minimal): Likewise.
* gnu/packages/texinfo.scm (info-reader): Likewise.
* gnu/packages/tls.scm (gnutls): Likewise.
(openssl-1.1): Likewise.
* gnu/packages/version-control.scm (git-minimal): Likewise.
(git): Likewise.
(gource): Likewise.
* gnu/packages/web.scm (mod-wsgi): Likewise.
* gnu/packages/xfce.scm (xfdesktop): Likewise.
* gnu/packages/perl.scm (perl-libtime-parsedate): Update comment.
* gnu/packages/video.scm (v4l-utils-minimal): Add FIXME comment.

Change-Id: I118ecd5894c24c53ec52c9208b0025ccfa3dd68a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-11-09 22:13:37 +01:00
Mathieu Othacehe
e235b9574a gnu: 389-ds-base: Fix LegacyVersion issue.
LegacyVersion does not exist anymore in packaging.version 25.0
(https://github.com/pypa/packaging/pull/407). Add a stub to prevent runtime
errors such as:

Traceback (most recent call last):
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/sbin/.dscreate-real", line 18, in <module>
    from lib389 import DirSrv
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/lib/python3.11/site-packages/lib389/__init__.py", line 54, in <module>
    from lib389._entry import Entry
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/lib/python3.11/site-packages/lib389/_entry.py", line 20, in <module>
    from lib389.utils import (ensure_str, ensure_bytes, ensure_list_bytes, display_log_data)
  File "/gnu/store/jq8iknqq5niwx9vchccbnnw6jdb3x8nq-389-ds-base-2.2.2/lib/python3.11/site-packages/lib389/utils.py", line 49, in <module>
    from packaging.version import LegacyVersion
ImportError: cannot import name 'LegacyVersion' from 'packaging.version' (/gnu/store/5ga1x27pz9wqwhq3sndcymfngdvcr4w9-python-packaging-bootstrap-25.0/lib/python3.11/site-packages/packaging/version.py)

* gnu/packages/patches/389-ds-base-legacy-version.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/openldap.scm (389-ds-base): Use it.

Change-Id: I34c12dce3092f9911383ae380af13ef74285ebc4
2025-11-02 20:29:37 +01:00
Mathieu Othacehe
a5e6ad127e gnu: 389-ds-base: Fix the build.
* gnu/packages/openldap.scm (389-ds-base)[arguments]<#:phases>: Fix the
certutil binary search.

Change-Id: Ic257b4820dd4943d0b3fdb46ba4104f1e13b5048
2025-11-02 20:29:37 +01:00
Maxim Cournoyer
2be06b8167 gnu: openldap-for-linphone: Update to 2.6.4-0.8511a0f.
* gnu/packages/openldap.scm (openldap-for-linphone): Update to 2.6.4-0.8511a0f.

Change-Id: I8f5cccf1e3fa346a5b9c4426ba372ec8127f6edd
2025-09-30 16:52:06 +09:00
Maxim Cournoyer
10482f731e Reapply "Update Maxim's email address."
This reverts commit a7db92d9b3, this time with
the more careful command, to avoid a world rebuild:

grep -rl --exclude-dir=build --exclude-dir=patches --exclude=ld-wrapper.in \
  --exclude=sitecustomize.py --exclude=guix-emacs.el maxim.cournoyer@gmail.com |
  xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'

Change-Id: I0871f5cf9ace79e34e78e24154d0da6ea95a3a91
2025-09-18 13:44:12 +09:00
Maxim Cournoyer
a7db92d9b3 Revert "Update Maxim's email address."
This reverts commit d0d87a744d. Oops! This
caused a world rebuild.

Change-Id: I25fff644b2b61d0ee93d69b457b04c72b5b74d15
2025-09-18 12:07:31 +09:00
Maxim Cournoyer
d0d87a744d Update Maxim's email address.
The change was automated via:

  git grep -l maxim.cournoyer@gmail.com |
    xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'

* .mailmap: New entry.

Change-Id: Iaa88b1e51c94159c49138fb43910badb990eb169
2025-09-18 08:05:19 +09:00
Janneke Nieuwenhuizen
b29be36a6e gnu: openldap-for-linphone: Fix build with gcc-14.
* gnu/packages/openldap.scm (openldap-for-linphone)[arguments]: New field to
relax gcc-14's strictness.

Change-Id: I9541b579df38d8a6a4461a87275399fd623a1f01
2025-07-18 20:17:20 +02:00
Janneke Nieuwenhuizen
0e75555a0e gnu: openldap: Update to 2.6.9; fixes build with gcc-14.
* gnu/packages/openldap.scm (openldap): Update to 2.6.9.

Change-Id: Ie9967139a7346c8fccc96ab88d3e6399aab6bdfe
2025-07-18 20:17:14 +02:00
Janneke Nieuwenhuizen
357a6a31cf gnu: 389-ds-base: Fix build with gcc-14.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Add CFLAGS to #:configure-flags
to relax gcc-14's strictness.

Change-Id: I54510c0d0d0f9032f4f5043053b0282e0a4ffb9e
Modified-by: Zheng Junjie <z572@z572.online>
2025-06-22 16:32:56 +08:00
Ricardo Wurmus
02d1d6907e gnu: nss-pam-ldapd: Update to 0.9.13.
* gnu/packages/openldap.scm (nss-pam-ldapd): Update to 0.9.13.
[arguments]: Use G-expressions.

Change-Id: Ib1cd8ebe847bae0f44a96599dc1d3faf1a84b0b6
2025-02-09 21:38:59 +01:00
宋文武
fe88550267 gnu: 389-ds-base: Fix build.
* gnu/packages/openldap.scm (389-ds-base)[source]: Add snippet.
[inputs]: Add libxcrypt.

Change-Id: I5ddb30e8a0ae23e7795a0a9a9e3f00b48379e3e8
2024-08-31 10:45:18 +02:00
Maxime Devos
75497ecc4a gnu: 389-ds-base: Add 'bash' input for 'wrap-program'.
It is required for cross-compilation.

* gnu/packages/openldap.scm
  (389-ds-base)[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2024-08-31 10:42:41 +02:00
Maxim Cournoyer
f59df1aa3c build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.
Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
    | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee
2024-08-31 10:42:16 +02:00
Ludovic Courtès
ec6395b1aa gnu: python-ldap: Update to 3.4.3.
* gnu/packages/openldap.scm (python-ldap): Update to 3.4.3.
2023-05-06 17:12:45 +02:00
Leo Famulari
bdbf3e36cf gnu: 389-ds-base: Make sure not to keep a store reference to HTTPD.
* gnu/packages/openldap.scm (389-ds-base)[inputs]: Move httpd ...
[native-inputs]: ... to here.
[arguments]: Forbid keeping a reference to httpd.
2023-04-30 04:47:19 -04:00
Ricardo Wurmus
794e8880b9 gnu: openldap-for-linphone: Hide it.
We don't want this to show up when searching for "openldap".

* gnu/packages/openldap.scm (openldap-for-linphone): Wrap in HIDDEN-PACKAGE
and add a comment.
2023-04-24 09:56:32 +02:00
Ricardo Wurmus
bdd48e3cb9 gnu: liblinphone: Restore special openldap variant.
This is a partial revert of commit f2166cface.

* gnu/packages/openldap.scm (openldap-for-linphone): Restore this variable.
* gnu/packages/linphone.scm (liblinphone)[inputs]: Replace openldap with
openldap-for-linphone.
2023-04-24 00:12:41 +02:00
Andreas Enge
f2166cface gnu: openldap: Update to 2.6.4 and unify the two variables.
* gnu/packages/openldap.scm (openldap): Update to 2.6.4.
(openldap-for-linphone): Remove variable.
* gnu/packages/linphone.scm (liblinphone)[inputs]: Replace
openldap-for-linphone by openldap.
2023-04-16 13:49:35 +02:00
Brian Cully
1b28cde6a5 gnu: openldap: Fix build.
* gnu/packages/openldap.scm (openldap): Update quoting to use gexps. Remove
reference to libldap_r.la, which no longer exists, and remove custom install
of libldap_r.so. Remove again a phase already removed in commit
0de5e6d653.

Signed-off-by: Andreas Enge <andreas@enge.fr>
2023-04-16 13:39:26 +02:00
Maxim Cournoyer
7d3bb28a6f gnu: openldap: Update to 2.6.3.
* gnu/packages/openldap.scm (openldap): Update to 2.6.3.
[arguments]: Integrate updated phases from openldap-2.6 package.  Strip
trailing #t.
2023-04-14 23:37:04 -04:00
Ricardo Wurmus
626d921558 gnu: Add openldap-for-linphone.
* gnu/packages/openldap.scm (openldap-for-linphone): New variable.
2023-04-08 20:05:06 +02:00
Efraim Flashner
4cf1acc7f3 Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
2023-01-30 12:39:40 +02:00
Ricardo Wurmus
7b8cac86ba gnu: 389-ds-base: Avoid dependency on systemd-detect-virt.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Remove invocation of
systemd-detect-virt.
2022-12-14 22:46:21 +01:00
Ricardo Wurmus
e2bcd41ce3 gnu: 389-ds-base: Enable one test.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Enable unit tests.
[native-inputs]: Add cmocka.
2022-12-14 21:52:34 +01:00
Ricardo Wurmus
b5bb44b260 gnu: 389-ds-base: Use gexp.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Use gexp; remove one
obsolete substitution.
2022-12-14 21:52:34 +01:00
Ricardo Wurmus
597685054b gnu: 389-ds-base: Update to 2.2.2.
* gnu/packages/openldap.scm (389-ds-base): Update to 2.2.2.
[inputs]: Add json-c and lmdb.
2022-12-14 21:52:34 +01:00
Ricardo Wurmus
2f707f9493 gnu: 389-ds-base: Update to 1.4.5.0.
* gnu/packages/openldap.scm (389-ds-base): Update to 1.4.5.0.
[source]: Fetch from git.
[arguments]: Remove unnecessary configure flags; update 'fix-references phase;
update 'overwrite-default-locations phase.
2022-12-14 17:19:06 +01:00
Ricardo Wurmus
7885b5be9b gnu: 389-ds-base: Drop input labels.
* gnu/packages/openldap.scm (389-ds-base)[inputs]: Drop labels.
[native-inputs]: Drop labels.
2022-12-14 17:19:06 +01:00
Marius Bakke
b8b4d63137 gnu: OpenLDAP: Update to 2.6.3.
* gnu/packages/openldap.scm (openldap-2.6): Update to 2.6.3.
2022-12-12 15:12:57 +01:00
Marius Bakke
b3fb4ed0b0 gnu: OpenLDAP: Update to 2.6.3.
* gnu/packages/openldap.scm (openldap): Update to 2.6.3.
2022-07-27 17:53:49 +02:00
Marius Bakke
0de5e6d653 gnu: cyrus-sasl: Do not propagate Kerberos.
* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[propagated-inputs]: Move MIT-KRB5 ...
[inputs]: ... here.
* gnu/packages/openldap.scm (openldap)[arguments]: Don't add krb5 linker arguments.
2022-07-23 19:43:11 +02:00
Marius Bakke
5708638a93 gnu: OpenLDAP: Update to 2.6.2.
* gnu/packages/openldap.scm (openldap): Update to 2.6.2.
[source](uri): Update primary mirror.
[arguments]: Take from ...
(openldap-2.6): ... this removed variable.  Remove #:make-flags, and set the
STRIP variable in fix-cross-gcc phase.
(python-ldap)[inputs]: Change from OPENLDAP-2.6 to OPENLDAP.
* gnu/packages/django.scm (python-django-auth-ldap)[native-inputs]: Likewise.
2022-07-16 23:25:18 +02:00
Marius Bakke
7f1e295c08 gnu: python-ldap: Update to 3.4.0.
* gnu/packages/openldap.scm (python-ldap): Update to 3.4.0.
[arguments]: Remove input labels.
[inputs]: Change from OPENLDAP to OPENLDAP-2.6.
2022-01-21 00:35:06 +01:00
Marius Bakke
0e8efe0611 gnu: OpenLDAP: Add 2.6.1.
* gnu/packages/openldap.scm (openldap-2.6): New variable.
2022-01-21 00:35:06 +01:00
Ludovic Courtès
8394619bac gnu: Simplify package inputs.
This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
2021-12-13 17:48:25 +01:00
Ludovic Courtès
b15e543d30 Merge branch 'master' into core-updates-frozen 2021-11-23 11:29:38 +01:00
Ricardo Wurmus
7239ad676c gnu: nss-pam-ldapd: Update to 0.9.12.
* gnu/packages/openldap.scm (nss-pam-ldapd): Update to 0.9.12.
[arguments]: Remove trailing #T.
2021-11-22 23:40:20 +01:00
Ricardo Wurmus
63c7bb62c4 gnu: 389-ds-base: Substitute more tool references.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Substitute references to
"ip" and "openssl".
[inputs]: Add iproute.
2021-10-01 22:09:26 +02:00
Ricardo Wurmus
51a9b8fd8f gnu: 389-ds-base: Update to 1.4.4.17.
* gnu/packages/openldap.scm (389-ds-base): Update to 1.4.4.17.
[source]: Use release tarball from Github.
[arguments]: Remove wrapping of readnsstate.
2021-09-30 15:32:35 +02:00
Ricardo Wurmus
6cd6b0abe7 gnu: 389-ds-base: Restore definition of pythondir.
* gnu/packages/openldap.scm (389-ds-base)[arguments]: Import python-version
from (guix build python-build-system); define pythondir before using it in
fix-install-location-of-python-tools.
2021-09-30 15:32:35 +02:00
Marius Bakke
8314335e24 gnu: OpenLDAP: Remove replacement package.
* gnu/packages/openldap.scm (openldap): Update to 2.4.57.
[replacement]: Remove.
(openldap-2.4.57): Remove variable.
2021-05-09 23:12:48 +02:00
Christopher Baines
a8448da0f4 Merge branch 'master' into core-updates 2021-03-06 00:18:30 +00:00
Léo Le Bouter
22ef895d24 gnu: 389-ds-base: Update to 1.4.0.31 [security fixes].
* gnu/packages/openldap.scm (389-ds-base): Update to 1.4.0.31.
2021-03-04 01:39:07 +01:00