Skip to content

dragonflydb: 0.1.0 → 1.30.0#405608

Closed
SumitKumar-17 wants to merge 1 commit intoNixOS:masterfrom
SumitKumar-17:update-dragonflydb-1.29.0
Closed

dragonflydb: 0.1.0 → 1.30.0#405608
SumitKumar-17 wants to merge 1 commit intoNixOS:masterfrom
SumitKumar-17:update-dragonflydb-1.29.0

Conversation

@SumitKumar-17
Copy link
Contributor

@SumitKumar-17 SumitKumar-17 commented May 9, 2025

Resolves #405217

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.

@SumitKumar-17 SumitKumar-17 force-pushed the update-dragonflydb-1.29.0 branch from 24f74d7 to cc6dade Compare May 9, 2025 14:56
@SumitKumar-17 SumitKumar-17 force-pushed the update-dragonflydb-1.29.0 branch from cc6dade to eb14057 Compare May 11, 2025 02:23
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 11, 2025
@nix-owners nix-owners bot requested a review from Yureien May 11, 2025 02:31
@SumitKumar-17 SumitKumar-17 changed the title dragonflydb: 0.1.0 → 1.29.0 dragonflydb: 0.1.0 → 1.30.0 May 11, 2025
@SumitKumar-17 SumitKumar-17 force-pushed the update-dragonflydb-1.29.0 branch from eb14057 to 7875abb Compare May 11, 2025 07:26
@mdaniels5757
Copy link
Member

mdaniels5757 commented May 12, 2025

Now there seem to be issues applying the patches, see the below log.

build log
$ nix build --file /nix/store/ynbhm7j6506vyc3wap3xcgpimch09893-nixpkgs-review-3.0.1/lib/python3.12/site-packages/nixpkgs_review/nix/review-shell.nix --nix-path 'nixpkgs=/home/m/.cache/nixpkgs-review/pr-405608/nixpkgs nixpkgs-overlays=/tmp/tmpzpn_mycn' --extra-experimental-features 'nix-command no-url-literals' --no-link --keep-going --no-allow-import-from-derivation --option build-use-sandbox relaxed --argstr local-system x86_64-linux --argstr nixpkgs-path /home/m/.cache/nixpkgs-review/pr-405608/nixpkgs --argstr nixpkgs-config-path /tmp/tmpdgkojj7w.nix --argstr attrs-path /home/m/.cache/nixpkgs-review/pr-405608/attrs.nix
error: builder for '/nix/store/sj1n5rai3b1jk1a7mc1m3zcrc0csmqv7-dragonflydb-1.30.0.drv' failed with exit code 1;
       last 25 log lines: [snip]
error: 1 dependencies of derivation '/nix/store/6c08iq6350yznh6bmfi81dxh7mjvns4z-review-shell.drv' failed to build

Link to currently reviewing PR:
https://github.com/NixOS/nixpkgs/pull/405608

--------- Report for 'x86_64-linux' ---------
1 package failed to build:
dragonflydb


$ /nix/store/675jb1s55193skcbj4pqlmd6jdrg8lxl-nix-2.24.14/bin/nix-shell --argstr local-system x86_64-linux --argstr nixpkgs-path /home/m/.cache/nixpkgs-review/pr-405608/nixpkgs --argstr nixpkgs-config-path /tmp/tmpdgkojj7w.nix --argstr attrs-path /home/m/.cache/nixpkgs-review/pr-405608/attrs.nix --nix-path 'nixpkgs=/home/m/.cache/nixpkgs-review/pr-405608/nixpkgs nixpkgs-overlays=/tmp/tmpzpn_mycn' /nix/store/ynbhm7j6506vyc3wap3xcgpimch09893-nixpkgs-review-3.0.1/lib/python3.12/site-packages/nixpkgs_review/nix/review-shell.nix

