Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
This commit is contained in:
Alyssa Ross
2024-06-09 22:47:12 +01:00
7455 changed files with 9725 additions and 8070 deletions
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
changelog = "https://www.sqlite.org/releaselog/${lib.replaceStrings [ "." ] [ "_" ] version}.html";
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
description = "Self-contained, serverless, zero-configuration, transactional SQL database engine";
downloadPage = "https://sqlite.org/download.html";
homepage = "https://www.sqlite.org/";
license = licenses.publicDomain;
+2 -2
View File
@@ -32,14 +32,14 @@ in
sqldiff = mkTool {
pname = "sqldiff";
makeTarget = "sqldiff";
description = "A tool that displays the differences between SQLite databases";
description = "Tool that displays the differences between SQLite databases";
homepage = "https://www.sqlite.org/sqldiff.html";
mainProgram = "sqldiff";
};
sqlite-analyzer = mkTool {
pname = "sqlite-analyzer";
makeTarget = "sqlite3_analyzer";
description = "A tool that shows statistics about SQLite databases";
description = "Tool that shows statistics about SQLite databases";
homepage = "https://www.sqlite.org/sqlanalyze.html";
mainProgram = "sqlite3_analyzer";
};