···11+# This action periodically merges a merge base of master and staging into haskell-updates.
22+#
33+# haskell-updates is based on master (so there are little unrelated failures and the cache
44+# is already prepopulated), but needs to target staging due to the high amount of rebuilds
55+# it typically causes. To prevent unrelated commits clattering the GitHub UI, we need to
66+# take care to only merge the merge-base of master and staging into haskell-updates.
77+#
88+# See also https://github.com/NixOS/nixpkgs/issues/361143.
99+1010+name: "Periodic Merges (haskell-updates)"
1111+1212+1313+on:
1414+ schedule:
1515+ # * is a special character in YAML so you have to quote this string
1616+ # Merge every 24 hours
1717+ - cron: '0 0 * * *'
1818+ workflow_dispatch:
1919+2020+permissions:
2121+ contents: read
2222+2323+jobs:
2424+ periodic-merge:
2525+ permissions:
2626+ contents: write # for devmasx/merge-branch to merge branches
2727+ pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
2828+ if: github.repository_owner == 'NixOS'
2929+ runs-on: ubuntu-latest
3030+ name: git merge-base master staging → haskell-updates
3131+ steps:
3232+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333+ with:
3434+ fetch-depth: 0
3535+3636+ # Note: If we want to do something similar for more branches, we can move this into a
3737+ # separate job, so we can use the matrix strategy again.
3838+ - name: Find merge base of master and staging
3939+ id: find_merge_base_step
4040+ run: |
4141+ merge_base="$(git merge-base refs/remotes/origin/master refs/remotes/origin/staging)"
4242+ echo "Found merge base: $merge_base" >&2
4343+ echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT"
4444+4545+ - name: git merge-base master staging → haskell-updates
4646+ uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
4747+ with:
4848+ type: now
4949+ head_to_merge: ${{ steps.find_merge_base_step.outputs.merge_base }}
5050+ target_branch: haskell-updates
5151+ github_token: ${{ secrets.GITHUB_TOKEN }}
5252+5353+ - name: Comment on failure
5454+ uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
5555+ if: ${{ failure() }}
5656+ with:
5757+ issue-number: 367709
5858+ body: |
5959+ Periodic merge from `${{ steps.find_merge_base_step.outputs.merge_base }}` into `haskell-updates` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
···11{
22 lib,
33- stdenv,
43 fetchFromGitHub,
54 rustPlatform,
66- libiconv,
77- apple-sdk_11,
85}:
96107rustPlatform.buildRustPackage rec {
···1916 };
20172118 cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
2222-2323- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
2424- libiconv
2525- apple-sdk_11
2626- ];
27192820 # Compilation during tests fails if this env var is not set.
2921 preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
-7
pkgs/by-name/gl/glsl_analyzer/package.nix
···33 stdenv,
44 fetchFromGitHub,
55 zig_0_13,
66- apple-sdk_11,
76}:
8798stdenv.mkDerivation (finalAttrs: {
···19182019 nativeBuildInputs = [
2120 zig_0_13.hook
2222- ];
2323-2424- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
2525- # The package failed to build on x86_64-darwin because the default was the 10.12 SDK
2626- # Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed.
2727- apple-sdk_11
2821 ];
29223023 postPatch = ''
···1515 # buildInputs
1616 openssl,
1717 rdkafka,
1818- apple-sdk_11,
1919- darwinMinVersionHook,
20182119 versionCheckHook,
2220 nix-update-script,
···138136 # Needed to get openssl-sys to use pkg-config.
139137 OPENSSL_NO_VENDOR = 1;
140138141141- buildInputs =
142142- [
143143- openssl
144144- rdkafka
145145- ]
146146- ++ lib.optionals stdenv.hostPlatform.isDarwin [
147147- # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
148148- apple-sdk_11
149149- (darwinMinVersionHook "10.13")
150150- ];
139139+ buildInputs = [
140140+ openssl
141141+ rdkafka
142142+ ];
151143152144 # the check phase requires linking with rocksdb which can be a problem since
153145 # the rust rocksdb crate is not updated very often.
···256256 cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
257257 cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
258258 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
259259+ cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
259260 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
260261261262 # these are for convenience, not for backward compat and shouldn't expire