[nix-shell:~/.cache/nixpkgs-review/pr-405608]$ nix log /nix/store/sj1n5rai3b1jk1a7mc1m3zcrc0csmqv7-dragonflydb-1.30.0.drv
Running phase: unpackPhase
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking source archive /nix/store/hqvmxdgmknd4hq0gyfw918s0561iv33z-source
source root is source
Running phase: patchPhase
@nix { "action": "setPhase", "phase": "patchPhase" }
patching file CMakeLists.txt
Hunk #1 succeeded at 35 with fuzz 2 (offset -4 lines).
Hunk #2 FAILED at 88.
Hunk #3 succeeded at 999 with fuzz 1 (offset -27 lines).
1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
patching file src/base/commandlineflags.h
Hunk #1 succeeded at 58 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 127.
1 out of 2 hunks FAILED -- saving rejects to file src/base/commandlineflags.h.rej
can't find file to patch at input line 78
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/base/mutex.h b/src/base/mutex.h
|index e82c597f..a58c1412 100644
|--- a/src/base/mutex.h
|+++ b/src/base/mutex.h
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file src/config.h.cmake.in
Hunk #1 succeeded at 19 with fuzz 2 (offset -15 lines).
can't find file to patch at input line 107
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
|index 95a573b1..54cd838f 100644
|--- a/src/glog/logging.h.in
|+++ b/src/glog/logging.h.in
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 137
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
Running phase: unpackPhase
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking source archive /nix/store/hqvmxdgmknd4hq0gyfw918s0561iv33z-source
source root is source
Running phase: patchPhase
@nix { "action": "setPhase", "phase": "patchPhase" }
patching file CMakeLists.txt
Hunk #1 succeeded at 35 with fuzz 2 (offset -4 lines).
Hunk #2 FAILED at 88.
Hunk #3 succeeded at 999 with fuzz 1 (offset -27 lines).
1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
patching file src/base/commandlineflags.h
Hunk #1 succeeded at 58 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 127.
1 out of 2 hunks FAILED -- saving rejects to file src/base/commandlineflags.h.rej
can't find file to patch at input line 78
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/base/mutex.h b/src/base/mutex.h
|index e82c597f..a58c1412 100644
|--- a/src/base/mutex.h
|+++ b/src/base/mutex.h
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file src/config.h.cmake.in
Hunk #1 succeeded at 19 with fuzz 2 (offset -15 lines).
can't find file to patch at input line 107
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
|index 95a573b1..54cd838f 100644
|--- a/src/glog/logging.h.in
|+++ b/src/glog/logging.h.in
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 137
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in
|index 7526fc34..16e60f46 100644
|--- a/src/glog/vlog_is_on.h.in
Running phase: unpackPhase
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking source archive /nix/store/hqvmxdgmknd4hq0gyfw918s0561iv33z-source
source root is source
Running phase: patchPhase
@nix { "action": "setPhase", "phase": "patchPhase" }
patching file CMakeLists.txt
Hunk #1 succeeded at 35 with fuzz 2 (offset -4 lines).
Hunk #2 FAILED at 88.
Hunk #3 succeeded at 999 with fuzz 1 (offset -27 lines).
1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej
patching file src/base/commandlineflags.h
Hunk #1 succeeded at 58 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 127.
1 out of 2 hunks FAILED -- saving rejects to file src/base/commandlineflags.h.rej
can't find file to patch at input line 78
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/base/mutex.h b/src/base/mutex.h
|index e82c597f..a58c1412 100644
|--- a/src/base/mutex.h
|+++ b/src/base/mutex.h
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file src/config.h.cmake.in
Hunk #1 succeeded at 19 with fuzz 2 (offset -15 lines).
can't find file to patch at input line 107
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
|index 95a573b1..54cd838f 100644
|--- a/src/glog/logging.h.in
|+++ b/src/glog/logging.h.in
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 137
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in
|index 7526fc34..16e60f46 100644
|--- a/src/glog/vlog_is_on.h.in
|+++ b/src/glog/vlog_is_on.h.in
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
patching file src/logging.cc
Hunk #1 succeeded at 120 with fuzz 2 (offset 17 lines).
Hunk #2 succeeded at 275 (offset -78 lines).
Hunk #3 FAILED at 724.
Hunk #4 succeeded at 792 (offset 42 lines).
Hunk #5 succeeded at 834 (offset 42 lines).
Hunk #6 FAILED at 811.
Hunk #7 FAILED at 838.
Hunk #8 FAILED at 865.
Hunk #9 FAILED at 874.
Hunk #10 FAILED at 1035.
Hunk #11 FAILED at 1086.
Hunk #12 FAILED at 1128.
Hunk #13 FAILED at 1168.
Hunk #14 FAILED at 1256.
Hunk #15 FAILED at 1287.
Hunk #16 succeeded at 1333 with fuzz 1 (offset 23 lines).
Hunk #17 FAILED at 1351.
Hunk #18 FAILED at 1667.
Hunk #19 FAILED at 1675.
Hunk #20 FAILED at 1706.
Hunk #21 succeeded at 1767 (offset 18 lines).
Hunk #22 succeeded at 1829 (offset 18 lines).
Hunk #23 succeeded at 1858 (offset 18 lines).
Hunk #24 FAILED at 1894.
Hunk #25 FAILED at 2241.
Hunk #26 FAILED at 2341.
Hunk #27 FAILED at 2657.
Hunk #28 FAILED at 2676.
20 out of 28 hunks FAILED -- saving rejects to file src/logging.cc.rej
patching file src/raw_logging.cc
Hunk #1 succeeded at 146 (offset 23 lines).
patching file src/utilities.cc
Hunk #1 FAILED at 141.
1 out of 1 hunk FAILED -- saving rejects to file src/utilities.cc.rej
patching file src/vlog_is_on.cc
Hunk #1 FAILED at 43.
Hunk #2 FAILED at 60.
Hunk #3 succeeded at 116 with fuzz 2 (offset -16 lines).
Hunk #4 succeeded at 149 (offset -16 lines).
2 out of 4 hunks FAILED -- saving rejects to file src/vlog_is_on.cc.rej

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 7, 2025
let
pname = "dragonflydb";
version = "0.1.0";
version = "1.30.0";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we bump this to 1.34.2?

@mdaniels5757 mdaniels5757 mentioned this pull request Oct 16, 2025
13 tasks
@typedrat typedrat mentioned this pull request Oct 17, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update Request: dragonflydb 0.1.0 → 1.29.0

3 participants