Build with nixpkgs scope #10963
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -153,124 +153,55 @@ | |
| ''; | ||
| }; | ||
|
|
||
| libgit2_nix = final.libgit2.overrideAttrs (attrs: { | ||
| src = libgit2; | ||
| version = libgit2.lastModifiedDate; | ||
| cmakeFlags = attrs.cmakeFlags or [] | ||
| ++ [ "-DUSE_SSH=exec" ]; | ||
| }); | ||
|
|
||
| boehmgc_nix = final.boehmgc.override { | ||
| enableLargeConfig = true; | ||
| }; | ||
|
|
||
| libseccomp_nix = final.libseccomp.overrideAttrs (_: rec { | ||
| version = "2.5.5"; | ||
| src = final.fetchurl { | ||
| url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; | ||
| hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U="; | ||
| }; | ||
| }); | ||
|
|
||
| # A new scope, so that we can use `callPackage` to inject our own interdependencies | ||
| # without "polluting" the top level "`pkgs`" attrset. | ||
| # This also has the benefit of providing us with a distinct set of packages | ||
| # we can iterate over. | ||
| nixComponents = lib.makeScope final.nixDependencies.newScope (import ./packaging/components.nix { | ||
| pkgs = final; | ||
| inherit stdenv versionSuffix; | ||
| }); | ||
|
|
||
| # The dependencies are in their own scope, so that they don't have to be | ||
| # in Nixpkgs top level `pkgs` or `nixComponents`. | ||
| nixDependencies = lib.makeScope final.newScope (scope: { | ||
| inherit stdenv versionSuffix; | ||
| libseccomp = final.libseccomp_nix; | ||
| boehmgc = final.boehmgc_nix; | ||
| libgit2 = final.libgit2_nix; | ||
| busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; | ||
| }); | ||
|
|
||
| nix = final.nixComponents.nix; | ||
|
|
||
| nix-internal-api-docs = final.callPackage ./src/internal-api-docs/package.nix { | ||
| inherit | ||
| stdenv | ||
| versionSuffix | ||
| ; | ||
| }; | ||
|
|
||
| nix-external-api-docs = final.callPackage ./src/external-api-docs/package.nix { | ||
| inherit | ||
| stdenv | ||
| versionSuffix | ||
| ; | ||
|
There was a problem hiding this comment. I would put these in There was a problem hiding this comment. Yeah, we're not using |
||
|
|
@@ -340,7 +271,7 @@ | |
| "static-" = nixpkgsFor.${system}.static; | ||
| }) | ||
| (nixpkgsPrefix: nixpkgs: | ||
| flatMapAttrs nixpkgs.nixComponents | ||
| (pkgName: pkg: | ||
| flatMapAttrs pkg.tests or {} | ||
| (testName: test: { | ||
|
|
@@ -373,16 +304,16 @@ | |
| } | ||
| (pkgName: {}: { | ||
| # These attributes go right into `packages.<system>`. | ||
| "${pkgName}" = nixpkgsFor.${system}.native.nixComponents.${pkgName}; | ||
| "${pkgName}-static" = nixpkgsFor.${system}.static.nixComponents.${pkgName}; | ||
| } | ||
| // flatMapAttrs (lib.genAttrs crossSystems (_: { })) (crossSystem: {}: { | ||
| # These attributes go right into `packages.<system>`. | ||
| "${pkgName}-${crossSystem}" = nixpkgsFor.${system}.cross.${crossSystem}.nixComponents.${pkgName}; | ||
| }) | ||
| // flatMapAttrs (lib.genAttrs stdenvs (_: { })) (stdenvName: {}: { | ||
| # These attributes go right into `packages.<system>`. | ||
| "${pkgName}-${stdenvName}" = nixpkgsFor.${system}.stdenvs."${stdenvName}Packages".nixComponents.${pkgName}; | ||
| }) | ||
| ) | ||
| // lib.optionalAttrs (builtins.elem system linux64BitSystems) { | ||
|
|
@@ -444,17 +375,17 @@ | |
| }; | ||
|
|
||
| mesonFlags = | ||
| map (transformFlag "libutil") pkgs.nixComponents.nix-util.mesonFlags | ||
| ++ map (transformFlag "libstore") pkgs.nixComponents.nix-store.mesonFlags | ||
| ++ map (transformFlag "libfetchers") pkgs.nixComponents.nix-fetchers.mesonFlags | ||
| ++ lib.optionals havePerl (map (transformFlag "perl") pkgs.nixComponents.nix-perl-bindings.mesonFlags) | ||
| ; | ||
|
|
||
| nativeBuildInputs = attrs.nativeBuildInputs or [] | ||
| ++ pkgs.nixComponents.nix-util.nativeBuildInputs | ||
| ++ pkgs.nixComponents.nix-store.nativeBuildInputs | ||
| ++ pkgs.nixComponents.nix-fetchers.nativeBuildInputs | ||
| ++ lib.optionals havePerl pkgs.nixComponents.nix-perl-bindings.nativeBuildInputs | ||
| ++ pkgs.nix-internal-api-docs.nativeBuildInputs | ||
| ++ pkgs.nix-external-api-docs.nativeBuildInputs | ||
| ++ [ | ||
|
|
||
|
There was a problem hiding this comment. I think we should move this file to |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| {pkgs, stdenv, versionSuffix}: scope: | ||
| let | ||
| inherit (scope) callPackage; | ||
| in | ||
|
|
||
| # This becomes the pkgs.nixComponents attribute set | ||
| { | ||
| nix = callPackage ../package.nix { }; | ||
|
|
||
| nix-util = callPackage ../src/libutil/package.nix { }; | ||
|
|
||
| nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { }; | ||
|
|
||
| nix-util-test = callPackage ../tests/unit/libutil/package.nix { }; | ||
|
|
||
| nix-util-c = callPackage ../src/libutil-c/package.nix { }; | ||
|
|
||
| nix-store = callPackage ../src/libstore/package.nix { }; | ||
|
|
||
| nix-fetchers = callPackage ../src/libfetchers/package.nix { }; | ||
|
|
||
| nix-perl-bindings = callPackage ../src/perl/package.nix { }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would put out the these deps in
packaging/<some-file>.nix. too. Instead of overridingprev/super, they would be overriding the regular scope. (Actually the package set function is the same, up to alpha equivalence, but the caller is different.)The
_nixsuffix is just poor mans scoping anyways.Agreed with using
self.callPackageof courseThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done:
_nixdefinitions (ie they're not in the overlay anymore),finaltopkgs.