wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-10 04:43:53 +02:00
Code Activity

Use lib instead of explicit fileset passing

Browse source
This commit is contained in:
Robert Hensing 2024-06-26 03:18:01 +02:00
parent d40c59ed19
commit 85de5a60c7
13 changed files with 26 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packaging/components.nix
View file

@ -1,10 +1,6 @@
{pkgs, stdenv, officialRelease, versionSuffix}: scope:
let
inherit (scope) callPackage;
# TODO: push fileset parameter into package.nix files as `lib` parameter
inherit (callPackage (args@{ lib }: args) {}) lib;
inherit (lib) fileset;
in
# This becomes the pkgs.nixComponents attribute set
@ -12,9 +8,7 @@ in
# TODO: build the nix CLI with meson
nix = pkgs.callPackage ../package.nix {
inherit
fileset
stdenv
officialRelease
versionSuffix
;
boehmgc = pkgs.boehmgc-nix;
@ -25,16 +19,13 @@ in
nix-util = callPackage ../src/libutil/package.nix {
inherit
fileset
stdenv
officialRelease
versionSuffix
;
};
nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix {
inherit
fileset
stdenv
versionSuffix
;
@ -42,7 +33,6 @@ in
nix-util-test = callPackage ../tests/unit/libutil/package.nix {
inherit
fileset
stdenv
versionSuffix
;
@ -50,7 +40,6 @@ in
nix-util-c = callPackage ../src/libutil-c/package.nix {
inherit
fileset
stdenv
versionSuffix
;
@ -58,9 +47,7 @@ in
nix-store = callPackage ../src/libstore/package.nix {
inherit
fileset
stdenv
officialRelease
versionSuffix
;
libseccomp = pkgs.libseccomp-nix;
@ -69,16 +56,13 @@ in
nix-fetchers = callPackage ../src/libfetchers/package.nix {
inherit
fileset
stdenv
officialRelease
versionSuffix
;
};
nix-perl-bindings = callPackage ../src/perl/package.nix {
inherit
fileset
stdenv
versionSuffix
;