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

Merge master into staging-next

parents 5db7542a fc430b0b

doc/release-notes/rl-2511.section.md

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ 


- `spidermonkey_91` has been removed, as it has been EOL since September 2022.



- The license of duckstation has changed from `gpl3Only` to `cc-by-nc-nd-40` making it unfree in newer releases. The `duckstation` package has been overhauled to support the new releases and `duckstation-bin` has been aliased to `duckstation` to support darwin binary builds.



- `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues.



- `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`.

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -23108,12 +23108,6 @@ 
    github = "schmittlauch";

    githubId = 1479555;

  };

  schneefux = {

    email = "schneefux+nixos_pkg@schneefux.xyz";

    github = "schneefux";

    githubId = 15379000;

    name = "schneefux";

  };

  schnow265 = {

    email = "thesnowbox@icloud.com";

    github = "schnow265";

nixos/tests/listmonk.nix

+2 −6
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ import ./make-test-python.nix ( 
        services.mailhog.enable = true;

        services.listmonk = {

          enable = true;

          settings = {

            admin_username = "listmonk";

            admin_password = "hunter2";

          };

          database = {

            createLocally = true;

            # https://github.com/knadh/listmonk/blob/174a48f252a146d7e69dab42724e3329dbe25ebe/internal/messenger/email/email.go#L18-L27
@@ -34,11 +30,10 @@ import ./make-test-python.nix ( 


      start_all()



      basic_auth = "listmonk:hunter2"

      def generate_listmonk_request(type, url, data=None):

         if data is None: data = {}

         json_data = json.dumps(data)

         return f'curl -u "{basic_auth}" -X {type} "http://localhost:9000/api/{url}" -H "Content-Type: application/json; charset=utf-8" --data-raw \'{json_data}\'''

         return f'curl -j -b cookies.txt -X {type} "http://localhost:9000/api/{url}" -H "Content-Type: application/json; charset=utf-8" --data-raw \'{json_data}\'''



      machine.wait_for_unit("mailhog.service")

      machine.wait_for_unit("postgresql.target")
@@ -47,6 +42,7 @@ import ./make-test-python.nix ( 
      machine.wait_for_open_port(8025)

      machine.wait_for_open_port(9000)

      machine.succeed("[[ -f /var/lib/listmonk/.db_settings_initialized ]]")

      machine.succeed('curl -c cookies.txt -X POST "http://localhost:9000/admin/login" --data email=listmonk@test.local --data username=listmonk --data password=hunter22 --data password2=hunter22')



      assert json.loads(machine.succeed(generate_listmonk_request("GET", 'health')))['data'], 'Health endpoint returned unexpected value'

nixos/tests/litestream.nix

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
          };



          server = {

            http_addr = "localhost";

            http_addr = "127.0.0.1";

            http_port = 3000;

          };

pkgs/applications/editors/vscode/extensions/continue.continue/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { 
      sources = {

        "x86_64-linux" = {

          arch = "linux-x64";

          hash = "sha256-jhzV5mDEwnHPcCaH/ZF/nLPTYZJlOEJkoaPcTg4+uU8=";

          hash = "sha256-4C8ug5B7xdd4rsmH9vsPkIerfF+tYniKn0tUk+zcNfg=";

        };

        "x86_64-darwin" = {

          arch = "darwin-x64";

          hash = "sha256-nmT7hWHqmukyomTHIVM6k+bw0qgeeaehDNngiQgKid8=";

          hash = "sha256-OCp1wNWSl/Gg2IJhVGWmM677yqRa4y4UVAC+oypziIE=";

        };

        "aarch64-linux" = {

          arch = "linux-arm64";

          hash = "sha256-suJ/my6dovvxN2BdQKEbw8HeBi6o9WjPe/y9Uttq1QI=";

          hash = "sha256-L2WwrZy0Aw7QO8060jW9rO8Dw6Fia450vvIWeW70uyU=";

        };

        "aarch64-darwin" = {

          arch = "darwin-arm64";

          hash = "sha256-9+bCE3d6bNeVHnXNrJkWpK3UeVhy7cQrwYvSJ66Oufw=";

          hash = "sha256-t5h3/PoILd2/vcXIa0IK5Qx1uxNzHUdoUlRSSXK6bdw=";

        };

      };

    in

    {

      name = "continue";

      publisher = "Continue";

      version = "1.2.6";

      version = "1.2.8";

    }

    // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];