Commit graph

512376 commits

Author SHA1 Message Date
Sandro Jäckel
4514e57231 cpython: use correct variable to set meta.mainProgram 2023-08-08 17:25:28 +00:00
Weijia Wang
5bc7a60800
Merge pull request #243672 from r-ryantm/auto-update/geoipupdate
geoipupdate: 5.1.1 -> 6.0.0
2023-08-08 19:21:53 +02:00
sternenseemann
af60e68744 testers.hasPkgConfigModules: allow checking multiple pkg-config mods
This is very useful in conjunction with meta.pkgConfigModules, as the
new tester can use the list provided by this meta attribute as a default
value for moduleNames, making its usage in passthru.tests very
convenient.

For backwards compatibility, a shim under the old name is maintained
with a warning.
2023-08-08 19:16:48 +02:00
Weijia Wang
f1dc41a5cd
Merge pull request #246722 from r-ryantm/auto-update/python310Packages.trytond
python310Packages.trytond: 6.8.2 -> 6.8.3
2023-08-08 19:06:05 +02:00
Weijia Wang
769837cbd8
Merge pull request #246688 from r-ryantm/auto-update/python310Packages.fake-useragent
python310Packages.fake-useragent: 1.1.3 -> 1.2.1
2023-08-08 19:03:39 +02:00
Weijia Wang
bb1372479b
Merge pull request #246500 from r-ryantm/auto-update/python310Packages.spacy-lookups-data
python310Packages.spacy-lookups-data: 1.0.3 -> 1.0.5
2023-08-08 19:02:47 +02:00
Weijia Wang
fbdfba771f
Merge pull request #246495 from r-ryantm/auto-update/python310Packages.py-partiql-parser
python310Packages.py-partiql-parser: 0.3.5 -> 0.3.6
2023-08-08 19:00:40 +02:00
Weijia Wang
34d676d220
Merge pull request #246490 from r-ryantm/auto-update/python310Packages.dkimpy
python310Packages.dkimpy: 1.1.4 -> 1.1.5
2023-08-08 18:59:35 +02:00
Weijia Wang
63d97739f4
Merge pull request #246471 from r-ryantm/auto-update/python311Packages.coinmetrics-api-client
python311Packages.coinmetrics-api-client: 2023.6.8.20 -> 2023.7.11.17
2023-08-08 18:57:36 +02:00
Weijia Wang
f197c389de
Merge pull request #246445 from r-ryantm/auto-update/python310Packages.oci
python310Packages.oci: 2.107.0 -> 2.109.0
2023-08-08 18:55:19 +02:00
Weijia Wang
a2aa135d22
Merge pull request #246112 from r-ryantm/auto-update/python310Packages.injector
python310Packages.injector: 0.20.1 -> 0.21.0
2023-08-08 18:46:08 +02:00
Weijia Wang
bae84efcd6
Merge pull request #246019 from r-ryantm/auto-update/python311Packages.packageurl-python
python311Packages.packageurl-python: 0.11.1 -> 0.11.2
2023-08-08 18:43:31 +02:00
Weijia Wang
5e324eedd6
Merge pull request #245796 from r-ryantm/auto-update/python310Packages.pyprecice
python310Packages.pyprecice: 2.5.0.2 -> 2.5.0.3
2023-08-08 18:40:22 +02:00
Weijia Wang
019ee8dfd1
Merge pull request #245752 from r-ryantm/auto-update/python310Packages.yfinance
python310Packages.yfinance: 0.2.24 -> 0.2.27
2023-08-08 18:38:26 +02:00
Weijia Wang
5fbfa2a145
Merge pull request #245614 from r-ryantm/auto-update/python310Packages.django-auth-ldap
python310Packages.django-auth-ldap: 4.3.0 -> 4.4.0
2023-08-08 18:36:47 +02:00
Weijia Wang
53af722f86
Merge pull request #245462 from r-ryantm/auto-update/python310Packages.holoviews
python310Packages.holoviews: 1.16.2 -> 1.17.0
2023-08-08 18:30:27 +02:00
Robert Hensing
1c4adbc2e1
Merge pull request #247953 from SuperSandro2000/arp-scan
arp-scan: set meta.mainProgram
2023-08-08 18:27:57 +02:00
Weijia Wang
9b3071e34d
Merge pull request #245257 from r-ryantm/auto-update/python310Packages.okonomiyaki
python310Packages.okonomiyaki: 1.3.2 -> 1.4.0
2023-08-08 18:27:02 +02:00
Robert Hensing
65ec4c1e86
Merge pull request #247954 from SuperSandro2000/tcp-dump
tcpdump: set meta.mainProgram
2023-08-08 18:26:02 +02:00
Weijia Wang
10614fb51a
Merge pull request #244978 from r-ryantm/auto-update/python310Packages.pyworld
python310Packages.pyworld: 0.3.3 -> 0.3.4
2023-08-08 18:20:20 +02:00
Weijia Wang
14310de62c
Merge pull request #244729 from r-ryantm/auto-update/python310Packages.vowpalwabbit
python310Packages.vowpalwabbit: 9.8.0 -> 9.9.0
2023-08-08 18:18:02 +02:00
Weijia Wang
817a1101e5
Merge pull request #244399 from r-ryantm/auto-update/python310Packages.pyvmomi
python310Packages.pyvmomi: 8.0.1.0.1 -> 8.0.1.0.2
2023-08-08 18:11:44 +02:00
Weijia Wang
5455890044
Merge pull request #244397 from r-ryantm/auto-update/python310Packages.globus-sdk
python310Packages.globus-sdk: 3.23.0 -> 3.25.0
2023-08-08 18:03:24 +02:00
Weijia Wang
ee10f25365
Merge pull request #244150 from r-ryantm/auto-update/python310Packages.mmh3
python310Packages.mmh3: 4.0.0 -> 4.0.1
2023-08-08 18:01:49 +02:00
Weijia Wang
d7392f7e21
Merge pull request #244145 from r-ryantm/auto-update/python310Packages.bugsnag
python310Packages.bugsnag: 4.4.0 -> 4.5.0
2023-08-08 17:59:14 +02:00
K900
b0b00f0e28
Merge pull request #247937 from linj-fork/fix-types.string
treewide: stop using types.string
2023-08-08 18:50:42 +03:00
Florian Klink
e2a3067c73
Merge pull request #247619 from r-ryantm/auto-update/talosctl
talosctl: 1.4.6 -> 1.4.7
2023-08-08 17:44:22 +02:00
figsoda
206f77f918
Merge pull request #247916 from GaetanLepage/lspsaga
vimPlugins.lspsaga-nvim: change upstream provider and delete unnecessary duplicate
2023-08-08 11:34:35 -04:00
Sandro Jäckel
ba43f4ce04
tcpdump: set meta.mainProgram 2023-08-08 17:22:26 +02:00
Sandro Jäckel
f0280400cf
tcpdump: fetch via https 2023-08-08 17:22:19 +02:00
Sandro Jäckel
307d648b6a
arp-scan: set meta.mainProgram 2023-08-08 17:21:31 +02:00
Sandro Jäckel
ac32b39e75
arp-scan: replace defunct meta.homepage 2023-08-08 17:21:22 +02:00
Sandro Jäckel
0159c0c3c1
arp-scan: don't shadow bash name variable 2023-08-08 17:21:10 +02:00
figsoda
fba2eab4c0 reason-shell: init at 0.3.10
https://github.com/jaywonchung/reason
2023-08-08 14:51:53 +00:00
sternenseemann
9d6cac3e53 mesonEmulatorHook: fix canExecute safety assertion
Currently the throw codepath will never be hit. Specifically it doesn't
guard against a misuse of the hook:

    pkgsCross.aarch64-multiplatform.mesonEmulatorHook # this should fail
    pkgsCross.aarch64-multiplatform.buildPackages.mesonEmulatorHook # this should (and does) succeed

