diff options
author | Yuriy Taraday <yorik.sar@gmail.com> | 2018-03-11 15:42:07 +0400 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-03-18 08:38:26 +0200 |
commit | 691fe19db9515ee20f3ae98766312b9653312f9e (patch) | |
tree | 9b49591c0767985100ec384fcc197dbceeb281b7 /pkgs/applications | |
parent | 453a60ed9556f4cbbd1d3868419abd0a6c35992b (diff) | |
download | nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.tar nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.tar.gz nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.tar.bz2 nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.tar.lz nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.tar.xz nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.tar.zst nixlib-691fe19db9515ee20f3ae98766312b9653312f9e.zip |
lkl: 2017-11-10 -> 2018-03-10
Bump lkl version to latest that includes merge of Linux 4.15 and fix for an issue where cptofs wasn't returning failure when image size was too small and file copying failed with: error writing file: No space left on device (see lkl/linux#427)
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/virtualization/lkl/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index cd72142e9794..8d5ecfce9fd2 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-11-10"; - rev = "52a6a643c7d1dd3031c0cbec75e1ac7a999f3d57"; + name = "lkl-2018-03-10"; + rev = "8772a4da6064444c5b70766b806fe272b0287c31"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1i5ywrfxqpykjjalwh9g4rwd4s186cqk3j806d327a67xb2ivxnp"; + sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { 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 tools/lkl/{cptofs,fs2tar,lklfuse} $out/bin + ln -s cptofs $out/bin/cpfromfs cp -r tools/lkl/include $dev/ cp tools/lkl/liblkl*.{a,so} $lib/lib ''; |