Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sqlite, sqlite-analyzer: 3.46.1 -> 3.47.0, sqlite-rsync: init at 3.47.0 #350406

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Oct 22, 2024

Changes: https://www.sqlite.org/draft/releaselog/current.html

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@trofi trofi marked this pull request as draft October 22, 2024 05:28
@trofi
Copy link
Contributor Author

trofi commented Oct 22, 2024

Drafting it until the official release is out.

@trofi
Copy link
Contributor Author

trofi commented Oct 27, 2024

The release is officially out. Marking as ready.

@ehamberg
Copy link
Contributor

@trofi This is missing the sqlite3_rsync tool, which is new in 3.47.0.

It should probably follow the recipe of sqlite-analyzer:

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index dd4e15ea5..1f912e6b8 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -2,7 +2,7 @@
 , updateAutotoolsGnuConfigScriptsHook
 
 # for tests
-, python3Packages, sqldiff, sqlite-analyzer, tracker
+, python3Packages, sqldiff, sqlite-analyzer, sqlite-rsync, tracker
 
 # uses readline & ncurses for a better interactive experience if set to true
 , interactive ? false
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   passthru = {
     tests = {
       inherit (python3Packages) sqlalchemy;
-      inherit sqldiff sqlite-analyzer tracker;
+      inherit sqldiff sqlite-analyzer sqlite-rsync tracker;
     };
 
     updateScript = gitUpdater {
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 2b843c0b2..b020b1c97 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -43,4 +43,11 @@ in
     homepage = "https://www.sqlite.org/sqlanalyze.html";
     mainProgram = "sqlite3_analyzer";
   };
+  sqlite-rsync = mkTool {
+    pname = "sqlite-rsync";
+    makeTarget = "sqlite3_rsync";
+    description = "Database remote-copy tool for SQLite";
+    homepage = "https://www.sqlite.org/rsync.html";
+    mainProgram = "sqlite3_rsync";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b175f8c9e..6670558ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23450,7 +23450,7 @@ with pkgs;
 
   inherit (callPackage ../development/libraries/sqlite/tools.nix {
     inherit (darwin.apple_sdk.frameworks) Foundation;
-  }) sqlite-analyzer sqldiff;
+  }) sqlite-analyzer sqldiff sqlite-rsync;
 
   sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
 

@trofi trofi changed the title sqlite, sqlite-analyzer: 3.46.1 -> 3.47.0 sqlite, sqlite-analyzer: 3.46.1 -> 3.47.0, sqlite-rsync: init at 3.47.0 Oct 28, 2024
@trofi
Copy link
Contributor Author

trofi commented Oct 28, 2024

@trofi This is missing the sqlite3_rsync tool, which is new in 3.47.0.

It should probably follow the recipe of sqlite-analyzer:

Thank you! Added your change as is as sqlite-rsync: init at 3.47.0 on top.

@adamcstephens
Copy link
Contributor

There’s a conflict.

@trofi
Copy link
Contributor Author

trofi commented Oct 28, 2024

There’s a conflict.

Caused by a tracker -> tinysparql rename. Updated. Thank you!

@adamcstephens
Copy link
Contributor

@ofborg eval

@trofi
Copy link
Contributor Author

trofi commented Oct 29, 2024

Updated the hash for recently added docsrc attribute.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants