Unverified Commit fb01d572 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

release-lib: build packages without `meta.platforms` on all platforms (#351919)

parents 2c3dde0b 9f362065

pkgs/development/cuda-modules/cuda-library-samples/generic.nix

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ let 
        cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.

      '';

      license = lib.licenses.bsd3;

      platforms = [ "x86_64-linux" ];

      maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;

    };

  };

pkgs/development/cuda-modules/cuda-samples/generic.nix

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ backendStdenv.mkDerivation (finalAttrs: { 
    description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";

    # CUDA itself is proprietary, but these sample apps are not.

    license = lib.licenses.bsd3;

    platforms = [ "x86_64-linux" ];

    maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;

  };

})

pkgs/test/build-environment-info/default.nix

+34 −6
Original line number Diff line number Diff line 
{ runCommand }:

{

  lib,

  stdenv,

  runCommand,

  getent,

  xcbuild,

}:



# Prints information about the state of the build environment for

# assistance debugging Hydra. Feel free to add anything you would find

# useful to this.

runCommand "build-environment-info" { } ''

  ulimit -a

runCommand "build-environment-info"

  {

    nativeBuildInputs = [ getent ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ xcbuild ];

  }

  ''

    # It’s useful to get more info even if a command fails.

    set +e



    run() {

      echoCmd : "$@"

      "$@"

    }



    run uname -a



    ${lib.optionalString stdenv.buildPlatform.isDarwin ''

      run env SYSTEM_VERSION_COMPAT=0 plutil -p /System/Library/CoreServices/SystemVersion.plist

    ''}



    run id



    run getent passwd "$(id -un)"



    run ulimit -a



    # Always fail so that this job can easily be restarted.

  exit 1

    run exit 1

  ''

pkgs/test/nixos-functions/default.nix

+8 −10
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ let 
    versionSuffix = "test";

    label = "test";

  };

in lib.optionalAttrs stdenv.hostPlatform.isLinux (

  pkgs.recurseIntoAttrs {

in pkgs.recurseIntoAttrs {



  nixos-test = (pkgs.nixos {

    system.nixos = dummyVersioning;
@@ -28,4 +27,3 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( 
  }).toplevel;



}
 
)

pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ let 
    '';

    # discourage nix-env from matching this package

    priority = 10;

    platforms = lib.platforms.all;

    # These create a large number of jobs, which puts load on Hydra

    # without any appreciable benefit (as the combined packages already

    # cause them all to be built and cached anyway).

    hydraPlatforms = [ ];

  } // lib.optionalAttrs (args ? shortdesc) {

    description = args.shortdesc;

  };