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

Merge 6983909b into haskell-updates

parents 1da7decf 6983909b

.github/workflows/eval.yml

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ jobs: 
  tag:

    name: Tag

    runs-on: ubuntu-24.04-arm

    needs: [ process ]

    needs: [ get-merge-commit, process ]

    if: needs.process.outputs.targetRunId

    permissions:

      pull-requests: write

.github/workflows/get-merge-commit.yml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ jobs: 
              ;;

            pull_request_target)

              if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then

                echo "Checking the commits:\n$commits"

                echo -e "Checking the commits:\n$commits"

                echo "$commits" >> "$GITHUB_OUTPUT"

              else

                # Skipping so that no notifications are sent

.github/workflows/periodic-merge-24h.yml

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ jobs: 
            into: staging-next-24.11

          - from: staging-next-24.11

            into: staging-24.11

          - from: master

            into: staging-next-25.05

          - from: staging-next-25.05

            into: staging-25.05

          - from: master staging

            into: haskell-updates

    uses: ./.github/workflows/periodic-merge.yml

ci/default.nix

+1 −4
Original line number Diff line number Diff line
@@ -63,10 +63,7 @@ let 
      fs = pkgs.lib.fileset;

      nixFilesSrc = fs.toSource {

        root = ../.;

        fileset = fs.difference (fs.unions [

          (fs.fileFilter (file: file.hasExt "nix") ../.)

          ../.git-blame-ignore-revs

        ]) (fs.maybeMissing ../.git);

        fileset = fs.difference ../. (fs.maybeMissing ../.git);

      };

    in

    {

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
# Nixpkgs 25.11 (2025.11/??) {#sec-nixpkgs-release-25.11}



## Highlights {#sec-nixpkgs-release-25.11-highlights}

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



- Create the first release note entry in this section!



## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities}



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



- Create the first release note entry in this section!



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



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



- Create the first release note entry in this section!



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



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



### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking}



- Create the first release note entry in this section!





### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}



- Create the first release note entry in this section!





### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}



- Create the first release note entry in this section!