[Nix-commits] SVN commit: nix - r33899 - nixpkgs/trunk/pkgs/top-level

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 23:04:05 2012
New Revision: 33899
URL: https://nixos.org/websvn/nix/?rev=33899&sc=1

Log:
GNU Readline 6.x: Build with Apple-GCC on Darwin.

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   Mon Apr 23 22:31:39 
2012(r33898)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Apr 23 23:04:05 
2012(r33899)
@@ -4644,7 +4644,14 @@
 
   readline5 = callPackage ../development/libraries/readline/readline5.nix { };
 
-  readline6 = callPackage ../development/libraries/readline/readline6.nix { };
+  readline6 = callPackage ../development/libraries/readline/readline6.nix {
+stdenv =
+  # On Darwin, Readline uses `-arch_only', which is specific to
+  # Apple-GCC.  So give it what it expects.
+  if stdenv.isDarwin
+  then overrideGCC stdenv gccApple
+  else stdenv;
+  };
 
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] gcc for MacOS X

[Ludovic Courtès]

Hi,

Konrad Hinsen  skribis:

> Actually, I wonder how your setup works: if stdenv contains gcc46, and
> building gcc46 requires stdenv, what gets built first?

For Nixpkgs, Darwin is an “impure” platform–i.e., Nixpkgs assumes some
tools are initially available on the machine under /usr/bin & co., and
uses them to bootstrap ‘stdenv’.

Concretely, there’s first an ‘stdenvNative’ that gets built, which is
essentially a set of symlinks from a store path to /usr/bin/gcc,
/usr/bin/ld, etc.

Then, the final stdenv, called ‘stdenvNix’, gets built.  It uses the
tools from ‘stdenvNative’ to build GMP, MPFR, MPC, GCC, etc.

See pkgs/stdenv/default.nix for details.

Thanks,
Ludo’.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] nix-prefetch-url for git

[Nicolas Pierron]

On Mon, Apr 23, 2012 at 02:29, Mathijs Kwik  wrote:
> Subject: nix-prefetch-url for git

Use nix-prefect-git, or fetchgit.

-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron - http://nbp.name/
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] gcc for MacOS X

[Ludovic Courtès]

Hi Konrad,

I think I understand the problem you’re experiencing:

Konrad Hinsen  skribis:

> I tried to install gcc46 after applying your patches. stdenv builds fine, but
> mpfr (a dependency of gcc46) fails at the link stage:
>
>   ld: pointer in read-only segment not allowed in slidable image, used in 
> ___gmpn_divexact_1 from /usr/local/lib/libgmp.a(dive_1.o)

Can you remove GMP from /usr/local?

It’s generally a bad idea to have software available there on Hydra,
because then packages built with Nix may end up using them, leading to a
complete mess of impurity as the rest of the world knows it.  :-)

Note that you should soon be able to grab binaries from hydra.nixos.org.

HTH,
Ludo’.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] gcc for MacOS X

[Ludovic Courtès]

Hi!

Eelco Dolstra  skribis:

> Darwin builds seem to be failing due to a missing /bin/bash:
> http://hydra.nixos.org/eval/613969

Oops!  Use of ‘allStdenvs.stdenvNative’ exposed a bug whereby ‘system’
would not be propagated through all the stdenvs.

Thus, running ‘nix-build -A stdenv --argstr system x86_64-darwin’ (as on
Hydra) would actually try to build it on an x86_64-linux, and fail for
lack of /bin/bash.

Fixed in r33898.

Thanks,
Ludo’.

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r33898 - nixpkgs/trunk/pkgs/top-level

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 22:31:39 2012
New Revision: 33898
URL: https://nixos.org/websvn/nix/?rev=33898&sc=1

Log:
allStdenvs: Propagate `system'.

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   Mon Apr 23 16:28:10 
2012(r33897)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Apr 23 22:31:39 
2012(r33898)
@@ -195,7 +195,7 @@
 
   allStdenvs = import ../stdenv {
 inherit system stdenvType platform;
-allPackages = args: import ./all-packages.nix ({ inherit config; } // 
args);
+allPackages = args: import ./all-packages.nix ({ inherit config system; } 
// args);
   };
 
   defaultStdenv = allStdenvs.stdenv // { inherit platform; };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] gcc for MacOS X

[Eelco Dolstra]

Hi,

On 23/04/12 18:00, Ludovic Courtès wrote:

> Here we are!  ‘stdenvNative’ on Darwin now uses GCC 4.6, like on all the
> other platforms.  The Darwin-specific tools (‘arch’, ‘sw_vers’, etc.)
> are now part of ‘stdenv’ as well, and ‘darwinArchUtility’ & co. are gone.

Great!

> Let me know if there’s anything wrong!

Darwin builds seem to be failing due to a missing /bin/bash:
http://hydra.nixos.org/eval/613969

-- 
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] gcc for MacOS X

[Konrad Hinsen]

Ludovic Courtès writes:

 > Here we are!  ‘stdenvNative’ on Darwin now uses GCC 4.6, like on all the
 > other platforms.  The Darwin-specific tools (‘arch’, ‘sw_vers’, etc.)
 > are now part of ‘stdenv’ as well, and ‘darwinArchUtility’ & co. are gone.
 > 
 > Let me know if there’s anything wrong!

Same problem as with your last patch: I can't build gcc46 because the
build of mpfr fails.

Actually, I wonder how your setup works: if stdenv contains gcc46, and
building gcc46 requires stdenv, what gets built first?

Konrad.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r33897 - nixpkgs/trunk/pkgs/development/compilers/ghc

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 16:28:10 2012
New Revision: 33897
URL: https://nixos.org/websvn/nix/?rev=33897&sc=1

Log:
GHC 7.4.2: Remove `darwinInstallNameToolUtility'.

