Unverified Commit 5259cc3e authored by Maciej Krüger's avatar Maciej Krüger Committed by GitHub
Browse files

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

parents afaa9e79 881e0490

pkgs/development/libraries/dqlite/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/tools/admin/lxd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −21
Original line number Diff line number Diff line
@@ -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 { };