Commit graph

394161 commits

Author SHA1 Message Date
Dan Callaghan b30534eb02 openldap: load client config from /etc, not the nix store
We want Openldap clients to load /etc/ldap.conf at runtime, not
${pkgs.openldap}/etc/ldap.conf which is always a sample config.

Pass sysconfdir=/etc at compile time, so that /etc/krb5.conf is embedded
in the library as the path of its config file.

Pass sysconfdir=${out}/etc at install time, so that the sample configs
and schema files are correctly included in the build output.

This hack works because the Makefiles are not smart enough to notice
that the sysconfdir variable has changed across invocations -- because
nobody ever writes their Makefiles to be that smart. :-)

Fixes #181937.
2022-07-22 03:19:46 +02:00
github-actions[bot] df9f22a8b8
Merge staging-next into staging 2022-07-22 00:03:25 +00:00
github-actions[bot] d44e369b44
Merge master into staging-next 2022-07-22 00:02:40 +00:00
maralorn 77085e9b2b
Merge pull request #182019 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2022-07-22 01:00:11 +02:00
Sandro f625c21fb5
Merge pull request #182302 from kilianar/minio
minio: 2022-05-08T23-50-31Z -> 2022-07-17T15-43-14Z
2022-07-22 00:50:06 +02:00
Martin Weinelt 76ee08a0db
Merge pull request #182341 from helsinki-systems/upd/nss_lastest 2022-07-22 00:41:35 +02:00
Bill Ewanick d99563cd78 Add oil to packages before invoking shell,
this allows the oil shell to actually run
2022-07-21 18:40:45 -04:00
Martin Weinelt 24e8a4993b
Merge pull request #182394 from NixOS/revert-182080-openldap-sysconfdir
Revert "openldap: load client config from /etc, not the nix store"
2022-07-22 00:29:58 +02:00
Martin Weinelt fa8de76521
Revert "openldap: load client config from /etc, not the nix store" 2022-07-22 00:29:21 +02:00
Martin Weinelt b435482234
Merge pull request #182080 from danc86/openldap-sysconfdir 2022-07-22 00:28:49 +02:00
Martin Weinelt 1ad808196d
Merge pull request #182078 from mweinelt/openldap-2.6.3 2022-07-22 00:28:24 +02:00
Malte Brandy b4d1872885 maintainers/scripts/haskell/hydra-report: Add hint about eval errors 2022-07-22 00:26:52 +02:00
Martin Weinelt 457d109dcd
Merge pull request #179597 from Mic92/openldap-path
[staging] openldap: remove deprecated options, improve encapsulation
2022-07-22 00:26:32 +02:00
Malte Brandy 15924be1b2 Merge branch 'master' into haskell-updates 2022-07-22 00:22:27 +02:00
Malte Brandy 8fc4df0415 haskellPackages: mark builds failing on hydra as broken
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
2022-07-22 00:22:14 +02:00
Vladimír Čunát 5589297001
Merge branch 'staging' into staging-next 2022-07-21 23:48:06 +02:00
Martin Weinelt 3debd9a437
Merge pull request #182381 from r-ryantm/auto-update/python3.10-structlog 2022-07-21 23:47:55 +02:00
Martin Weinelt 97a9f89dfe
Merge pull request #181620 from NixOS/python-updates 2022-07-21 23:45:34 +02:00
R. Ryantm 3b740fe8ab python310Packages.structlog: 21.5.0 -> 22.1.0 2022-07-21 21:35:10 +00:00
Sandro 09b26806a0
Merge pull request #182235 from r-ryantm/auto-update/python310Packages.google-cloud-spanner 2022-07-21 23:21:01 +02:00
ajs124 d6a0bb7262
Merge pull request #181566 from fabaff/wolfssl-bump 2022-07-21 23:08:25 +02:00
Sandro 955e844ded
Merge pull request #182139 from astro/taler
taler-exchange: 0.8.1 -> unstable-2022-07-17 and taler-merchant: 0.8.…
2022-07-21 22:55:50 +02:00
Sandro 3f21fea08a
Merge pull request #181339 from centromere/cxx-rs-1.0.71 2022-07-21 22:54:58 +02:00
Sandro 19f46ac104
Merge pull request #182333 from AtilaSaraiva/obs-vkcapture 2022-07-21 22:48:25 +02:00
Robert Scott 7035839167
Merge pull request #182317 from fabaff/angr-bump
python310Packages.angr: 9.2.10 -> 9.2.11
2022-07-21 21:48:11 +01:00
Sandro 98b4daa994
Merge pull request #181881 from SuperSandro2000/searx 2022-07-21 22:39:48 +02:00
Martin Weinelt e3df41b3bc python3Packages.dask: 2022.05.2 -> 2022.7.0 2022-07-21 22:35:34 +02:00
Martin Weinelt d3e6dbb771 python3Packages.matrix-nio: run tests in asyncio legacy mode 2022-07-21 22:35:34 +02:00
Robert Scott 3737f384aa python3Packages.pyquil: remove qcs-api-client version constraint
as already done upstream https://github.com/rigetti/pyquil/pull/1449
2022-07-21 22:35:34 +02:00
Robert Scott 79a23e73c3 python3Packages.owslib: remove pyproj version constraint 2022-07-21 22:35:33 +02:00
Robert Scott 51bc3a3a8a python3Packages.islpy: 2022.2 -> 2022.2.1 2022-07-21 22:35:33 +02:00
Robert Scott 44a05c2d4b python3Packages.pyosmium: switch to pytestCheckHook 2022-07-21 22:35:33 +02:00
Robert Scott fe35f960d2 python3Packages.typer: include rich in checkInputs 2022-07-21 22:35:33 +02:00
K900 465efd5bb4 python3Packages.pyqt5: 5.15.4 -> 5.15.7 2022-07-21 22:35:33 +02:00
K900 52ad8519d5 python3Packages.pyqt-builder: use sip-distinfo from PATH
Fixes PyQt5 build.
2022-07-21 22:35:33 +02:00
Martin Weinelt 353e6ff616 python3Packages.requests-cache: 0.9.4 -> 0.9.5 2022-07-21 22:35:33 +02:00
Mauricio Collares 0a74993f68 python3Packages.sphinx: do not use deprecated docutils 0.19 API 2022-07-21 22:35:33 +02:00
Martin Weinelt 3fe71fcbcf python3Packages.qiskit-terra: 0.20.1 -> 0.21.0 2022-07-21 22:35:33 +02:00
Martin Weinelt 020e152765 python3Packages.unifi-discovery: test in asyncio legacy mode 2022-07-21 22:35:33 +02:00
Mauricio Collares 34b89ade0d python3Packages.rpy2: update R_LIBS_SITE patch 2022-07-21 22:35:32 +02:00
Martin Weinelt 910bb76bb5 python3Packages.orjson: 3.6.7 -> 3.7.8 2022-07-21 22:35:32 +02:00
Martin Weinelt e3e90eec62 python3Packages.subarulink: test in asyncio legacy mode 2022-07-21 22:35:32 +02:00
Martin Weinelt b4988e25b5 maturin: 0.12.9 -> 0.13.0 2022-07-21 22:35:32 +02:00
Martin Weinelt ac783147e7 python3Packages.cattrs: 1.10.0 -> 22.1.0
https://github.com/python-attrs/cattrs/blob/main/HISTORY.rst#2210-2022-04-03
2022-07-21 22:35:32 +02:00
Martin Weinelt 61718b8bd3 python3Packages.awkward: skip failing test 2022-07-21 22:35:32 +02:00
Martin Weinelt f7c33f8617 python3Packages.snowflake-connector-python: relax charset-normalizer constraint 2022-07-21 22:35:32 +02:00
Martin Weinelt accf1514b6 python3Packages.mailsuite: 1.8.0 -> 1.9.2 2022-07-21 22:35:32 +02:00
Martin Weinelt 84189d8cd7 python3Packages.sphinx-jupyterbook-latex: relax sphinx constraint 2022-07-21 22:35:32 +02:00
Martin Weinelt 513fa21e47 python3Packages.xbox-webapi: test in asyncio legacy mode 2022-07-21 22:35:32 +02:00
Martin Weinelt c61efc1d0d python3Packages.python-kasa: test in asyncio legacy mode 2022-07-21 22:35:32 +02:00