[Nix-commits] SVN commit: nix - r34024 - nixpkgs/trunk/pkgs/applications/video/MPlayer
Author: mkwik
Date: Wed May 9 10:01:35 2012
New Revision: 34024
URL: https://nixos.org/websvn/nix/?rev=34024sc=1
Log:
mplayer: enabled speex support
I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by
default too, so it's probably on most systems already
Modified:
nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix
==
--- nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Wed May 9
07:22:18 2012(r34023)
+++ nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Wed May 9
10:01:35 2012(r34024)
@@ -10,6 +10,7 @@
, x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null
, lameSupport ? true, lame ? null
+, speexSupport ? true, speex ? null
, screenSaverSupport ? true, libXScrnSaver
, pulseSupport ? false, pulseaudio
, mesa, pkgconfig, unzip, yasm, freefont_ttf
@@ -29,6 +30,7 @@
assert amrSupport - (amrnb != null amrwb != null);
assert screenSaverSupport - libXScrnSaver != null;
assert vdpauSupport - libvdpau != null;
+assert speexSupport - speex != null;
let
@@ -111,7 +113,8 @@
++ stdenv.lib.optional pulseSupport pulseaudio
++ stdenv.lib.optional screenSaverSupport libXScrnSaver
++ stdenv.lib.optional lameSupport lame
-++ stdenv.lib.optional vdpauSupport libvdpau;
+++ stdenv.lib.optional vdpauSupport libvdpau
+++ stdenv.lib.optional speexSupport speex;
buildNativeInputs = [ yasm ];
@@ -132,6 +135,7 @@
${if codecs != null then --codecsdir=${codecs} else }
${if (stdenv.isi686 || stdenv.isx86_64) then
--enable-runtime-cpudetection else }
${if x11Support then --enable-x11 else }
+${stdenv.lib.optionalString speexSupport --enable-speex}
--disable-xanim
--disable-ivtv
--enable-vidix
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34025 - nixpkgs/trunk/pkgs/os-specific/linux/bbswitch
Author: mkwik
Date: Wed May 9 10:01:38 2012
New Revision: 34025
URL: https://nixos.org/websvn/nix/?rev=34025sc=1
Log:
bbswitch: upgraded to 0.4.2
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix Wed May 9
10:01:35 2012(r34024)
+++ nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix Wed May 9
10:01:38 2012(r34025)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
let
- baseName = bbswitch-0.4.1;
+ baseName = bbswitch-0.4.2;
name = ${baseName}-${kernel.version};
in
@@ -11,7 +11,7 @@
src = fetchurl {
url =
http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz;;
-sha256 =
d579c6efc5f6482f0cf0b2c1b1f1a127413218cdffdc8f2d5a946c11909bda23;
+sha256 = 06j3cm1rk3lcbv54k0magrijykrzmkrna8n5cc274iz59842lga3;
};
preBuild = ''
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34026 - nixpkgs/trunk/pkgs/development/compilers/uhc
Author: mkwik
Date: Wed May 9 10:01:41 2012
New Revision: 34026
URL: https://nixos.org/websvn/nix/?rev=34026sc=1
Log:
upgraded uhc
Modified:
nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/uhc/default.nixWed May 9
10:01:38 2012(r34025)
+++ nixpkgs/trunk/pkgs/development/compilers/uhc/default.nixWed May 9
10:01:41 2012(r34026)
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation {
- name = uhc-svn-git20120412;
+ name = uhc-svn-git20120502;
src = fetchgit {
url = https://github.com/UU-ComputerScience/uhc.git;;
- rev = eef10f64d84bc0aa145121f2a61accea03b9bc76;
- sha256 =
c867d22423adb17396a28eef030c53f282b1443db2149aa7b8ab659ac7c18576;
+ rev = ab26d787657bb729d8a4f92ef5d067d9990f6ce3;
+ sha256 =
66c5b6d95dc80a652f6e17476a1b18fbef4b4ff6199a92d033f0055526ec97ff;
};
postUnpack = sourceRoot=\${sourceRoot}/EHC;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34027 - in nixpkgs/trunk/pkgs/development/libraries/haskell: attoparsec-conduit conduit network-conduit persistent persistent-sqlite semigroups wai wai-app-static wai-
Author: simons
Date: Wed May 9 11:25:59 2012
New Revision: 34027
URL: https://nixos.org/websvn/nix/?rev=34027sc=1
Log:
Updated Haskell packages.
- attoparsec-conduit: updated to version 0.4.0.1
- conduit: updated to version 0.4.2
- network-conduit: updated to version 0.4.0.1
- persistent-sqlite: updated to version 0.9.0.2
- persistent: updated to version 0.9.0.4
- semigroups: updated to version 0.8.3.1
- wai-app-static: updated to version 1.2.0.3
- wai-extra: updated to version 1.2.0.4
- wai: updated to version 1.2.0.2
- warp: updated to version 1.2.0.2
- xml-conduit: updated to version 0.7.0.2
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/semigroups/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wai-extra/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/wai/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/warp/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/xml-conduit/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
Wed May 9 10:01:41 2012(r34026)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
Wed May 9 11:25:59 2012(r34027)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = attoparsec-conduit;
- version = 0.4.0;
- sha256 = 1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0;
+ version = 0.4.0.1;
+ sha256 = 1r01xaaw439qpbfnanv2yfw9fz6id8cy17yqdm6x6vk35hmv59kc;
buildDepends = [ attoparsec conduit text transformers ];
meta = {
homepage = http://github.com/snoyberg/conduit;;
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/conduit/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/conduit/default.nix
Wed May 9 10:01:41 2012(r34026)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/conduit/default.nix
Wed May 9 11:25:59 2012(r34027)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = conduit;
- version = 0.4.1.1;
- sha256 = 1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa;
+ version = 0.4.2;
+ sha256 = 1v8s80g8gyxb139dzqbbh4qv6ax08g5smrvx2zc5sd2773wwqwz0;
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
Wed May 9 10:01:41 2012(r34026)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/network-conduit/default.nix
Wed May 9 11:25:59 2012(r34027)
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = network-conduit;
- version = 0.4.0;
- sha256 = 0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs;
+ version = 0.4.0.1;
+ sha256 = 0xmfhar4knyn01xyigrp4lymb1vcsahd9v12i6rrqzi10mdcz6bl;
buildDepends = [
conduit liftedBase monadControl network transformers
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
Wed May 9 10:01:41 2012(r34026)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
Wed May 9 11:25:59 2012(r34027)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = persistent-sqlite;
- version = 0.9.0.1;
- sha256 = 19bwkaazg3c822n3308awy70ml40jvncr4c3rvidq72zzdvql9c2;
+ version = 0.9.0.2;
+ sha256 = 19wmz13k3qbpam2siykczgacgaj48yw4p7iz3y6v8a2z8wha73zb;
buildDepends = [
aeson conduit monadControl persistent text transformers
];
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Wed May 9 10:01:41 2012(r34026)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
Wed May 9 11:25:59 2012(r34027)
@@ -1,16 +1,16 @@
-{ cabal, aeson,
[Nix-dev] What kills my xserver?
Hi Nixos-ers, I've never been able to reboot my machine from inside a KDE session in combination with KDM. Also, a logout takes excessively long (10 seconds). Lately, I investigated the crime scene, found some good leads, but now I'm stuck. I'll first illustrate the problem, which I'll do with simple xterm sessions instead of a full KDE session. So what does work: * start an xterm session from KDM * kdmctl shutdown reboot 0 0 ask * exit xterm As a result, the machine restarts, as expected. Alternatively, I can leave out the kdmctl call. Then there is a 'logout' to KDM, as expected. Nice. So what does *not* work: * start an xterm session ** switch to a console with alt+shift+F1, and then switch back to xterm with alt+F7 * kdmctl shutdown reboot 0 0 ask * exit xterm The xterm disappears, I get an empty screen for 10 secons, and then KDM reappears. Slow, and no reboot. What is it doing? In the time to end the session, it could reboot the machine several times, build the entire nixpkgs collection from scratch, etc. It's definitely not waiting on any network I/O. No. KDM turned out to be an important witness when given a couple of debug flags. The long delay is in fact just KDM calling sleep(10) as part of an error handler when it notices that the xserver is dead after the session ended. Then the xserver is restarted and the reboot request erased. Now, you might think that the switch to a virtual terminal and back is not a big issue, because that's something you'd normally not do if you're in a graphical environment. Indeed. However, the logout/reboot problem shows up in my case as well when using a KDE session. It's the same result, although I'm not sure if it's the same cause: When the KDE session ends, first ksmserver performs some shutdown actions, then the startkde script resumes and kills off the remaining kdeinit processes and probably a bit more. I've verified that ksmserver succesfully registers a shutdown with KDM. Also, startkde runs the shutdown till completion, as visible in the session log. And then ... nothing for the by now familiar ten seconds. Because it's easy to change different configurations with Nixos, I tried several setups without noticing any different results: * KDE 4.7 and KDE 4.8. With 4.7 I sometimes get a message from KDE bughandler that ksmserver crashed, but I can only click around in it in the ten seconds that KDM is sleeping. Actually, I'm wondering why I actually get graphical output because isn't KDM waiting because the xserver had died... * Nixos default linux kernel 2.6, 3.2 and 3.3, and my own customized 3.2 kernel * DRI enabled/disabled * Intel display driver 2.17 (needed for dri), and the 2.15 version (nixos default). There is by now also a 2.19 version that is strongly recommended but I cannot easily try it because it requires a newer pixman. Given that there is no difference between 2.15 and 2.17, I doubt that changing to 2.19 will have any effect. * with my own .kde folder and starting with an empty .kde folder * with the KDE default kwin as window manager, and with xmonad. Running a xmonad-only session without desktop manager works perfectly, like with xterm. * killing manually most processes before logging out. I'm sure that in the end all applications using the xserver are gone. Actually, killing some of the kde processes do bring me back quickly to KDM, so I do have the impression that some shutdown actions are causing the problems. The big questions is thus: * why does the xserver die prematurely? There is nothing in my session log, kde log, X11 log, or messages log related to this. Perhaps that question can be answered if I would know: * why does this only show up with KDE and not with xterm or xmonad? * is it in any way related to hardware/driver issues, like when switching to a virtual terminal? * why do others not have this problem? If you have an idea, solution or suggestion, please let me know. Surely I can shutdown my machine with shutdown and the like, but that's not very nice... Arie ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r34029 - nixpkgs/trunk/pkgs/development/interpreters/guile
Author: ludo
Date: Wed May 9 13:42:46 2012
New Revision: 34029
URL: https://nixos.org/websvn/nix/?rev=34029sc=1
Log:
GNU Guile 2.0: Fix cross-GNU builds.
Modified:
nixpkgs/trunk/pkgs/development/interpreters/guile/default.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/guile/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/guile/default.nix Wed May
9 11:49:52 2012(r34028)
+++ nixpkgs/trunk/pkgs/development/interpreters/guile/default.nix Wed May
9 13:42:46 2012(r34029)
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, coverageAnalysis ? null }:
+, libffi, gawk, makeWrapper, coverageAnalysis ? null, gnu ? null }:
# Do either a coverage analysis build or a standard build.
(if coverageAnalysis != null
@@ -48,6 +48,15 @@
setupHook = ./setup-hook.sh;
+ crossAttrs.preConfigure =
+stdenv.lib.optionalString (stdenv.cross.config == i586-pc-gnu)
+ # On GNU, libgc depends on libpthread, but the cross linker doesn't
+ # know where to find libpthread, which leads to erroneous test failures
+ # in `configure', where `-pthread' and `-lpthread' aren't explicitly
+ # passed. So it needs some help (XXX).
+ export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib;
+
+
meta = {
description = GNU Guile 2.0, an embeddable Scheme implementation;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34030 - in nixpkgs/trunk/pkgs: development/libraries/haskell/c2hs development/libraries/haskell/haskell-mpi development/libraries/haskell/language-c top-level
Author: andres
Date: Wed May 9 16:19:52 2012
New Revision: 34030
URL: https://nixos.org/websvn/nix/?rev=34030sc=1
Log:
Added haskell-mpi and dependencies.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/
nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/c2hs/default.nix Wed May
9 16:19:52 2012(r34030)
@@ -0,0 +1,17 @@
+{ cabal, filepath, languageC }:
+
+cabal.mkDerivation (self: {
+ pname = c2hs;
+ version = 0.16.3;
+ sha256 = 1qqsxfdkf5sfj3mvk265dbng3br9w633y8v1piajqaidki7vwqm5;
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ filepath languageC ];
+ meta = {
+homepage = http://www.cse.unsw.edu.au/~chak/haskell/c2hs/;;
+description = C-Haskell FFI tool that gives some cross-language type
safety;
+license = self.stdenv.lib.licenses.gpl2;
+platforms = self.ghc.meta.platforms;
+maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-mpi/default.nix
Wed May 9 16:19:52 2012(r34030)
@@ -0,0 +1,19 @@
+{ cabal, c2hs, cereal, extensibleExceptions, mpi }:
+
+cabal.mkDerivation (self: {
+ pname = haskell-mpi;
+ version = 1.2.1;
+ sha256 = 1d3xlwz3sx1m7iyf67cfr1vsp3w4iz9mmqvmvdiblj4569hxblr5;
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ cereal extensibleExceptions ];
+ buildTools = [ c2hs ];
+ extraLibraries = [ mpi ];
+ meta = {
+homepage = http://github.com/bjpop/haskell-mpi;;
+description = Distributed parallel programming in Haskell using MPI;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
Wed May 9 16:19:52 2012(r34030)
@@ -0,0 +1,16 @@
+{ cabal, alex, filepath, happy, syb }:
+
+cabal.mkDerivation (self: {
+ pname = language-c;
+ version = 0.3.2.1;
+ sha256 = 1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx;
+ buildDepends = [ filepath syb ];
+ buildTools = [ alex happy ];
+ meta = {
+homepage = http://www.sivity.net/projects/language.c/;;
+description = Analysis and generation of C code;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 13:42:46
2012(r34029)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 16:19:52
2012(r34030)
@@ -526,6 +526,8 @@
bytestringTrie = callPackage
../development/libraries/haskell/bytestring-trie {};
+ c2hs = callPackage ../development/libraries/haskell/c2hs {};
+
Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix
{ cabal = self.cabal.override { Cabal = null; }; };
Cabal = null; # core package in GHC
@@ -814,6 +816,10 @@
haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {};
+ haskellMpi = callPackage ../development/libraries/haskell/haskell-mpi {
+mpi = pkgs.openmpi;
+ };
+
haskellSrc_1_0_1_3 = callPackage
../development/libraries/haskell/haskell-src/1.0.1.3.nix {};
haskellSrc_1_0_1_4 = callPackage
../development/libraries/haskell/haskell-src/1.0.1.4.nix {};
haskellSrc_1_0_1_5 = callPackage
../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
@@ -969,6 +975,8 @@
jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
+ languageC = callPackage ../development/libraries/haskell/language-c {};
+
languageJavascript = callPackage
../development/libraries/haskell/language-javascript {};
languageHaskellExtract = callPackage
[Nix-commits] SVN commit: nix - r34031 - nixpkgs/trunk/pkgs/top-level
Author: andres
Date: Wed May 9 16:20:01 2012
New Revision: 34031
URL: https://nixos.org/websvn/nix/?rev=34031sc=1
Log:
Changing the way haskellPackagesFun is invoked.
This is supposed to make it easier to create locally modified
version preferences in Haskell package sets, by using override
on the extraPrefs attribute.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 9 16:19:52
2012(r34030)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 9 16:20:01
2012(r34031)
@@ -2214,47 +2214,61 @@
# So we enable it for selected versions only.
# Helper functions to abstract away from repetitive instantiations.
- haskellPackagesFun =
-ghcPath : ghcBinary : prefFun : profExplicit : profDefault : modifyPrio :
+ haskellPackagesFun = makeOverridable
+ ({ ghcPath
+, ghcBinary ? ghc6101Binary
+, prefFun
+, extraPrefs ? (x : {})
+, profExplicit ? false, profDefault ? false
+, modifyPrio ? lowPrio
+} :
import ./haskell-packages.nix {
-inherit pkgs newScope modifyPrio prefFun;
+inherit pkgs newScope modifyPrio;
+prefFun = self : super : prefFun self super // extraPrefs super;
enableLibraryProfiling =
if profExplicit then profDefault
else getConfig [ cabal libraryProfiling ]
profDefault;
ghc = callPackage ghcPath { ghc = ghcBinary; };
- };
+ });
# Currently active GHC versions.
haskellPackages_ghc6104 =
recurseIntoAttrs
- (haskellPackagesFun ../development/compilers/ghc/6.10.4.nix
-ghc6101Binary (x : x.ghc6104Prefs) false false lowPrio);
+ (haskellPackagesFun { ghcPath = ../development/compilers/ghc/6.10.4.nix;
+prefFun = x : x.ghc6104Prefs;
+ });
haskellPackages_ghc6121 =
-haskellPackagesFun ../development/compilers/ghc/6.12.1.nix
- ghc6101Binary (x : x.ghc6121Prefs) false false lowPrio;
+haskellPackagesFun { ghcPath = ../development/compilers/ghc/6.12.1.nix;
+ prefFun = x : x.ghc6121Prefs;
+ };
haskellPackages_ghc6122 =
-haskellPackagesFun ../development/compilers/ghc/6.12.2.nix
- ghc6101Binary (x : x.ghc6122Prefs) false false lowPrio;
+haskellPackagesFun { ghcPath = ../development/compilers/ghc/6.12.2.nix;
+ prefFun = x : x.ghc6122Prefs;
+ };
haskellPackages_ghc6123 =
recurseIntoAttrs
- (haskellPackagesFun ../development/compilers/ghc/6.12.3.nix
-ghc6101Binary (x : x.ghc6123Prefs) false false lowPrio);
+ (haskellPackagesFun { ghcPath = ../development/compilers/ghc/6.12.3.nix;
+prefFun = x : x.ghc6123Prefs;
+ });
# Will never make it into a platform release, severe bugs; leave at lowPrio.
haskellPackages_ghc701 =
-haskellPackagesFun ../development/compilers/ghc/7.0.1.nix
- ghc6101Binary (x : x.ghc701Prefs) false false lowPrio;
+haskellPackagesFun { ghcPath = ../development/compilers/ghc/7.0.1.nix;
+ prefFun = x : x.ghc701Prefs;
+ };
haskellPackages_ghc702 =
-haskellPackagesFun ../development/compilers/ghc/7.0.2.nix
- ghc6101Binary (x : x.ghc702Prefs) false false lowPrio;
+haskellPackagesFun { ghcPath = ../development/compilers/ghc/7.0.2.nix;
+ prefFun = x : x.ghc702Prefs;
+ };
haskellPackages_ghc703 =
-haskellPackagesFun ../development/compilers/ghc/7.0.3.nix
- ghc6101Binary (x : x.ghc703Prefs) false false lowPrio;
+haskellPackagesFun { ghcPath = ../development/compilers/ghc/7.0.3.nix;
+ prefFun = x : x.ghc703Prefs;
+ };
# Current default version: 7.0.4.
#
@@ -2281,53 +2295,65 @@
haskellPackages_ghc704_no_profiling =
recurseIntoAttrs
- (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix
-(if stdenv.isDarwin then ghc704Binary else ghc6101Binary)
-(x : x.ghc704Prefs) true false
-(haskellDefaultVersionPrioFun false));
+ (haskellPackagesFun { ghcPath = ../development/compilers/ghc/7.0.4.nix;
+ghcBinary = if stdenv.isDarwin then ghc704Binary
else ghc6101Binary;
+prefFun = x : x.ghc704Prefs;
+profExplicit = true;
+modifyPrio = haskellDefaultVersionPrioFun false;
+ });
haskellPackages_ghc704_profiling =
recurseIntoAttrs
- (haskellPackagesFun ../development/compilers/ghc/7.0.4.nix
-(if stdenv.isDarwin then ghc704Binary else ghc6101Binary)
-(x :
Re: [Nix-dev] What kills my xserver?
Hi Arie, On Wed, May 9, 2012 at 2:25 PM, Arie Middelkoop amidd...@gmail.com wrote: Hi Nixos-ers, I've never been able to reboot my machine from inside a KDE session in combination with KDM. Also, a logout takes excessively long (10 seconds). Lately, I investigated the crime scene, found some good leads, but now I'm stuck. ... For what it's worth, I have the same symptoms although I have not investigated it at all. I am using the ati videoDriver (the Free one). I'd be happy to collect some information if it helps to debug. I had always assumed that a fresh ~/.kde would solve it but never bothered to try. Cheers, Cillian (goibhniu) ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] What kills my xserver?
Same here, KDE with xmonad instead of kwin, intel open source driver. Sometimes logging out takes 10 seconds, sometimes dialog just won't show up at all. On Wed, May 9, 2012 at 6:41 PM, Cillian de Róiste cillian.deroi...@gmail.com wrote: Hi Arie, On Wed, May 9, 2012 at 2:25 PM, Arie Middelkoop amidd...@gmail.com wrote: Hi Nixos-ers, I've never been able to reboot my machine from inside a KDE session in combination with KDM. Also, a logout takes excessively long (10 seconds). Lately, I investigated the crime scene, found some good leads, but now I'm stuck. ... For what it's worth, I have the same symptoms although I have not investigated it at all. I am using the ati videoDriver (the Free one). I'd be happy to collect some information if it helps to debug. I had always assumed that a fresh ~/.kde would solve it but never bothered to try. Cheers, Cillian (goibhniu) ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r34032 - in nixpkgs/trunk/pkgs: development/libraries/haskell/GLUT development/libraries/haskell/OpenGL top-level
Author: andres
Date: Wed May 9 17:21:37 2012
New Revision: 34032
URL: https://nixos.org/websvn/nix/?rev=34032sc=1
Log:
Adapted the ghc-7.4.1 package version defaults to upcoming Platform release.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Wed May
9 16:20:01 2012(r34031)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Wed May
9 17:21:37 2012(r34032)
@@ -6,6 +6,7 @@
sha256 = 0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02;
buildDepends = [ OpenGL ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+ noHaddock = true;
meta = {
homepage = http://www.haskell.org/HOpenGL/;;
description = A binding for the OpenGL Utility Toolkit;
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix Wed May
9 17:21:37 2012(r34032)
@@ -0,0 +1,15 @@
+{ cabal, libX11, mesa }:
+
+cabal.mkDerivation (self: {
+ pname = OpenGL;
+ version = 2.2.3.1;
+ sha256 = 1vl5i1l76mjc0p18awdrvdcpszaz1z891505cqmn1xlld7ijb14z;
+ extraLibraries = [ libX11 mesa ];
+ meta = {
+homepage = http://www.haskell.org/HOpenGL/;;
+description = A binding for the OpenGL graphics system;
+license = self.stdenv.lib.licenses.bsd3;
+platforms = self.ghc.meta.platforms;
+maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 16:20:01
2012(r34031)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Wed May 9 17:21:37
2012(r34032)
@@ -132,30 +132,33 @@
# NOTE: 2011.4.0.0 is the current default.
+ # These are currently set to versions that will likely be in
+ # the next platform release (May 2012). Please update with
+ # care.
haskellPlatformArgs_future = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.4.1 ok
fgl = self.fgl_5_4_2_4;# 7.4.1 ok
-GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok
+GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok
html = self.html_1_0_1_2; # 7.4.1 ok
HUnit= self.HUnit_1_2_4_2; # 7.4.1 ok
network = self.network_2_3_0_13; # 7.4.1 ok
-OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok
+OpenGL = self.OpenGL_2_2_3_1; # 7.4.1 ok
parallel = self.parallel_3_2_0_2; # 7.4.1 ok
parsec = self.parsec_3_1_2; # 7.4.1 ok
QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok
regexBase= self.regexBase_0_93_2; # 7.4.1 ok
regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok
regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok
-stm = self.stm_2_3; # 7.4.1 ok
+stm = self.stm_2_3;# 7.4.1 ok
syb = self.syb_0_3_6_1;# 7.4.1 ok
xhtml= self.xhtml_3000_2_0_5; # 7.4.1 ok
zlib = self.zlib_0_5_3_3; # 7.4.1 ok
HTTP = self.HTTP_4000_2_3; # 7.4.1 ok
text = self.text_0_11_2_0; # 7.4.1 ok
-transformers = self.transformers_0_2_2_0; # 7.4.1 ok
-mtl = self.mtl_2_0_1_0;# 7.4.1 ok
+transformers = self.transformers_0_3_0_0; # 7.4.1 ok
+mtl = self.mtl_2_1_1; # 7.4.1 ok
random = self.random_1_0_1_1; # 7.4.1 ok
cabalInstall = self.cabalInstall_0_14_0;# 7.4.1 ok
alex = self.alex_3_0_1; # 7.4.1 ok
@@ -1094,6 +1097,7 @@
OpenGL_2_2_1_1 = callPackage
../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
OpenGL_2_2_3_0 = callPackage
../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
+ OpenGL_2_2_3_1 = callPackage
../development/libraries/haskell/OpenGL/2.2.3.1.nix {};
OpenGL_2_4_0_2 = callPackage
../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
OpenGL_2_5_0_0 = callPackage
../development/libraries/haskell/OpenGL/2.5.0.0.nix {};
OpenGL24 = self.OpenGL_2_4_0_2;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
[Nix-dev] Stdenv branch merge
Hi all, I'm about to merge the stdenv branch into the trunk. This has two fairly critical fixes: - A change to Glibc to prevent it from using /etc/ld.so.cache. On systems such as Ubuntu, this can cause Nix packages to dynamically link against libraries in /usr/lib and so on. (Patch by Jack Cummings.) - A workaround to GMP aborts in QEMU/KVM virtual machines. There are also some minor updates to Bash, OpenSSL and so on. As always, after the merge, it may take the Nixpkgs/NixOS channels a while to catch up. -- Eelco Dolstra | http://www.st.ewi.tudelft.nl/~dolstra/ ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] What kills my xserver?
Hmm - I'm wondering if it might be KMS related.. Does disabling KMS change anything? boot.kernelParams = [ nomodeset ]; Cheers, Sol On Wed, May 9, 2012 at 9:53 AM, Mathijs Kwik math...@bluescreen303.nlwrote: Same here, KDE with xmonad instead of kwin, intel open source driver. Sometimes logging out takes 10 seconds, sometimes dialog just won't show up at all. On Wed, May 9, 2012 at 6:41 PM, Cillian de Róiste cillian.deroi...@gmail.com wrote: Hi Arie, On Wed, May 9, 2012 at 2:25 PM, Arie Middelkoop amidd...@gmail.com wrote: Hi Nixos-ers, I've never been able to reboot my machine from inside a KDE session in combination with KDM. Also, a logout takes excessively long (10 seconds). Lately, I investigated the crime scene, found some good leads, but now I'm stuck. ... For what it's worth, I have the same symptoms although I have not investigated it at all. I am using the ati videoDriver (the Free one). I'd be happy to collect some information if it helps to debug. I had always assumed that a fresh ~/.kde would solve it but never bothered to try. Cheers, Cillian (goibhniu) ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r34033 - in nixpkgs/trunk/pkgs: applications/science/math/eukleides development/libraries/SDL_image development/libraries/pango top-level
Author: eelco
Date: Wed May 9 21:10:12 2012
New Revision: 34033
URL: https://nixos.org/websvn/nix/?rev=34033sc=1
Log:
* Disable some failing builds on specific platforms.
Modified:
nixpkgs/trunk/pkgs/applications/science/math/eukleides/default.nix
nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix
nixpkgs/trunk/pkgs/development/libraries/pango/1.29.x.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Modified: nixpkgs/trunk/pkgs/applications/science/math/eukleides/default.nix
==
--- nixpkgs/trunk/pkgs/applications/science/math/eukleides/default.nix Wed May
9 17:21:37 2012(r34032)
+++ nixpkgs/trunk/pkgs/applications/science/math/eukleides/default.nix Wed May
9 21:10:12 2012(r34033)
@@ -31,7 +31,7 @@
circles and conics.
'';
-platforms = stdenv.lib.platforms.all;
+platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
Modified: nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix Wed May
9 17:21:37 2012(r34032)
+++ nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix Wed May
9 21:10:12 2012(r34033)
@@ -36,6 +36,6 @@
meta = {
description = SDL image library;
homepage = http://www.libsdl.org/projects/SDL_image/;
-platforms = stdenv.lib.platforms.all;
+platforms = stdenv.lib.platforms.linux;
};
}
Modified: nixpkgs/trunk/pkgs/development/libraries/pango/1.29.x.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/pango/1.29.x.nix Wed May 9
17:21:37 2012(r34032)
+++ nixpkgs/trunk/pkgs/development/libraries/pango/1.29.x.nix Wed May 9
21:10:12 2012(r34033)
@@ -31,6 +31,6 @@
license = LGPLv2+;
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
-platforms = stdenv.lib.platforms.all;
+platforms = stdenv.lib.platforms.linux;
};
}
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==
--- nixpkgs/trunk/pkgs/top-level/release.nixWed May 9 17:21:37 2012
(r34032)
+++ nixpkgs/trunk/pkgs/top-level/release.nixWed May 9 21:10:12 2012
(r34033)
@@ -94,7 +94,7 @@
fuse = linux;
gajim = linux;
gawk = all;
- gcc = all;
+ gcc = linux;
gcc33 = linux;
gcc34 = linux;
gcc41 = linux;
@@ -183,7 +183,7 @@
man = linux;
manpages = linux;
maxima = linux;
- mc = all;
+ mc = linux;
mcabber = linux;
mcron = linux;
mdadm = linux;
@@ -241,12 +241,12 @@
ppl = all;
procps = linux;
pwdutils = linux;
- pthreadmanpages = all;
+ pthreadmanpages = linux;
pygtk = linux;
pyqt4 = linux;
python = allBut i686-cygwin;
pythonFull = linux;
- sbcl = all;
+ sbcl = linux;
qt3 = linux;
quake3demo = linux;
readline = all;
@@ -257,7 +257,7 @@
rsync = linux;
rubber = allBut i686-cygwin;
ruby = all;
- rxvt_unicode = all;
+ rxvt_unicode = linux;
samba = linux;
screen = linux ++ darwin;
scrot = linux;
@@ -267,7 +267,7 @@
sharutils = all;
slim = linux;
sloccount = allBut i686-cygwin;
- smartmontools = all;
+ smartmontools = linux;
socat = linux;
spidermonkey = linux;
splashutils = linux;
@@ -410,23 +410,13 @@
*/
strategoPackages = {
-sdf = all;
-strategoxt = all;
-javafront = all;
+sdf = linux;
+strategoxt = linux;
+javafront = linux;
strategoShell = linux ++ darwin;
dryad = linux;
};
- strategoPackages018 = {
-sdfStatic = all;
-sdf = all;
-strategoxt = all;
-javafront = all;
-aspectjfront = all;
-strategoShell = all;
-dryad = linux;
- };
-
pythonPackages = {
zfec = linux;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34034 - in nixos/trunk/modules: services/system system/etc
Author: eelco
Date: Wed May 9 21:35:47 2012
New Revision: 34034
URL: https://nixos.org/websvn/nix/?rev=34034sc=1
Log:
* Some more trivial builders with lots of dependencies that should be
built locally.
Modified:
nixos/trunk/modules/services/system/dbus.nix
nixos/trunk/modules/system/etc/etc.nix
Modified: nixos/trunk/modules/services/system/dbus.nix
==
--- nixos/trunk/modules/services/system/dbus.nixWed May 9 21:10:12
2012(r34033)
+++ nixos/trunk/modules/services/system/dbus.nixWed May 9 21:35:47
2012(r34034)
@@ -12,6 +12,7 @@
configDir = pkgs.stdenv.mkDerivation {
name = dbus-conf;
+preferLocalBuild = true;
buildCommand = ''
ensureDir $out
Modified: nixos/trunk/modules/system/etc/etc.nix
==
--- nixos/trunk/modules/system/etc/etc.nix Wed May 9 21:10:12 2012
(r34033)
+++ nixos/trunk/modules/system/etc/etc.nix Wed May 9 21:35:47 2012
(r34034)
@@ -30,6 +30,8 @@
builder = ./make-etc.sh;
+preferLocalBuild = true;
+
/* !!! Use toXML. */
sources = map (x: x.source) config.environment.etc;
targets = map (x: x.target) config.environment.etc;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34035 - configurations/trunk/tud
Author: eelco
Date: Wed May 9 21:40:19 2012
New Revision: 34035
URL: https://nixos.org/websvn/nix/?rev=34035sc=1
Log:
* Enable parallel building. Cross fingers.
Modified:
configurations/trunk/tud/common.nix
configurations/trunk/tud/machines.nix
Modified: configurations/trunk/tud/common.nix
==
--- configurations/trunk/tud/common.nix Wed May 9 21:35:47 2012(r34034)
+++ configurations/trunk/tud/common.nix Wed May 9 21:40:19 2012(r34035)
@@ -28,8 +28,7 @@
nix.extraOptions =
''
- #fsync-metadata = false
- #use-sqlite-wal = false
+ build-cores = 0
'';
services.zabbixAgent.enable = true;
Modified: configurations/trunk/tud/machines.nix
==
--- configurations/trunk/tud/machines.nix Wed May 9 21:35:47 2012
(r34034)
+++ configurations/trunk/tud/machines.nix Wed May 9 21:40:19 2012
(r34035)
@@ -142,6 +142,7 @@
ethernetAddress = 00:16:3e:00:00:01;
systems = [ i686-solaris ];
maxJobs = 1;
+buildUser = nix;
}
{ # Legacy FreeBSD machine.
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] What kills my xserver?
On 09/05/12 21:19, Sol Reynolds wrote: Hmm - I'm wondering if it might be KMS related.. Does disabling KMS change anything? boot.kernelParams = [ nomodeset ]; It was worth a try, but unfortunately then my xserver doesn't start. It loads the intel driver, and then the xserver barfs that it cannot find devices. If KMS is disabled, do I then also need to pass some additional options to the xserver? I wouldn't be surprised if this issue is really a hardware issue. If I'm not mistaken, Mathijs has similar hardware as I have (Intel Sandy Bridge). Arie ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r34036 - nixpkgs/trunk/pkgs/os-specific/linux/kernel
Author: eelco
Date: Wed May 9 21:49:39 2012
New Revision: 34036
URL: https://nixos.org/websvn/nix/?rev=34036sc=1
Log:
* Linux 3.0.31.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Wed May 9
21:40:19 2012(r34035)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Wed May 9
21:49:39 2012(r34036)
@@ -227,7 +227,7 @@
import ./generic.nix (
rec {
-version = 3.0.24;
+version = 3.0.31;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b $INSTALL_MOD_PATH'
@@ -235,7 +235,7 @@
src = fetchurl {
url = mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2;
- sha256 = 0j783ivlgg66jvasxaapimyzaqyn61jlz4abhkynckr4h5hrpvw4;
+ sha256 = 1b5ix1fc55m6vsr28dh5xi89fphl3m3kmvaniq9div5rj8f6kv0f;
};
config = configWithPlatform stdenv.platform;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] What kills my xserver?
On 09/05/12 18:41, Cillian de Róiste wrote: For what it's worth, I have the same symptoms although I have not investigated it at all. I am using the ati videoDriver (the Free one). I'd be happy to collect some information if it helps to debug. I had always assumed that a fresh ~/.kde would solve it but never bothered to try. One of the many steps that I tried is a fresh ~/.kde, and I can confirm that this does not help in resolving the issue. Actually, I recall that the Nixos manual mentions that it's possible to test your system in a virtual machine. I wonder if this could help in ruling out hardware issues. Virtualized hardware is hopefully more deterministic among different systems than real hardware... Arie ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] [NixOS/nix] 0c4c8f: Remove obsolete files (moved to release tree)
Branch: refs/heads/master Home: https://github.com/NixOS/nix Commit: 0c4c8f7a9d09c497d95771c894a5cc3d4276609b https://github.com/NixOS/nix/commit/0c4c8f7a9d09c497d95771c894a5cc3d4276609b Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-08 (Tue, 08 May 2012) Changed paths: R scripts/maintenance/gc-commands R scripts/maintenance/gc-releases.pl R scripts/maintenance/readcache.pm R scripts/maintenance/shrink-manifest.pl Log Message: --- Remove obsolete files (moved to release tree) Commit: a58efdb69b0c018322bb773ce14dc33cb252b165 https://github.com/NixOS/nix/commit/a58efdb69b0c018322bb773ce14dc33cb252b165 Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-09 (Wed, 09 May 2012) Changed paths: M doc/manual/release-notes.xml Log Message: --- Update the release notes Commit: 7a213ffc6912794d2cc4374bb9bf2c1f59a384a3 https://github.com/NixOS/nix/commit/7a213ffc6912794d2cc4374bb9bf2c1f59a384a3 Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-09 (Wed, 09 May 2012) Changed paths: M doc/manual/env-common.xml M doc/manual/opt-common-syn.xml M doc/manual/opt-common.xml Log Message: --- Document $NIX_PATH / -I Commit: cb1248d2082ff8292e2516f124feea4427cf150a https://github.com/NixOS/nix/commit/cb1248d2082ff8292e2516f124feea4427cf150a Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-09 (Wed, 09 May 2012) Changed paths: M doc/manual/conf-file.xml M doc/manual/nix-build.xml M doc/manual/nix-store.xml Log Message: --- Document some nix-store subcommands Compare: https://github.com/NixOS/nix/compare/afa7b8a...cb1248d ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34040 - release/trunk/channels
Author: eelco
Date: Wed May 9 23:13:05 2012
New Revision: 34040
URL: https://nixos.org/websvn/nix/?rev=34040sc=1
Log:
* Update the /data/releases cleanup scripts.
Added:
release/trunk/channels/ReadCache.pm (props changed)
- copied unchanged from r34039, nix/trunk/scripts/maintenance/readcache.pm
release/trunk/channels/print-dead-files.pl (contents, props changed)
- copied, changed from r34039,
nix/trunk/scripts/maintenance/gc-releases.pl
release/trunk/channels/remove-dead-files.sh (contents, props changed)
- copied, changed from r34039, nix/trunk/scripts/maintenance/gc-commands
Copied: release/trunk/channels/ReadCache.pm (from r34039,
nix/trunk/scripts/maintenance/readcache.pm)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ release/trunk/channels/ReadCache.pm Wed May 9 23:13:05 2012
(r34040, copy of r34039, nix/trunk/scripts/maintenance/readcache.pm)
@@ -0,0 +1,21 @@
+package readcache;
+use strict;
+
+# Read the archive directories.
+our %archives;
+
+sub readDir {
+my $dir = shift;
+opendir(DIR, $dir) or die cannot open `$dir': $!;
+my @as = readdir DIR;
+foreach my $archive (@as) {
+next unless $archive =~ /^sha256_/ || $archive =~ /\.nar-bsdiff$/ ||
$archive =~ /\.nar\.bz2$/;
+$archives{$archive} = $dir/$archive;
+}
+closedir DIR;
+}
+
+readDir /data/releases/nars;
+readDir /data/releases/patches;
+
+print STDERR scalar (keys %archives), \n;
Copied and modified: release/trunk/channels/print-dead-files.pl (from r34039,
nix/trunk/scripts/maintenance/gc-releases.pl)
==
--- nix/trunk/scripts/maintenance/gc-releases.plWed May 9 22:13:53
2012(r34039, copy source)
+++ release/trunk/channels/print-dead-files.pl Wed May 9 23:13:05 2012
(r34040)
@@ -1,8 +1,8 @@
-#! /var/run/current-system/sw/bin/perl -w -I. -I..
+#! /var/run/current-system/sw/bin/perl -w -I .
use strict;
-use NixManifest;
-use readcache;
+use Nix::Manifest;
+use ReadCache;
use File::Basename;
@@ -26,7 +26,7 @@
$file-{url} =~ /\/([^\/]+)$/;
my $basename = $1;
die unless defined $basename;
-#print $basename, \n;
+#print STDERR GOT $basename\n;
$usedFiles{$basename} = 1;
print STDERR missing archive `$basename'\n
unless defined $readcache::archives{$basename};
@@ -38,7 +38,7 @@
$file-{url} =~ /\/([^\/]+)$/;
my $basename = $1;
die unless defined $basename;
-#print $basename, \n;
+#print STDERR GOT2 $basename\n;
$usedFiles{$basename} = 1;
die missing archive `$basename'
unless defined $readcache::archives{$basename};
Copied and modified: release/trunk/channels/remove-dead-files.sh (from r34039,
nix/trunk/scripts/maintenance/gc-commands)
==
--- nix/trunk/scripts/maintenance/gc-commands Wed May 9 22:13:53 2012
(r34039, copy source)
+++ release/trunk/channels/remove-dead-files.sh Wed May 9 23:13:05 2012
(r34040)
@@ -1,2 +1,4 @@
-./gc-releases.pl /data/releases/patches/all-patches $(find /data/releases
-name MANIFEST) | sort dead
-cat dead | xargs -d '\n' sh -c 'find $@ -mtime +100 -print' | xargs -d '\n'
mv -v --target-directory=/data/releases/trash/
+#! /bin/sh
+./print-dead-files.pl /data/releases/patches/all-patches $(find /data/releases
-name MANIFEST | grep -v '\.trash' | grep -v '\.tmp') | sort /tmp/dead
+mkdir -p /data/releases/.trash/
+xargs -d '\n' sh -c 'find $@ -mtime +100 -print' /tmp/dead | xargs -d '\n'
mv -v --target-directory=/data/releases/.trash/
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34041 - attic/nix nix
Author: eelco Date: Wed May 9 23:13:46 2012 New Revision: 34041 URL: https://nixos.org/websvn/nix/?rev=34041sc=1 Log: * Move the Nix repo to the attic. Added: attic/nix/ - copied from r34040, nix/ Deleted: nix/ ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Bootstrapping NixOS
Maybe I should just remove the wiki until I find time to host current bootstrapping archives myself. I personally think the community should provide more feedback to get this back into the repositories.. Eelco Dolstra removed it in the bast due to lack of documentation without even asking for improving it. If you have a fast connection bootstrap on your own qemu instance and copy everything up to your server eg using rsync or by creating your own tar. I can also create a new archive for you. i686 is no issue. x86_64 will require longer upload time ( a couple of hours ). http://mawercer.de/~marc/minimal-install-archive.patch is the last patch which still may apply which you can use to create the archive yourself. cd /etc/nixos/nixos; nix-build -A minimal_install_archive ./release.nix If others have a better way for bootstrapping they may talk about their way. Nice about my archive is that it ships with scripts such as run-in-chroot which you may want to use a couple of times for rebuilding the system till you get everything right. Marc Weber ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] [NixOS/nix] 663c06: Disable building in chroot for Nix's corepkgs
Branch: refs/heads/master Home: https://github.com/NixOS/nix Commit: 663c06e8cd7d3b0495b13f2bb08e2cfab889 https://github.com/NixOS/nix/commit/663c06e8cd7d3b0495b13f2bb08e2cfab889 Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-09 (Wed, 09 May 2012) Changed paths: M corepkgs/buildenv.nix M corepkgs/nar.nix M corepkgs/unpack-channel.nix Log Message: --- Disable building in chroot for Nix's corepkgs The dependencies of the corepkgs are not necessarily in the chroot (or in the Nix store), so don't build them in a chroot. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] What kills my xserver?
Intel driver (and probably other modern drivers) _need_ KMS to set their resolution among other things. So X11 just won't start with nomodeset. On Wed, May 9, 2012 at 9:19 PM, Sol Reynolds sol.reyno...@gmail.com wrote: Hmm - I'm wondering if it might be KMS related.. Does disabling KMS change anything? boot.kernelParams = [ nomodeset ]; Cheers, Sol On Wed, May 9, 2012 at 9:53 AM, Mathijs Kwik math...@bluescreen303.nl wrote: Same here, KDE with xmonad instead of kwin, intel open source driver. Sometimes logging out takes 10 seconds, sometimes dialog just won't show up at all. On Wed, May 9, 2012 at 6:41 PM, Cillian de Róiste cillian.deroi...@gmail.com wrote: Hi Arie, On Wed, May 9, 2012 at 2:25 PM, Arie Middelkoop amidd...@gmail.com wrote: Hi Nixos-ers, I've never been able to reboot my machine from inside a KDE session in combination with KDM. Also, a logout takes excessively long (10 seconds). Lately, I investigated the crime scene, found some good leads, but now I'm stuck. ... For what it's worth, I have the same symptoms although I have not investigated it at all. I am using the ati videoDriver (the Free one). I'd be happy to collect some information if it helps to debug. I had always assumed that a fresh ~/.kde would solve it but never bothered to try. Cheers, Cillian (goibhniu) ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
