From 69bc0b64ab9d5900abd6f8f0aa26e9d31ff17521 Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 23 Dec 2022 13:31:49 -0500 Subject: sqlite-replication: drop Dqlite and LXD haven't required this custom SQLite version since 2020 (it was last updated in 2019), and its GitHub repo no longer exists. --- pkgs/development/libraries/dqlite/default.nix | 4 ++-- pkgs/tools/admin/lxd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 21 --------------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 748e1e756cb31..07d753dd83336 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -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; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 348760fb3e887..8e405b9be352d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cd035820397d..2b7e1f2045dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22898,27 +22898,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 { }; -- cgit 1.4.1