Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixDarwinDylibNames for libargon2 #104041

Merged
merged 2 commits into from Nov 17, 2020
Merged

fixDarwinDylibNames for libargon2 #104041

merged 2 commits into from Nov 17, 2020

Conversation

alexjg
Copy link
Contributor

@alexjg alexjg commented Nov 17, 2020

Motivation for this change

The dylib name for argon2 was incorrect, which was causing broken rpath entries in darwin executables.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 17, 2020
@ofborg ofborg bot requested a review from Radvendii November 17, 2020 10:47
@veprbl veprbl merged commit b654e02 into NixOS:master Nov 17, 2020
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/phpdbg-missing-argon2-dependency-on-osx/9872/2

github-actions bot added a commit to andir/nixos.cloud that referenced this pull request Nov 21, 2020
@github-actions
niv nixpkgs: update 069f183f -> 6625284c
b66b270 
## Changelog for nixpkgs:
Commits: [NixOS/nixpkgs@069f183f...6625284c](NixOS/nixpkgs@069f183...6625284)

* [`c7b9b3de`](NixOS/nixpkgs@c7b9b3d) cockroachdb: fix license information
* [`a83e5c42`](NixOS/nixpkgs@a83e5c4) firecracker: 0.22.0 -> 0.23.0
* [`10712e7b`](NixOS/nixpkgs@10712e7) firefox-bin: 82.0.2 -> 82.0.3
* [`c2a2081d`](NixOS/nixpkgs@c2a2081) starship: 0.46.2 -> 0.47.0
* [`1c682556`](NixOS/nixpkgs@1c68255) android-file-transfer: 3.9 -> 4.0
* [`89e35b3f`](NixOS/nixpkgs@89e35b3) pdfpc: 4.4.0 → 4.4.1
* [`1594881e`](NixOS/nixpkgs@1594881) vulkan-validation-layers: Add output for generated include files
* [`30c88909`](NixOS/nixpkgs@30c8890) pakcs: 2.2.0 -> 2.2.1
* [`41f94c0b`](NixOS/nixpkgs@41f94c0) lazpaint: 7.1.4 -> 7.1.5
* [`c2acc890`](NixOS/nixpkgs@c2acc89) openmpt123: 0.5.2 -> 0.5.3
* [`13be3766`](NixOS/nixpkgs@13be376) kernel config: explicitly enable CONFIG_IPV6
* [`08f33ba4`](NixOS/nixpkgs@08f33ba) spotify-unwrapped: 1.1.42.622.gbd112320-37 -> 1.1.46.916.g416cacf1
* [`90126c3e`](NixOS/nixpkgs@90126c3) vdirsyncer: delete default.nix, point vdirsyncer to stable.nix
* [`45204384`](NixOS/nixpkgs@4520438) vdirsyncer: rename stable.nix to default.nix
* [`89fae7b7`](NixOS/nixpkgs@89fae7b) vdirsyncerStable: deprecate
* [`b8065eea`](NixOS/nixpkgs@b8065ee) youtube-dl: 2020.11.01.1 -> 2020.11.12
* [`654e49be`](NixOS/nixpkgs@654e49b) documize-community: 3.8.0 -> 3.8.1
* [`71998ddc`](NixOS/nixpkgs@71998dd) rspamd: fix builds on non-x86_64-linux platforms
* [`9f9134c7`](NixOS/nixpkgs@9f9134c) sbt: 1.4.2 → 1.4.3
* [`bc714f86`](NixOS/nixpkgs@bc714f8) ocamlPackages.ca-certs: init at 0.1.2
* [`52d7e318`](NixOS/nixpkgs@52d7e31) nodePackages.hsd: init at 2.2.0
* [`64c7186a`](NixOS/nixpkgs@64c7186) nodePackages.hs-airdrop: init at 0.9.0
* [`c282ed87`](NixOS/nixpkgs@c282ed8) nodePackages.hs-client: init at 0.0.9
* [`68761cb0`](NixOS/nixpkgs@68761cb) wrapProgram for phpdbg in pkgs.php*
* [`a9a14233`](NixOS/nixpkgs@a9a1423) gitea: 1.12.5 -> 1.12.6
* [`bb15fa74`](NixOS/nixpkgs@bb15fa7) linux: 5.10-rc3 -> 5.10-rc4
* [`1c1b18ba`](NixOS/nixpkgs@1c1b18b) vimPlugins: update
* [`c103097b`](NixOS/nixpkgs@c103097) vimPlugins.codi-vim: init at 2020-07-25
* [`3e504fa5`](NixOS/nixpkgs@3e504fa) vimPlugins.plenary-nvim: init at 2020-11-06
* [`cc9c13ca`](NixOS/nixpkgs@cc9c13c) vimPlugins.popup-nvim: init at 2020-10-08
* [`ba819f33`](NixOS/nixpkgs@ba819f3) vimPlugins.nvim-dap: init at 2020-11-14
* [`a38c1bd5`](NixOS/nixpkgs@a38c1bd) vimPlugins.nvim-dap-virtual-text: init at 2020-11-09
* [`6fdcc900`](NixOS/nixpkgs@6fdcc90) vimPlugins.nvim-treesitter-refactor: init at 2020-10-07
* [`103abbf0`](NixOS/nixpkgs@103abbf) vimPlugins.nvim-treesitter-textobjects: init at 2020-11-05
* [`324ed9d7`](NixOS/nixpkgs@324ed9d) vimPlugins.playground: init at 2020-10-19
* [`002a5f9d`](NixOS/nixpkgs@002a5f9) Add sphinx autoapi 1.5.1
* [`701df1a3`](NixOS/nixpkgs@701df1a) nano: Add update script
* [`500772ad`](NixOS/nixpkgs@500772a) nodePackages: update
* [`4180533b`](NixOS/nixpkgs@4180533) gammastep: 2.0.2 -> 2.0.5
* [`0338f728`](NixOS/nixpkgs@0338f72) nano: Add test
* [`65e0474c`](NixOS/nixpkgs@65e0474) pijul: 1.0.0-alpha.1 -> 1.0.0-alpha.3
* [`1b86837c`](NixOS/nixpkgs@1b86837) ocamlPackages.owl: 0.10.0 -> 1.0.0
* [`204f52ce`](NixOS/nixpkgs@204f52c) buildah: 1.17.0 -> 1.18.0
* [`8c105939`](NixOS/nixpkgs@8c10593) koreader: 2020.09 -> 2020.10.1
* [`10fd7fa0`](NixOS/nixpkgs@10fd7fa) koreader: 2020.10.1 -> 2020.11
* [`1a6c252d`](NixOS/nixpkgs@1a6c252) slack: 4.10.3 -> 4.11.1
* [`35db176b`](NixOS/nixpkgs@35db176) wine: only use strictDeps when mingwSupport is enabled
* [`621f649b`](NixOS/nixpkgs@621f649) libsForQt5.libopenshot-audio: enable on darwin
* [`fcd325c9`](NixOS/nixpkgs@fcd325c) libsForQt5.libopenshot: enable on darwin
* [`972bcb49`](NixOS/nixpkgs@972bcb4) openshot-qt: enable on darwin
* [`c5b0f56a`](NixOS/nixpkgs@c5b0f56) release: disable darwin bootstrapped stdenv test
* [`f86a9434`](NixOS/nixpkgs@f86a943) home-assistant: loosen aiohttp version pin to unbreak build
* [`9d39bd3e`](NixOS/nixpkgs@9d39bd3) sofia-sip: 1.12.11 -> 1.13.2
* [`e184cede`](NixOS/nixpkgs@e184ced) spandsp: 0.0.6 -> 3.0.0
* [`8385c2f9`](NixOS/nixpkgs@8385c2f) freeswitch: 1.10.3 -> 1.10.5
* [`6dda0115`](NixOS/nixpkgs@6dda011) xterm: Add update script
* [`d2d6b503`](NixOS/nixpkgs@d2d6b50) xterm: 353 → 362
* [`61e56265`](NixOS/nixpkgs@61e5626) xterm: Add test
* [`48ca228b`](NixOS/nixpkgs@48ca228) _1password-gui: 0.9.3 -> 0.9.4-1
* [`646d4612`](NixOS/nixpkgs@646d461) nnn: 3.4 → 3.5
* [`c7b3e43b`](NixOS/nixpkgs@c7b3e43) shaarli-material: remove package
* [`aa760bf5`](NixOS/nixpkgs@aa760bf) bitwarden: 1.22.2 -> 1.23.0
* [`0f049c8d`](NixOS/nixpkgs@0f049c8) strawberry: 0.8.2 -> 0.8.3
* [`7b21c0b5`](NixOS/nixpkgs@7b21c0b) cinnamon.cinnamon-control-center: 4.6.0 -> 4.6.2
* [`929db7f5`](NixOS/nixpkgs@929db7f) vulkan-tools: Correct description in metadata
* [`b2fae2db`](NixOS/nixpkgs@b2fae2d) vulkan-tools-lunarg: init at 1.2.141.0
* [`e5e032a5`](NixOS/nixpkgs@e5e032a) ocamlPackages.camlimages: 5.0.3 → 5.0.4
* [`b9a2a8a2`](NixOS/nixpkgs@b9a2a8a) lgogdownloader: 3.5 -> 3.7
* [`88aedac5`](NixOS/nixpkgs@88aedac) cimg: 2.9.2 -> 2.9.3
* [`ba9d95ca`](NixOS/nixpkgs@ba9d95c) julia_10: rewrite
* [`18e21a5a`](NixOS/nixpkgs@18e21a5) Remove VueScan
* [`cbf437c4`](NixOS/nixpkgs@cbf437c) cdk: 5.0-20190224 -> 5.0-20200923
* [`b605b989`](NixOS/nixpkgs@b605b98) scribusUnstable: 1.5.5 -> 1.5.6.1
* [`6e4fbac8`](NixOS/nixpkgs@6e4fbac) amdvlk: 2020.Q4.3 -> 2020.Q4.4
* [`512c3c0a`](NixOS/nixpkgs@512c3c0) maintainers: rename filalex77 -> Br1ght0ne
* [`bc029589`](NixOS/nixpkgs@bc02958) crystal: refactor and add 0.35.1
* [`085da94a`](NixOS/nixpkgs@085da94) shards: refactor and 0.11.0 -> {0.11.1, 0.12.0}
* [`15eb465c`](NixOS/nixpkgs@15eb465) coursier: 2.0.6 → 2.0.7
* [`f3dc13bd`](NixOS/nixpkgs@f3dc13b) sbt-extras: 2020-11-08 → 2020-11-17
* [`0c74da13`](NixOS/nixpkgs@0c74da1) qt5{14,15}.qtbase: fix on darwin
* [`62a34589`](NixOS/nixpkgs@62a3458) openafs_1_8: Cleanup build and fix build issues
* [`f08099d0`](NixOS/nixpkgs@f08099d) openafs_1_8: Merge server output with out
* [`54a69eb8`](NixOS/nixpkgs@54a69eb) openafs_1_8: Properly generate and split off developer documentation
* [`366159c6`](NixOS/nixpkgs@366159c) nodePackages.vscode-json-languageserver: init at 1.3.1
* [`fe1a36fe`](NixOS/nixpkgs@fe1a36f) aacgain: fix src
* [`b654e021`](NixOS/nixpkgs@b654e02) libargon2: fixDarwinDylibNames for libargon2 (NixOS/nixpkgs#104041)
* [`011ecb8f`](NixOS/nixpkgs@011ecb8) crate2nix: init at 0.8.0
* [`ec4b52e9`](NixOS/nixpkgs@ec4b52e) gnome3.gnome-contacts: 3.38 → 3.38.1
* [`83d3362d`](NixOS/nixpkgs@83d3362) gnome3.gnome-contacts: clean up
* [`bb8dcb6f`](NixOS/nixpkgs@bb8dcb6) gnome3.gnome-mahjongg: 3.38.2 → 3.38.3
* [`01788e28`](NixOS/nixpkgs@01788e2) gnome3.gnome-nibbles: 3.38.1 → 3.38.2
* [`a7ca1e3d`](NixOS/nixpkgs@a7ca1e3) gnome3.seahorse: 3.37.2 → 3.38.0.1
* [`98004107`](NixOS/nixpkgs@9800410) gnome-connections: 3.38.0 → 3.38.1
* [`9bf45755`](NixOS/nixpkgs@9bf4575) gspell: 1.8.4 → 1.9.1
* [`613f224d`](NixOS/nixpkgs@613f224) gnome-user-docs: 3.38.0 → 3.38.1
* [`805cedf8`](NixOS/nixpkgs@805cedf) doc/builders: Remove out-of-date example
* [`f0e0e272`](NixOS/nixpkgs@f0e0e27) glade: 3.36.0 → 3.38.1
* [`f4ce49f9`](NixOS/nixpkgs@f4ce49f) gnome3.aisleriot: 3.22.11 → 3.22.13
* [`bfadfd5f`](NixOS/nixpkgs@bfadfd5) libhandy: 1.0.1 → 1.0.2
* [`9b7d4441`](NixOS/nixpkgs@9b7d444) deja-dup: 42.4 → 42.5
* [`3a707939`](NixOS/nixpkgs@3a70793) telepathy-mission-control: 5.16.5 → 5.16.6
* [`ab7661ed`](NixOS/nixpkgs@ab7661e) gnome-online-accounts: 3.37.90 → 3.38.0
* [`4a99872c`](NixOS/nixpkgs@4a99872) libhandy_0: disable glade catalog
* [`04320e77`](NixOS/nixpkgs@04320e7) gopls: 0.5.1 -> 0.5.3 (NixOS/nixpkgs#104065)
* [`3087df3e`](NixOS/nixpkgs@3087df3) knot-resolver: add support for new DoH implementation
* [`e61ef63e`](NixOS/nixpkgs@e61ef63) kresd service: switch .listenDoH to new implementation
* [`cd5c7c0e`](NixOS/nixpkgs@cd5c7c0) knot-resolver: drop capabilities after startup
* [`335798d2`](NixOS/nixpkgs@335798d) knot-resolver: fix a stupid system breaking non-systemd
* [`86f2d455`](NixOS/nixpkgs@86f2d45) gnomeExtensions.sound-output-device-chooser: 28 → 32
* [`95554885`](NixOS/nixpkgs@9555488) aliases: rfkill is replaced by utillinux, not util-linux
* [`9fb57ebd`](NixOS/nixpkgs@9fb57eb) sweethome3d: 6.3 -> 6.4.2
* [`3a30b1fc`](NixOS/nixpkgs@3a30b1f) python3Packages.pyee: init at 7.0.4
* [`327a00a7`](NixOS/nixpkgs@327a00a) gumbo: Add darwin to platforms
* [`097f5a54`](NixOS/nixpkgs@097f5a5) python3Packages.pyppeteer: init at 0.2.2
* [`5ad6a3b2`](NixOS/nixpkgs@5ad6a3b) urlwatch: 2.19 -> 2.21
* [`7d3811e2`](NixOS/nixpkgs@7d3811e) matterbridge: 1.18.0 -> 1.19.0
* [`5545c83c`](NixOS/nixpkgs@5545c83) signal-desktop: 1.37.3 -> 1.38.1
* [`2a0fbf08`](NixOS/nixpkgs@2a0fbf0) libmicrodns: Change platforms to `unix`. See NixOS/nixpkgs#104062.
* [`54673b1f`](NixOS/nixpkgs@54673b1) chromium: 86.0.4240.198 -> 87.0.4280.66
* [`69300bba`](NixOS/nixpkgs@69300bb) python3Packages.awkward1: 0.2.38 -> 0.4.4
* [`4e9f7bbf`](NixOS/nixpkgs@4e9f7bb) buildGo{Package,Module}: set trimpath in GOFLAGS
* [`33822cb1`](NixOS/nixpkgs@33822cb) docker: drop redundant removeReferencesTo
* [`90bb6fbb`](NixOS/nixpkgs@90bb6fb) singularity: drop unneeded removeReferencesTo
* [`d1884cba`](NixOS/nixpkgs@d1884cb) minio: drop redundant trimpath flag
* [`11c19be4`](NixOS/nixpkgs@11c19be) direnv: workaround hardcoded GOFLAGS
* [`702c2425`](NixOS/nixpkgs@702c242) quorum: workaround trimpath build failure
* [`87aa3671`](NixOS/nixpkgs@87aa367) cockroachdb: workaround trimpath build failure
* [`283900f4`](NixOS/nixpkgs@283900f) python3Packages.xmlschema: 1.2.5 -> 1.3.1
* [`9ca12dc4`](NixOS/nixpkgs@9ca12dc) python3Packages.reedsolo: init at 1.5.4
* [`52d3cc44`](NixOS/nixpkgs@52d3cc4) tomb: 2.7 -> 2.8
* [`832add51`](NixOS/nixpkgs@832add5) python3Packages.csvw: 1.8.0 -> 1.8.1
* [`ed6d6ebc`](NixOS/nixpkgs@ed6d6eb) python3Packages.mocket: 3.9.2 -> 3.9.3
* [`5c4a4a5d`](NixOS/nixpkgs@5c4a4a5) python3Packages.async_stagger: 0.3.0 -> 0.3.1
* [`46463b7d`](NixOS/nixpkgs@46463b7) python3Packages.async-upnp-client: 0.14.14 -> 0.14.15
* [`77e9b466`](NixOS/nixpkgs@77e9b46) python3Packages.brother: 0.1.17 -> 0.1.18
* [`204501b9`](NixOS/nixpkgs@204501b) python3Packages.clldutils: 3.5.2 -> 3.5.4
* [`cfef6dd8`](NixOS/nixpkgs@cfef6dd) python3Packages.ircrobots: 0.3.3 -> 0.3.5
* [`c63c4f71`](NixOS/nixpkgs@c63c4f7) python3Packages.ircstates: 0.11.3 -> 0.11.5
* [`492c60cc`](NixOS/nixpkgs@492c60c) python3Packages.ntc-templates: 1.5.0 -> 1.6.0
* [`f1064430`](NixOS/nixpkgs@f106443) python3Packages.PyRMVtransport: 0.2.9 -> 0.2.10
* [`a823dee9`](NixOS/nixpkgs@a823dee) python3Packages.python-didl-lite: 1.2.4 -> 1.2.5
* [`1edae8aa`](NixOS/nixpkgs@1edae8a) btfs: 2.22 -> 2.23
* [`597e7748`](NixOS/nixpkgs@597e774) ocamlPackages.dispatch: 0.4.1 → 0.5.0
* [`47b02b30`](NixOS/nixpkgs@47b02b3) ocamlPackages.ppx_blob: 0.4.0 → 0.7.1
* [`9a38c3a1`](NixOS/nixpkgs@9a38c3a) knot-resolver: fix evaluation on darwin
* [`7edf1ced`](NixOS/nixpkgs@7edf1ce) pypy: enable aarch64-linux platform
* [`e453e9ef`](NixOS/nixpkgs@e453e9e) grafana: 7.3.2 -> 7.3.3
* [`8061cdaf`](NixOS/nixpkgs@8061cda) matrix-synapse: 1.22.1 -> 1.23.0
* [`7e25b711`](NixOS/nixpkgs@7e25b71) nixos: use nativeBuildInputs in make- iso9660-image and system-tarball
* [`f2e4de72`](NixOS/nixpkgs@f2e4de7) libgda: 5.2.9 -> 5.2.10
* [`99b47e71`](NixOS/nixpkgs@99b47e7) Revert "spandsp: 0.0.6 -> 3.0.0"
* [`4897c239`](NixOS/nixpkgs@4897c23) spandsp3: init at 3.0.0
* [`19ddb6e6`](NixOS/nixpkgs@19ddb6e) freeswitch: use spandsp3
@github-actions github-actions bot mentioned this pull request Nov 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

@Radvendii Radvendii Awaiting requested review from Radvendii

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@alexjg @nixos-discourse @veprbl