commit 66aa02f190d17b4e7c4bf0f7f891984647a38234 · pyrox.dev/nixpkgs

+2 -2

doc/stdenv/meta.chapter.md

···

       44
       44
        
                       "mips32-linux",

     

       45
       45
        
                       "x86_64-darwin",

     

       46
       46
        
                       "i686-cygwin",

     

       47
       47
       -
                       "i686-freebsd",

     

       48
       48
       -
                       "x86_64-freebsd",

     

       47
       47
       +
                       "i686-freebsd13",

     

       48
       48
       +
                       "x86_64-freebsd13",

     

       49
       49
        
                       "i686-openbsd",

     

       50
       50
        
                       "x86_64-openbsd"

     

       51
       51
        
                   ],

+2 -1

lib/systems/default.nix

···

       47
       47
        
               else if final.isUClibc              then "uclibc"

     

       48
       48
        
               else if final.isAndroid             then "bionic"

     

       49
       49
        
               else if final.isLinux /* default */ then "glibc"

     

       50
       50
       +
               else if final.isFreeBSD             then "fblibc"

     

       51
       51
       +
               else if final.isNetBSD              then "nblibc"

     

       50
       52
        
               else if final.isAvr                 then "avrlibc"

     

       51
       53
        
               else if final.isNone                then "newlib"

     

       52
       52
       -
               else if final.isNetBSD              then "nblibc"

     

       53
       54
        
               # TODO(@Ericson2314) think more about other operating systems

     

       54
       55
        
               else                                     "native/impure";

     

       55
       56
        
             # Choose what linker we wish to use by default. Someday we might also

+1 -1

lib/systems/doubles.nix

···

       13
       13
        
           "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"

     

       14
       14
        
       

     

       15
       15
        
           # FreeBSD

     

       16
       16
       -
           "i686-freebsd" "x86_64-freebsd"

     

       16
       16
       +
           "i686-freebsd13" "x86_64-freebsd13"

     

       17
       17
        
       

     

       18
       18
        
           # Genode

     

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

+5

lib/systems/examples.nix

···

       303
       303
        
       

     

       304
       304
        
         # BSDs

     

       305
       305
        
       

     

       306
       306
       +
         x86_64-freebsd = {

     

       307
       307
       +
           config = "x86_64-unknown-freebsd13";

     

       308
       308
       +
           useLLVM = true;

     

       309
       309
       +
         };

     

       310
       310
       +
       

     

       306
       311
        
         x86_64-netbsd = {

     

       307
       312
        
           config = "x86_64-unknown-netbsd";

     

       308
       313
        
         };

+1 -1

lib/systems/inspect.nix

···

       59
       59
        
           isiOS          = { kernel = kernels.ios; };

     

       60
       60
        
           isLinux        = { kernel = kernels.linux; };

     

       61
       61
        
           isSunOS        = { kernel = kernels.solaris; };

     

       62
       62
       -
           isFreeBSD      = { kernel = kernels.freebsd; };

     

       62
       62
       +
           isFreeBSD      = { kernel = { name = "freebsd"; }; };

     

       63
       63
        
           isNetBSD       = { kernel = kernels.netbsd; };

     

       64
       64
        
           isOpenBSD      = { kernel = kernels.openbsd; };

     

       65
       65
        
           isWindows      = { kernel = kernels.windows; };

+12 -3

lib/systems/parse.nix

···

       290
       290
        
           # the normalized name for macOS.

     

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

     

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

     

       293
       293
       -
           freebsd  = { execFormat = elf;     families = { inherit bsd; }; };

     

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

     

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

     

       295
       295
       +
           # config string is paramount.

     

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

     

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

     

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

     

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

     

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

     
···

       431
       435
        
               then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "redox";                      }

     

       432
       436
        
             else if (elemAt l 2 == "mmixware")

     

       433
       437
        
               then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "mmixware";                   }

     

       438
       438
       +
             else if hasPrefix "freebsd" (elemAt l 2)

     

       439
       439
       +
               then { cpu = elemAt l 0; vendor = elemAt l 1;    kernel = elemAt l 2;                }

     

       434
       440
        
             else if hasPrefix "netbsd" (elemAt l 2)

     

       435
       441
        
               then { cpu = elemAt l 0; vendor = elemAt l 1;    kernel = elemAt l 2;                }

     

       436
       442
        
             else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])

     
···

       485
       491
        
       

     

       486
       492
        
         mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));

     

       487
       493
        
       

     

       494
       494
       +
         kernelName = kernel:

     

       495
       495
       +
           kernel.name + toString (kernel.version or "");

     

       496
       496
       +
       

     

       488
       497
        
         doubleFromSystem = { cpu, kernel, abi, ... }:

     

       489
       498
        
           /**/ if abi == abis.cygnus       then "${cpu.name}-cygwin"

     

       490
       499
        
           else if kernel.families ? darwin then "${cpu.name}-darwin"

     

       491
       491
       -
           else "${cpu.name}-${kernel.name}";

     

       500
       500
       +
           else "${cpu.name}-${kernelName kernel}";

     

       492
       501
        
       

     

       493
       502
        
         tripleFromSystem = { cpu, vendor, kernel, abi, ... } @ sys: assert isSystem sys; let

     

       494
       503
        
           optExecFormat =

     
···

       496
       505
        
                                 gnuNetBSDDefaultExecFormat cpu != kernel.execFormat)

     

       497
       506
        
               kernel.execFormat.name;

     

       498
       507
        
           optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";

     

       499
       499
       -
         in "${cpu.name}-${vendor.name}-${kernel.name}${optExecFormat}${optAbi}";

     

       508
       508
       +
         in "${cpu.name}-${vendor.name}-${kernelName kernel}${optExecFormat}${optAbi}";

     

       500
       509
        
       

     

       501
       510
        
         ################################################################################

     

       502
       511

+3 -3

lib/tests/systems.nix

···

       16
       16
        
         testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);

     

       17
       17
        
       

     

       18
       18
        
         testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];

     

       19
       19
       -
         testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];

     

       19
       19
       +
         testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];

     

       20
       20
        
         testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];

     

       21
       21
        
         testmmix = mseteq mmix [ "mmix-mmixware" ];

     

       22
       22
        
         testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];

     

       23
       23
        
         testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ];

     

       24
       24
        
         testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ];

     

       25
       25
       -
         testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];

     

       25
       25
       +
         testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd13" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];

     

       26
       26
        
       

     

       27
       27
        
         testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];

     

       28
       28
        
         testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ];

     

       29
       29
       -
         testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];

     

       29
       29
       +
         testfreebsd = mseteq freebsd [ "i686-freebsd13" "x86_64-freebsd13" ];

     

       30
       30
        
         testgenode = mseteq genode [ "aarch64-genode" "i686-genode" "x86_64-genode" ];

     

       31
       31
        
         testredox = mseteq redox [ "x86_64-redox" ];

     

       32
       32
        
         testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);