commit 695d4bc76b9abdc3208a9475d71fdf0f41e925c8 · pyrox.dev/nixpkgs

+1 -1

lib/attrsets.nix

···

       757
       757
        
              matchAttrs :: AttrSet -> AttrSet -> Bool

     

       758
       758
        
         */

     

       759
       759
        
         matchAttrs =

     

       760
       760
       -
           # Attribute set strucutre to match

     

       760
       760
       +
           # Attribute set structure to match

     

       761
       761
        
           pattern:

     

       762
       762
        
           # Attribute set to find patterns in

     

       763
       763
        
           attrs:

+1 -1

lib/derivations.nix

···

       17
       17
        
           situations below.

     

       18
       18
        
       

     

       19
       19
        
           For illustration and/or testing, we define derivation such that its

     

       20
       20
       -
           evaluation is very noticable.

     

       20
       20
       +
           evaluation is very noticeable.

     

       21
       21
        
       

     

       22
       22
        
               let derivation = throw "This won't be evaluated.";

     

       23
       23

+1 -1

lib/modules.nix

···

       479
       479
        
             ) (lib.functionArgs f);

     

       480
       480
        
       

     

       481
       481
        
             # Note: we append in the opposite order such that we can add an error

     

       482
       482
       -
             # context on the explicited arguments of "args" too. This update

     

       482
       482
       +
             # context on the explicit arguments of "args" too. This update

     

       483
       483
        
             # operator is used to make the "args@{ ... }: with args.lib;" notation

     

       484
       484
        
             # works.

     

       485
       485
        
           in f (args // extraArgs)

+2 -2

lib/strings.nix

···

       185
       185
        
         */

     

       186
       186
        
         makeBinPath = makeSearchPathOutput "bin" "bin";

     

       187
       187
        
       

     

       188
       188
       -
         /* Normalize path, removing extranous /s

     

       188
       188
       +
         /* Normalize path, removing extraneous /s

     

       189
       189
        
       

     

       190
       190
        
            Type: normalizePath :: string -> string

     

       191
       191
        
       

     
···

       330
       330
        
         */

     

       331
       331
        
         escape = list: replaceStrings list (map (c: "\\${c}") list);

     

       332
       332
        
       

     

       333
       333
       -
         /* Escape occurence of the element of `list` in `string` by

     

       333
       333
       +
         /* Escape occurrence of the element of `list` in `string` by

     

       334
       334
        
            converting to its ASCII value and prefixing it with \\x.

     

       335
       335
        
            Only works for printable ascii characters.

     

       336
       336

+1 -1

lib/systems/architectures.nix

···

       67
       67
        
           #

     

       68
       68
        
           # Note:

     

       69
       69
        
           #

     

       70
       70
       -
           # - The succesors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`

     

       70
       70
       +
           # - The successors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`

     

       71
       71
        
           #   which no current AMD Zen michroarch support.

     

       72
       72
        
           # - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no

     

       73
       73
        
           #   current Intel microarch support.

+2 -2

lib/systems/default.nix

···

       20
       20
        
         # necessary.

     

       21
       21
        
         #

     

       22
       22
        
         # `parsed` is inferred from args, both because there are two options with one

     

       23
       23
       -
         # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS

     

       23
       23
       +
         # clearly preferred, and to prevent cycles. A simpler fixed point where the RHS

     

       24
       24
        
         # always just used `final.*` would fail on both counts.

     

       25
       25
        
         elaborate = args': let

     

       26
       26
        
           args = if lib.isString args' then { system = args'; }

     
···

       62
       62
        
             linker =

     

       63
       63
        
               /**/ if final.useLLVM or false      then "lld"

     

       64
       64
        
               else if final.isDarwin              then "cctools"

     

       65
       65
       -
               # "bfd" and "gold" both come from GNU binutils. The existance of Gold

     

       65
       65
       +
               # "bfd" and "gold" both come from GNU binutils. The existence of Gold

     

       66
       66
        
               # is why we use the more obscure "bfd" and not "binutils" for this

     

       67
       67
        
               # choice.

     

       68
       68
        
               else                                     "bfd";

+1 -1

lib/systems/flake-systems.nix

···

       1
       1
        
       # See [RFC 46] for mandated platform support and ../../pkgs/stdenv for

     

       2
       2
        
       # implemented platform support. This list is mainly descriptive, i.e. all

     

       3
       3
       -
       # system doubles for platforms where nixpkgs can do native compiliation

     

       3
       3
       +
       # system doubles for platforms where nixpkgs can do native compilation

     

       4
       4
        
       # reasonably well are included.

     

       5
       5
        
       #

     

       6
       6
        
       # [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md

+1 -1

lib/tests/modules.sh

···

       246
       246
        
       ## Freeform modules

     

       247
       247
        
       # Assigning without a declared option should work

     

       248
       248
        
       checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix

     

       249
       249
       -
       # No freeform assigments shouldn't make it error

     

       249
       249
       +
       # No freeform assignments shouldn't make it error

     

       250
       250
        
       checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix

     

       251
       251
        
       # but only if the type matches

     

       252
       252
        
       checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix