From c726012afe1dbd13da7ab15381e3de2867bc8af5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Dec 2009 15:39:49 +0000 Subject: [PATCH] * Refactoring: move most filesystem utilities / FUSE filesystems to tools/filesystems. Previously they were all over the place. svn path=/nixpkgs/trunk/; revision=18809 --- .../aefs/default.nix | 0 .../filesystems}/btrfsprogs/default.nix | 0 .../curlftpfs/default.nix | 0 .../dosfstools/default.nix | 0 .../filesystems}/e2fsprogs/default.nix | 0 .../filesystems}/genext2fs/default.nix | 0 .../glusterfs/default.nix | 0 .../glusterfs/src-for-default.nix | 0 .../glusterfs/src-info-for-default.nix | 0 .../filesystems}/jfsrec/default.nix | 0 .../filesystems}/jfsutils/default.nix | 0 .../filesystems}/ntfs-3g/default.nix | 0 .../filesystems}/ntfsprogs/default.nix | 0 .../filesystems}/reiser4progs/default.nix | 0 .../filesystems}/reiserfsprogs/default.nix | 0 .../reiserfsprogs/headers-fix.patch | 0 ...erbose-flag-ignore-for-compatibility.patch | 0 .../relfs/default.nix} | 0 .../smbfs-fuse/default.nix} | 0 .../filesystems}/squashfs/default.nix | 0 .../sshfs-fuse/default.nix | 0 .../wdfs/default.nix | 0 .../filesystems}/xfsprogs/default.nix | 0 pkgs/tools/misc/relfs/cvs.2007.12.01.nix | 50 ------- pkgs/top-level/all-packages.nix | 127 +++++++++--------- 25 files changed, 63 insertions(+), 114 deletions(-) rename pkgs/tools/{security => filesystems}/aefs/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/btrfsprogs/default.nix (100%) rename pkgs/tools/{networking => filesystems}/curlftpfs/default.nix (100%) rename pkgs/tools/{misc => filesystems}/dosfstools/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/e2fsprogs/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/genext2fs/default.nix (100%) rename pkgs/tools/{networking => filesystems}/glusterfs/default.nix (100%) rename pkgs/tools/{networking => filesystems}/glusterfs/src-for-default.nix (100%) rename pkgs/tools/{networking => filesystems}/glusterfs/src-info-for-default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/jfsrec/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/jfsutils/default.nix (100%) rename pkgs/{misc => tools/filesystems}/ntfs-3g/default.nix (100%) rename pkgs/{misc => tools/filesystems}/ntfsprogs/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/reiser4progs/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/reiserfsprogs/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/reiserfsprogs/headers-fix.patch (100%) rename pkgs/{os-specific/linux => tools/filesystems}/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch (100%) rename pkgs/tools/{misc/relfs/cvs.2008.03.05.nix => filesystems/relfs/default.nix} (100%) rename pkgs/tools/{networking/smbfs-fuse/0.8.7.nix => filesystems/smbfs-fuse/default.nix} (100%) rename pkgs/{os-specific/linux => tools/filesystems}/squashfs/default.nix (100%) rename pkgs/tools/{networking => filesystems}/sshfs-fuse/default.nix (100%) rename pkgs/tools/{networking => filesystems}/wdfs/default.nix (100%) rename pkgs/{os-specific/linux => tools/filesystems}/xfsprogs/default.nix (100%) delete mode 100644 pkgs/tools/misc/relfs/cvs.2007.12.01.nix diff --git a/pkgs/tools/security/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix similarity index 100% rename from pkgs/tools/security/aefs/default.nix rename to pkgs/tools/filesystems/aefs/default.nix diff --git a/pkgs/os-specific/linux/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix similarity index 100% rename from pkgs/os-specific/linux/btrfsprogs/default.nix rename to pkgs/tools/filesystems/btrfsprogs/default.nix diff --git a/pkgs/tools/networking/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix similarity index 100% rename from pkgs/tools/networking/curlftpfs/default.nix rename to pkgs/tools/filesystems/curlftpfs/default.nix diff --git a/pkgs/tools/misc/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix similarity index 100% rename from pkgs/tools/misc/dosfstools/default.nix rename to pkgs/tools/filesystems/dosfstools/default.nix diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix similarity index 100% rename from pkgs/os-specific/linux/e2fsprogs/default.nix rename to pkgs/tools/filesystems/e2fsprogs/default.nix diff --git a/pkgs/os-specific/linux/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix similarity index 100% rename from pkgs/os-specific/linux/genext2fs/default.nix rename to pkgs/tools/filesystems/genext2fs/default.nix diff --git a/pkgs/tools/networking/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix similarity index 100% rename from pkgs/tools/networking/glusterfs/default.nix rename to pkgs/tools/filesystems/glusterfs/default.nix diff --git a/pkgs/tools/networking/glusterfs/src-for-default.nix b/pkgs/tools/filesystems/glusterfs/src-for-default.nix similarity index 100% rename from pkgs/tools/networking/glusterfs/src-for-default.nix rename to pkgs/tools/filesystems/glusterfs/src-for-default.nix diff --git a/pkgs/tools/networking/glusterfs/src-info-for-default.nix b/pkgs/tools/filesystems/glusterfs/src-info-for-default.nix similarity index 100% rename from pkgs/tools/networking/glusterfs/src-info-for-default.nix rename to pkgs/tools/filesystems/glusterfs/src-info-for-default.nix diff --git a/pkgs/os-specific/linux/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix similarity index 100% rename from pkgs/os-specific/linux/jfsrec/default.nix rename to pkgs/tools/filesystems/jfsrec/default.nix diff --git a/pkgs/os-specific/linux/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix similarity index 100% rename from pkgs/os-specific/linux/jfsutils/default.nix rename to pkgs/tools/filesystems/jfsutils/default.nix diff --git a/pkgs/misc/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix similarity index 100% rename from pkgs/misc/ntfs-3g/default.nix rename to pkgs/tools/filesystems/ntfs-3g/default.nix diff --git a/pkgs/misc/ntfsprogs/default.nix b/pkgs/tools/filesystems/ntfsprogs/default.nix similarity index 100% rename from pkgs/misc/ntfsprogs/default.nix rename to pkgs/tools/filesystems/ntfsprogs/default.nix diff --git a/pkgs/os-specific/linux/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix similarity index 100% rename from pkgs/os-specific/linux/reiser4progs/default.nix rename to pkgs/tools/filesystems/reiser4progs/default.nix diff --git a/pkgs/os-specific/linux/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix similarity index 100% rename from pkgs/os-specific/linux/reiserfsprogs/default.nix rename to pkgs/tools/filesystems/reiserfsprogs/default.nix diff --git a/pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch b/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch similarity index 100% rename from pkgs/os-specific/linux/reiserfsprogs/headers-fix.patch rename to pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch diff --git a/pkgs/os-specific/linux/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch b/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch similarity index 100% rename from pkgs/os-specific/linux/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch rename to pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/filesystems/relfs/default.nix similarity index 100% rename from pkgs/tools/misc/relfs/cvs.2008.03.05.nix rename to pkgs/tools/filesystems/relfs/default.nix diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/filesystems/smbfs-fuse/default.nix similarity index 100% rename from pkgs/tools/networking/smbfs-fuse/0.8.7.nix rename to pkgs/tools/filesystems/smbfs-fuse/default.nix diff --git a/pkgs/os-specific/linux/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix similarity index 100% rename from pkgs/os-specific/linux/squashfs/default.nix rename to pkgs/tools/filesystems/squashfs/default.nix diff --git a/pkgs/tools/networking/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix similarity index 100% rename from pkgs/tools/networking/sshfs-fuse/default.nix rename to pkgs/tools/filesystems/sshfs-fuse/default.nix diff --git a/pkgs/tools/networking/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix similarity index 100% rename from pkgs/tools/networking/wdfs/default.nix rename to pkgs/tools/filesystems/wdfs/default.nix diff --git a/pkgs/os-specific/linux/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix similarity index 100% rename from pkgs/os-specific/linux/xfsprogs/default.nix rename to pkgs/tools/filesystems/xfsprogs/default.nix diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix deleted file mode 100644 index 22f9560946a..00000000000 --- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix +++ /dev/null @@ -1,50 +0,0 @@ -args : with args; - let localDefs = builderDefs { - src = /* put a fetchurl here */ - if args ? src then args.src else fetchcvs { - cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; - module = "relfs"; - date = "2007-12-01"; - sha256 = "39d97d0aa16b8bc953b2ef5f6308e9f9eda300c1de8a7acb6f8c8e5897c0c7b5"; - }; - - buildInputs = [ocaml fuse postgresql pcre - e2fsprogs gnomevfs pkgconfig GConf]; - configureFlags = []; - } null; /* null is a terminator for sumArgs */ - in with localDefs; -let build = fullDepEntry (" - cd deps - sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl - make - cd ../src - sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c - sed -e 's@/usr/local/@'\$out/'@' -i Makefile - sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile - make - mkdir -p \$out/bin - echo ' - createuser -A -D \$1 - dropdb relfs_\$1 ; - rm -rf /tmp/relfs-\$1-tmp; - mkdir /tmp/relfs-\$1-tmp; - USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & - sleep 1 && - kill -15 \${!}; - rm -rf /tmp/relfs-\$1-tmp ; - psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; - ALTER TABLE obj OWNER TO \$1; - ALTER TABLE obj_mimetype OWNER TO \$1; - ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; - chmod a+x \$out/bin/relfs_grant; -") [minInit doUnpack addInputs]; -in -stdenv.mkDerivation rec { - name = "relfs-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [build doMakeInstall doForceShare doPropagate]); - meta = { - description = "A relational filesystem on top of FUSE"; - inherit src; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdeb770d2ca..e9e9278d3d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -306,19 +306,11 @@ let ### TOOLS - darwinArchUtility = import ../os-specific/darwin/arch { - inherit stdenv; - }; - - darwinSwVersUtility = import ../os-specific/darwin/sw_vers { - inherit stdenv; - }; - acct = import ../tools/system/acct { inherit fetchurl stdenv; }; - aefs = import ../tools/security/aefs { + aefs = import ../tools/filesystems/aefs { inherit fetchurl stdenv fuse; }; @@ -381,6 +373,10 @@ let inherit fetchurl stdenv gnutar gzip coreutils utillinux gnugrep gnused psmisc nettools; }; + btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { + inherit libuuid zlib acl; + }; + eggdrop = import ../tools/networking/eggdrop { inherit fetchurl stdenv tcl; }; @@ -512,7 +508,7 @@ let sslSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic)); }; - curlftpfs = import ../tools/networking/curlftpfs { + curlftpfs = import ../tools/filesystems/curlftpfs { inherit fetchurl stdenv fuse curl pkgconfig zlib glib; }; @@ -576,7 +572,7 @@ let libiconv = if stdenv.isDarwin then libiconv else null; }; - dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) { + dosfstools = composedArgsAndFun (import ../tools/filesystems/dosfstools) { inherit builderDefs; }; @@ -584,6 +580,10 @@ let inherit fetchurl stdenv cdrkit m4; }; + e2fsprogs = import ../tools/filesystems/e2fsprogs { + inherit fetchurl stdenv pkgconfig libuuid; + }; + enblendenfuse = import ../tools/graphics/enblend-enfuse { inherit fetchurl stdenv libtiff libpng lcms libxmi boost; }; @@ -613,7 +613,6 @@ let inherit stdenv fetchurl; }; - expect = import ../tools/misc/expect { inherit fetchurl stdenv tcl tk autoconf; inherit (xorg) xproto libX11; @@ -681,6 +680,10 @@ let inherit (gtkLibs) gtk; }; + genext2fs = import ../tools/filesystems/genext2fs { + inherit fetchurl stdenv; + }; + getopt = import ../tools/misc/getopt { inherit fetchurl stdenv; }; @@ -696,7 +699,7 @@ let inherit (xlibs) xproto libXt libX11; }; - glusterfs = builderDefsPackage ../tools/networking/glusterfs { + glusterfs = builderDefsPackage ../tools/filesystems/glusterfs { inherit fuse; bison = bison24; flex = flex2535; @@ -868,6 +871,14 @@ let inherit fetchurl stdenv unzip jdk; }; + jfsrec = import ../tools/filesystems/jfsrec { + inherit fetchurl stdenv boost; + }; + + jfsutils = import ../tools/filesystems/jfsutils { + inherit fetchurl stdenv libuuid; + }; + jhead = import ../tools/graphics/jhead { inherit stdenv fetchurl; }; @@ -1082,6 +1093,14 @@ let inherit (gtkLibs) gtk; }; + ntfs3g = import ../tools/filesystems/ntfs-3g { + inherit fetchurl stdenv utillinux; + }; + + ntfsprogs = import ../tools/filesystems/ntfsprogs { + inherit fetchurl stdenv libuuid; + }; + ntp = import ../tools/networking/ntp { inherit fetchurl stdenv libcap; }; @@ -1269,7 +1288,15 @@ let inherit stdenv fetchurl; }; - relfs = composedArgsAndFun (import ../tools/misc/relfs/cvs.2008.03.05.nix) { + reiser4progs = import ../tools/filesystems/reiser4progs { + inherit fetchurl stdenv libaal; + }; + + reiserfsprogs = import ../tools/filesystems/reiserfsprogs { + inherit fetchurl stdenv; + }; + + relfs = composedArgsAndFun (import ../tools/filesystems/relfs) { inherit fetchcvs stdenv ocaml postgresql fuse pcre builderDefs pkgconfig libuuid; inherit (gnome) gnomevfs GConf; @@ -1367,7 +1394,7 @@ let inherit fetchurl stdenv; }; - smbfsFuse = composedArgsAndFun (import ../tools/networking/smbfs-fuse/0.8.7.nix) { + smbfsFuse = composedArgsAndFun (import ../tools/filesystems/smbfs-fuse) { inherit builderDefs samba fuse; }; @@ -1379,6 +1406,14 @@ let inherit fetchurl stdenv openssl; }; + squashfsTools = import ../tools/filesystems/squashfs { + inherit fetchurl stdenv zlib; + }; + + sshfsFuse = import ../tools/filesystems/sshfs-fuse { + inherit fetchurl stdenv pkgconfig fuse glib; + }; + sudo = import ../tools/security/sudo { inherit fetchurl stdenv coreutils pam groff; }; @@ -1392,10 +1427,6 @@ let inherit (xlibs) libX11 libXext libXt libXaw libXpm; }; - sshfsFuse = import ../tools/networking/sshfs-fuse { - inherit fetchurl stdenv pkgconfig fuse glib; - }; - ssmtp = import ../tools/networking/ssmtp { inherit fetchurl stdenv openssl; tlsSupport = true; @@ -1565,7 +1596,7 @@ let inherit fetchurl stdenv automake autoconf libtool; }; - wdfs = import ../tools/networking/wdfs { + wdfs = import ../tools/filesystems/wdfs { inherit stdenv fetchurl neon fuse pkgconfig glib; }; @@ -1601,6 +1632,10 @@ let inherit (xlibs) libXmu; }; + xfsprogs = import ../tools/filesystems/xfsprogs { + inherit fetchurl stdenv libtool gettext libuuid; + }; + xmlroff = import ../tools/typesetting/xmlroff { inherit fetchurl stdenv pkgconfig libxml2 libxslt popt; inherit (gtkLibs) glib pango gtk; @@ -5139,10 +5174,6 @@ let inherit fetchurl stdenv autoconf automake; }; - btrfsProgs = builderDefsPackage (import ../os-specific/linux/btrfsprogs) { - inherit libuuid zlib acl; - }; - cpufrequtils = ( import ../os-specific/linux/cpufrequtils { inherit fetchurl stdenv libtool gettext; @@ -5162,6 +5193,14 @@ let inherit fetchurl stdenv zlib; }; + darwinArchUtility = import ../os-specific/darwin/arch { + inherit stdenv; + }; + + darwinSwVersUtility = import ../os-specific/darwin/sw_vers { + inherit stdenv; + }; + davfs2 = import ../os-specific/linux/davfs2 { inherit fetchurl stdenv zlib; neon = neon028; @@ -5192,10 +5231,6 @@ let libuuid = if ! stdenv.isDarwin then utillinuxng else null; - e2fsprogs = import ../os-specific/linux/e2fsprogs { - inherit fetchurl stdenv pkgconfig libuuid; - }; - e3cfsprogs = import ../os-specific/linux/e3cfsprogs { inherit stdenv fetchurl gettext; }; @@ -5216,10 +5251,6 @@ let inherit fetchurl stdenv; }; - genext2fs = import ../os-specific/linux/genext2fs { - inherit fetchurl stdenv; - }; - gpm = import ../servers/gpm { inherit fetchurl stdenv ncurses bison; flex = flex2535; @@ -5299,14 +5330,6 @@ let inherit fetchurl stdenv; }; - jfsrec = import ../os-specific/linux/jfsrec { - inherit fetchurl stdenv boost; - }; - - jfsutils = import ../os-specific/linux/jfsutils/default.nix { - inherit fetchurl stdenv libuuid; - }; - kbd = import ../os-specific/linux/kbd { inherit fetchurl stdenv bison flex; }; @@ -5806,14 +5829,6 @@ let inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils; }; - reiserfsprogs = import ../os-specific/linux/reiserfsprogs { - inherit fetchurl stdenv; - }; - - reiser4progs = import ../os-specific/linux/reiser4progs { - inherit fetchurl stdenv libaal; - }; - radeontools = import ../os-specific/linux/radeontools { inherit pciutils; inherit fetchurl stdenv; @@ -5843,10 +5858,6 @@ let libjpeg = libjpegStatic; }; - squashfsTools = import ../os-specific/linux/squashfs { - inherit fetchurl stdenv zlib; - }; - statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; @@ -5956,10 +5967,6 @@ let inherit fetchurl stdenv qt4 imagemagick inkscape; }; - xfsprogs = import ../os-specific/linux/xfsprogs/default.nix { - inherit fetchurl stdenv libtool gettext libuuid; - }; - xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf @@ -8367,14 +8374,6 @@ let inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix; }; - ntfs3g = import ../misc/ntfs-3g { - inherit fetchurl stdenv utillinux; - }; - - ntfsprogs = import ../misc/ntfsprogs { - inherit fetchurl stdenv libuuid; - }; - pgadmin = import ../applications/misc/pgadmin { inherit fetchurl stdenv postgresql libxml2 libxslt openssl; inherit wxGTK;