Unverified Commit a4c569c9 authored by Brian Napolitano's avatar Brian Napolitano Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents 8554713d 25265625

.github/workflows/check-nix-format.yml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ jobs: 
            pkgs/development/cuda-modules

            pkgs/test/cuda

            pkgs/top-level/cuda-packages.nix

          NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions

        # Iterate over all environment variables beginning with NIX_FMT_PATHS_.

        run: |

          for env_var in "${!NIX_FMT_PATHS_@}"; do

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -632,6 +632,11 @@ in mkLicense lset) ({ 
    url = "https://old.calculate-linux.org/packages/licenses/iASL";

  };



  icu = {

    spdxId = "ICU";

    fullName = "ICU";

  };



  ijg = {

    spdxId = "IJG";

    fullName = "Independent JPEG Group License";

lib/systems/doubles.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
    "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"



    # FreeBSD

    "i686-freebsd13" "x86_64-freebsd13"

    "i686-freebsd" "x86_64-freebsd"



    # Genode

    "aarch64-genode" "i686-genode" "x86_64-genode"

lib/systems/examples.nix

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ rec { 
  # BSDs



  x86_64-freebsd = {

    config = "x86_64-unknown-freebsd13";

    config = "x86_64-unknown-freebsd";

    useLLVM = true;

  };

lib/systems/parse.nix

+1 −5
Original line number Diff line number Diff line
@@ -326,11 +326,7 @@ rec { 
    # the normalized name for macOS.

    macos    = { execFormat = macho;   families = { inherit darwin; }; name = "darwin"; };

    ios      = { execFormat = macho;   families = { inherit darwin; }; };

    # A tricky thing about FreeBSD is that there is no stable ABI across

    # versions. That means that putting in the version as part of the

    # config string is paramount.

    freebsd12 = { execFormat = elf;     families = { inherit bsd; }; name = "freebsd"; version = 12; };

    freebsd13 = { execFormat = elf;     families = { inherit bsd; }; name = "freebsd"; version = 13; };

    freebsd  = { execFormat = elf;     families = { inherit bsd; }; name = "freebsd"; };

    linux    = { execFormat = elf;     families = { }; };

    netbsd   = { execFormat = elf;     families = { inherit bsd; }; };

    none     = { execFormat = unknown; families = { }; };