[Nix-commits] SVN commit: nix - r34192 - nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform
Author: andres
Date: Mon May 21 06:17:27 2012
New Revision: 34192
URL: https://nixos.org/websvn/nix/?rev=34192sc=1
Log:
Fixed incorrect version number of Haskell Platform.
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
==
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
Sun May 20 21:04:52 2012(r34191)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
Mon May 21 06:17:27 2012(r34192)
@@ -10,7 +10,7 @@
cabal.mkDerivation (self : {
pname = haskell-platform;
- version = 2011.4.0.0;
+ version = 2012.2.0.0;
cabalFile = ./haskell-platform-2012.2.0.0.cabal;
setupFile = ./Setup.hs;
src = null;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-dev] Using Nix to build embedded linux firmware
Hi, I am currently evaluating Nix and it's universe of tools for a company project and after playing with it for a while, I'd like to discuss my considerations with the list. Our company, Travelping GmbH, is a producer of specialized telecommunications equipment. The firmware for our devices is based on a custom Linux distribution, TPLINO. In the project I'm working on, we're basically looking for a new underpinning of TPLINO. We've been working with OpenWRT for about 5 years now and there are some areas where it doesn't satisfy our requirements anymore. Comparing to the alternatives provided by Yocto and Gentoo, the Nix package manager seemed particularly attractive for its ability to reliably generate whole system _configurations_ and the advanced upgrade/rollback features. A closer look at Nix has revealed some questions: Cross Compilation There seems to be some work in the nixpkgs tree that deals with cross builds (pkgs/top-level/release-cross.nix). It would be interesing to hear from the people who are behind this. Are cross builds alive and supported? Nix's binary size and runtime requirements: Our usual size limit for images is 8MB compressed. With an image that small, we need to be really picky about what goes in and what doesn't. Quick measurement shows that Nix + libraries take ~10MB on disk. AFAIK, Nix also requires the C++ STL. The size is only a problem for small devices which have a very limited amount of flash memory available. Those devices might also not be able to execute Nix expressions because their CPU power and main memory is limited. It seems Nix wasn't really designed to run in resource-constrained environments. Has anybody run into similar issues before? Remote installation of packages: As a follow-up thought to the last one, would it be possible to update an installation remotely, with only a very limited set of tools being present? I've looked at Disnix, and the README says that all target hosts need to have Nix (and Nixpkgs) installed, which is unfortunate but understandable given its intended use case (server/cluster deployment). The Nix store file structure seems simple enough to allow remote management. Is this correct? Configuration changes: System configuration (networking, services...) is not part of Nixpkgs but is kept in the NixOS tree. This is good, because we have very specific needs in terms of network configuration and implement it ourselves anyway. How does Nix handle pre/post upgrade scripts? As far as I understand, the Nixpkgs tree only contains build instructions, any output is created at compile time. I really enjoyed working with the Nix tools and look forward to receiving some answers. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-dev] Using Nix to build embedded linux firmware
Cross Compilation There seems to be some work in the nixpkgs tree that deals with cross builds (pkgs/top-level/release-cross.nix). It would be interesing to hear from the people who are behind this. Are cross builds alive and supported? It works, it is used, it may require some fixing for your specific target. Nix's binary size and runtime requirements: Our usual size limit for images is 8MB compressed. With an image that small, we need to be really picky about what goes in and what doesn't. Quick measurement shows that Nix + libraries take ~10MB on disk. AFAIK, Nix also requires the C++ STL. The size is only a problem for small devices which have a very limited amount of flash memory available. Those devices might also not be able to execute Nix expressions because their CPU power and main memory is limited. It seems Nix wasn't really designed to run in resource-constrained environments. Has anybody run into similar issues before? Cross-builds could alleviate this problem. It is quite easy to prepare an archive with everything needed by a cross-built expression. You may need to patch stdenv, though, as you could need a smaller libc and busybox instead of glibc and coreutils. There is some support for that, but you'll likely need to tune it for your use case. Another question is updating.. Nix model may mean that you will have to do more writes (whether with deploying cross-builds or not). Remote installation of packages: As a follow-up thought to the last one, would it be possible to update an installation remotely, with only a very limited set of tools being present? I've looked at Disnix, and the README says that all target hosts need to have Nix (and Nixpkgs) installed, which is unfortunate but understandable given its intended use case (server/cluster deployment). The Nix store file structure seems simple enough to allow remote management. Is this correct? Technically, it would be possible to have a mirror nix store on a normal computer and sync device with it (as path contents should not change, you need only to copy new paths and delete obsolete ones, not change anything). Configuration changes: System configuration (networking, services...) is not part of Nixpkgs but is kept in the NixOS tree. This is good, because we have very specific needs in terms of network configuration and implement it ourselves anyway. How does Nix handle pre/post upgrade scripts? As far as I understand, the Nixpkgs tree only contains build instructions, any output is created at compile time. Nix doesn't support this. You would probably have to generate them and then create a minimal tool to run these scripts on configuration changes. In a sense, NixOS is an example of such a tool. Note that it gets no support from Nix per se for configuration activation. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
Re: [Nix-dev] Using Nix to build embedded linux firmware
On Mon, May 21, 2012 at 10:11:32AM +0200, Felix Lange wrote: Hi, I am currently evaluating Nix and it's universe of tools for a company project and after playing with it for a while, I'd like to discuss my considerations with the list. Our company, Travelping GmbH, is a producer of specialized telecommunications equipment. The firmware for our devices is based on a custom Linux distribution, TPLINO. In the project I'm working on, we're basically looking for a new underpinning of TPLINO. We've been working with OpenWRT for about 5 years now and there are some areas where it doesn't satisfy our requirements anymore. Comparing to the alternatives provided by Yocto and Gentoo, the Nix package manager seemed particularly attractive for its ability to reliably generate whole system _configurations_ and the advanced upgrade/rollback features. A closer look at Nix has revealed some questions: Cross Compilation There seems to be some work in the nixpkgs tree that deals with cross builds (pkgs/top-level/release-cross.nix). It would be interesing to hear from the people who are behind this. Are cross builds alive and supported? Yes. A major problem we have is that we still don't cross-build *perl*, because it looks like not trivial. OpenWRT in this respect has some in-svn big files describing each system they cross-build too. Therefore, one troublesome piece to cross-build is nix itself. But many other programs cross-build fine. I wrote most of the cross-building pieces, and I use them both for preparing binaries for already-deployed OpenWRT systems, and also for full-prepared systems (nanonixos for the nanonote). http://viric.name/cgi-bin/nanonixos/doc/trunk/doc/home.wiki Nix's binary size and runtime requirements: Our usual size limit for images is 8MB compressed. With an image that small, we need to be really picky about what goes in and what doesn't. Quick measurement shows that Nix + libraries take ~10MB on disk. AFAIK, Nix also requires the C++ STL. The size is only a problem for small devices which have a very limited amount of flash memory available. Those devices might also not be able to execute Nix expressions because their CPU power and main memory is limited. It seems Nix wasn't really designed to run in resource-constrained environments. Has anybody run into similar issues before? Nix evaluation still requires quite a lot of RAM. In the Nanonote (32MB of RAM) I don't think I can't get evaluation far away. Remote installation of packages: As a follow-up thought to the last one, would it be possible to update an installation remotely, with only a very limited set of tools being present? I've looked at Disnix, and the README says that all target hosts need to have Nix (and Nixpkgs) installed, which is unfortunate but understandable given its intended use case (server/cluster deployment). The Nix store file structure seems simple enough to allow remote management. Is this correct? In nanonixos I use a very easy remote installation of packages. See http://viric.name/cgi-bin/nanonixos/artifact/ddf64d608c252cd3e655c56fe37228701bda7ef4 Configuration changes: System configuration (networking, services...) is not part of Nixpkgs but is kept in the NixOS tree. This is good, because we have very specific needs in terms of network configuration and implement it ourselves anyway. How does Nix handle pre/post upgrade scripts? As far as I understand, the Nixpkgs tree only contains build instructions, any output is created at compile time. Nanonixos supplies a bit of this, in a simple way. Take a look of the files there: http://viric.name/cgi-bin/nanonixos/dir?ci=0faacb2bb92031a5 Feel free to clone the repository too. So as you see there is some work to do: * perl * nix cross-building with perl support (I think recent versions of nix don't cross-build anything at all, but we could do some effort for it) * nanonixos is a very simple remote deployment of a systemv GNU/Linux. Could be made more fancy like nixos. 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] Using Nix to build embedded linux firmware
On Mon, May 21, 2012 at 12:48:25PM +0400, Michael Raskin wrote: Nix's binary size and runtime requirements: Our usual size limit for images is 8MB compressed. With an image that small, we need to be really picky about what goes in and what doesn't. Quick measurement shows that Nix + libraries take ~10MB on disk. AFAIK, Nix also requires the C++ STL. The size is only a problem for small devices which have a very limited amount of flash memory available. Those devices might also not be able to execute Nix expressions because their CPU power and main memory is limited. It seems Nix wasn't really designed to run in resource-constrained environments. You may need to patch stdenv, though, as you could need a smaller libc and busybox instead of glibc and coreutils. There is some support for that, but you'll likely need to tune it for your use case. I wanted to do some work towards minimizing the amount of binaries deployed, but the nanonote has 2GB of NAND, and so I did not worry much. :) We could have some optional deployment of manpages, etc. Remote installation of packages: As a follow-up thought to the last one, would it be possible to update an installation remotely, with only a very limited set of tools being present? I've looked at Disnix, and the README says that all target hosts need to have Nix (and Nixpkgs) installed, which is unfortunate but understandable given its intended use case (server/cluster deployment). The Nix store file structure seems simple enough to allow remote management. Is this correct? Technically, it would be possible to have a mirror nix store on a normal computer and sync device with it (as path contents should not change, you need only to copy new paths and delete obsolete ones, not change anything). That's what the 'tonano' script does: http://viric.name/cgi-bin/nanonixos/artifact/ddf64d608c252cd3e655c56fe37228701bda7ef4 Configuration changes: System configuration (networking, services...) is not part of Nixpkgs but is kept in the NixOS tree. This is good, because we have very specific needs in terms of network configuration and implement it ourselves anyway. How does Nix handle pre/post upgrade scripts? As far as I understand, the Nixpkgs tree only contains build instructions, any output is created at compile time. Nix doesn't support this. You would probably have to generate them and then create a minimal tool to run these scripts on configuration changes. In a sense, NixOS is an example of such a tool. Note that it gets no support from Nix per se for configuration activation. Nanonixos is a simpler (less lines, less flexibility) example of such a tool too. In fact I'd be interested to be able to deploy a full nanonixos to those broadcom-mips-based routers, but I've not cared enough about making small store paths still. (I wrote the previous letter without having read this) Regards, Lluís. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r34193 - configurations/trunk/tud
Author: rob Date: Mon May 21 10:27:58 2012 New Revision: 34193 URL: https://nixos.org/websvn/nix/?rev=34193sc=1 Log: remove shelley from buildfarm network spec. Modified: configurations/trunk/tud/network.nix Modified: configurations/trunk/tud/network.nix == --- configurations/trunk/tud/network.nixMon May 21 06:17:27 2012 (r34192) +++ configurations/trunk/tud/network.nixMon May 21 10:27:58 2012 (r34193) @@ -7,7 +7,7 @@ lucifer = import ./lucifer.nix; wendy = import ./wendy.nix; ike = import ./build-machines-dell-r815.nix; - shelley = import ./build-machines-dell-r815.nix; + #shelley = import ./build-machines-dell-r815.nix; #mrkitty = import ./mrkitty.nix; mrhankey = import ./mrhankey.nix; } ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] [NixOS/nix] e071f8: Add an experimental nix-make file
Branch: refs/heads/master Home: https://github.com/NixOS/nix Commit: e071f87dc5476983c557cf6185fbdeab0c4c67c5 https://github.com/NixOS/nix/commit/e071f87dc5476983c557cf6185fbdeab0c4c67c5 Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-21 (Mon, 21 May 2012) Changed paths: A build.nix Log Message: --- Add an experimental nix-make file To use it, just do (e.g.) nix-build build.nix -A nix_env. ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [Nix-commits] [NixOS/nix] e071f8: Add an experimental nix-make file
YEAH!!! Finally we can bootstrap Nix! From: nix-commits-boun...@lists.science.uu.nl [nix-commits-boun...@lists.science.uu.nl] on behalf of Eelco Dolstra [eelco.dols...@logicblox.com] Sent: Monday, May 21, 2012 3:43 PM To: nix-comm...@lists.science.uu.nl Subject: [Nix-commits] [NixOS/nix] e071f8: Add an experimental nix-make file Branch: refs/heads/master Home: https://github.com/NixOS/nix Commit: e071f87dc5476983c557cf6185fbdeab0c4c67c5 https://github.com/NixOS/nix/commit/e071f87dc5476983c557cf6185fbdeab0c4c67c5 Author: Eelco Dolstra eelco.dols...@logicblox.com Date: 2012-05-21 (Mon, 21 May 2012) Changed paths: A build.nix Log Message: --- Add an experimental nix-make file To use it, just do (e.g.) nix-build build.nix -A nix_env. ___ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
[Nix-commits] SVN commit: nix - r34194 - nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte
Author: rickynils
Date: Mon May 21 14:58:16 2012
New Revision: 34194
URL: https://nixos.org/websvn/nix/?rev=34194sc=1
Log:
Added missing pygtk dependency to Gnome VTE library.
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/default.nix Mon May 21
10:27:58 2012(r34193)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/desktop/vte/default.nix Mon May 21
14:58:16 2012(r34194)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses
-, pythonSupport ? false, python}:
+, pythonSupport ? false, python, pygtk}:
stdenv.mkDerivation rec {
name = vte-0.28.0;
@@ -10,12 +10,19 @@
};
buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
-stdenv.lib.optional pythonSupport python;
+stdenv.lib.optionals pythonSupport [python pygtk];
configureFlags = ''
${if pythonSupport then --enable-python else --disable-python}
'';
-
+
+ postInstall = stdenv.lib.optionalString pythonSupport ''
+cd $(toPythonPath $out)/gtk-2.0
+for n in *; do
+ ln -s gtk-2.0/$n ../$n
+done
+ '';
+
meta = {
homepage = http://www.gnome.org/;
description = A library implementing a terminal emulator widget for GTK+;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34195 - in nixpkgs/trunk: applications applications/misc applications/misc/gnome_terminator pkgs/applications/misc/gnome_terminator pkgs/top-level
Author: rickynils
Date: Mon May 21 15:08:16 2012
New Revision: 34195
URL: https://nixos.org/websvn/nix/?rev=34195sc=1
Log:
gnome-terminator 0.96.
Added:
nixpkgs/trunk/applications/
nixpkgs/trunk/applications/misc/
nixpkgs/trunk/applications/misc/gnome_terminator/
nixpkgs/trunk/applications/misc/gnome_terminator/default.nix
nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/
nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/applications/misc/gnome_terminator/default.nix
==
Added: nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix Mon May
21 15:08:16 2012(r34195)
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python, pygtk, vte, gettext, intltool, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = gnome-terminator-0.96;
+
+ src = fetchurl {
+url =
https://launchpad.net/terminator/trunk/0.96/+download/terminator_0.96.tar.gz;;
+sha256 =
d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201;
+ };
+
+ buildInputs =
+[ python pygtk vte gettext intltool makeWrapper
+];
+
+ phases = unpackPhase installPhase;
+
+ installPhase = ''
+python setup.py --without-icon-cache install --prefix=$out
+for i in $(cd $out/bin ls); do
+wrapProgram $out/bin/$i \
+--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH
+done
+ '';
+
+ meta = {
+description = Gnome terminal emulator with support for tiling and tabs.
+homepage = http://www.tenshu.net/p/terminator.html;
+license = GPLv2;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 14:58:16
2012(r34194)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 15:08:16
2012(r34195)
@@ -6819,6 +6819,10 @@
inherit (gnome) GConf;
};
+ gnome_terminator = callPackage ../applications/misc/gnome_terminator {
+vte = gnome.vte.override { pythonSupport = true; };
+ };
+
googleearth = callPackage_i686 ../applications/misc/googleearth { };
google_talk_plugin = callPackage
../applications/networking/browsers/mozilla-plugins/google-talk-plugin { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] [Nix-commits] SVN commit: nix - r34195 - in nixpkgs/trunk: applications applications/misc applications/misc/gnome_terminator pkgs/applications/misc/gnome_terminator pkgs/top-level
Hi, On 21/05/12 11:08, Rickard Nilsson wrote: Log: gnome-terminator 0.96. This breaks Nixpkgs evaluation: http://hydra.nixos.org/build/2639203 -- Eelco Dolstra | LogicBlox, Inc. | 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 - r34196 - nixpkgs/trunk/pkgs/applications/misc/gnome_terminator
Author: rickynils
Date: Mon May 21 15:45:03 2012
New Revision: 34196
URL: https://nixos.org/websvn/nix/?rev=34196sc=1
Log:
Fixed stupid syntax error in gnome-terminator's default.nix.
Modified:
nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix
==
--- nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix Mon May
21 15:08:16 2012(r34195)
+++ nixpkgs/trunk/pkgs/applications/misc/gnome_terminator/default.nix Mon May
21 15:45:03 2012(r34196)
@@ -23,7 +23,7 @@
'';
meta = {
-description = Gnome terminal emulator with support for tiling and tabs.
+description = Gnome terminal emulator with support for tiling and tabs.;
homepage = http://www.tenshu.net/p/terminator.html;
license = GPLv2;
};
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34197 - in nixpkgs/trunk/pkgs: misc/busybox top-level
Author: eelco
Date: Mon May 21 17:51:40 2012
New Revision: 34197
URL: https://nixos.org/websvn/nix/?rev=34197sc=1
Log:
* By default, build a dynamically linked Busybox. In the initrd we
need Glibc anyway, so there is no point in static linking. This
saves about a megabyte from the initrd.
Modified:
nixpkgs/trunk/pkgs/misc/busybox/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/misc/busybox/default.nix
==
--- nixpkgs/trunk/pkgs/misc/busybox/default.nix Mon May 21 15:45:03 2012
(r34196)
+++ nixpkgs/trunk/pkgs/misc/busybox/default.nix Mon May 21 17:51:40 2012
(r34197)
@@ -30,9 +30,9 @@
CONFIG_INSTALL_NO_USR y
'';
- staticConfig = (if enableStatic then ''
- CONFIG_STATIC y
-'' else );
+ staticConfig = stdenv.lib.optionalString enableStatic ''
+CONFIG_STATIC y
+ '';
in
@@ -65,6 +65,8 @@
'' else );
};
+ enableParallelBuilding = true;
+
meta = {
description = Tiny versions of common UNIX utilities in a single small
executable;
homepage = http://busybox.net/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 15:45:03
2012(r34196)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 17:51:40
2012(r34197)
@@ -8336,9 +8336,7 @@
auctex = callPackage ../tools/typesetting/tex/auctex { };
- busybox = callPackage ../misc/busybox {
-enableStatic = true;
- };
+ busybox = callPackage ../misc/busybox { };
cups = callPackage ../misc/cups { };
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34198 - nixpkgs/trunk/pkgs/os-specific/linux/kernel
Author: eelco
Date: Mon May 21 18:14:47 2012
New Revision: 34198
URL: https://nixos.org/websvn/nix/?rev=34198sc=1
Log:
* Linux 3.2.18.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix
==
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix Mon May 21
17:51:40 2012(r34197)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.2.nix Mon May 21
18:14:47 2012(r34198)
@@ -234,7 +234,7 @@
import ./generic.nix (
rec {
-version = 3.2.17;
+version = 3.2.18;
testing = false;
modDirVersion = version;
@@ -245,7 +245,7 @@
src = fetchurl {
url = mirror://kernel/linux/kernel/v3.0/${if testing then testing/
else }linux-${version}.tar.xz;
- sha256 = 16yyldmmk5rj4bm3x1phxnv2848cybapianj92bg9c6d8x3zzm8f;
+ sha256 = 0qghi3n2xq2alkcgbjklpngy3pqwbsjm5cls7vah3qr9yw46m1fp;
};
config = configWithPlatform stdenv.platform;
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34199 - nixpkgs/trunk/pkgs/build-support/kernel
Author: eelco Date: Mon May 21 20:47:57 2012 New Revision: 34199 URL: https://nixos.org/websvn/nix/?rev=34199sc=1 Log: * Be less verbose generating initrds. Modified: nixpkgs/trunk/pkgs/build-support/kernel/make-initrd.sh Modified: nixpkgs/trunk/pkgs/build-support/kernel/make-initrd.sh == --- nixpkgs/trunk/pkgs/build-support/kernel/make-initrd.sh Mon May 21 18:14:47 2012(r34198) +++ nixpkgs/trunk/pkgs/build-support/kernel/make-initrd.sh Mon May 21 20:47:57 2012(r34199) @@ -36,7 +36,7 @@ # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root find * -print0 | cpio -ov -H newc --null | gzip -9 $out/initrd) +(cd root find * -print0 | cpio -o -H newc --null | gzip -9 $out/initrd) if [ -n $makeUInitrd ]; then mv $out/initrd $out/initrd.gz ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34200 - in nixpkgs/trunk/pkgs: os-specific/linux/systemd top-level
Author: eelco
Date: Mon May 21 20:48:19 2012
New Revision: 34200
URL: https://nixos.org/websvn/nix/?rev=34200sc=1
Log:
* Added systemd.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/systemd/
nixpkgs/trunk/pkgs/os-specific/linux/systemd/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/systemd/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/systemd/default.nixMon May 21
20:48:19 2012(r34200)
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod
+, xz, pam, acl, cryptsetup, libuuid, m4 }:
+
+stdenv.mkDerivation rec {
+ name = systemd-44;
+
+ src = fetchurl {
+url = http://www.freedesktop.org/software/systemd/${name}.tar.xz;;
+sha256 = 0g138b5yvn419xqrakpk75q2sb4g7pj10br9b6zq4flb9d5sqnks;
+ };
+
+ buildInputs =
+[ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl
+ cryptsetup libuuid m4
+];
+
+ configureFlags =
+[ --localstatedir=/var
+ --with-distro=other
+ --with-rootprefix=$(out)
+ --with-rootprefix=$(out)
+ --with-dbusinterfacedir=$(out)/share/dbus-1/interfaces
+ --with-dbuspolicydir=$(out)/etc/dbus-1/system.d
+ --with-dbussystemservicedir=$(out)/share/dbus-1/system-services
+ --with-dbussessionservicedir=$(out)/share/dbus-1/services
+];
+
+ installFlags = localstatedir=$(TMPDIR)/var;
+
+ enableParallelBuilding = true;
+
+ meta = {
+homepage = http://www.freedesktop.org/wiki/Software/systemd;
+description = A system and service manager for Linux;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 20:47:57
2012(r34199)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 21 20:48:19
2012(r34200)
@@ -5953,6 +5953,8 @@
sysstat = callPackage ../os-specific/linux/sysstat { };
+ systemd = callPackage ../os-specific/linux/systemd { };
+
sysvinit = callPackage ../os-specific/linux/sysvinit { };
sysvtools = callPackage ../os-specific/linux/sysvinit {
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34201 - nixos/trunk/modules/tasks
Author: rob
Date: Mon May 21 21:26:45 2012
New Revision: 34201
URL: https://nixos.org/websvn/nix/?rev=34201sc=1
Log:
Execute mount-all task on config-changed event to make sure it is performed
before other upstart jobs are started on activating the new configuration.
Modified:
nixos/trunk/modules/tasks/filesystems.nix
Modified: nixos/trunk/modules/tasks/filesystems.nix
==
--- nixos/trunk/modules/tasks/filesystems.nix Mon May 21 20:48:19 2012
(r34200)
+++ nixos/trunk/modules/tasks/filesystems.nix Mon May 21 21:26:45 2012
(r34201)
@@ -183,7 +183,7 @@
};
jobs.mountall =
- { startOn = started udev;
+ { startOn = started udev or config-changed;
task = 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 - r34202 - nixpkgs/trunk/pkgs/top-level
Author: cillian
Date: Mon May 21 22:38:44 2012
New Revision: 34202
URL: https://nixos.org/websvn/nix/?rev=34202sc=1
Log:
http://ftp.logilab.org is no longer valid, changing to ftp:// instead
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==
--- nixpkgs/trunk/pkgs/top-level/python-packages.nixMon May 21 21:26:45
2012(r34201)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nixMon May 21 22:38:44
2012(r34202)
@@ -174,7 +174,7 @@
name = logilab-astng-0.21.1;
src = fetchurl {
- url = http://ftp.logilab.org/pub/astng/${name}.tar.gz;;
+ url = ftp://ftp.logilab.org/pub/astng/${name}.tar.gz;;
sha256 = 0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67;
};
propagatedBuildInputs = [logilabCommon];
@@ -821,7 +821,7 @@
name = logilab-common-0.56.0;
src = fetchurl {
- url = http://ftp.logilab.org/pub/common/${name}.tar.gz;;
+ url = ftp://ftp.logilab.org/pub/common/${name}.tar.gz;;
sha256 = 14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971;
};
propagatedBuildInputs = [unittest2];
@@ -1559,7 +1559,7 @@
name = pylint-0.23.0;
src = fetchurl {
- url = http://ftp.logilab.org/pub/pylint/${name}.tar.gz;;
+ url = ftp://ftp.logilab.org/pub/pylint/${name}.tar.gz;;
sha256 = 07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d;
};
propagatedBuildInputs = [astng];
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34203 - in nixpkgs/trunk/pkgs/desktops/gnome-2: . bindings/gnome-python
Author: cillian
Date: Mon May 21 22:46:40 2012
New Revision: 34203
URL: https://nixos.org/websvn/nix/?rev=34203sc=1
Log:
Submitting patch by qknight (Joachim Schiele) to add Gnome2 python bindings
Added:
nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/gnome-python/
nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix
Added: nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
Mon May 21 22:46:40 2012(r34203)
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk,
glib, gtk, pythonDBus}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ version = 2.28;
+ name = gnome-python-${version}.1;
+
+ src = fetchurl {
+url =
http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2;;
+sha256 =
759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8;
+ };
+
+ phases = unpackPhase configurePhase buildPhase installPhase;
+
+ # You should be using WAF instead; see the file INSTALL.WAF
+ configurePhase = ''
+python waf configure --prefix=$out
+ '';
+
+ buildPhase = ''
+python waf build
+ '';
+
+ installPhase = ''
+python waf install
+ '';
+
+ buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome
pythonDBus ];
+
+ doCheck = false;
+
+ meta = {
+homepage = http://projects.gnome.org/gconf/;;
+description = Python wrapper for gconf;
+maintainers = [ stdenv.lib.maintainers.qknight ];
+ };
+}
\ No newline at end of file
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix
==
--- nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix Mon May 21 22:38:44
2012(r34202)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2/default.nix Mon May 21 22:46:40
2012(r34203)
@@ -111,4 +111,6 @@
libglademm = callPackage ./bindings/libglademm { };
+ gnome_python = callPackage ./bindings/gnome-python { };
+
}
___
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
[Nix-commits] SVN commit: nix - r34204 - in nixos/trunk: gui/chrome/content/nixos-gui modules/services/networking/gw6c
Author: eelco Date: Mon May 21 23:18:20 2012 New Revision: 34204 URL: https://nixos.org/websvn/nix/?rev=34204sc=1 Log: * Delete empty directories. Deleted: nixos/trunk/gui/chrome/content/nixos-gui/ nixos/trunk/modules/services/networking/gw6c/ ___ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
Re: [Nix-dev] Git conversion of NixOS and Nixpkgs
Hi, On 20/05/12 00:25, Eelco Dolstra wrote: I've uploaded Git repositories of NixOS and Nixpkgs to GitHub for testing: https://github.com/edolstra/nixos https://github.com/edolstra/nixpkgs These should have the complete history from the Subversion repository, including all branches and tags. They were generated using svn2git-kde. Since there were some minor problems with the history, I've rerun svn2git and performed a forced push. So if you cloned these repositories, you may need to do a rebase. -- Eelco Dolstra | LogicBlox, Inc. | 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
