Unverified Commit 9de6bb67 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

release.nix: move lib-tests into regular nixpkgs tests attrs set (#471130)

parents ffb95d37 a58d4838

pkgs/test/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ in 
    };

  };



  lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };



  pkgs-lib = recurseIntoAttrs (callPackage ../pkgs-lib/tests { });



  buildFHSEnv = recurseIntoAttrs (callPackages ./buildFHSEnv { });

pkgs/top-level/release.nix

+2 −4
Original line number Diff line number Diff line
@@ -95,11 +95,10 @@ let 
    "aarch64"

  ] (arch: elem "${arch}-darwin" supportedSystems);



  nonPackageJobs = rec {

  nonPackageJobs = {

    tarball = import ./make-tarball.nix {

      inherit

        pkgs

        lib-tests

        nixpkgs

        officialRelease

        ;
@@ -111,7 +110,6 @@ let 


    manual = pkgs.nixpkgs-manual.override { inherit nixpkgs; };

    metrics = import ./metrics.nix { inherit pkgs nixpkgs; };

    lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };



    darwin-tested =

      if supportDarwin.x86_64 || supportDarwin.aarch64 then
@@ -220,7 +218,7 @@ let 
        jobs.release-checks

        jobs.metrics

        jobs.manual

        jobs.lib-tests

        jobs.tests.lib-tests.x86_64-linux

        jobs.tests.pkgs-lib.formats-tests.x86_64-linux

        jobs.stdenv.x86_64-linux

        jobs.cargo.x86_64-linux