Commit Graph

496357 Commits

Author SHA1 Message Date
Randy Eckenrode
057dd0effe
libiconvReal: implement ABI compatibility on Darwin
This commit prepares libiconvReal to replace darwin.libiconv, allowing
it to be used with binary derivations that patch out references to the
system libiconv with one from nixpkgs.

Apple’s libiconv is based on GNU libiconv 1.11 (the last version before
it switched to LGPLv3+). Any newer releases by Apple appear to be build
system tweaks. The core sources are barely updated. This means that
Darwin users won’t get any fixes from upstream updates, and maintaining
darwin.libiconv requires dealing with a separate and different build
system (because Apple now builds it with Xcode). Fortunately, it is
possible to build upstream libiconv in a way that is compatible with
Apple’s distribution of it.

There are two things that need to happen to produce an ABI-compatible
build of libiconv:

* Existing symbols need to be exported with the `iconv_` prefix instead
  of the `libiconv_` prefix. New symbols can have the `libiconv` prefix,
  and one symbol in Apple’s distribution does, but older ones must have
  the older prefix; and
* Reexport `libcharset.dylib` from `libiconv.dylib`. This is explained
  by Apple as the result of a bug in their transition to an Xcode-based
  build system.

Both these these are doable and have been done by this commit. I have
tested it with building GHC, which downloads a binary distribution as
part of its bootstrap and replaces references to the system libiconv
with darwin.libiconv. Using this patch, libiconvReal is able to work
without any changes to the GHC derivation.

