Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 721f2b9fb2fe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e8dc13478fc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 28, 2016

  1. lxc: 2.0.4 -> 2.0.6 (security) 

    https://security-tracker.debian.org/tracker/CVE-2016-8649
(cherry picked from commit 514b3763f74330729ce62c39599ecd81db710d57)
    @avnik @peti
    avnik authored and peti committed Nov 28, 2016
    Copy the full SHA
    d35e2de View commit details

  2. lxc: fix sandbox builds 

    Package attempt to write /etc/bash_completion.d, I directed it to
"${out}/etc/bash_completion.d" as it was suggested.

(cherry picked from commit 36053e4907ccee9cd1845da87ae2846384571c0a)
    @avnik @peti
    avnik authored and peti committed Nov 28, 2016
    Copy the full SHA
    3e8dc13 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/os-specific/linux/lxc/default.nix
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/lxc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "lxc-${version}";
version = "2.0.4";
version = "2.0.6";

src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
sha256 = "10lm7vfw4j7arcynmgyjqd8v2fqn7spbablj42j26kmzljcydj8l";
sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw";
};

nativeBuildInputs = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
"sysconfdir=\${out}/etc"
"sysconfigdir=\${out}/etc/default"
"bashcompdir=\${out}/share/bash-completion/completions"
"READMEdir=\${TMPDIR}/var/lib/lxc/rootfs"
"LXCPATH=\${TMPDIR}/var/lib/lxc"
];