Unverified Commit edc6c261 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents b08ebe20 e0ddc599

lib/cli.nix

+10 −1
Original line number Diff line number Diff line
@@ -90,7 +90,16 @@ rec { 
    mkOption ?

      k: v: if v == null

            then []

            else [ (mkOptionName k) (lib.generators.mkValueStringDefault {} v) ]

            else if optionValueSeparator == null then

              [ (mkOptionName k) (lib.generators.mkValueStringDefault {} v) ]

            else

              [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault {} v}" ],



    # how to separate an option from its flag;

    # by default, there is no separator, so option `-c` and value `5`

    # would become ["-c" "5"].

    # This is useful if the command requires equals, for example, `-c=5`.

    optionValueSeparator ? null

    }:

    options:

      let

lib/tests/misc.nix

+21 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,27 @@ runTests { 
    ];

  };



  testToGNUCommandLineSeparator = {

    expr = cli.toGNUCommandLine { optionValueSeparator = "="; } {

      data = builtins.toJSON { id = 0; };

      X = "PUT";

      retry = 3;

      retry-delay = null;

      url = [ "https://example.com/foo" "https://example.com/bar" ];

      silent = false;

      verbose = true;

    };



    expected = [

      "-X=PUT"

      "--data={\"id\":0}"

      "--retry=3"

      "--url=https://example.com/foo"

      "--url=https://example.com/bar"

      "--verbose"

    ];

  };



  testToGNUCommandLineShell = {

    expr = cli.toGNUCommandLineShell {} {

      data = builtins.toJSON { id = 0; };

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -1787,6 +1787,12 @@ 
    githubId = 816777;

    name = "Ashley Gillman";

  };

  ashgoldofficial = {

    email = "ashley.goldwater@gmail.com";

    github = "ASHGOLDOFFICIAL";

    githubId = 104313094;

    name = "Andrey Shaat";

  };

  ashkitten = {

    email = "ashlea@protonmail.com";

    github = "ashkitten";
@@ -12443,6 +12449,11 @@ 
    githubId = 18661391;

    name = "Malte Janz";

  };

  malteneuss = {

    github = "malteneuss";

    githubId = 5301202;

    name = "Malte Neuss";

  };

  malte-v = {

    email = "nixpkgs@mal.tc";

    github = "malte-v";

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- [ollama](https://ollama.ai), server for running large language models locally.



- [nextjs-ollama-llm-ui](https://github.com/jakobhoeg/nextjs-ollama-llm-ui), light-weight frontend server to chat with Ollama models through a web app.



- [ownCloud Infinite Scale Stack](https://owncloud.com/infinite-scale-4-0/), a modern and scalable rewrite of ownCloud.



- [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition.

nixos/doc/manual/release-notes/rl-2411.section.md

+3 −1
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ 


## Backward Incompatibilities {#sec-release-24.11-incompatibilities}



- Create the first release note entry in this section!

- `nvimpager` was updated to version 0.13.0, which changes the order of user and

  nvimpager settings: user commands in `-c` and `--cmd` now override the

  respective default settings because they are executed later.



## Other Notable Changes {#sec-release-24.11-notable-changes}