Note that this patch does not actually deprecate or remove
darwin.libiconv yet. That will be done in a future patch after Darwin
support is added for aliases and deprecating packages in the `darwin`
attrset.
2023-06-21 19:05:54 -04:00
adisbladis
23bd312777
Merge pull request #238586 from adisbladis/emacs-passhru-nativecomp-fixup
emacs: add back nativeComp/treeSitter passthru
2023-06-20 13:22:21 +12:00
rnhmjoj
623d7d2124 nixos/tests/fakeroute: init 2023-06-20 01:12:04 +00:00
rnhmjoj
7d263715bd nixos/fakeroute: run as unprivileged user 2023-06-20 01:12:04 +00:00
rnhmjoj
ed93c9d353 fakeroute: 0.2 -> 0.3 2023-06-20 01:12:04 +00:00
Weijia Wang
991c60a231
Merge pull request #238455 from Scrumplex/update-vencord-1.2.8
vencord: 1.2.5 -> 1.2.8
2023-06-20 03:43:23 +03:00
Weijia Wang
54ad08104f
Merge pull request #238594 from fgaz/upnp-router-control/0.3.2
upnp-router-control: 0.3.1 -> 0.3.2
2023-06-20 03:39:10 +03:00
Weijia Wang
4ea93448ed
Merge pull request #238585 from fgaz/miniaudicle/1.4.2.0
miniaudicle: 1.3.5.2 -> 1.4.2.0
2023-06-20 03:38:10 +03:00
Weijia Wang
642a2113a9
Merge pull request #238548 from NickCao/aws-nuke
aws-nuke: 2.21.2 -> 2.22.1
2023-06-20 03:36:35 +03:00
Weijia Wang
62063366df
Merge pull request #238390 from NickCao/fil
FIL-plugins: fix cross compilation
2023-06-20 03:29:27 +03:00
Weijia Wang
f7918807ee
Merge pull request #238541 from NickCao/ansifilter
ansifilter: 2.19 -> 2.20
2023-06-20 03:23:54 +03:00
Weijia Wang
457b8200c1
Merge pull request #238393 from NickCao/assimp
assimp: fix build for riscv
2023-06-20 03:23:05 +03:00
Weijia Wang
7cfb57e446
Merge pull request #238539 from NickCao/alpine-make-vm-image
alpine-make-vm-image: 0.11.0 -> 0.11.1
2023-06-20 03:20:57 +03:00
Weijia Wang
8aee1cd4d6
Merge pull request #238358 from r-ryantm/auto-update/pdal
pdal: 2.5.4 -> 2.5.5
2023-06-20 03:19:46 +03:00
Weijia Wang
3b0b099be2
Merge pull request #238556 from fgaz/shattered-pixel-dungeon/2.1.2
shattered-pixel-dungeon: 2.0.2 -> 2.1.2
2023-06-20 03:19:12 +03:00
Martin Weinelt
9e43a266e7
Merge pull request #238286 from mweinelt/css-inline-0.10.0
python310Packages.css-inlline: 0.9.0 -> 0.10.0
2023-06-20 02:15:27 +02:00
Weijia Wang
8334e299f0
Merge pull request #238552 from fgaz/lobster/2023.9
lobster: 2023.6 -> 2023.9
2023-06-20 03:14:53 +03:00
Martin Weinelt
4670093f55
Merge pull request #238399 from mweinelt/evcc-0.118.1
evcc: 0.118.0 -> 0.118.1
2023-06-20 02:14:40 +02:00
Weijia Wang
d984f28210
Merge pull request #238529 from kalekseev/ruff-lsp
python3Packages.ruff-lsp: 0.0.31 -> 0.0.32
2023-06-20 03:14:09 +03:00
Weijia Wang
aea74ad50e
Merge pull request #238538 from foo-dogsquared/update-extension-manager
gnome-extension-manager: 0.4.1 -> 0.4.2
2023-06-20 03:12:15 +03:00
Weijia Wang
015e594673
Merge pull request #238608 from fabaff/pyezviz-bump
python311Packages.pyezviz: 0.2.0.17 -> 0.2.1.2
2023-06-20 03:11:06 +03:00
Weijia Wang
37a2c63495
Merge pull request #238572 from qbit/tidal-hifi-5.2.0
tidal-hifi: 5.1.0 -> 5.2.0
2023-06-20 03:09:55 +03:00
Weijia Wang
7e70a25540
Merge pull request #238609 from fabaff/checkov-bump
checkov: 2.3.294 -> 2.3.296
2023-06-20 03:09:10 +03:00
Weijia Wang
085830dc79
Merge pull request #238580 from SubhrajyotiSen/update-maestro
maestro: 1.28.0 -> 1.29.0
2023-06-20 03:08:39 +03:00
Weijia Wang
c7df2ea023
Merge pull request #238567 from r-ryantm/auto-update/python310Packages.python-lsp-server
python310Packages.python-lsp-server: 1.7.2 -> 1.7.3
2023-06-20 03:01:56 +03:00
Weijia Wang
fcb1400f3e
Merge pull request #238519 from r-ryantm/auto-update/waypoint
waypoint: 0.11.1 -> 0.11.2
2023-06-20 02:48:51 +03:00
Weijia Wang
6519dfd2b8
Merge pull request #238573 from r-ryantm/auto-update/python310Packages.pyslurm
python310Packages.pyslurm: 22.5.1 -> 23.2.1
2023-06-20 02:47:13 +03:00
Weijia Wang
bd3b2c165e
Merge pull request #238563 from r-ryantm/auto-update/python310Packages.pytest-testmon
python310Packages.pytest-testmon: 2.0.8 -> 2.0.9
2023-06-20 02:45:44 +03:00
Weijia Wang
397a3ef26f
Merge pull request #238528 from r-ryantm/auto-update/dart
dart: 3.0.4 -> 3.0.5
2023-06-20 02:43:28 +03:00
Weijia Wang
ea15ceb69e
Merge pull request #238527 from r-ryantm/auto-update/haruna
haruna: 0.11.0 -> 0.11.1
2023-06-20 02:38:35 +03:00
Weijia Wang
078b9ff81e
Merge pull request #238627 from justinas/teleport-12-4-7
teleport_12: 12.1.5 -> 12.4.7
2023-06-20 02:33:59 +03:00
Weijia Wang
dc5c97d6c2
Merge pull request #238526 from r-ryantm/auto-update/python310Packages.pdf2image
python310Packages.pdf2image: 1.16.2 -> 1.16.3
2023-06-20 02:29:42 +03:00
figsoda
882f4293ed
Merge pull request #238632 from linsui/clipboard
vimPlugins.clipboard-image-nvim: fix for neovim 9.0
2023-06-19 19:22:50 -04:00
figsoda
bbee794153
Merge pull request #238643 from thiagokokada/add-more-vim-plugins
vimPlugins.remember-nvim: init at 2023-06-12;  vimPlugins.nvim-test: init at 2023-05-02
2023-06-19 19:20:27 -04:00
Weijia Wang
56b647e6d0
Merge pull request #238605 from figsoda/typos
typos: 1.15.0 -> 1.15.1
2023-06-20 02:18:07 +03:00
Weijia Wang
202d01291f
Merge pull request #238616 from jfroche/cloud-init-bump
cloud-init: 23.1.2 -> 23.2
2023-06-20 02:09:40 +03:00
Weijia Wang
e1eb7c72c1
Merge pull request #238633 from figsoda/guppy
cargo-{hakari,guppy}: update
2023-06-20 02:03:30 +03:00
Weijia Wang
4f516d9efa
Merge pull request #238607 from e1mo/bird-lg-update
bird-lg: 1.3.0 -> 1.3.1, bird-lg: add e1mo as maintainer
2023-06-20 02:00:16 +03:00
maxine
ea28400779
Merge pull request #238653 from rhoriguchi/plex
plex: 1.32.3.7192-7aa441827 -> 1.32.4.7195-7c8f9d3b6
2023-06-20 00:58:33 +02:00
Weijia Wang
62bb0b0788
Merge pull request #238626 from adamcstephens/leftwm/0.4.2
leftwm: 0.4.1 -> 0.4.2
2023-06-20 01:57:10 +03:00
Weijia Wang
ee49b2f1e6
Merge pull request #238620 from natsukium/rdkit/update
python3Packages.rdkit: 2023.03.1 -> 2023.03.2
2023-06-20 01:50:35 +03:00
Weijia Wang
0981faadcc
Merge pull request #238589 from imincik/shapely-geospatial-team-maint
python3Packages.shapely: change package maintainer to geospatial team
2023-06-20 01:49:14 +03:00
Weijia Wang
933e78c919
Merge pull request #238588 from imincik/fiona-geospatial-team-maint
python3Packages.fiona: change package maintainer to geospatial team
2023-06-20 01:48:56 +03:00
Weijia Wang
12ff5ea274
Merge pull request #238584 from imincik/pdal-geospatial-team-maint
pdal: change package maintainer to geospatial team
2023-06-20 01:48:28 +03:00
Weijia Wang
d49cbcec20
Merge pull request #238610 from skorpy2009/master
remmina: 1.4.30 -> 1.4.31
2023-06-20 01:45:25 +03:00
Weijia Wang
9dc5a7a513
Merge pull request #238598 from imincik/grass-geospatial-team-maint
grass: change package maintainer to geospatial team
2023-06-20 01:43:43 +03:00
Weijia Wang
d281bab48c
Merge pull request #238613 from chvp/bump-hookshot
matrix-hookshot: 4.2.0 -> 4.3.0
2023-06-20 01:43:03 +03:00
Weijia Wang
59b528e4c1
Merge pull request #238602 from imincik/geos-geospatial-team-maint
geos: change package maintainer to geospatial team
2023-06-20 01:41:47 +03:00
Weijia Wang
d81aaef072
Merge pull request #238524 from wegank/openscenegraph-darwin
openscenegraph: unbreak on darwin
2023-06-20 01:39:01 +03:00
Weijia Wang
556adf1247
Merge pull request #238422 from toastal/soupault-4.6.0
soupault: 4.4.0 → 4.6.0
2023-06-20 01:38:17 +03:00