Commit graph

512325 commits

Author SHA1 Message Date
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
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
maralorn 9acbe31a1f
libpsl: add meta.pkgConfigModules annotation 2023-08-08 16:00:28 +02:00
maralorn 583141c525
libepoxy: add meta.pkgConfigModules annotation 2023-08-08 16:00:28 +02:00
maralorn 1d551bd1fc
libdatrie: add meta.pkgConfigModules annotation 2023-08-08 16:00:27 +02:00
Weijia Wang c6bdba9c94
Merge pull request #247884 from wegank/libextractor-exiv2
libextractor: add patch for exiv2 0.28
2023-08-08 15:56:58 +02:00
Lin Jian 74fadae942
treewide: stop using types.string
It is an error[1] now.

[1]: https://github.com/NixOS/nixpkgs/pull/247848
2023-08-08 21:31:21 +08:00
Mario Rodas 7f60434172
Merge pull request #209548 from felipeqq2/init/storj-uplink
storj-uplink: init at 1.68.2
2023-08-08 08:29:16 -05:00
Jennifer Graul c58635a1fa
python3Packages.django-bootstrap5: init at 23.3 2023-08-08 15:25:52 +02:00
Theodore Ni 6e4f56287a
python3.pkgs.botorch: add and move dependencies to nativeBuildInputs (#247269) 2023-08-08 09:02:23 -04:00
Mario Rodas 0f9c200e21
Merge pull request #241697 from tricktron/fix-vscode-insiders
vscode: fix vscode-insiders on darwin
2023-08-08 07:54:21 -05:00
Mario Rodas b29ee7d19a
Merge pull request #247700 from tjni/gifski
gifski: fix tests by running them in debug mode
2023-08-08 07:53:26 -05:00
Janik 777fcd15e2
Merge pull request #245677 from fsagbuya/linux-gpib 2023-08-08 14:52:14 +02:00
Mario Rodas c34a0c22fe
Merge pull request #247927 from marsam/update-esbuild
esbuild: 0.18.19 -> 0.18.20
2023-08-08 07:47:31 -05:00
Mario Rodas 432f8cb2e5
Merge pull request #247904 from fabaff/metasploit-bump
metasploit: 6.3.27 -> 6.3.28
2023-08-08 07:04:17 -05:00
maralorn 4e6868b1aa
Merge pull request #247907 from sternenseemann/pkg-config-meta-data
Populate meta.pkgConfigModules for misc packages
2023-08-08 13:45:39 +02:00
Anderson Torres 065a7ed424 nongnu-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Anderson Torres c23bd886e1 melpa-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Anderson Torres deb0c58086 elpa-devel-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Anderson Torres e07cb46e21 elpa-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Theodore Ni 919f78a5ce
python3.pkgs.broadbean: add build dependencies and fix constraints (#247464) 2023-08-08 12:46:29 +02:00
Theodore Ni 42c541314b python3.pkgs.aplpy: dependency cleanup 2023-08-08 12:45:49 +02:00
Theodore Ni e43bf6cf77 python3.pkgs.pyregion: add missing cython dependency 2023-08-08 12:45:49 +02:00
Gaetan Lepage c8988d699d vimPlugins.nvim-treesitter: update grammars 2023-08-08 12:21:28 +02:00
Gaetan Lepage ce19d22bd5 vimPlugins: update 2023-08-08 12:20:49 +02:00
Gaetan Lepage 5f850c22f5 vimPlugins.lspsaga-nvim: change upstream provider and delete unnecessary duplicate 2023-08-08 12:18:53 +02:00
sternenseemann c995eb0c5e util-linux: add meta.pkgConfigModules annotation 2023-08-08 11:52:07 +02:00
sternenseemann f8c558ca80 libsepol: add meta.pkgConfigModules annotation 2023-08-08 11:51:46 +02:00
sternenseemann e7d708bd73 pcre: add meta.pkgConfigModules annotation 2023-08-08 11:51:34 +02:00
Fabian Affolter 4e07a9a10e metasploit: 6.3.27 -> 6.3.28 2023-08-08 11:51:32 +02:00
sternenseemann addc9bcd3e pango: add meta.pkgConfigModules annotation 2023-08-08 11:51:18 +02:00
sternenseemann fc5a8f129f libthai: add meta.pkgConfigModules annotation 2023-08-08 11:51:00 +02:00