Author: shlevy
Date: Wed Sep 28 21:59:07 2011
New Revision: 29535
URL: https://ssl.nixos.org/websvn/nix/?rev=29535&sc=1
Log:
aufs3-util
Added:
nixpkgs/trunk/pkgs/os-specific/linux/aufs3-util/
- copied from r29530, nixpkgs/trunk/pkgs/os-specific/linux/aufs2.1-util/
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/aufs3-util/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/aufs3/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/aufs3-util/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/aufs2.1-util/default.nix Wed Sep
28 16:48:17 2011 (r29530)
+++ nixpkgs/trunk/pkgs/os-specific/linux/aufs3-util/default.nix Wed Sep 28
21:59:07 2011 (r29535)
@@ -1,20 +1,18 @@
-{ stdenv, fetchgit, kernel, aufs2_1 }:
-
-let version = "20110217"; in
+{ stdenv, fetchgit, kernel, aufs3 }:
stdenv.mkDerivation {
- name = "aufs2.1-util-${version}";
+ name = "aufs3-util-${aufs3.patch.version}";
src = fetchgit {
- url = "git://git.c3sl.ufpr.br/aufs/aufs2-util.git";
- rev = "0f0cf3f2ae39906fd4b5376cdaa24e9fe64a03f4";
- sha256 =
"0fce5601b67efe8b5652a813ae612348bf4503aa71056cd31a5ed0406632e364";
+ url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git;
+ rev = aufs3.patch.utilRev;
+ sha256 = aufs3.patch.utilHash;
};
- buildInputs = [ aufs2_1 ];
+ buildInputs = [ aufs3 ];
makeFlags =
- [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
+ [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"
"Install=install"
"DESTDIR=$(out)"
];
@@ -32,7 +30,7 @@
'';
meta = {
- description = "Utilities for AUFS2.1";
+ description = "Utilities for AUFS3";
homepage = http://aufs.sourceforge.net/;
maintainers = [ stdenv.lib.maintainers.eelco
stdenv.lib.maintainers.shlevy ];
Modified: nixpkgs/trunk/pkgs/os-specific/linux/aufs3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/aufs3/default.nix Wed Sep 28
21:46:07 2011 (r29534)
+++ nixpkgs/trunk/pkgs/os-specific/linux/aufs3/default.nix Wed Sep 28
21:59:07 2011 (r29535)
@@ -30,6 +30,7 @@
cp -v usr/include/linux/aufs_type.h $out/include/linux
'';
+ passthru = { inherit patch; };
meta = {
description = "Another Unionfs implementation for Linux (third
generation)";
homepage = http://aufs.sourceforge.net/;
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Wed Sep 28
21:46:07 2011 (r29534)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Wed Sep 28
21:59:07 2011 (r29535)
@@ -293,6 +293,8 @@
aufs3_0 = rec {
name = "aufs3.0";
version = "3.0";
+ utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155";
+ utilHash =
"4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Sep 28 21:46:07
2011 (r29534)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Sep 28 21:59:07
2011 (r29535)
@@ -5598,6 +5598,10 @@
aufs2_util = callPackage ../os-specific/linux/aufs2-util { };
+ aufs3_util = if kernel.features ? aufs3 then
+ callPackage ../os-specific/linux/aufs3-util { }
+ else null;
+
blcr = callPackage ../os-specific/linux/blcr {
#libtool = libtool_1_5; # libtool 2 causes a fork bomb
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
