Author: raskin Date: Mon Feb 6 06:03:04 2012 New Revision: 32047 URL: https://nixos.org/websvn/nix/?rev=32047&sc=1
Log: Configuration before a larger rebuild Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix 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/lesser-expressions/raskin-user.nix ============================================================================== --- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Feb 6 05:49:27 2012 (r32046) +++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Mon Feb 6 06:03:04 2012 (r32047) @@ -71,4 +71,6 @@ ])); } #{name="eql-env"; path=(symlinkJoin "eql-env" [eql ecl gmp mpfr gcc glibc]);} + {name="java32"; path=pkgsi686Linux.jre;} + {name="mesa32"; path=pkgsi686Linux.mesa;} ]) Modified: configurations/trunk/misc/raskin/package-groups.nix ============================================================================== --- configurations/trunk/misc/raskin/package-groups.nix Mon Feb 6 05:49:27 2012 (r32046) +++ configurations/trunk/misc/raskin/package-groups.nix Mon Feb 6 06:03:04 2012 (r32047) @@ -14,7 +14,9 @@ programmingLanguages = [ - clisp guile fpc gcc ocaml php bc maxima j + clisp guile fpc gcc ocaml php bc + (lib.overrideDerivation maxima (p: {local=1;})) + j zsh sbcl ecl tcl tk erlang m4 tcsh /*eql*/ flex2534 bison23 clang gfortran ruby /*gwrap*/ haskellPackages.ghc octave lazarus /*guile_lib*/ @@ -50,7 +52,7 @@ ipmitool ipmiutil freeipmi ] ++ baseKernel.extraModulePackages; - toys = [ construo rogue fsg beret + toys = [ construoBase rogue fsg beret lincity chipmunk xmoto sgtpuzzles xboard xaos nethack zangband neverball /*(xsokoban.passthru.function (x: { @@ -98,18 +100,18 @@ browsers = [ opera chromeWrapper - mozplugger + /*mozplugger*/ - (wrapFirefox { browser = firefox80Pkgs.firefox; nameSuffix="8"; }) + (wrapFirefox { browser = firefox90Pkgs.firefox; nameSuffix="9"; }) (wrapFirefox { browser = firefox90Pkgs.firefox; nameSuffix=""; }) ]; graphicEdit = [ inkscape gimp libjpeg - pp.drgeo + pp.drgeo freecad myKDE.kdeedu optipng minidjvu pdftk imagemagick pdf2djvu barcode - /*blender*/ + /*blender*/ k3d openscad pp._3dc ]; fatXApps @@ -287,7 +289,7 @@ cuneiform alsaLib opencv ocrad tesseract asymptote cfdg myKDE.oxygen_icons redland librdf_rasqal librdf_raptor - zbar + zbar pstoedit ]; consoleEditors = [ Modified: configurations/trunk/misc/raskin/private-packages.nix ============================================================================== --- configurations/trunk/misc/raskin/private-packages.nix Mon Feb 6 05:49:27 2012 (r32046) +++ configurations/trunk/misc/raskin/private-packages.nix Mon Feb 6 06:03:04 2012 (r32047) @@ -23,17 +23,17 @@ })); drgeo = (drgeo.override {src="" + /home/repos/drgeo-1.1.0 + "/";}); btrfsProgs = (btrfsProgs.override { - src = "" + /home/repos/btrfs-progs-integration +"/"; + src = "" + /home/repos/btrfs-progs-unstable +"/"; patches = []; buildInputs = btrfsProgs.buildInputs ++ [ - attr libuuid + attr libuuid zlib ]; }); uzbl = (uzbl.override { src = "" + /home/repos/uzbl + "/"; }); grub2Bzr = (stdenv.lib.overrideDerivation grub2 (x: { src = "" + /home/repos/grub; buildInputs = x.buildInputs ++ [ - automake autoconf libtool intltool + automake110x autoconf libtool intltool autogen python ]; prePatch = '' @@ -107,6 +107,21 @@ find . -name '*.cpp' -exec sed -re 's@([ "])/bin/rm@\1rm@g' -i '{}' ';' find . -name 'configure' -exec sed -re 's@([ "])/bin/rm@\1rm@g' -i '{}' ';' ''; - }; + }; + _3dc = pkgsi686Linux.stdenv.mkDerivation rec { + name = "3dc-git-head"; + src= "/home/repos/3dc"; + JustStamp = "${builtins.readFile "${src}/.git/refs/heads/master"}"; + installPhase = '' + ensureDir "$out/bin" + cp bin/3dc "$out/bin" + ''; + buildInputs = [ + boost + ]; + meta = { + homepage = "https://github.com/malexw/3dc"; + }; + }; }; in pp Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix ============================================================================== --- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Mon Feb 6 05:49:27 2012 (r32046) +++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Mon Feb 6 06:03:04 2012 (r32047) @@ -40,10 +40,20 @@ myKDE = pkgs.kde47; kernelToUse = rec { kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_3_2.override { - src = /home/repos/linux-next-3.2-2011-12-23.tar.gz; + #src = /home/repos/linux-next-3.2-2011-12-23.tar.gz; + #extraConfig = '' + # BT_L2CAP? y + # BT_SCO? y + #''; + kernelPatches = pkgs.linux_3_2.kernelPatches ++ (map (x: {name=x; patch=x;}) [ + /root/linux-patches/debug-mac80211 + # /root/linux-patches/fix-mac80211 + # /root/linux-patches/just-in-case-mac80211 + # /root/linux-patches/mac80211-fix-bw-switch + ]); extraConfig = '' - BT_L2CAP? y - BT_SCO? y + ATH_DEBUG y + ATH9K_DEBUGFS y ''; }) kernelPackages; @@ -53,7 +63,7 @@ inherit pkgs myTexLive myKDE; baseKernel = kernelToUse; }; -in +base = { require = [ # /etc/nixos/nixos/modules/services/hardware/bluetooth.nix @@ -174,7 +184,7 @@ fonts = import ./fonts.nix {inherit pkgs;}; time = { - timeZone = "Europe/Moscow"; + timeZone = "Etc/GMT-4"; }; nix = { @@ -304,4 +314,15 @@ ''; }; +}; +in +base // { + nesting = { + children = [ + (pkgs.lib.recursiveUpdate base { + boot.loader.grub.configurationName = "Linux 2.6.29 (stable kernel)"; + boot.kernelPackages = let a = (pkgs.linuxPackagesFor pkgs.linux_2_6_29 a); in a; + }) + ]; + }; } _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits