Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented May 2, 2025

Continuation of #399462

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 2, 2025
@nix-owners nix-owners bot requested a review from globin May 2, 2025 13:25
@ghost ghost marked this pull request as draft May 3, 2025 08:18
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels May 3, 2025
@ghost ghost changed the base branch from staging to master May 3, 2025 08:37
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` labels May 3, 2025
@ghost ghost marked this pull request as ready for review May 3, 2025 08:39
@ghost
Copy link
Author

ghost commented May 3, 2025

Should be good now, @SuperSandro2000
Since the older upgrades were targeting staging for the massive rebuilds, I assumed this would to, targeting staging from the start. But for some reason, that was not the case, having only 1-10 this time.
Is there a way to know from the beginning how many rebuilds there are going to be, before making the PR, or just do it and see and rebase to the other branch if needed?

@SuperSandro2000
Copy link
Member

Estimating the rebuilds locally is possible but uses lots of resources. Usually we just look at the previous PR and unusually that changes.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 5, 2025
@liberodark
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 403628


x86_64-linux

✅ 3 packages built:
  • discourse
  • discourseAllPlugins
  • redis

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels May 13, 2025
@lblasc
Copy link
Contributor

lblasc commented Jun 7, 2025

@Saterfield990 redis 8.0.2 is out, can you please update PR ? Thanks!

@ghost ghost changed the title redis: 7.2.7 -> 8.0.0 redis: 7.2.7 -> 8.0.2 Jun 10, 2025
@wegank wegank added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Jun 11, 2025
@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 403628
Commit: 46c725806a987375f8fe32cb9e1ab3f5f8dc5d1f


x86_64-linux

✅ 3 packages built:
  • discourse
  • discourseAllPlugins
  • redis

aarch64-linux

✅ 3 packages built:
  • discourse
  • discourseAllPlugins
  • redis

x86_64-darwin

❌ 1 package failed to build:
  • redis

aarch64-darwin

❌ 1 package failed to build:
  • redis

Error logs: `x86_64-darwin`
redis
    CC functions.o
    CC function_lua.o
    CC commands.o
    CC strl.o
    CC connection.o
    CC unix.o
    CC logreqres.o
    CC hnsw.o
    CC vset.o
    CC redis-cli.o
    CC redisassert.o
    CC cli_common.o
    CC cli_commands.o
    CC redis-benchmark.o
    LINK redis-server
clang: error: no such file or directory: '../deps/fast_float/libfast_float.a'
make[1]: *** [Makefile:421: redis-server] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/private/tmp/nix-build-redis-8.0.2.drv-0/source/src'
make: *** [Makefile:11: all] Error 2

Error logs: `aarch64-darwin`
redis
    CC functions.o
    CC function_lua.o
    CC commands.o
    CC strl.o
    CC connection.o
    CC unix.o
    CC logreqres.o
    CC hnsw.o
    CC vset.o
    CC redis-cli.o
    CC redisassert.o
    CC cli_common.o
    CC cli_commands.o
    CC redis-benchmark.o
    LINK redis-server
clang: error: no such file or directory: '../deps/fast_float/libfast_float.a'
make[1]: *** [Makefile:421: redis-server] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/private/tmp/nix-build-redis-8.0.2.drv-0/source/src'
make: *** [Makefile:11: all] Error 2

@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 403628 --package redis.tests
Commit: 46c725806a987375f8fe32cb9e1ab3f5f8dc5d1f


x86_64-linux

⏩ 2 packages marked as broken and skipped:
  • redis.tests.redis.keydb
  • redis.tests.redis.redis

aarch64-linux

⏩ 2 packages marked as broken and skipped:
  • redis.tests.redis.keydb
  • redis.tests.redis.redis

x86_64-darwin

⏩ 2 packages marked as broken and skipped:
  • redis.tests.redis.keydb
  • redis.tests.redis.redis

aarch64-darwin

⏩ 2 packages marked as broken and skipped:
  • redis.tests.redis.keydb
  • redis.tests.redis.redis

All redis tests marked as broken? Great...

@wolfgangwalther
Copy link
Contributor

Broken build on darwin seems to be a regression here, it builds fine on master.

@ghost
Copy link
Author

ghost commented Jul 1, 2025

In the error logs it says something about not finding fast_float which is available in nixpkgs.
Maybe it needs it in the nativeBuildInputs/buildInputs. Someone with a darwin machine should test this theory to see if it's any good.

@wolfgangwalther
Copy link
Contributor

fast_float seems to be a vendored dependency upstream: https://github.com/redis/redis/tree/unstable/deps/fast_float

@wolfgangwalther
Copy link
Contributor

There is another error further up:

error: invalid argument '-std=c11' not allowed with 'C++'
make[3]: *** [Makefile:18: fast_float_strtod.o] Error 1
make[3]: Leaving directory '/private/tmp/nix-build-redis-8.0.2.drv-0/source/deps/fast_float'
make[2]: *** [Makefile:80: fast_float] Error 2
make[2]: *** Waiting for unfinished jobs....

When I remove this line, it starts to build:

  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);

This was introduced in #114203 without further comment. I guess it's safe to remove now.

@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 403628
Commit: f31f1bf19c69c0637d39e8d83db4a0073d98c344


x86_64-linux

✅ 3 packages built:
  • discourse
  • discourseAllPlugins
  • redis

aarch64-linux

✅ 3 packages built:
  • discourse
  • discourseAllPlugins
  • redis

x86_64-darwin

✅ 1 package built:
  • redis

aarch64-darwin

✅ 1 package built:
  • redis

@wolfgangwalther wolfgangwalther merged commit 1144b43 into NixOS:master Jul 1, 2025
23 of 27 checks passed
@vcunat
Copy link
Member

vcunat commented Jul 4, 2025

FYI, it doesn't seem great on aarch64-linux on Hydra, with 2/2 failures:
https://hydra.nixos.org/build/301394579#tabs-buildsteps

@wolfgangwalther
Copy link
Contributor

The error is:

*** [err]: Test master connection drops while streaming repl buffer into the db in tests/integration/replication-rdbchannel.tcl

Upstream has one commit for this file that is still unreleased and "fixes a flaky integration test": redis/redis@a0b2257

This might also be unrelated, though.

@ghost ghost deleted the redis branch July 4, 2025 07:59
@ghost
Copy link
Author

ghost commented Jul 4, 2025

Applying that commit as a patch did not work:

Running phase: patchPhase
applying patch /nix/store/xw8y4qdqdx8s472x4w2wg84q4avy2ac5-redis-5.0-use-system-jemalloc.patch
patching file src/Makefile
Hunk #1 succeeded at 279 with fuzz 1 (offset 50 lines).
applying patch /nix/store/3iy92f1g127na3k6yw6y4nfnppba3w16-14034.patch
patching file tests/integration/replication-rdbchannel.tcl
Hunk #2 FAILED at 295.
Hunk #3 succeeded at 433 (offset -3 lines).
1 out of 3 hunks FAILED -- saving rejects to file tests/integration/replication-rdbchannel.tcl.rej

@wolfgangwalther
Copy link
Contributor

Maybe just disable this test similar to --skipunit integration/failover # flaky and slow for the moment and try again on the next update?

@ghost ghost mentioned this pull request Jul 4, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants