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

Merge staging-next into staging

parents ef4d22fd 400bb9a8
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ jobs:
                    name == '12.approved-by: package-maintainer'
                  )

                const approvals =
                const approvals = new Set(
                  (await github.paginate(github.rest.pulls.listReviews, {
                    owner: context.repo.owner,
                    repo: context.repo.repo,
@@ -104,15 +104,16 @@ jobs:
                  }))
                  .filter(review => review.state == 'APPROVED')
                  .map(review => review.user.id)
                )

                const maintainers = Object.keys(
                const maintainers = new Set(Object.keys(
                  JSON.parse(await readFile('comparison/maintainers.json', 'utf-8'))
                )
                ))

                // And the labels that should be there
                const after = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8')).labels
                if (approvals.length > 0) after.push(`12.approvals: ${approvals.length > 2 ? '3+' : approvals.length}`)
                if (maintainers.some(id => approvals.includes(id))) after.push('12.approved-by: package-maintainer')
                if (approvals.size > 0) after.push(`12.approvals: ${approvals.size > 2 ? '3+' : approvals.size}`)
                if (Array.from(maintainers).some(m => approvals.has(m))) after.push('12.approved-by: package-maintainer')

                // Remove the ones not needed anymore
                await Promise.all(
+6 −6
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@
      },
      "branch": "nixpkgs-unstable",
      "submodules": false,
      "revision": "8ca7ec685bbee55d6dcb326abe23945c0806c39e",
      "url": "https://github.com/NixOS/nixpkgs/archive/8ca7ec685bbee55d6dcb326abe23945c0806c39e.tar.gz",
      "hash": "1hkxm871m66mjsc4acdki32qqnpgk3n6vi3zrzns2bwlwp6ivcjx"
      "revision": "6afe187897bef7933475e6af374c893f4c84a293",
      "url": "https://github.com/NixOS/nixpkgs/archive/6afe187897bef7933475e6af374c893f4c84a293.tar.gz",
      "hash": "1x3yas2aingswrw7hpn43d9anlb08bpyk42dqg6v8f3p3yk83p1b"
    },
    "treefmt-nix": {
      "type": "Git",
@@ -22,9 +22,9 @@
      },
      "branch": "main",
      "submodules": false,
      "revision": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007",
      "url": "https://github.com/numtide/treefmt-nix/archive/1f3f7b784643d488ba4bf315638b2b0a4c5fb007.tar.gz",
      "hash": "13qisjalw9qvd6lkd9g8225r46j5wdjrp3zw6jrs81q2vxwdz37m"
      "revision": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
      "url": "https://github.com/numtide/treefmt-nix/archive/a05be418a1af1198ca0f63facb13c985db4cb3c5.tar.gz",
      "hash": "1yadm9disc59an4a6c1zidq82530rd7i7idzzsirv6dlwirbqk3q"
    }
  },
  "version": 5
+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@

- New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.

- `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`
- `gramps` has been updated to 6.0.0
  Upstream recommends [backing up your Family Trees](https://gramps-project.org/wiki/index.php/Gramps_6.0_Wiki_Manual_-_Manage_Family_Trees#Backing_up_a_Family_Tree) before upgrading.

## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}

+8 −1
Original line number Diff line number Diff line
@@ -15892,6 +15892,12 @@
    githubId = 1377571;
    name = "Matthew S. Daiter";
  };
  mdaniels5757 = {
    email = "nix@mdaniels.me";
    github = "mdaniels5757";
    githubId = 8762511;
    name = "Michael Daniels";
  };
  mdarocha = {
    email = "marek@mdarocha.pl";
    github = "mdarocha";
@@ -26358,10 +26364,11 @@
    name = "Danny Wilson";
  };
  vizid = {
    email = "vizid1337@gmail.com";
    email = "mail@vizqq.cc";
    github = "ViZiD";
    githubId = 7444430;
    name = "Radik Islamov";
    keys = [ { fingerprint = "5779 01B8 C620 E064 4212  C6FC F396 46E8 0C71 08E7"; } ];
  };
  vji = {
    email = "mail@viktor.im";
+9 −0
Original line number Diff line number Diff line
@@ -44,12 +44,21 @@

- The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/).

- The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream.

- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.

- `renovate` was updated to v40. See the [upstream release notes](https://github.com/renovatebot/renovate/releases/tag/40.0.0) for breaking changes.

- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.

- The Postfix module has been updated and likely requires configuration changes:
  - The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure
    - [services.postfix.config.smtpd_tls_chain_files](#opt-services.postfix.config.smtpd_tls_chain_files) for server certificates,
    - [services.postfix.config.smtp_tls_chain_files](#opt-services.postfix.config) for client certificates.

- `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`

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

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
Loading