Skip to content

staging-next 2022-08-25#188284

Merged
FRidh merged 343 commits intomasterfrom
staging-next
Sep 12, 2022
Merged

staging-next 2022-08-25#188284
FRidh merged 343 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Copy Markdown
Member

@vcunat vcunat commented Aug 25, 2022

ajs124 and others added 30 commits August 17, 2022 20:16
I can't think of any good reason it was the way it was before. I think
CMake can be made to install the headers too, but this is a fine first
step.
gcc stopped using libelf in commit 48215350c24 ("re PR lto/46273 (Failed
to bootstrap)") around 2010, before gcc-4.6.0.
The current `gpgme` expression ignores the `doCheck` parameter because
upstream's `Makefile` runs the tests automatically as part of the
`buildPhase`.  Let's run the tests as part of the `checkPhase` iff
`doCheck` is set, like the rest of nixpkgs' packages.

In particular, with this commit, `pkgsCross.*.gpgme` will no longer
attempt to run the tests (tests are not supposed to be run when
host!=build).
llvmPackages*.libunwind: Don't redo install phase from scratch
The patch url went 404 and other distros¹ have discarded it as well in
favor of packaging nss-pem²

[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-libs/nss?id=5eca3e02c87163b3c541cdee893830d201abfb86
[2] https://github.com/kdudka/nss-pem
It's usefulness is not clear to us maintainers.
bluez: remove unused fetchpatch import
@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented Sep 12, 2022

@FRidh
Copy link
Copy Markdown
Member

FRidh commented Sep 12, 2022

I just accidentally merged this. Looking at the overview it does not seem to block anything.

We could disable the test file for aarch64-darwin to unblock it.

@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented Sep 12, 2022

Merge at this point was most likely OK-ish.

@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented Sep 15, 2022

Uh... you merged it the other way. So that staging-next was the first parent and master was the second parent. That's a bit inconvenient for some of my workflows.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 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: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vim Advanced text editor 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: 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 and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.