NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

components.nix: Simplify with scope

Browse source
This commit is contained in:
Robert Hensing 2024-06-26 03:33:30 +02:00
parent 85de5a60c7
commit 74b9b77c9f
2 changed files with 16 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -178,7 +178,7 @@
# we can iterate over. # we can iterate over.
nixComponents = lib.makeScope final.newScope (import ./packaging/components.nix { nixComponents = lib.makeScope final.newScope (import ./packaging/components.nix {
pkgs = final; pkgs = final;
inherit stdenv versionSuffix officialRelease; inherit stdenv versionSuffix;
}); });
nix = final.nixComponents.nix; nix = final.nixComponents.nix;

71
packaging/components.nix
View file

@ -1,70 +1,29 @@
{pkgs, stdenv, officialRelease, versionSuffix}: scope: {pkgs, stdenv, versionSuffix}: scope:
let let
inherit (scope) callPackage; inherit (scope) callPackage;
in in
# This becomes the pkgs.nixComponents attribute set # This becomes the pkgs.nixComponents attribute set
{ {
# TODO: build the nix CLI with meson inherit stdenv versionSuffix;
nix = pkgs.callPackage ../package.nix { libseccomp = pkgs.libseccomp-nix;
inherit boehmgc = pkgs.boehmgc-nix;
stdenv libgit2 = pkgs.libgit2-nix;
versionSuffix busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox-shell;
;
boehmgc = pkgs.boehmgc-nix;
libgit2 = pkgs.libgit2-nix;
libseccomp = pkgs.libseccomp-nix;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox-shell;
};
nix-util = callPackage ../src/libutil/package.nix { nix = callPackage ../package.nix { };
inherit
stdenv
versionSuffix
;
};
nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { nix-util = callPackage ../src/libutil/package.nix { };
inherit
stdenv
versionSuffix
;
};
nix-util-test = callPackage ../tests/unit/libutil/package.nix { nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { };
inherit
stdenv
versionSuffix
;
};
nix-util-c = callPackage ../src/libutil-c/package.nix { nix-util-test = callPackage ../tests/unit/libutil/package.nix { };
inherit
stdenv
versionSuffix
;
};
nix-store = callPackage ../src/libstore/package.nix { nix-util-c = callPackage ../src/libutil-c/package.nix { };
inherit
stdenv
versionSuffix
;
libseccomp = pkgs.libseccomp-nix;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox-shell;
};
nix-fetchers = callPackage ../src/libfetchers/package.nix { nix-store = callPackage ../src/libstore/package.nix { };
inherit
stdenv
versionSuffix
;
};
nix-perl-bindings = callPackage ../src/perl/package.nix { nix-fetchers = callPackage ../src/libfetchers/package.nix { };
inherit
stdenv nix-perl-bindings = callPackage ../src/perl/package.nix { };
versionSuffix
;
};
} }