Modified:
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix  Mon Apr 23 
16:28:06 2012(r33896)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix  Mon Apr 23 
16:28:10 2012(r33897)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "7.4.1.20120412";
@@ -10,8 +10,7 @@
 sha256 = "0hpzd51s5nvlsjk3wza45ji5v6m0szqjzch45fvv7wfzllrm595l";
   };
 
-  buildInputs = [ghc perl gmp ncurses] ++
-(if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+  buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
 libraries/integer-gmp_CONFIGURE_OPTS += 
--configure-option=--with-gmp-libraries="${gmp}/lib"
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r33896 - nixpkgs/trunk/pkgs/development/compilers/gcc/4.6

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 16:28:06 2012
New Revision: 33896
URL: https://nixos.org/websvn/nix/?rev=33896&sc=1

Log:
GCC 4.6: Don't bail out when `gnused' isn't provided.

Modified:
   nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nixMon Apr 
23 15:47:41 2012(r33895)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nixMon Apr 
23 16:28:06 2012(r33896)
@@ -28,7 +28,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, gnused
+, gnused ? null
 }:
 
 assert langJava -> zip != null && unzip != null
@@ -40,6 +40,9 @@
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
 with stdenv.lib;
 with builtins;
 
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] gcc for MacOS X

[Ludovic Courtès]

Hello!

Here we are!  ‘stdenvNative’ on Darwin now uses GCC 4.6, like on all the
other platforms.  The Darwin-specific tools (‘arch’, ‘sw_vers’, etc.)
are now part of ‘stdenv’ as well, and ‘darwinArchUtility’ & co. are gone.

Let me know if there’s anything wrong!

Ludo’.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] [PATCH] Put old generations in grub submenu (NixOS)

[Eelco Dolstra]

Hi,

On 11/03/12 12:15, Eelco Dolstra wrote:

>>> I have made a patch which adds an option
>>> (config.boot.loader.grub.oldVersionsInSubmenu)
>>> for hiding the old versions of the system in a submenu to reduce cluttering.
>>
>> Awesome !
> 
> Indeed, I didn't know about the existence of this feature in Grub.  I would
> suggest making it the default behaviour (that is, don't bother making it an 
> option).

I've finally applied this (minus the option, I just made it unconditional).

-- 
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

[Nix-commits] SVN commit: nix - r33895 - nixpkgs/trunk/pkgs/top-level

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 15:47:41 2012
New Revision: 33895
URL: https://nixos.org/websvn/nix/?rev=33895&sc=1

Log:
GFortran: Use GFortran 4.6 on Darwin.

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   Mon Apr 23 15:47:37 
2012(r33894)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Apr 23 15:47:41 
2012(r33895)
@@ -1975,13 +1975,7 @@
 texinfo = texinfo49;
   });
 
-  gfortran =
-if stdenv.isDarwin
-then wrapGCC (gccApple.gcc.override {
-  langF77 = true;
-  inherit gmp mpfr bison flex;
-})
-else gfortran46;
+  gfortran = gfortran46;
 
   gfortran40 = wrapGCC (gcc40.gcc.override {
 langFortran = true;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r33894 - in nixpkgs/trunk/pkgs: development/compilers/gcc/4.6 development/libraries/ncurses stdenv/nix top-level

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 15:47:37 2012
New Revision: 33894
URL: https://nixos.org/websvn/nix/?rev=33894&sc=1

Log:
Darwin: Use GCC 4.6 in `stdenvNix'.

Modified:
   nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
   nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix
   nixpkgs/trunk/pkgs/stdenv/nix/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
==
--- nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nixMon Apr 
23 15:47:31 2012(r33893)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nixMon Apr 
23 15:47:37 2012(r33894)
@@ -28,6 +28,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
+, gnused
 }:
 
 assert langJava -> zip != null && unzip != null
@@ -226,6 +227,10 @@
 ++ (optionals (cross != null) [binutilsCross])
 ++ (optionals langAda [gnatboot])
 ++ (optionals langVhdl [gnat])
+
+# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+++ (optional stdenv.isDarwin gnused)
 ;
 
   configureFlagsArray = stdenv.lib.optionals

Modified: nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nixMon Apr 
23 15:47:31 2012(r33893)
+++ nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nixMon Apr 
23 15:47:37 2012(r33894)
@@ -27,7 +27,11 @@
 
   enableParallelBuilding = true;
 
-  preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile 
Makefile'';
+  preBuild =
+# On Darwin, we end up using the native `sed' during bootstrap, and it
+# fails to run this command, which isn't needed anyway.
+stdenv.lib.optionalString (!stdenv.isDarwin)
+''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
 
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the

Modified: nixpkgs/trunk/pkgs/stdenv/nix/default.nix
==
--- nixpkgs/trunk/pkgs/stdenv/nix/default.nix   Mon Apr 23 15:47:31 2012
(r33893)
+++ nixpkgs/trunk/pkgs/stdenv/nix/default.nix   Mon Apr 23 15:47:37 2012
(r33894)
@@ -28,7 +28,7 @@
 import ../../build-support/native-darwin-cctools-wrapper {inherit 
stdenv;}
   else
 pkgs.binutils;
-gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc;
+gcc = pkgs.gcc.gcc;
 coreutils = pkgs.coreutils;
 shell = pkgs.bash + "/bin/sh";
   };

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Apr 23 15:47:31 
2012(r33893)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix   Mon Apr 23 15:47:37 
2012(r33894)
@@ -1962,8 +1962,12 @@
   (if stdenv.system == "i686-darwin"
then import ../development/compilers/gcc/4.2-apple32
else import ../development/compilers/gcc/4.2-apple64) {
- inherit fetchurl stdenv noSysDirs;
+ inherit fetchurl noSysDirs;
  profiledCompiler = true;
+
+ # Since it fails to build with GCC 4.6, build it with the "native"
+ # Apple-GCC.
+ stdenv = allStdenvs.stdenvNative;
});
 
   gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