The check sort of worked to guard against use in situations where the
hook wasn't misplaced between nativeBuildInputs and buildInputs, but
the build platform was actually able to execute binaries built for the
host platform.

This worked because nativeBuildInputs would first of all need to
evaluate pkgsHostTarget.mesonEmulatorHook in order to access the spliced
derivation it wants, pkgsBuildHost.mesonEmulatorHook. For this, you'd
need to pass the if expression, at which point buildPlatform and
targetPlatform would match the build and target platform of the
derivation that uses the hook. Consequently the check is “correct”,
since it is its build platform that needs not to be able execute stuff
built for its host platform.

The target platform is technically wrong here, but it works out
since (at least currently) in nixpkgs either build and host or host and
target platform are equal. When doing the check in pkgsHostTarget,
target and host platform are equal.

However, this is a kind of incomprehensible rube goldberg machine, let's
some mistakes slip through the cracks and relies on implementation
details of splicing.

To alleviate this, we do the following:

- We move the check _into_ the derivation. By doing the check when
  obtaining the file for the setup hook and not before calling
  `makeSetupHook`. This means that we can force `mesonEmulatorHook`
  even if forcing `mesonEmulatorHook.outPath` would throw. This ensures
  that splicing can work even if the some of the derivation variants
  would fail to evaluate.

