Merge pull request #123139 from wucke13/lxd-libco

remove libco-canonical
This commit is contained in:
Luke Granger-Brown 2021-05-23 15:33:54 +01:00 committed by GitHub
commit 914bb96473
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 53 deletions

View file

@ -1,25 +1,26 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libco-canonical
, libuv, raft-canonical, sqlite-replication }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv
, raft-canonical, sqlite-replication }:
stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.5.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "0h7ypigj1b6xbspzc35y89jkp84v8rqiv9qgkyqlqylr7mcw952a";
sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U=";
};
nativeBuildInputs = [ autoreconfHook file pkg-config ];
buildInputs = [
libco-canonical.dev
libuv
raft-canonical.dev
sqlite-replication
];
enableParallelBuilding = true;
# tests fail
doCheck = false;

View file

@ -1,39 +0,0 @@
{ lib, stdenv, fetchFromGitHub, pkg-config }:
with lib;
stdenv.mkDerivation rec {
pname = "libco-canonical";
version = "20";
src = fetchFromGitHub {
owner = "canonical";
repo = "libco";
rev = "v${version}";
sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq";
};
nativeBuildInputs = [ pkg-config ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
outputs = [ "dev" "out" ];
patchPhase = ''
# upstream project assumes all build products will go into single directory
# `$prefix` but we need `includedir` to point to "dev", not "out"
#
# pkgs/build-support/setup-hooks/multiple-outputs.sh would normally patch
# this automatically, but it fails here due to use of absolute paths
substituteInPlace Makefile \
--replace "@includedir@|\$(PREFIX)" "@includedir@|${placeholder "dev"}"
'';
meta = {
description = "A cooperative multithreading library written in C89";
homepage = "https://github.com/canonical/libco";
license = licenses.isc;
maintainers = with maintainers; [ wucke13 ];
};
}

View file

@ -2,18 +2,20 @@
stdenv.mkDerivation rec {
pname = "raft-canonical";
version = "0.9.23";
version = "0.10.1";
src = fetchFromGitHub {
owner = "canonical";
repo = "raft";
rev = "v${version}";
sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr";
sha256 = "sha256-Q4m0CCIArgsobhmhqLvkr7fK40SX/qBk6K5Qu0eRLaI=";
};
nativeBuildInputs = [ autoreconfHook file pkg-config ];
buildInputs = [ libuv ];
enableParallelBuilding = true;
preConfigure = ''
substituteInPlace configure --replace /usr/bin/ " "
'';

View file

@ -1,7 +1,7 @@
{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap
, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
, dqlite, raft-canonical, sqlite-replication, udev
, writeShellScriptBin, apparmor-profiles, apparmor-parser
, criu
, bash
@ -38,9 +38,9 @@ buildGoPackage rec {
rm _dist/src/github.com/lxc/lxd
cp -r _dist/src/* ../../..
popd
'';
buildFlags = [ "-tags libsqlite3" ];
makeFlagsArray+=("-tags libsqlite3")
'';
postInstall = ''
# test binaries, code generation
@ -59,8 +59,8 @@ buildGoPackage rec {
'';
nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];
buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
raft-canonical.dev sqlite-replication udev.dev ];
buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev
sqlite-replication udev.dev ];
meta = with lib; {
description = "Daemon based on liblxc offering a REST API to manage containers";

View file

@ -379,6 +379,7 @@ mapAliases ({
libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
libcap_progs = libcap.out; # added 2016-04-29
libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore."; # added 2021-05-16
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
libdbusmenu-glib = libdbusmenu; # added 2018-05-01
liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12

View file

@ -15793,8 +15793,6 @@ in
libclxclient = callPackage ../development/libraries/libclxclient { };
libco-canonical = callPackage ../development/libraries/libco-canonical { };
libconfuse = callPackage ../development/libraries/libconfuse { };
libcangjie = callPackage ../development/libraries/libcangjie { };