@@ -3199,7 +3203,14 @@
 target = crossSystem;
   };
 
-  valgrind = callPackage ../development/tools/analysis/valgrind { };
+  valgrind = callPackage ../development/tools/analysis/valgrind {
+stdenv =
+  # On Darwin, Valgrind 3.7.0 expects Apple's GCC (for
+  # `__private_extern'.)
+  if stdenv.isDarwin
+  then overrideGCC stdenv gccApple
+  else stdenv;
+  };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
@@ -4429,8 +4440,15 @@
   mysocketw = callPackage ../development/libraries/mysocketw { };
 
   ncurses = makeOverridable (import ../development/libraries/ncurses) {
-inherit fetchurl stdenv;
+inherit fetchurl;
 unicode = system != "i686-cygwin";
+stdenv =
+  # On Darwin, NCurses uses `-no-cpp-precomp', which is specific to
+  # Apple-GCC.  Since NCurses is part of stdenv, always use
+  # `stdenvNative' to build it.
+  if stdenv.isDarwin
+  then allStdenvs.stdenvNative
+  else stdenv;
   };
 
   neon = neon029;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r33893 - in nixpkgs/trunk/pkgs: build-support/native-darwin-cctools-wrapper development/compilers/ghc development/compilers/llvm development/interpreters/python/2.6 dev

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 15:47:31 2012
New Revision: 33893
URL: https://nixos.org/websvn/nix/?rev=33893&sc=1

Log:
Darwin: Add `mig', `lipo', etc. to `stdenvNative'.

Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

Deleted:
   nixpkgs/trunk/pkgs/os-specific/darwin/arch/builder.sh
   nixpkgs/trunk/pkgs/os-specific/darwin/arch/default.nix
   nixpkgs/trunk/pkgs/os-specific/darwin/install_name_tool/builder.sh
   nixpkgs/trunk/pkgs/os-specific/darwin/install_name_tool/default.nix
   nixpkgs/trunk/pkgs/os-specific/darwin/lipo/builder.sh
   nixpkgs/trunk/pkgs/os-specific/darwin/lipo/default.nix
   nixpkgs/trunk/pkgs/os-specific/darwin/sw_vers/builder.sh
   nixpkgs/trunk/pkgs/os-specific/darwin/sw_vers/default.nix
Modified:
   nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
   nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.2.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.3.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.0.4.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.1.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.2.2.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.1.nix
   nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
   nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix
   nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/python/2.6/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix
   nixpkgs/trunk/pkgs/development/interpreters/python/3.2/default.nix
   nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
   nixpkgs/trunk/pkgs/development/libraries/yajl/default.nix
   nixpkgs/trunk/pkgs/development/tools/analysis/valgrind/default.nix
   nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/264.nix
   nixpkgs/trunk/pkgs/development/tools/build-managers/cmake/default.nix
   nixpkgs/trunk/pkgs/development/web/nodejs/default.nix
   nixpkgs/trunk/pkgs/servers/sql/mysql55/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: 
nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
==
--- nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh   
Mon Apr 23 15:47:21 2012(r33892)
+++ nixpkgs/trunk/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh   
Mon Apr 23 15:47:31 2012(r33893)
@@ -1,6 +1,16 @@
 source $stdenv/setup
 
 mkdir -p $out/bin
-for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil 
libtool; do 
-ln -s /usr/bin/$i $out/bin/
+for i in $binaries
+do 
+ln -s "/usr/bin/$i" "$out/bin/"
 done
+
+# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
+# let it see the impure directories.
+cat > "$out/bin/mig" < zlib != null;
-assert stdenv.isDarwin -> darwinArchUtility != null;
-assert stdenv.isDarwin -> darwinSwVersUtility != null;
 
 with stdenv.lib;
 
@@ -33,8 +30,7 @@
   buildInputs =
 optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
 [ bzip2 ]
-++ optional zlibSupport zlib
-++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
+++ optional zlibSupport zlib;
 
 
   # Build the basic Python interpreter without modules that have

Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix  Mon Apr 
23 15:47:21 2012(r33892)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix  Mon Apr 
23 15:47:31 2012(r33893)
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
 , sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
-, darwinArchUtility ? null, darwinSwVersUtility ? null
 }:
 
 assert zlibSupport -> zlib != null;
-assert stdenv.isDarwin -> darwinArchUtility != null;
-assert stdenv.isDarwin -> darwinSwVersUtility != null;
 
 with stdenv.lib;
 
@@ -39,8 +36,7 @@
   buildInputs =
 optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
 [ bzip2 openssl ]
-++ optional zlibSupport zlib
-++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
+++ optional zlibSupport zlib;
 
   ensurePurity =
 ''

Modified: nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix
==
--- nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix  Mon Apr 
23 15:47:21 2012(r33892)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/3.1/default.nix  Mon Apr 
23 15:47:31 2012(r33893)
@@ -9,11 +9,8 @@
 , openssl
 , tcl, tk
 , libX11, xproto
-

[Nix-commits] SVN commit: nix - r33892 - nixpkgs/trunk/pkgs/tools/text/gnupatch

[Ludovic Courtès]

Author: ludo
Date: Mon Apr 23 15:47:21 2012
New Revision: 33892
URL: https://nixos.org/websvn/nix/?rev=33892&sc=1

