nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-21 22:32:26 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -185,7 +185,6 @@
nix-internal-api-docs = final.callPackage ./src/internal-api-docs/package.nix { nix-internal-api-docs = final.callPackage ./src/internal-api-docs/package.nix {
inherit inherit
fileset
stdenv stdenv
versionSuffix versionSuffix
; ;
@ -193,7 +192,6 @@
nix-external-api-docs = final.callPackage ./src/external-api-docs/package.nix { nix-external-api-docs = final.callPackage ./src/external-api-docs/package.nix {
inherit inherit
fileset
stdenv stdenv
versionSuffix versionSuffix
; ;

3
maintainers/hydra.nix
View File

@ -9,7 +9,6 @@
}: }:
let let
inherit (inputs) nixpkgs nixpkgs-regression; inherit (inputs) nixpkgs nixpkgs-regression;
inherit (lib) fileset;
installScriptFor = tarballs: installScriptFor = tarballs:
nixpkgsFor.x86_64-linux.native.callPackage ../scripts/installer.nix { nixpkgsFor.x86_64-linux.native.callPackage ../scripts/installer.nix {
@ -25,8 +24,6 @@ let
lib.versionAtLeast client.version "2.4pre20211005") lib.versionAtLeast client.version "2.4pre20211005")
"-${client.version}-against-${daemon.version}"; "-${client.version}-against-${daemon.version}";
inherit fileset;
test-client = client; test-client = client;
test-daemon = daemon; test-daemon = daemon;

6
package.nix
View File

@ -1,12 +1,10 @@
{ lib { lib
, fetchurl
, stdenv , stdenv
, releaseTools , releaseTools
, autoconf-archive , autoconf-archive
, autoreconfHook , autoreconfHook
, aws-sdk-cpp , aws-sdk-cpp
, boehmgc , boehmgc
, buildPackages
, nlohmann_json , nlohmann_json
, bison , bison
, boost , boost
@ -15,7 +13,6 @@
, curl , curl
, editline , editline
, readline , readline
, fileset
, flex , flex
, git , git
, gtest , gtest
@ -50,7 +47,6 @@
, pname ? "nix" , pname ? "nix"
, versionSuffix ? "" , versionSuffix ? ""
, officialRelease ? false
# Whether to build Nix. Useful to skip for tasks like testing existing pre-built versions of Nix # Whether to build Nix. Useful to skip for tasks like testing existing pre-built versions of Nix
, doBuild ? true , doBuild ? true
@ -113,6 +109,8 @@
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
# selected attributes with defaults, will be used to define some # selected attributes with defaults, will be used to define some

16
packaging/components.nix
View File

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

6
src/external-api-docs/package.nix
View File

@ -1,7 +1,5 @@
{ lib { lib
, stdenv , stdenv
, releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -12,6 +10,10 @@
, versionSuffix ? "" , versionSuffix ? ""
}: }:
let
inherit (lib) fileset;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "nix-external-api-docs"; pname = "nix-external-api-docs";
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;

6
src/internal-api-docs/package.nix
View File

@ -1,7 +1,5 @@
{ lib { lib
, stdenv , stdenv
, releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -12,6 +10,10 @@
, versionSuffix ? "" , versionSuffix ? ""
}: }:
let
inherit (lib) fileset;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "nix-internal-api-docs"; pname = "nix-internal-api-docs";
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;

6
src/libfetchers/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, releaseTools , releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -16,17 +15,16 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
, officialRelease ? false
# Check test coverage of Nix. Probably want to use with with at least # Check test coverage of Nix. Probably want to use with with at least
# one of `doCheck` or `doInstallCheck` enabled. # one of `doCheck` or `doInstallCheck` enabled.
, withCoverageChecks ? false , withCoverageChecks ? false
# Avoid setting things that would interfere with a functioning devShell
, forDevShell ? false
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
mkDerivation = mkDerivation =

5
src/libstore/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, releaseTools , releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -13,7 +12,6 @@
, aws-sdk-cpp , aws-sdk-cpp
, libseccomp , libseccomp
, nlohmann_json , nlohmann_json
, man
, sqlite , sqlite
, busybox-sandbox-shell ? null , busybox-sandbox-shell ? null
@ -21,7 +19,6 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
, officialRelease ? false
# Check test coverage of Nix. Probably want to use with at least # Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled. # one of `doCheck` or `doInstallCheck` enabled.
@ -32,6 +29,8 @@
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
mkDerivation = mkDerivation =

3
src/libutil-c/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, releaseTools , releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -19,6 +18,8 @@
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
mkDerivation = mkDerivation =

4
src/libutil/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, releaseTools , releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -18,7 +17,6 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , versionSuffix ? ""
, officialRelease ? false
# Check test coverage of Nix. Probably want to use with at least # Check test coverage of Nix. Probably want to use with at least
# one of `doCheck` or `doInstallCheck` enabled. # one of `doCheck` or `doInstallCheck` enabled.
@ -26,6 +24,8 @@
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
mkDerivation = mkDerivation =

5
src/perl/package.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, fileset
, stdenv , stdenv
, perl , perl
, perlPackages , perlPackages
@ -16,6 +15,10 @@
, versionSuffix ? "" , versionSuffix ? ""
}: }:
let
inherit (lib) fileset;
in
perl.pkgs.toPerlModule (stdenv.mkDerivation (finalAttrs: { perl.pkgs.toPerlModule (stdenv.mkDerivation (finalAttrs: {
pname = "nix-perl"; pname = "nix-perl";
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;

3
tests/unit/libutil-support/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, releaseTools , releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -21,6 +20,8 @@
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
mkDerivation = mkDerivation =

3
tests/unit/libutil/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, releaseTools , releaseTools
, fileset
, meson , meson
, ninja , ninja
@ -25,6 +24,8 @@
}: }:
let let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
mkDerivation = mkDerivation =