Author: raskin
Date: Tue Nov 29 05:09:03 2011
New Revision: 30609
URL: https://nixos.org/websvn/nix/?rev=30609&sc=1
Log:
Various package set updates
Modified:
configurations/trunk/misc/raskin/lesser-expressions/pb.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
Modified: configurations/trunk/misc/raskin/lesser-expressions/pb.nix
==============================================================================
--- configurations/trunk/misc/raskin/lesser-expressions/pb.nix Mon Nov 28
18:12:33 2011 (r30608)
+++ configurations/trunk/misc/raskin/lesser-expressions/pb.nix Tue Nov 29
05:09:03 2011 (r30609)
@@ -35,6 +35,17 @@
packageOverrides = p : {
linuxHeaders26Cross = p.forceBuildDrv
(p.linuxHeaders_2_6_28.override {cross = crossSystem;});
+ guile = p.guile_1_8;
+ glibcLocales = p.glibcLocales.override {
+ locales=["en_US.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8"
+ "ru_RU.KOI8-R/KOI8-R" "ru_RU.CP1251/CP1251"
+ "C" "POSIX"
+ ];
+ allLocales = false;
+ };
+ };
+ gnutls={
+ guile = false;
};
};
};
@@ -46,15 +57,15 @@
justUse
[
"hello" "bashInteractive"
- "guile_1_8" "strace"
+ "guile" "strace"
"binutils" "gdb"
"utillinuxng" "less"
"gnugrep" "gnused"
"coreutils"
+ "tmux" "glibcLocales"
])
++
[
- (pkgs.gcc46.hostDrv)
- #(pkgs.lsh.override{guile=pkgs.guile_1_8;}).hostDrv
+ (pkgs.gcc45.hostDrv)
]
)).hostDrv
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Mon Nov 28 18:12:33
2011 (r30608)
+++ configurations/trunk/misc/raskin/package-groups.nix Tue Nov 29 05:09:03
2011 (r30609)
@@ -80,11 +80,11 @@
# relfs
sshfsFuse fuse fusesmb ntfs3g
- glusterfs smbnetfs xtreemfs
+ glusterfs smbnetfs /*xtreemfs*/
curlftpfs
- baseKernel.kernelPackages.aufs3_util
+ baseKernel.kernelPackages.aufs_util
];
networkTools
@@ -100,8 +100,8 @@
opera chromeWrapper
mozplugger
- (wrapFirefox { browser = firefox70Pkgs.firefox; nameSuffix="7"; })
- (wrapFirefox { browser = firefox80bPkgs.firefox; nameSuffix=""; })
+ (wrapFirefox { browser = firefox80Pkgs.firefox; nameSuffix="8"; })
+ (wrapFirefox { browser = firefox90bPkgs.firefox; nameSuffix=""; })
];
graphicEdit = [
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Mon Nov 28
18:12:33 2011 (r30608)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Tue Nov 29
05:09:03 2011 (r30609)
@@ -40,7 +40,7 @@
myKDE = pkgs.kde47;
kernelToUse = rec {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_3_1 kernelPackages;
- extraModulePackages = [kernelPackages.acpi_call
/*kernelPackages.aufs2_1*/];
+ extraModulePackages = [kernelPackages.acpi_call kernelPackages.aufs ];
};
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
inherit pkgs myTexLive myKDE;
@@ -274,8 +274,6 @@
manifests = if false then [] else [
http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest/MANIFEST
http://hydra.nixos.org/jobset/nixpkgs/stdenv/channel/latest/MANIFEST
-
http://hydra.nixos.org/job/nix/trunk/build/channel/latest/MANIFEST
- http://hydra.nixos.org/project/nixos/channel/latest/MANIFEST
http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
