Unverified Commit 197fb0a1 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents eeecc350 257aa2b0
Loading
Loading
Loading
Loading
+6 −15
Original line number Diff line number Diff line
@@ -20,24 +20,15 @@ runCommand "nix-parse-${nix.name}"
  ''
    export NIX_STORE_DIR=$TMPDIR/store
    export NIX_STATE_DIR=$TMPDIR/state
    nix-store --init

    cd "${nixpkgs}"

    # Passes all files to nix-instantiate at once.
    # Much faster, but will only show first error.
    parse-all() {
      find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null 2>/dev/null
    }

    # Passes each file separately to nix-instantiate with -n1.
    # Much slower, but will show all errors.
    parse-each() {
      find . -type f -iname '*.nix' | xargs -n1 -P $(nproc) nix-instantiate --parse >/dev/null
    }

    if ! parse-all; then
      parse-each
    fi
    # This will only show the first parse error, not all of them. That's fine, because
    # the other CI jobs will report in more detail. This job is about checking parsing
    # across different implementations / versions, not about providing the best DX.
    # Returning all parse errors requires significantly more resources.
    find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null

    touch $out
  ''
+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@

- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

- `webkitgtk_4_0` has been removed because it depends on an unmaintained version of security-critical libsoup library (`libsoup_2`) and the support will be [dropped upstream soon](https://webkitgtk.org/2025/10/07/webkitgtk-soup2-deprecation.html).

- Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
  The latter was probably broken anyway.
  If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.
+0 −48
Original line number Diff line number Diff line
@@ -4928,12 +4928,6 @@
    githubId = 640797;
    name = "Roger Qiu";
  };
  cmfwyp = {
    email = "cmfwyp@riseup.net";
    github = "cmfwyp";
    githubId = 20808761;
    name = "cmfwyp";
  };
  cmm = {
    email = "repo@cmm.kakpryg.net";
    github = "cmm";
@@ -5040,12 +5034,6 @@
    githubId = 27779510;
    keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845  6A22 CF7B BB5B C756 1BD3"; } ];
  };
  codsl = {
    email = "codsl@riseup.net";
    github = "codsl";
    githubId = 6402559;
    name = "codsl";
  };
  codyopel = {
    email = "codyopel@gmail.com";
    github = "codyopel";
@@ -14778,12 +14766,6 @@
    matrix = "@link2xt:matrix.org";
    name = "link2xt";
  };
  linquize = {
    email = "linquize@yahoo.com.hk";
    github = "linquize";
    githubId = 791115;
    name = "Linquize";
  };
  linsui = {
    email = "linsui555@gmail.com";
    github = "linsui";
@@ -17309,12 +17291,6 @@
    githubId = 64710;
    name = "Matthew O'Gorman";
  };
  Mogria = {
    email = "m0gr14@gmail.com";
    github = "mogria";
    githubId = 754512;
    name = "Mogria";
  };
  mohe2015 = {
    name = "Moritz Hedtke";
    email = "Moritz.Hedtke@t-online.de";
@@ -19217,12 +19193,6 @@
    githubId = 5339261;
    keys = [ { fingerprint = "4258 3FE7 12E9 6071 E84D  53C7 6E1D A270 0B72 746D"; } ];
  };
  oida = {
    email = "oida@posteo.de";
    github = "oida";
    githubId = 7249506;
    name = "oida";
  };
  oidro = {
    github = "oidro";
    githubId = 31112680;
@@ -20867,12 +20837,6 @@
    githubId = 88623613;
    name = "ProggerX";
  };
  proglodyte = {
    email = "proglodyte23@gmail.com";
    github = "proglodyte";
    githubId = 18549627;
    name = "Proglodyte";
  };
  proglottis = {
    email = "proglottis@gmail.com";
    github = "proglottis";
@@ -27404,12 +27368,6 @@
    githubId = 1476338;
    name = "Viktor Illmer";
  };
  vklquevs = {
    email = "vklquevs@gmail.com";
    github = "vklquevs";
    githubId = 1771234;
    name = "vklquevs";
  };
  vlaci = {
    email = "laszlo.vasko@outlook.com";
    github = "vlaci";
@@ -27605,12 +27563,6 @@
    githubId = 988849;
    name = "Vasiliy Yorkin";
  };
  vyp = {
    email = "elisp.vim@gmail.com";
    github = "vyp";
    githubId = 3889405;
    name = "vyp";
  };
  w-lfchen = {
    email = "w-lfchen@posteo.net";
    github = "w-lfchen";
+5 −5
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ llscheck,,,,,,mrcjkb
lmathx,,,,,5.3,alexshpilkin
lmpfrlib,,,,,5.3,alexshpilkin
loadkit,,,,,,alerque
lpeg,,,,,,vyp
lpeg,,,,,,
lpeg_patterns,,,,,,
lpeglabel,,,,1.6.0,,
lrexlib-gnu,,,,,,
lrexlib-oniguruma,,,,,,junestepp
lrexlib-pcre,,,,,,vyp
lrexlib-pcre,,,,,,
lrexlib-posix,,,,,,
lsp-progress.nvim,,,,,,gepbird
lua-cjson,,,,,,
@@ -86,7 +86,7 @@ lualdap,,,,,,aanderse
lualine.nvim,,,http://luarocks.org/dev,,,
lualogging,,,,,,
luaossl,,,,,5.1,
luaposix,,,,34.1.1-1,,vyp lblasc
luaposix,,,,34.1.1-1,,lblasc
luaprompt,,,,,,Freed-Wu
luarepl,,,,,,
luarocks,,,,,,mrcjkb teto
@@ -96,7 +96,7 @@ luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
luasec,,,,,,flosse
luasnip,,,,,,
luasocket,,,,,,
luasql-sqlite3,,,,,,vyp
luasql-sqlite3,,,,,,
luassert,,,,,,
luasystem,,,,,,
luatext,,,,,,
@@ -148,7 +148,7 @@ sofa,,,,,,f4z3r
sqlite,,,,,,
std._debug,,,,,,
std.normalize,,,,,,
stdlib,,,,41.2.2,,vyp
stdlib,,,,41.2.2,,
teal-language-server,,,,,,
telescope-manix,,,,,,
telescope.nvim,,,,,5.1,
+10 −0
Original line number Diff line number Diff line
@@ -296,6 +296,15 @@ in
          Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.
        '';
      };
      extraArgs = lib.mkOption {
        type = lib.types.listOf lib.types.str;
        default = [ ];
        example = [
          "--rcon-bind=localhost:27015"
          "--rcon-password=..."
        ];
        description = "Extra command line arguments.";
      };
    };
  };

@@ -340,6 +349,7 @@ in
          (playerListOption "server-adminlist" cfg.admins)
          (playerListOption "server-whitelist" cfg.allowedPlayers)
          (lib.optionalString (cfg.allowedPlayers != [ ]) "--use-server-whitelist")
          cfg.extraArgs
        ];

        # Sandboxing
Loading