Log:
GNU Patch: On Darwin, use an existing tarball, and patch from there.

Added:
   nixpkgs/trunk/pkgs/tools/text/gnupatch/darwin-fix.patch
Modified:
   nixpkgs/trunk/pkgs/tools/text/gnupatch/default.nix

Added: nixpkgs/trunk/pkgs/tools/text/gnupatch/darwin-fix.patch
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/text/gnupatch/darwin-fix.patch Mon Apr 23 
15:47:21 2012(r33892)
@@ -0,0 +1,60 @@
+Fix builds on Darwin:
+http://lists.gnu.org/archive/html/bug-patch/2010-01/msg4.html .
+
+
+commit 2c4e3ecddec8a686bd50d238f4cefebb950298b7
+Author: Andreas Gruenbacher 
+Date:   Fri Jan 1 15:58:15 2010 +0100
+
+* Makefile.in (LIBSRCS, LIBM4FILES): Add the missing files strnlen.c,
+strnlen.m4, and safe-read.m4.
+
+diff --git a/Makefile.in b/Makefile.in
+index 3b3d78a..26dc281 100644
+--- a/Makefile.in
 b/Makefile.in
+@@ -91,6 +91,7 @@ LIBSRCS = \
+   gl/lib/stripslash.c \
+   gl/lib/strncasecmp.c \
+   gl/lib/strndup.c \
++  gl/lib/strnlen.c \
+   gl/lib/xmalloc.c \
+   gl/lib/xstrndup.c
+
+
+Add the missing bits from Gnulib.
+
+--- /dev/null  2012-04-23 08:54:35.747205543 +0200
 b/gl/lib/strnlen.c 2012-01-16 22:35:02.0 +0100
+@@ -0,0 +1,31 @@
++/* Find the length of STRING, but scan at most MAXLEN characters.
++   Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc.
++   Written by Simon Josefsson.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software Foundation,
++   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
++
++#include 
++
++#include 
++
++/* Find the length of STRING, but scan at most MAXLEN characters.
++   If no '\0' terminator is found in that many characters, return MAXLEN.  */
++
++size_t
++strnlen (const char *string, size_t maxlen)
++{
++  const char *end = memchr (string, '\0', maxlen);
++  return end ? (size_t) (end - string) : maxlen;
++}

Modified: nixpkgs/trunk/pkgs/tools/text/gnupatch/default.nix
==
--- nixpkgs/trunk/pkgs/tools/text/gnupatch/default.nix  Mon Apr 23 15:47:03 
2012(r33891)
+++ nixpkgs/trunk/pkgs/tools/text/gnupatch/default.nix  Mon Apr 23 15:47:21 
2012(r33892)
@@ -1,19 +1,12 @@
 { stdenv, fetchurl, ed }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "patch-2.6.1";
 
-  src =
-if stdenv.isDarwin
-then fetchurl {
-  # Temporary fix for
-  # http://lists.gnu.org/archive/html/bug-patch/2010-01/msg4.html .
-  url = "ftp://alpha.gnu.org/gnu/patch/patch-2.6.1.87-94d8.tar.gz";;
-  sha256 = "0jnw8p0nvkmwi1a2z56bssqik8fvkb71zd2cpzl1sklnrg1g3b6p";
-} else fetchurl {
-  url = "mirror://gnu/patch/${name}.tar.gz";
-  sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
-};
+  src = fetchurl {
+url = "mirror://gnu/patch/${name}.tar.gz";
+sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
+  };
 
   buildInputs = (stdenv.lib.optional doCheck ed);
 
@@ -40,3 +33,9 @@
 platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isDarwin {
+  patches = [ ./darwin-fix.patch ];
+}))
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

[Nix-commits] SVN commit: nix - r33891 - nixos/trunk/modules/installer/grub

[Eelco Dolstra]

Author: eelco
Date: Mon Apr 23 15:47:03 2012
New Revision: 33891
URL: https://nixos.org/websvn/nix/?rev=33891&sc=1

Log:
* Put old NixOS configurations in a GRUB submenu.  Contributed by
  Andreas Källberg.

Modified:
   nixos/trunk/modules/installer/grub/grub-menu-builder.sh

Modified: nixos/trunk/modules/installer/grub/grub-menu-builder.sh
==
--- nixos/trunk/modules/installer/grub/grub-menu-builder.sh Mon Apr 23 
12:42:03 2012(r33890)
+++ nixos/trunk/modules/installer/grub/grub-menu-builder.sh Mon Apr 23 
15:47:03 2012(r33891)
@@ -269,6 +269,12 @@
 addEntry "NixOS - variation" $link ""
 done
 
+if [ "$grubVersion" = 2 ]; then
+cat >> $tmp <> $tmp 

[Nix-commits] SVN commit: nix - r33890 - nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre

[Eelco Dolstra]

Author: eelco
Date: Mon Apr 23 12:42:03 2012
New Revision: 33890
URL: https://nixos.org/websvn/nix/?rev=33890&sc=1

Log:
* Revert pcre (r33561).  It breaks Apache
  (http://hydra.nixos.org/build/2447441).

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
==
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix 
Mon Apr 23 09:34:01 2012(r33889)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix 
Mon Apr 23 12:42:03 2012(r33890)
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.30";
+  name = "pcre-8.21";
 
   src = fetchurl {
 url = 
"ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";;
-sha256 = "1b7lcp4kfjc0jyvpw4pxkbmyjhmnwlrd85rrifnrfklkvgbky4f1";
+sha256 = "1qwrqldbwszbmr4cw4f0xmcl889cmmjbf58l9vxn89zw26fm1f54";
   };
 
   # The compiler on Darwin crashes with an internal error while building the
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] nix configuration language

