Author: raskin Date: Fri Nov 4 14:05:35 2011 New Revision: 30224 URL: https://nixos.org/websvn/nix/?rev=30224&sc=1
Log: Package set drift Modified: configurations/trunk/misc/raskin/package-groups.nix configurations/trunk/misc/raskin/private-packages.nix configurations/trunk/misc/raskin/raskin-asus-n53j.nix Modified: configurations/trunk/misc/raskin/package-groups.nix ============================================================================== --- configurations/trunk/misc/raskin/package-groups.nix Fri Nov 4 14:04:38 2011 (r30223) +++ configurations/trunk/misc/raskin/package-groups.nix Fri Nov 4 14:05:35 2011 (r30224) @@ -80,7 +80,9 @@ # relfs sshfsFuse fuse fusesmb ntfs3g - glusterfs smbnetfs xtreemfs + glusterfs smbnetfs xtreemfs + + curlftpfs baseKernel.kernelPackages.aufs3_util ]; @@ -113,10 +115,11 @@ fatXApps = [ openoffice - wireshark gnash + wireshark /*gnash*/ /*abiword*/ fontforgeX xchm /*scribus*/ lyx taskjuggler golly flashplayer + thunderbird ]; im = [ @@ -327,6 +330,11 @@ boehmgc libffi pythonDBus libusb + perlPackages.DBDSQLite perlPackages.DBI + + docbook_xsl docbook5_xsl docbook5 docbook_xml_dtd_43 + libxslt libxml2 + (pkgsi686Linux.glibc) ]; Modified: configurations/trunk/misc/raskin/private-packages.nix ============================================================================== --- configurations/trunk/misc/raskin/private-packages.nix Fri Nov 4 14:04:38 2011 (r30223) +++ configurations/trunk/misc/raskin/private-packages.nix Fri Nov 4 14:05:35 2011 (r30224) @@ -6,7 +6,7 @@ src= "/var/repos/warmux/"; phaseNames = ["JustStamp" "doAutogen"] ++ x.phaseNames; JustStamp = x.noDepEntry '' - echo "${builtins.readFile "/var/repos/warmux/.svn/all-wcprops"}" &> /dev/null + echo "${builtins.readFile "/var/repos/warmux/.svn/wc.db"}" &> /dev/null ''; buildInputs = x.buildInputs ++ [automake autoconf libtool intltool perl]; })); @@ -15,7 +15,7 @@ name = "tbe-svn-head"; phaseNames = ["JustStamp"] ++ x.phaseNames; JustStamp = x.noDepEntry '' - echo "${builtins.readFile "/var/repos/tbe/.svn/all-wcprops"}" &> /dev/null + echo "${builtins.readFile "/var/repos/tbe/.svn/wc.db"}" &> /dev/null ''; qt4 = qt46; buildInputs = [qt46] ++ (lib.filter (y : y.outPath != qt47.outPath) x.buildInputs); Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix ============================================================================== --- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Fri Nov 4 14:04:38 2011 (r30223) +++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Fri Nov 4 14:05:35 2011 (r30224) @@ -39,7 +39,7 @@ }; myKDE = pkgs.kde47; kernelToUse = rec { - kernelPackages = pkgs.linuxPackagesFor pkgs.linux_3_0 kernelPackages; + kernelPackages = pkgs.linuxPackagesFor pkgs.linux_3_1 kernelPackages; extraModulePackages = [kernelPackages.acpi_call /*kernelPackages.aufs2_1*/]; }; packageGroups = import /etc/nixos/configurations/misc/raskin/package-groups.nix { _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits