diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-04-12 04:51:30 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-04-12 15:49:54 +0200 |
| commit | 7d9d876140907a926336ba8dffacd20481b17937 (patch) | |
| tree | 527e5c52b853199c802bc6c73315f216e863234c /pkgs/os-specific/linux/lxc | |
| parent | 42e5be8f55f44629a18f12a8d20ca22421dce168 (diff) | |
| download | nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.tar nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.tar.gz nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.tar.bz2 nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.tar.lz nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.tar.xz nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.tar.zst nixpkgs-7d9d876140907a926336ba8dffacd20481b17937.zip | |
lxc: 1.1.5 -> 2.0.0
Diffstat (limited to 'pkgs/os-specific/linux/lxc')
| -rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lxc/support-db2x.patch | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index fcfe4975fd7..4ac5d0c7951 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "1.1.5"; + version = "2.0.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1gnhgs4i2zamfdydj895inr9i072658wd47nf1ryw5710hdsv24m"; + sha256 = "1r0hgk91n3frrmla1681l74ag5sngbbkdagvjfqzxwcf9l8pwwsv"; }; nativeBuildInputs = [ @@ -29,10 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch - (fetchpatch { - url = "https://github.com/lxc/lxc/commit/3db8dd39a797f87f8b348f1b6b44953a25f3f170.patch"; - sha256 = "0scbzm9dqqhqsl0ri8da8a34r4qj9ph0cg68l9s7gw01vpvqbs8l"; - }) ]; XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; @@ -40,7 +36,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--enable-doc" "--disable-api-docs" "--with-init-script=none" "--with-distro=nixos" # just to be sure it is "unknown" diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch index 4662ca2e504..16715992d35 100644 --- a/pkgs/os-specific/linux/lxc/support-db2x.patch +++ b/pkgs/os-specific/linux/lxc/support-db2x.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index 92a4690..4dd341b 100644 +index 84f8699..dce9033 100644 --- a/configure.ac +++ b/configure.ac -@@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then +@@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then AC_SUBST(db2xman) fi AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) |