- Since splicing works now, we can no longer have to do the check
  “globally” before splicing happens. This means we can use the setup
  hook derivation's own platforms. buildPlatform is irrelevant here,
  since this is only the platform on which the shell script is put
  together. hostPlatform matters, since it is were the setup hook is
  executed later (i.e. the using derivation's build platform). target
  platform is the platform the adjacent meson builds executables for,
  i.e. the platform we may need to emulate for.

To verify this change, I have evaluated all derivations using
mesonEmulatorHook in `pkgsCross.aarch64-multiplatform` before and after
this change. The hashes don't change.
2023-08-08 16:49:20 +02:00
Eelco Dolstra
bcb02bd1a5 nixVersions.nix_2_13: 2.13.3 -> 2.13.5 2023-08-08 07:35:13 -07:00
WilliButz
acbf16d419
Merge pull request #247709 from Ma27/nextcloud-adminuser-doc-fix
nixos/nextcloud: improve documentation of `adminuser`-option
2023-08-08 16:29:59 +02:00
OTABI Tomoya
86ca2f6680
Merge pull request #247720 from aaronjheng/trunk-io
trunk-io: 1.2.4 -> 1.2.6
2023-08-08 23:23:53 +09:00
Janik
31ad272060
Merge pull request #247896 from NetaliDev/python-django-bootstrap5 2023-08-08 16:20:57 +02:00
sternenseemann
75a8378bef spike: don't assume naming of cross C compiler 2023-08-08 16:20:46 +02:00
7c6f434c
ffeaa635ea
Merge pull request #247335 from chayleaf/rizin
rizin: 0.5.2 -> 0.6.0
2023-08-08 14:16:52 +00:00
happysalada
fd52a5ccd6 atuin: 15.0.0 -> 16.0.0 2023-08-08 22:07:26 +08:00
maralorn
e032f864d0
Merge pull request #247939 from maralorn/more-pkg-config-meta
Populate meta.pkgConfigModules for more packages
2023-08-08 16:01:06 +02:00
maralorn
de7882fd41
xorg.libXtst: add meta.pkgConfigModules annotation 2023-08-08 16:00:38 +02:00
maralorn
09b6e7fb21
xorg.libXdmcp: add meta.pkgConfigModules annotation 2023-08-08 16:00:38 +02:00
maralorn
d85a512a38
xorg.libxcb: add meta.pkgConfigModules annotation 2023-08-08 16:00:37 +02:00
maralorn
ae7cc3b314
libsysprof-capture: add meta.pkgConfigModules annotation 2023-08-08 16:00:37 +02:00
maralorn
2d87e9ae03
sqlite: add meta.pkgConfigModules annotation 2023-08-08 16:00:37 +02:00
maralorn
94a6ca907f
libxkbcommon: add meta.pkgConfigModules annotation 2023-08-08 16:00:37 +02:00
maralorn
cacb118b78
libsoup: add meta.pkgConfigModules annotation 2023-08-08 16:00:28 +02:00