[Ben Franksen]

Ben Franksen wrote:
> Checking out the nix sources via git, I can't even build it:
> 
> ben@sarun[1]: .../tmp/nix > git status
> # On branch master
> nothing to commit (working directory clean)
> ben@sarun[1]: .../tmp/nix > ./bootstrap.sh
> autoreconf: Entering directory `.'
> autoreconf: configure.ac: not using Gettext
> autoreconf: running: aclocal --force
> autoreconf: configure.ac: tracing
> autoreconf: configure.ac: not using Libtool
> autoreconf: running: /usr/bin/autoconf --force
> configure.ac:59: error: possibly undefined macro: AC_DISABLE_SHARED
>   If this token and others are legitimate, please use
>   m4_pattern_allow. See the Autoconf documentation.
> configure.ac:60: error: possibly undefined macro: AC_ENABLE_STATIC
> configure.ac:85: error: possibly undefined macro: AC_DISABLE_STATIC
> configure.ac:86: error: possibly undefined macro: AC_ENABLE_SHARED
> configure.ac:87: error: possibly undefined macro: AC_PROG_LIBTOOL
> autoreconf: /usr/bin/autoconf failed with exit status: 1
> 
> I do have autoconf, automake etc installed at version 2.68.

Found the solution: I did not have libtool installed. After installing 
libtool it works.

Cheers
Ben

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] nix configuration language

[Marc Weber]

Excerpts from Ben Franksen's message of Mon Apr 23 13:53:28 +0200 2012:
> want it to manage binaries, only the configuration data.
So you end up having a mysql.cnf and a apache conf without a running
apache process ?

Get nixos - have a look at how etc is managed (there is a etc perl
builder script, and ls -ld /etc/* will be enough to show that all
managed files point to /etc/static whose sub paths point to nix/store)

You can manage etc in a similar way *and* create a list of packages
which must be present on the system such as 'apache2-...' because you
have apache configurations.

> > Another nice keyword might be "chef":
> > https://github.com/opscode/chef
> various formats not widely known outside the application area. I want a 
> small versatile tool, not a huge 'framework'. And open source, please ;-)
Isn't it apache license? Anyway it doesn't matter for you.

Marc Weber
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] nix configuration language

[Ben Franksen]

Marc Weber wrote:
> Excerpts from Ben Franksen's message of Mon Apr 23 12:42:14 +0200 2012:
>> I don't know how I can execute a 'nix-language script'. Is there a tool
>> in the nix package that I could use for that?
> the nix suite ships with test cases. If you look at those you'll find
> that its nix-instantiate --eval-only [--strict] foo.nix which evaluates
> nix code and eventually writes .drv files or such.

Thank you, this is exactly what I needed to know. Now I can start to play 
with the idea...

> nix-build basically does a nix-instantiate and the a nix-store --realise
> .drv file (maybe its hardcoded in C).
> 
> If you use Vim you may want to look at vim-addon-nix which provides
> default mappings for running nix via vim-addon-actions.
> It also syntax checks the nix files on buf write.

Cool. Will look at this.

> Now it depends on which output you need and how to do what would be
> called "IO" Haskell, or which is nixos-rebuild for nixos - thus how to
> do something with your description (which might be called evaluated
> result).

Yes.

> Eg the "nix" way would be create a store paths such as
> 
> $out/bin/realise
> $out/machine1/target-ssh-data
> $out/machine1/configuration.nix
> 
> where the realise script tries to connect to the target machines,
> copying over the configuration then running nixos-rebuild.

We do have a self-written tool for distributing the configuration in a 
quasi-immutable way, similar to nix (but a lot less elegant). The problem 
with nix is that it is a bit too radical for our purposes, i.e. we do not 
want it to manage binaries, only the configuration data.

> However in the real world you have to cope with state - eg do HTTP
> forwarding until domain servers caches time out if you move web sites,
> and drop that after a couple of days etc.

What we do is very different from web/cloud stuff. It /is/ a distributed 
system, but rather one for which you would want to use Erlang (though we do 
not, unfortunately, else we'd use that for configuration, too).

> I'm not entirely sure - maybe what you're looking for is what disnix is
> about: http://nixos.org/disnix/

I looked at disnix, and it is certainly interesting, but as it builds on nix 
it is most probably overkill, even more so than nix itself is.

>> Do you think it would be very difficult to extract the language from the
>> nix source tree?
> define "very difficult". 

Checking out the nix sources via git, I can't even build it:

ben@sarun[1]: .../tmp/nix > git status
# On branch master
nothing to commit (working directory clean)
ben@sarun[1]: .../tmp/nix > ./bootstrap.sh
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force 
autoreconf: configure.ac: tracing
autoreconf: configure.ac: not using Libtool
autoreconf: running: /usr/bin/autoconf --force
configure.ac:59: error: possibly undefined macro: AC_DISABLE_SHARED
  If this token and others are legitimate, please use m4_pattern_allow.
  See the Autoconf documentation.
configure.ac:60: error: possibly undefined macro: AC_ENABLE_STATIC
configure.ac:85: error: possibly undefined macro: AC_DISABLE_STATIC
configure.ac:86: error: possibly undefined macro: AC_ENABLE_SHARED
configure.ac:87: error: possibly undefined macro: AC_PROG_LIBTOOL
autoreconf: /usr/bin/autoconf failed with exit status: 1

I do have autoconf, automake etc installed at version 2.68.

> Think about how to use the result. Wait for
> more replies. Think about which tool will turn your "configuration" done
> with any DSL into something "real".

There will probably have to be 'builders' of some sort or the other, 
depending on the format of the output. I will play around a bit and see...

> Another nice keyword might be "chef":
> https://github.com/opscode/chef

Looking at the web-site I don't think this fits the bill at all. The output 
from our configuration spec is typically a number of simple text files in 
various formats not widely known outside the application area. I want a 
small versatile tool, not a huge 'framework'. And open source, please ;-)

> to find related work before spending huge amounts of time this.

No fear, I really cannot invest a lot of time to do such a split/re-
factoring. But what you wrote above about nix-instantiate --eval-only sounds 
promising.

> You're welcome in any case :)

Thanks!

Cheers
Ben

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] nix configuration language

[Marc Weber]

Excerpts from Ben Franksen's message of Mon Apr 23 12:42:14 +0200 2012:
> I don't know how I can execute a 'nix-language script'. Is there a tool in 
> the nix package that I could use for that?
the nix suite ships with test cases. If you look at those you'll find
that its nix-instantiate --eval-only [--strict] foo.nix which evaluates
nix code and eventually writes .drv files or such.

nix-build basically does a nix-instantiate and the a nix-store --realise
.drv file (maybe its hardcoded in C).

If you use Vim you may want to look at vim-addon-nix which provides
default mappings for running nix via vim-addon-actions.
It also syntax checks the nix files on buf write.

Now it depends on which output you need and how to do what would be
called "IO" Haskell, or which is nixos-rebuild for nixos - thus how to
do something with your description (which might be called evaluated
result).

Eg the "nix" way would be create a store paths such as

$out/bin/realise
$out/machine1/target-ssh-data
$out/machine1/configuration.nix

where the realise script tries to connect to the target machines,
copying over the configuration then running nixos-rebuild.

However in the real world you have to cope with state - eg do HTTP
forwarding until domain servers caches time out if you move web sites,
and drop that after a couple of days etc.

I'm not entirely sure - maybe what you're looking for is what disnix is
about: http://nixos.org/disnix/

> Do you think it would be very difficult to extract the language from the nix 
> source tree?
define "very difficult". Think about how to use the result. Wait for
more replies. Think about which tool will turn your "configuration" done
with any DSL into something "real".
Get nix code. its not that hard to get an overview.

Another nice keyword might be "chef":
https://github.com/opscode/chef
to find related work before spending huge amounts of time this.

You're welcome in any case :)

Marc Weber
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] nix configuration language

[Ben Franksen]

Marc Weber wrote:
> Excerpts from Ben Franksen's message of Mon Apr 23 10:53:26 +0200 2012:
>> Would it be sensible or even possible to factor out the configuration
>> language from the nix package and distribute it separately?
> Such things are always possible. I think you should talk about your use
> case first.

Large control systems: many devices (hundreds, thousands), most of them 
quite similar to each other, but now and then the occasional exception to 
the rule. A few devices very complex, needing hierarchies of configuration 
data.

> Eventually using another lazy language such as Haskell get's
> your job done as well.

I love programming in Haskell, but it is too large and complex for use as a 
configuration language. It also too hard to understand for the typical 
control system engineer.

> That's why you should be aware about why the nix
> language is the tool of choice for you

Well, I see nix (the language) as something like yaml or json (only smaller 
and cleaner) with the additional feature of user-defined functions (and some 
built-in ones). Nix has a number of features that make it especially 
suitable for configuration (no wonder: it's what it has been designed for), 
for instance the inherit feature which makes it easy to define exceptions to 
a general rule.

> Writing a DSL for configurations can be done easily using many scripting
> languages - thus you should be aware why you like nix that much.

Mostly it's the purity and laziness that make it IMO superior to the 
standard scripting languages. We have been using perl, python, tcl, but none 
of them are as suited to the task as I think the nix language would be.

> For prototyping you can use nix and make it create arbitrary
> configuration files.

I don't know how I can execute a 'nix-language script'. Is there a tool in 
the nix package that I could use for that?

I would not want to fork the configuration language from nix, but rather 
factor the language out, so users who only need/want the language can still 
profit from improvements made by the nix development.

Do you think it would be very difficult to extract the language from the nix 
source tree?

Cheers
Ben

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] [NixOS/nix] 25de80: Adding a nix option to sync before registering a p...

[Eelco Dolstra]

  Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 25de80e2b61208850c4a39d8ee44967ada8f040e
  
https://github.com/NixOS/nix/commit/25de80e2b61208850c4a39d8ee44967ada8f040e
  Author: Lluís Batlle i Rossell 
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
M src/libstore/local-store.cc

  Log Message:
  ---
  Adding a nix option to sync before registering a path, for non-ext*
filesystems.


diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index f3b779d..950e6e7 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -968,6 +968,8 @@ void LocalStore::registerValidPath(const ValidPathInfo & 
info)
 
 void LocalStore::registerValidPaths(const ValidPathInfos & infos)
 {
+if (queryBoolSetting("sync-before-registering", true))
+sync();
 while (1) {
 try {
 SQLiteTxn txn(db);



  Commit: 85799bf89ed2649d7f3e2298de0478c50a71776d
  
https://github.com/NixOS/nix/commit/85799bf89ed2649d7f3e2298de0478c50a71776d
  Author: Lluís Batlle i Rossell 
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
M src/libstore/local-store.cc

  Log Message:
  ---
  Fixing the default of sync-before-registering

Setting 'false' as default, as suggested by Eelco.

I also added a comment about the setting in the code.


diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 950e6e7..ca541e1 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -968,8 +968,12 @@ void LocalStore::registerValidPath(const ValidPathInfo & 
info)
 
 void LocalStore::registerValidPaths(const ValidPathInfos & infos)
 {
-if (queryBoolSetting("sync-before-registering", true))
+/* sqlite will fsync by default, but the new valid paths may not be 
fsync-ed.
+ * So some may want to fsync them before registering the validity, at the
+ * expense of some speed of the path registering operation. */
+if (queryBoolSetting("sync-before-registering", false))
 sync();
+
 while (1) {
 try {
 SQLiteTxn txn(db);



  Commit: 6387830c3b12722e5962a99aa81f225ea0830076
  
https://github.com/NixOS/nix/commit/6387830c3b12722e5962a99aa81f225ea0830076
  Author: Eelco Dolstra 
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
M src/libstore/local-store.cc

  Log Message:
  ---
  Merge pull request #2 from viric/master

Again, adding the sync option


diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 1ab9d15..f04436b 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -968,6 +968,12 @@ void LocalStore::registerValidPath(const ValidPathInfo & 
info)
 
 void LocalStore::registerValidPaths(const ValidPathInfos & infos)
 {
+/* sqlite will fsync by default, but the new valid paths may not be 
fsync-ed.
+ * So some may want to fsync them before registering the validity, at the
+ * expense of some speed of the path registering operation. */
+if (queryBoolSetting("sync-before-registering", false))
+sync();
+
 while (1) {
 try {
 SQLiteTxn txn(db);



Compare: https://github.com/NixOS/nix/compare/259c6d3...6387830
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Re: [Nix-dev] gcc for MacOS X

[Ludovic Courtès]

Hi Konrad,

Thanks for looking into it.

I’m currently testing a modified version of the patch that uses GCC in
stdenv (instead of Apple’s GCC).

I’ll make sure to test as much as possible before committing.  :-)

Ludo’.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-commits] SVN commit: nix - r33889 - in nixpkgs/trunk/pkgs: applications/version-management/darcs development/libraries/haskell/Graphalyze development/libraries/haskell/Hipmunk development/librari

[Peter Simons]

Author: simons
Date: Mon Apr 23 09:34:01 2012
New Revision: 33889
URL: https://nixos.org/websvn/nix/?rev=33889&sc=1

Log:
Updated Haskell packages.

 - alternative-io: updated to version 0.0.1
 - blaze-markup: added version 0.5.1.0
 - crypto-conduit: updated to version 0.3.2
 - cryptohash: updated to version 0.7.5
 - darcs: updated to version 2.8.0
 - filestore: updated to version 0.4.2
 - Graphalyze: cosmetic change
 - hamlet: updated to version 1.0.1.1
 - happstack-hamlet: updated to version 7.0.1
 - happstack-server: updated to version 7.0.1
 - HFuse: updated to version 0.2.4.1
 - Hipmunk: updated to version 5.2.0.8
 - language-javascript: updated to version 0.5.2
 - libmpd: updated to version 0.8.0
 - lifted-base: updated to version 0.1.0.4
 - monad-control: updated to version 0.3.1.2
 - persistent: updated to version 0.9.0.3
 - regex-compat: use latest version when building with GHC 7.4.1
 - skein: updated to version 0.1.0.7
 - snap-core: updated to version 0.8.1
 - snap-server: updated to version 0.8.1.1
 - tls: updated to version 0.9.5
 - vty: updated to version 4.7.0.12
 - wai-app-static: updated to version 1.2.0.2
 - yesod-core: updated to version 1.0.1.1

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-markup/
   nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-markup/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/default.nix
  - copied, changed from r33888, 
nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.1.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/monad-control/0.3.1.nix
Modified:
   nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/alternative-io/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/crypto-conduit/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/cryptohash/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/filestore/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
   
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
   
nixpkgs/trunk/pkgs/development/libraries/haskell/happstack/happstack-server.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/hfuse/default.nix
   
nixpkgs/trunk/pkgs/development/libraries/haskell/language-javascript/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/libmpd/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/lifted-base/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/skein/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/snap/core.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/snap/server.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/tls/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/vty/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/wai-app-static/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
==
--- nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
Mon Apr 23 04:25:18 2012(r33888)
+++ nixpkgs/trunk/pkgs/applications/version-management/darcs/default.nix
Mon Apr 23 09:34:01 2012(r33889)
@@ -1,17 +1,18 @@
 { cabal, curl, extensibleExceptions, filepath, hashedStorage
 , haskeline, html, HTTP, mmap, mtl, network, parsec, random
-, regexCompat, tar, terminfo, text, zlib
+, regexCompat, tar, terminfo, text, vector, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "darcs";
-  version = "2.5.2";
-  sha256 = "11mk1xcrxk2x5c0s96s19wb4xvhjl9s59bdqcrj8f4w09zbgjlw9";
+  version = "2.8.0";
+  sha256 = "10yfab7qb20hzikwrgra7zhx7ad2j0s6l7zksmvczf4xm6hw458l";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
 extensibleExceptions filepath hashedStorage haskeline html HTTP
-mmap mtl network parsec random regexCompat tar terminfo text zlib
+mmap mtl network parsec random regexCompat tar terminfo text vector
+zlib
   ];
   extraLibraries = [ curl ];
   meta = {

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix
==
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Graphalyze/default.nix 
Mon Apr 23 04:25:18 2012(r33888)
+++ nixpkgs/trunk/pkgs/development/libraries

[Nix-dev] nix-prefetch-url for git

[Mathijs Kwik]

Hi all,

How can I prefetch a git repo (at certain revision) to get its sha256 ?

Thanks,
Mathijs
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] nix configuration language

[Marc Weber]

Excerpts from Ben Franksen's message of Mon Apr 23 10:53:26 +0200 2012:
> Would it be sensible or even possible to factor out the configuration 
> language from the nix package and distribute it separately?
Such things are always possible. I think you should talk about your use
case first. Eventually using another lazy language such as Haskell get's
your job done as well. That's why you should be aware about why the nix
language is the tool of choice for you

Writing a DSL for configurations can be done easily using many scripting
languages - thus you should be aware why you like nix that much.

For prototyping you can use nix and make it create arbitrary
configuration files.

Marc Weber
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] gcc for MacOS X

[Konrad Hinsen]

Ludovic Courtès writes:

 > The attached patch incorporates all these changes.

I tried to install gcc46 after applying your patches. stdenv builds fine, but
mpfr (a dependency of gcc46) fails at the link stage:

  ld: pointer in read-only segment not allowed in slidable image, used in 
___gmpn_divexact_1 from /usr/local/lib/libgmp.a(dive_1.o)

I don't know what that message really means, but I wonder if it's OK to see it
linking to /usr/local/lib/libgmp.a. When I try

  nix-instantiate pkgs/top-level/all-packages.nix -A gmp

Nix tells me this gives gmp-5.0.3, which is in my Nix store. So I suspect that
the builder for mpfr picks up the wrong version of gmp.

Konrad.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] nix configuration language

[Ben Franksen]

Hi Everyone

I hope this is the right forum for my question.

I like the nix configuration language and I think it would be a useful tool 
in applications other than nix and nixos.

Would it be sensible or even possible to factor out the configuration 
language from the nix package and distribute it separately?

Cheers
Ben

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] Building vboxguest failed.

[Alexey Ivanov]

virtualbox guest additions http://i.imgur.com/n5zRJ.png
log here http://sprunge.us/LHGQ

irc log:


[07:54:14]  krab: Not nix-specific, see
http://ubuntuforums.org/showthread.php?t=1888470 . Looks like a newer vbox
will fix this, but a patch is possible. Please post the issue to the ML, I
or someone else will be more likely to fix it then.

[07:54:47]  ML?

[07:55:10]  Mailing list
https://mail.cs.uu.nl/mailman/listinfo/nix-dev

[07:56:44]  krab: Hm, looks like there's already a new virtualbox
out. I'll test building it (probably overnight) and if it works I'll commit
it

[07:57:37]  Vbox v.4.1.12
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] confused by the recent channels stuff

[Lluís Batlle i Rossell]

Hello,

On Mon, Apr 23, 2012 at 02:52:38AM +0200, Eelco Dolstra wrote:
> On 22/04/12 11:03, Mathijs Kwik wrote:
> > However, I have some local packages in my /etc/nixos/nixpkgs, and they
> > are not available anymore.
> > So I guess channels are not for people who want to have some local
> > modifications.
> > And what does this mean for binary updates? Are they only available
> > through the channel from now on?
> 
> It's the same as it's always been: if the path you're building is available 
> in a
> subscribed channel, you get binaries, otherwise it's built from source.  So it
> depends on how much your source tree differs from the sources in the channel.

Will 'installer.manifests' still be available in nixos? Should we use it at all,
and if so, what manifests url do you recommend for nixos/nixpkgs from trunk?

Regards,
Lluís.
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] [Nix-commits] SVN commit: nix - r33823 - nixos/trunk/modules/programs/bash

[Peter Simons]

Hi Eelco,

 > /etc/nixos/{nixos,nixpkgs} are gone in the installation CD and on
 > newly installed systems. The sources are now in the channels profile,
 > so "nix-channel --update" will replace them with the latest version,
 > if desired.

in this new setup, what is the difference between "nix-channel update"
and "nixos-rebuild pull"?

Take care,
Peter

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] confused by the recent channels stuff

[Mathijs Kwik]

On Mon, Apr 23, 2012 at 9:00 AM, Mathijs Kwik  wrote:
> On Mon, Apr 23, 2012 at 2:52 AM, Eelco Dolstra
>  wrote:
>> Hi,
>>
>> On 22/04/12 11:03, Mathijs Kwik wrote:
>>
>>> However, I have some local packages in my /etc/nixos/nixpkgs, and they
>>> are not available anymore.
>>> So I guess channels are not for people who want to have some local
>>> modifications.
>>> Does this mean we need to setup the old nixpkgs_sys symlink manually
>>> after a new installation?
>>
>> You can do that, or pass "-f /path/to/my/nixpkgs" to nix-env.
>
> And how will this work for nixos-rebuild? It doesn't know -f

To answer myself: it has  -I
>
>>
>>> And what does this mean for binary updates? Are they only available
>>> through the channel from now on?
>>
>> It's the same as it's always been: if the path you're building is available 
>> in a
>> subscribed channel, you get binaries, otherwise it's built from source.  So 
>> it
>> depends on how much your source tree differs from the sources in the channel.
>>
>> --
>> 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
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

Re: [Nix-dev] confused by the recent channels stuff

[Mathijs Kwik]

On Mon, Apr 23, 2012 at 2:52 AM, Eelco Dolstra
 wrote:
> Hi,
>
> On 22/04/12 11:03, Mathijs Kwik wrote:
>
>> However, I have some local packages in my /etc/nixos/nixpkgs, and they
>> are not available anymore.
>> So I guess channels are not for people who want to have some local
>> modifications.
>> Does this mean we need to setup the old nixpkgs_sys symlink manually
>> after a new installation?
>
> You can do that, or pass "-f /path/to/my/nixpkgs" to nix-env.

And how will this work for nixos-rebuild? It doesn't know -f

>
>> And what does this mean for binary updates? Are they only available
>> through the channel from now on?
>
> It's the same as it's always been: if the path you're building is available 
> in a
> subscribed channel, you get binaries, otherwise it's built from source.  So it
> depends on how much your source tree differs from the sources in the channel.
>
> --
> 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
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev