Merge pull request #207449 from winterqt/drop-sqlite-replication

This commit is contained in:
Maciej Krüger
2022-12-26 02:59:08 +01:00
committed by GitHub
4 changed files with 5 additions and 25 deletions
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv
, raft-canonical, sqlite-replication }:
, raft-canonical, sqlite }:
stdenv.mkDerivation rec {
pname = "dqlite";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libuv
raft-canonical.dev
sqlite-replication
sqlite
];
enableParallelBuilding = true;
+2 -2
View File
@@ -19,7 +19,7 @@
, libcap
, dqlite
, raft-canonical
, sqlite-replication
, sqlite
, udev
, writeShellScriptBin
, apparmor-profiles
@@ -58,7 +58,7 @@ buildGoModule rec {
libcap
dqlite.dev
raft-canonical.dev
sqlite-replication
sqlite
udev.dev
];
+1
View File
@@ -1432,6 +1432,7 @@ mapAliases ({
spotify-unwrapped = spotify; # added 2022-11-06
spring-boot = spring-boot-cli; # added 2020-04-24
sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22
sqlite-replication = throw "'sqlite-replication' has been removed since it is no longer required by lxd and is not maintained."; # throw 2022-12-26
sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22
squid4 = squid; # added 2019-08-22
srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21
-21
View File
@@ -22896,27 +22896,6 @@ with pkgs;
sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec {
name = "sqlite-${version}";
version = "3.27.2+replication3";
src = fetchFromGitHub {
owner = "CanonicalLtd";
repo = "sqlite";
rev = "version-${version}";
sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw";
};
nativeBuildInputs = [ tcl ];
configureFlags = oldAttrs.configureFlags ++ [
"--enable-replication"
"--disable-amalgamation"
"--disable-tcl"
];
preConfigure = ''
echo "D 2019-03-09T15:45:46" > manifest
echo -n "8250984a368079bb1838d48d99f8c1a6282e00bc" > manifest.uuid
'';
});
dqlite = callPackage ../development/libraries/dqlite { };
sqlcipher = callPackage ../development/libraries/sqlcipher { };