From faf4d8ca8d2a44d89c651505680a775f17ba5955 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 29 Aug 2010 18:31:51 +0000 Subject: [PATCH] Now AUFS2 has proper source for 2.6.35 and 2.6.32 svn path=/nixpkgs/trunk/; revision=23515 --- pkgs/os-specific/linux/aufs2/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix index 0cf3f4bd782..c755b993ec8 100644 --- a/pkgs/os-specific/linux/aufs2/default.nix +++ b/pkgs/os-specific/linux/aufs2/default.nix @@ -7,11 +7,18 @@ let version = "20100522"; in stdenv.mkDerivation { name = "aufs2-${version}"; - src = fetchgit { - url = "http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"; - rev = "d950eef373ff1e0448ad3945b734da6ab050571d"; - sha256 = "816145b0341bd7862df50c058144cf6ebc25c05d2976f781ff0fe10d4559b853"; - }; + src = + if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.35") 0) then + fetchurl { + url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2"; + sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6"; + } + else + fetchgit { + url = "http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"; + rev = "d950eef373ff1e0448ad3945b734da6ab050571d"; + sha256 = "816145b0341bd7862df50c058144cf6ebc25c05d2976f781ff0fe10d4559b853"; + }; buildInputs = [ perl ]; @@ -29,7 +36,8 @@ stdenv.mkDerivation { meta = { description = "Another Unionfs implementation for Linux (second generation)"; homepage = http://aufs.sourceforge.net/; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = [ stdenv.lib.maintainers.eelco + stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; }