···1+# This action periodically merges a merge base of master and staging into haskell-updates.
2+#
3+# haskell-updates is based on master (so there are little unrelated failures and the cache
4+# is already prepopulated), but needs to target staging due to the high amount of rebuilds
5+# it typically causes. To prevent unrelated commits clattering the GitHub UI, we need to
6+# take care to only merge the merge-base of master and staging into haskell-updates.
7+#
8+# See also https://github.com/NixOS/nixpkgs/issues/361143.
9+10+name: "Periodic Merges (haskell-updates)"
11+12+13+on:
14+ schedule:
15+ # * is a special character in YAML so you have to quote this string
16+ # Merge every 24 hours
17+ - cron: '0 0 * * *'
18+ workflow_dispatch:
19+20+permissions:
21+ contents: read
22+23+jobs:
24+ periodic-merge:
25+ permissions:
26+ contents: write # for devmasx/merge-branch to merge branches
27+ pull-requests: write # for peter-evans/create-or-update-comment to create or update comment
28+ if: github.repository_owner == 'NixOS'
29+ runs-on: ubuntu-latest
30+ name: git merge-base master staging → haskell-updates
31+ steps:
32+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+ with:
34+ fetch-depth: 0
35+36+ # Note: If we want to do something similar for more branches, we can move this into a
37+ # separate job, so we can use the matrix strategy again.
38+ - name: Find merge base of master and staging
39+ id: find_merge_base_step
40+ run: |
41+ merge_base="$(git merge-base refs/remotes/origin/master refs/remotes/origin/staging)"
42+ echo "Found merge base: $merge_base" >&2
43+ echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT"
44+45+ - name: git merge-base master staging → haskell-updates
46+ uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
47+ with:
48+ type: now
49+ head_to_merge: ${{ steps.find_merge_base_step.outputs.merge_base }}
50+ target_branch: haskell-updates
51+ github_token: ${{ secrets.GITHUB_TOKEN }}
52+53+ - name: Comment on failure
54+ uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
55+ if: ${{ failure() }}
56+ with:
57+ issue-number: 367709
58+ body: |
59+ 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 }}).
···1{
2 lib,
3- stdenv,
4 fetchFromGitHub,
5 rustPlatform,
6- libiconv,
7- apple-sdk_11,
8}:
910rustPlatform.buildRustPackage rec {
···19 };
2021 cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
22-23- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
24- libiconv
25- apple-sdk_11
26- ];
2728 # Compilation during tests fails if this env var is not set.
29 preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
···1{
2 lib,
03 fetchFromGitHub,
4 rustPlatform,
005}:
67rustPlatform.buildRustPackage rec {
···16 };
1718 cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y=";
000001920 # Compilation during tests fails if this env var is not set.
21 preCheck = "export GIRT_BUILD_GIT_HASH=${version}";
-7
pkgs/by-name/gl/glsl_analyzer/package.nix
···3 stdenv,
4 fetchFromGitHub,
5 zig_0_13,
6- apple-sdk_11,
7}:
89stdenv.mkDerivation (finalAttrs: {
···1920 nativeBuildInputs = [
21 zig_0_13.hook
22- ];
23-24- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
25- # The package failed to build on x86_64-darwin because the default was the 10.12 SDK
26- # Once the default on all platforms has been raised to the 11.0 SDK or higher, this can be removed.
27- apple-sdk_11
28 ];
2930 postPatch = ''
···15 # buildInputs
16 openssl,
17 rdkafka,
18- apple-sdk_11,
19- darwinMinVersionHook,
2021 versionCheckHook,
22 nix-update-script,
···138 # Needed to get openssl-sys to use pkg-config.
139 OPENSSL_NO_VENDOR = 1;
140141- buildInputs =
142- [
143- openssl
144- rdkafka
145- ]
146- ++ lib.optionals stdenv.hostPlatform.isDarwin [
147- # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
148- apple-sdk_11
149- (darwinMinVersionHook "10.13")
150- ];
151152 # the check phase requires linking with rocksdb which can be a problem since
153 # the rust rocksdb crate is not updated very often.
···15 # buildInputs
16 openssl,
17 rdkafka,
001819 versionCheckHook,
20 nix-update-script,
···136 # Needed to get openssl-sys to use pkg-config.
137 OPENSSL_NO_VENDOR = 1;
138139+ buildInputs = [
140+ openssl
141+ rdkafka
142+ ];
000000143144 # the check phase requires linking with rocksdb which can be a problem since
145 # the rust rocksdb crate is not updated very often.
···256 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
257 cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
258 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
0259 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
260261 # these are for convenience, not for backward compat and shouldn't expire
···256 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
257 cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
258 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
259+ cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
260 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
261262 # these are for convenience, not for backward compat and shouldn't expire