Commit Graph
156163 Commits
Author SHA1 Message Date
Eelco Dolstra c45cf3a28e * In the jobs attribute, support a more high-level way of specifying
jobs, e.g. (from the nscd job)

    { name = "nscd";

      description = "Name Service Cache Daemon";

      startOn = "startup";
      stopOn = "shutdown";

      environment = { LD_LIBRARY_PATH = nssModulesPath; };
        
      preStart =
        ''
          mkdir -m 0755 -p /var/run/nscd
          mkdir -m 0755 -p /var/db/nscd
        '';

      exec = "${pkgs.glibc}/sbin/nscd -f ${./nscd.conf} -d 2> /dev/null";
    };

  The Upstart job is generated from this.  The main goal is to provide
  some abstraction from the Upstart syntax.  For instance, this should
  make it easier to upgrade to newer versions of Upstart, to switch to
  an entirely different process management system (e.g. initng or
  launchd), or to test a job independantly from Upstart.  (However the
  startOn and stopOn attributes are tied to Upstart's event model.)

svn path=/nixos/branches/modular-nixos/; revision=16376
2009-07-15 15:24:11 +00:00
Eelco Dolstra 0e3bef4195 * Declare the type of jobs.
svn path=/nixos/branches/modular-nixos/; revision=16375
2009-07-15 13:41:00 +00:00
Eelco Dolstra f076849acd * Escape strings.
svn path=/nixos/branches/modular-nixos/; revision=16374
2009-07-15 13:40:30 +00:00
Eelco Dolstra 1424399002 * Simplify.
svn path=/nixos/branches/modular-nixos/; revision=16373
2009-07-15 12:52:32 +00:00
Eelco Dolstra 96fe3ba1b7 * Inline make-job.nix.
svn path=/nixos/branches/modular-nixos/; revision=16372
2009-07-15 11:38:17 +00:00
Eelco Dolstra 9d1e31117f * Get rid of the "users" and "groups" fields in jobs.
svn path=/nixos/branches/modular-nixos/; revision=16371
2009-07-15 11:34:55 +00:00
Eelco Dolstra ca8e00cafa * Got rid of the extraPath field in jobs (use
environment.systemPackages instead).  Also renamed
  services.extraJobs to jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
2009-07-15 11:19:11 +00:00
Eelco Dolstra def0be732f * job.extraHttpdConfig: not used anywhere.
svn path=/nixos/branches/modular-nixos/; revision=16369
2009-07-15 09:14:24 +00:00
Eelco Dolstra 118418ba31 * Refactoring the Upstart module. Got rid of job.extraEtc, it's
redundant now (modules can just define environment.etc).

svn path=/nixos/branches/modular-nixos/; revision=16367
2009-07-15 09:06:36 +00:00
Eelco Dolstra b66fd2364c * Don't put /etc/nixos/nixos in ~/.nix-defexpr.
svn path=/nixos/branches/modular-nixos/; revision=16366
2009-07-15 08:45:29 +00:00
Ludovic Courtès aa699024db GNU Ed 1.4.
svn path=/nixpkgs/trunk/; revision=16365
2009-07-14 21:59:16 +00:00
Michael Raskin 81d09cd1f3 Use GTK2 for Lazarus and get Unicode support
svn path=/nixpkgs/trunk/; revision=16363
2009-07-14 20:31:11 +00:00
Michael Raskin 57c8392eee Fixed cmdline override in 2.6.31-rc3 kernel config
svn path=/nixpkgs/trunk/; revision=16362
2009-07-14 19:24:10 +00:00
Lluís Batlle i Rossell b510addf20 Enabling by default the grub support for buggy BIOSes on CD boot.
Two of two, raskin and me, voted for this change.

svn path=/nixpkgs/trunk/; revision=16361
2009-07-14 18:23:53 +00:00
Eelco Dolstra da996583ee * Include the NixOS manpages in the system environment. Actually
there is only one currently: configuration.nix(5), which contains a
  list of all the options.

svn path=/nixos/branches/modular-nixos/; revision=16360
2009-07-14 16:27:46 +00:00
Eelco Dolstra 80cab44fce * Options / config: these should be attrsets, not lists (IMHO).
svn path=/nixpkgs/trunk/; revision=16359
2009-07-14 16:22:42 +00:00
Eelco Dolstra 896a9f0508 * Generate a manual page for configuration.nix containing all the
options.

svn path=/nixos/branches/modular-nixos/; revision=16358
2009-07-14 15:47:03 +00:00
Ludovic Courtès 7f080535c4 Fix derivation name of `icecat3Xul'.
svn path=/nixpkgs/trunk/; revision=16357
2009-07-14 15:22:31 +00:00
Eelco Dolstra befe45a1d3 * docbook-xsl / docbook-xsl-ns: match the upstream package name. Also
updated docbook-xsl-ns.

svn path=/nixpkgs/trunk/; revision=16356
2009-07-14 15:02:56 +00:00
Eelco Dolstra a27f3942ef * Callouts require the docbook_xsl images.
svn path=/nixos/branches/modular-nixos/; revision=16354
2009-07-14 13:31:32 +00:00
Eelco Dolstra ab1676b457 * Urgh, this should have been in commit r16350.
svn path=/nixos/branches/modular-nixos/; revision=16353
2009-07-14 13:28:50 +00:00
Ludovic Courtès 0bba7e6b84 GNU IceCat 3.5.
svn path=/nixpkgs/trunk/; revision=16352
2009-07-14 12:59:04 +00:00
Eelco Dolstra b56d08fc83 * Move the hardware modules back to the main modules tree. No need
for a separate tree.
  
* Pass the path of the modules tree to modules so that you don't have
  to write absolute paths, e.g. you can say

    require = [ "${modulesPath}/hardware/network/intel-3945abg.nix" ];

  instead of

    require = [ /etc/nixos/nixos/hardware/network/intel-3945abg.nix ];

  The latter is bad because it makes it hard to build from a different
  NixOS source tree.

svn path=/nixos/branches/modular-nixos/; revision=16350
2009-07-14 12:36:02 +00:00
Marc Weber 62eccd21d4 updating bleeding edge source file info for nix-repository-manager
svn path=/nixpkgs/trunk/; revision=16349
2009-07-14 12:31:37 +00:00
Eelco Dolstra b84bab7873 * Use the relatime mount option by default. (This is the default
anyway in Linux 2.6.30.)

svn path=/nixos/branches/modular-nixos/; revision=16348
2009-07-14 12:07:17 +00:00
Michael Raskin a310f4f2a0 Forgot to turn off debugging options in all-mod-config..
svn path=/nixpkgs/trunk/; revision=16347
2009-07-14 10:23:45 +00:00
Michael Raskin 396ae631ea Add AMD64 config for 2.6.31-rc3
svn path=/nixpkgs/trunk/; revision=16346
2009-07-14 09:57:51 +00:00
Michael Raskin 64c89c7532 Oops, mixed up hashes
svn path=/nixpkgs/trunk/; revision=16345
2009-07-14 09:18:22 +00:00
Michael Raskin ad2f62980a Try building a really full-featured configuration of the fresh Linux kernel pre-release
svn path=/nixpkgs/trunk/; revision=16344
2009-07-14 09:13:59 +00:00
Michael Raskin cf03c27fb7 Update FPC and Lazarus
svn path=/nixpkgs/trunk/; revision=16343
2009-07-14 09:08:05 +00:00
Peter Simons 2ec77fdc7e scons: don't overwrite a pre-existing PYTHONPATH in the wrapper
svn path=/nixpkgs/trunk/; revision=16342
2009-07-13 20:08:44 +00:00
Lluís Batlle i Rossell 3a8a3c91f7 Adding a patch for grub, so livecds with grub can still boot with buggy bioses,
as those of Acer 292LMi or Airis N990. This allows booting the NixOS ISO releases.
I made it optional, not included by default. I don't think it would harm at all enabling
it always - let it be decided on forum.

svn path=/nixpkgs/trunk/; revision=16341
2009-07-13 16:57:33 +00:00
Ludovic Courtès ed658483e9 Hugin: Fix segfault on x86_64.
svn path=/nixpkgs/trunk/; revision=16340
2009-07-13 16:24:47 +00:00
Nicolas Pierron b09382fcd1 Extract properties.nix and modules.nix from options.nix.
svn path=/nixpkgs/trunk/; revision=16339
2009-07-13 16:18:52 +00:00
Ludovic Courtès 9cd30e68e3 GNU Cflow 1.3.
svn path=/nixpkgs/trunk/; revision=16338
2009-07-13 14:54:01 +00:00
Ludovic Courtès c73091b572 emacsPackages: Recurse into attributes.
This allows, e.g., "nix-env -qa magit" to work.
Reported by Peter Simons.

svn path=/nixpkgs/trunk/; revision=16337
2009-07-13 11:53:06 +00:00
Andres Löh 66b32c4b66 Added SHA for Haskell.
svn path=/nixpkgs/trunk/; revision=16335
2009-07-13 11:36:50 +00:00
Ludovic Courtès 1bc6e5c847 GLOBAL: Install the Emacs mode.
svn path=/nixpkgs/trunk/; revision=16334
2009-07-13 09:21:04 +00:00
Ludovic Courtès 474c54071b Add GNU GLOBAL, a source code tag system.
svn path=/nixpkgs/trunk/; revision=16333
2009-07-13 09:05:56 +00:00
Ludovic Courtès 3a4ba343a4 Hugin: Fix typo stealthily introduced in r15692.
svn path=/nixpkgs/trunk/; revision=16332
2009-07-12 22:00:35 +00:00
Michael Raskin b69be987c0 Added setuid-ready chroot utility.
svn path=/nixpkgs/trunk/; revision=16331
2009-07-12 08:10:51 +00:00
Lluís Batlle i Rossell c331fd106b Updated the xserver video drivers list, removing the old via, and putting the new openchrome.
svn path=/nixos/branches/modular-nixos/; revision=16330
2009-07-11 10:33:42 +00:00
Lluís Batlle i Rossell dab4dc0de1 Using openchrome trunk instead of that distributed with xorg. That
doesn't work in K8N800, and trunk even does a bit of 3D by hw.

svn path=/nixpkgs/trunk/; revision=16329
2009-07-11 10:32:27 +00:00
Ludovic Courtès f6533bc527 Emacs-w3m: Substitute `identify' from ImageMagick.
svn path=/nixpkgs/trunk/; revision=16328
2009-07-11 10:30:48 +00:00
Andres Löh 9f9ec8d2c6 Added myself as a maintainer.
svn path=/nixpkgs/trunk/; revision=16327
2009-07-10 19:50:04 +00:00
Andres Löh 059b912b27 Efficiency fix for ghc-get-packages script.
svn path=/nixpkgs/trunk/; revision=16326
2009-07-10 19:36:50 +00:00
Ludovic Courtès 18ef0d1673 emacs-w3m: Fix typo.
svn path=/nixpkgs/trunk/; revision=16325
2009-07-10 17:53:49 +00:00
Ludovic Courtès da897b6eda Group Emacs packages in an `emacsPackages' function.
This avoids problem such as bytecode incompatibilies (e.g., between
GNU Emacs 22 and 23), API changes.  It would also allow packages
to be built with different emacsen (S(X)Emacs, etc.).


svn path=/nixpkgs/trunk/; revision=16324
2009-07-10 16:17:06 +00:00
Ludovic Courtès 45f7159af3 emacs-w3m: Get the source from CVS.
svn path=/nixpkgs/trunk/; revision=16323
2009-07-10 16:01:50 +00:00
Ludovic Courtès 099dd7fa16 nix-prefetch-svn: Use SHA256/Base32 by default.
svn path=/nixpkgs/trunk/; revision=16322
2009-07-10 15:50:11 +00:00