Skip to content

Staging next 2021-09-17 #138268

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

Merged
merged 289 commits into from
Sep 24, 2021
Merged

Staging next 2021-09-17 #138268

merged 289 commits into from
Sep 24, 2021

Conversation

lukegb
Copy link
Contributor

@lukegb lukegb commented Sep 17, 2021

alyssais and others added 30 commits September 2, 2021 19:53
@r-burns

This comment has been minimized.

Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
@happysalada
Copy link
Contributor

@r-burns thanks a lot for commenting! Let me try differrent solutions regarding this tomorrow.

@github-actions github-actions bot removed the 6.topic: pantheon The Pantheon desktop environment label Sep 22, 2021
vcunat and others added 3 commits September 23, 2021 01:39
#138268 (comment)
It's now not commonly used in Linux NixPkgs; I suppose it will be better
this way than failing.
Reverts d43df74

NetBSD makefiles strip local symbols from libs using `OBJCOPY?=objcopy`,
which is missing on macOS. GNU objcopy appears to succeed but produces
broken .a libs which do not link into dependers.

(As this issue does not fail the netbsd.compat build,
downstream netbsd.install is added to passthru.tests.)

Since `OBJCOPY` is only used for stripping, we can:
* skip stripping with the hacky `OBJCOPY=echo`
* use cctools strip, which is invoked in the same way

The latter is obviously preferable if it works.
Indeed, locals are stripped, although it doesn't affect size much.
Comparison:

`OBJCOPY=echo`:
```
$ du -b result/lib/*.a
347784	result/lib/libnbcompat.a
357120	result/lib/libnbcompat_p.a
```

`OBJCOPY=${cctools}/bin/strip`:
```
$ du -b result/lib/*.a
347008	result/lib/libnbcompat.a
357120	result/lib/libnbcompat_p.a
```
lukegb and others added 4 commits September 23, 2021 02:14
[staging-next] netbsd.compat: fix libs by using cctools strip as objcopy
Still needs upstream resolution,
but we can grab a Vcpkg patch in the meantime
r-burns and others added 4 commits September 23, 2021 02:24
[staging-next] tix: fix build on darwin
[staging-next] python3Packages.libarcus: fix build against protobuf 3.18+
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 23, 2021
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 24, 2021
github-actions bot and others added 3 commits September 24, 2021 06:01
My last iproute2 update (247aed0) broke the build due to the new
patch [0].

Reported-by: Sergei Trofimovich <slyich@gmail.com>

[0]: #136701 (comment)
@lukegb lukegb merged commit a78925d into master Sep 24, 2021
@r-burns r-burns mentioned this pull request Sep 24, 2021
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: bsd Running or building packages on BSD 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux.
Projects
None yet
Development

Successfully merging this pull request may close these issues.