Unverified Commit a9100fc9 authored by Zoe Roux's avatar Zoe Roux Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents 735b57d9 e16a8baa

.github/workflows/backport.yml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ jobs: 
        uses: korthout/backport-action@v1.2.0

        with:

          # Config README: https://github.com/korthout/backport-action#backport-action

          copy_labels_pattern: 'severity:\ssecurity'

          pull_description: |-

            Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.

.github/workflows/manual-nixpkgs.yml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ on: 
      - master

    paths:

      - 'doc/**'

      - 'lib/**'



jobs:

  nixpkgs:

doc/builders/images/makediskimage.section.md

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ in 
    diskSize = "auto";

    additionalSpace = "0M"; # Defaults to 512M.

    copyChannel = false;

    memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M.

  }

```

lib/ascii-table.nix

+4 −1
Original line number Diff line number Diff line 
{ " "  = 32;

{ "\t" =  9;

  "\n" = 10;

  "\r" = 13;

  " "  = 32;

  "!"  = 33;

  "\"" = 34;

  "#"  = 35;

lib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ let 
      escapeShellArg escapeShellArgs

      isStorePath isStringLike

      isValidPosixName toShellVar toShellVars

      escapeRegex escapeXML replaceChars lowerChars

      escapeRegex escapeURL escapeXML replaceChars lowerChars

      upperChars toLower toUpper addContextFrom splitString

      removePrefix removeSuffix versionOlder versionAtLeast

      getName getVersion