Conversation
nix-owners
bot
requested review from
Ericson2314,
Mic92,
RaitoBezarius,
edolstra,
fricklerhandwerk and
tomberek
github-actions
bot
added
10.rebuild-darwin: 1
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
| }; | ||
|
|
||
| # TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed. | ||
| boost = |
There was a problem hiding this comment.
Just a heads up. We didn't use to have this override in nixpkgs. Question is if we want this now?
There was a problem hiding this comment.
Afaik this would only save us downloading icu.
| }).overrideAttrs | ||
| (old: { | ||
| # Need to remove `--with-*` to use `--with-libraries=...` | ||
| buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase; |
There was a problem hiding this comment.
boost seems to not have python enabled by default. So we can drop the overrideAttrs here and in the nix repository.
There was a problem hiding this comment.
It seems that @Ericson2314 was working around something.
I don't know the intricacies of this.
There was a problem hiding this comment.
I've switched it to the default boost package for now.
| let | ||
| cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "h"); | ||
| in | ||
| fileset.unions [ |
There was a problem hiding this comment.
I don't think filesets are allows in nixpkgs at the moment because of that nix bug.
There was a problem hiding this comment.
The filesets are intentionally dead code to keep the files similar to upstream.
So we're not affected by the bug, but we may remove these filesets anyway. I'm neither convinced to remove them nor keep them.
There was a problem hiding this comment.
I feel like we don't have the right info yet to base a decision on. I'd suggest to keep it as is for now and perhaps revisit the presence of unused fileset attrs in 2.27.
pkgs/tools/package-management/nix/2_26/src/internal-api-docs/package.nix
Show resolved
Hide resolved
pkgs/tools/package-management/nix/2_26/src/libexpr-test-support/package.nix
Show resolved
Hide resolved
pkgs/tools/package-management/nix/2_26/src/libfetchers-tests/package.nix
Show resolved
Hide resolved
nativeBuildInputs = [ nix ] would have no effect before this change. The pkg-config test on the dev output probably didn't work before, so I've removed it for now.
|
|
I believe I've addressed @Mic92's comments sufficiently. Incremental improvements are of course still possible :) |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2024-02-12-nix-team-meeting-minutes-212-5/60216/1 |
|
Successfully created backport PR for |
|
How do you now apply a patch to nix? |
| Given a set of layers, create a mkDerivation-like function | ||
| */ | ||
| mkPackageBuilder = | ||
| exts: userFn: stdenv.mkDerivation (lib.extends (lib.composeManyExtensions exts) userFn); |
There was a problem hiding this comment.
Might worth extending this to a general helper function. This looks better than the implementation of various custom builders currently, and can make builders follow mkDerivation rules more, like finalAttrs
There was a problem hiding this comment.
I was contemplating to insert a callback to allow overriding, somewhere near here, but got side tracked.
It should allow source overriding, or even overriding attributes in all component packages at once.
general helper function
If you're suggesting to turn this into a general Nixpkgs utility, I'd prefer to switch to #296769 instead, because this solution still has issues like no package-local non-derivation variables, messy returned attrs. It'd also be nice to have a path towards multi-derivation package outputs, of which we have a messy implementation right now in everything.nix, which I think currently has an issue that could've been avoided, but not with mkDerivation.
|
Cooking up a solution at NixOS/nix#12503, to keep the expressions harmonized. (Useful when your patches aren't merged and you want to skip forward to a git revision, for example) When merged and upstreamed: nix.appendPatches [ ./foo.patch (fetchpatch2 { ... }) ] |
|
Also why you are not updating |
|
#383508 is ready for review.
That is the intent. Considering that the packaging has changed a bit I think it was good not to increment EDIT: not bumping to 2.25 was a mistake. |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
6 participants
This is the first Nixpkgs build of Nix that uses meson and uses the componentized build.
Related
Future versions may use a similar method of packaging (copying files mostly as-is), or we could "make it our own" here in Nixpkgs and support multiple versions using conditionals, etc.
This initial version probably leaves one or two things to be desired, but let's get the ball rolling first.
TODO
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Context:
Add a 👍 reaction to pull requests you find important.