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: b0adb09b328e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 454041a557b3
Choose a head ref
  • 6 commits
  • 1 file changed
  • 2 contributors

Commits on May 23, 2017

  1. lkl: add meta.homepage

    @joachifm
    joachifm committed May 23, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e845495 View commit details

  2. lkl: bc & python are native build inputs

    @joachifm
    joachifm committed May 23, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e983d43 View commit details

  3. lkl: d747073 -> 2017-03-24 

    - Moves to a more recent kernel (4.10, I think ...)
- API break re the previous version
- cptofs: fix root directory copy
- add support for disks with custom ops
- add LKL_HIJACK_NET_QDISC to configure qdisc policy
- add LKL_HIJACK_SYSCTL to configure sysctl values
    @joachifm
    joachifm committed May 23, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c8f40a View commit details

  4. lkl: break description into longDescription and a briefer descr

    @joachifm
    joachifm committed May 23, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e0b623a View commit details

  5. lkl: split outputs 

    Breaking out lib allows users to link against lkl without pulling the
kitchen sink into their closure.
    @joachifm
    joachifm committed May 23, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    49ecd62 View commit details

Commits on May 24, 2017

  1. Merge pull request #26040 from joachifm/lkl 

    lkl: d747073 -> 2017-03-24
    @copumpkin
    copumpkin authored May 24, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    454041a View commit details
Showing with 20 additions and 10 deletions.
  1. +20 −10 pkgs/applications/virtualization/lkl/default.nix
30 changes: 20 additions & 10 deletions pkgs/applications/virtualization/lkl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:

stdenv.mkDerivation rec {
name = "lkl-${stdenv.lib.substring 0 7 rev}";
rev = "d74707304d4e4614081ae2a612a833aeb46622b5";
name = "lkl-2017-03-24";
rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb";

buildInputs = [ bc python fuse libarchive ];
outputs = [ "dev" "lib" "out" ];

nativeBuildInputs = [ bc python ];

buildInputs = [ fuse libarchive ];

src = fetchFromGitHub {
inherit rev;
owner = "lkl";
repo = "linux";
sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp";
sha256 = "07dmira76i0ki577sra4fdl1wvzfzxzd75252lza0sc6jdzrrwvj";
};

# Fix a /usr/bin/env reference in here that breaks sandboxed builds
prePatch = "patchShebangs arch/lkl/scripts";

installPhase = ''
mkdir -p $out/{bin,lib}
mkdir -p $out/bin $lib/lib $dev
# This tool assumes a different directory structure so let's point it at the right location
cp tools/lkl/bin/lkl-hijack.sh $out/bin
substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib'
sed -i $out/bin/lkl-hijack.sh \
-e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib,"
cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
cp -r tools/lkl/include $out
cp tools/lkl/liblkl*.{a,so} $out/lib
cp -r tools/lkl/include $dev/
cp tools/lkl/liblkl*.{a,so} $lib/lib
'';

# We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code):
@@ -38,7 +42,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
description = "The Linux kernel as a library";
longDescription = ''
LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as
extensively as possible with minimal effort and reduced maintenance
overhead
'';
homepage = https://github.com/lkl/linux/;
platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];