Commit graph

35511 commits

Author SHA1 Message Date
Eelco Dolstra
1367074940 Allow imports in plain modules 2013-10-28 22:45:57 +01:00
Eelco Dolstra
1e24ce2a9b Remove debug code 2013-10-28 22:45:57 +01:00
Eelco Dolstra
e28ea1239f Fix evaluation of environment.variables 2013-10-28 22:45:57 +01:00
Eelco Dolstra
9a8516438e Fix NixOps evaluation 2013-10-28 22:45:57 +01:00
Eelco Dolstra
259f7a93b1 Rename environment.nix -> nix.package 2013-10-28 22:45:57 +01:00
Eelco Dolstra
44d6d88739 Fix option renaming 2013-10-28 22:45:56 +01:00
Eelco Dolstra
d5047faede Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or
an apply function.
2013-10-28 22:45:56 +01:00
Eelco Dolstra
f4a418761b Check for undeclared options 2013-10-28 22:45:56 +01:00
Eelco Dolstra
c263b5b284 Show error locations in submodules 2013-10-28 22:45:56 +01:00
Eelco Dolstra
a40583e7e4 Fix bogus mkOption types
Among others, systemd unit options were not being type-checked because
of this.  mkOption should really check its arguments better...
2013-10-28 22:45:56 +01:00
Eelco Dolstra
1408ac51a4 Add missing types 2013-10-28 22:45:56 +01:00
Eelco Dolstra
89bd18b3af Fix manual generation 2013-10-28 22:45:56 +01:00
Eelco Dolstra
7cf0e0bda8 Manual: Fix bad \" characters 2013-10-28 22:45:56 +01:00
Eelco Dolstra
3bfbdcdfbf Remove dead code 2013-10-28 22:45:56 +01:00
Eelco Dolstra
b6b14dae78 Fix comment 2013-10-28 22:45:55 +01:00
Eelco Dolstra
b479dac8df Inline some functions on the critical path 2013-10-28 22:45:55 +01:00
Eelco Dolstra
9769671260 Reduce the number of allocations a bit 2013-10-28 22:45:55 +01:00
Eelco Dolstra
40913958a2 Keep position information for option declarations and definitions
Also, when an option definition fails to type-check, print the file
name of the module in which the offending definition occurs, e.g.

  error: user-thrown exception: The option value `boot.loader.grub.version' in `/etc/nixos/configuration.nix' is not a integer.
2013-10-28 22:45:55 +01:00
Eelco Dolstra
cfab329437 Use isType instead of typeOf 2013-10-28 22:45:55 +01:00
Eelco Dolstra
4b1a9dd00b Remove uses of mkFixStrictness
mkFixStrictness is no longer needed, woohoo!
2013-10-28 22:45:55 +01:00
Eelco Dolstra
0e333688ce Big cleanup of the NixOS module system
The major changes are:

* The evaluation is now driven by the declared options.  In
  particular, this fixes the long-standing problem with lack of
  laziness of disabled option definitions.  Thus, a configuration like

    config = mkIf false {
      environment.systemPackages = throw "bla";
    };

  will now evaluate without throwing an error.  This also improves
  performance since we're not evaluating unused option definitions.

* The implementation of properties is greatly simplified.

* There is a new type constructor "submodule" that replaces
  "optionSet".  Unlike "optionSet", "submodule" gets its option
  declarations as an argument, making it more like "listOf" and other
  type constructors.  A typical use is:

    foo = mkOption {
      type = type.attrsOf (type.submodule (
        { config, ... }:
        { bar = mkOption { ... };
          xyzzy = mkOption { ... };
        }));
    };

  Existing uses of "optionSet" are automatically mapped to
  "submodule".

* Modules are now checked for unsupported attributes: you get an error
  if a module contains an attribute other than "config", "options" or
  "imports".

* The new implementation is faster and uses much less memory.
2013-10-28 22:45:55 +01:00
Eelco Dolstra
f4dadc5df8 rename.nix: Don't use the extraConfigs feature 2013-10-28 22:45:55 +01:00
Eelco Dolstra
2cc37c17d9 openvpn.nix: Improve types 2013-10-28 22:45:55 +01:00
Eelco Dolstra
5b8c4d2a7d Get rid of the only use of mkNotdef 2013-10-28 22:45:54 +01:00
Eelco Dolstra
335422f7be Get rid of the only use of mkDefaultValue 2013-10-28 22:45:54 +01:00
Eelco Dolstra
41c8f9598e Remove dead code 2013-10-28 22:45:54 +01:00
Jason "Don" O'Conal
d9b4fe9e5d pythonPackages.sympy: add expression 2013-10-28 21:10:19 +00:00
aszlig
df4a3cc9f9
miro: New package, version 6.0.
I actually had this breeding in my nixpkgs overrides for a year and only
recently took the time to fix it and thus revive my video feeds :-)

The package uses a patch which is removing the dependency on gconf and
switches to storage within a shelve in ~/.miro/config instead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:50 +01:00
aszlig
aa018de67d
python-pywebkitgtk: New package, version 1.1.8.
This is needed as a build dependency for miro.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:50 +01:00
aszlig
246b59ec11
chromium: Update stable and beta channels.
stable: 30.0.1599.101 -> 30.0.1599.114
http://googlechromereleases.blogspot.de/2013/10/stable-channel-update_22.html

beta: 31.0.1650.26 -> 31.0.1650.34
http://googlechromereleases.blogspot.de/2013/10/beta-channel-update_23.html

Builds and tests pass on my machine. The update for the dev channel is
currently not building and I'm going to fix it later.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:49 +01:00
aszlig
877614ce99
python-paramiko: Fix maintainerS attribute name.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:49 +01:00
aszlig
45e740b119
mixxx: New package in version 1.11.0.
Compiles fine on linux i686 and amd64. Adding myself as maintainer, even
though I'm not using the package by myself, but a friend is using it for
DJing from a NixOS live system I'm maintaining.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:49 +01:00
aszlig
46b2bd427c
portmidi: New package in version 217.
This uses a patch from Gentoo to disable Java support for now, as it is
not needed for supporting Mixxx (which is the package I'm preparing).
Hopefully, the patch will be applied upstream so we can safely drop it
here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:48 +01:00
Domen Kožar
a80598b535 nixops: build nixops also for OSX and FreeBSD 2013-10-28 19:44:43 +01:00
Peter Simons
094edba311 ghc-with-packages.nix: make sure that GHC itself is included in the environment 2013-10-28 17:54:28 +01:00
Domen Kožar
f58a1f5c98 Merge pull request #1137 from offlinehacker/nixos/redis/fix_user_syslog
nixos/redis: user set uid, log to syslog by default
2013-10-28 08:26:19 -07:00
Jaka Hudoklin
d28a9619a1 nixos/redis: log to syslog by default 2013-10-28 18:18:24 +01:00
Jaka Hudoklin
b20c08d2cb nixos/redis: user set uid, make it compatible #1076 2013-10-28 18:18:13 +01:00
Domen Kožar
04fc38d233 Merge pull request #1135 from offlinehacker/nixos/graphite/fix
Fix graphite startup and limit amount of log messages
2013-10-28 07:22:54 -07:00
Jaka Hudoklin
c1ad189295 nixos/graphite: limit amount of log message defaults 2013-10-28 17:09:53 +01:00
Jaka Hudoklin
0229f45cf3 nixos/graphite: graphite requires pidfile set for startup 2013-10-28 17:08:33 +01:00
Jason "Don" O'Conal
f79ae71748 php54: add pcntl option 2013-10-27 23:57:44 +00:00
Domen Kožar
f4aaced654 ngrok: rewrite to download all dependencies with fetch* functions 2013-10-27 22:57:09 +01:00
Jason "Don" O'Conal
ab18b33f3e sup: update to latest version 2013-10-27 21:57:09 +01:00
Michael Raskin
3022fff7db Adding Quantum Minigolf game 2013-10-28 00:09:46 +04:00
William A. Kennington III
59de62317d btrfs: fix build to link against libgcc_s so that pthread_cancel is linked
Currently, the command btrfs scrub start <filesystem> attempts to invoke the pthread_cancel
routine and ends with an error melibgcc_sssage about it being missing. This prevents btrfs
scrub status from maintaining proper statistics about the running scrub.

Close #1127.
2013-10-27 20:21:22 +02:00
Peter Simons
216e9976fe haskell-uniplate: update to version 1.6.12 2013-10-27 19:07:15 +01:00
Peter Simons
aab65b9f2b haskell-socks: update to version 0.5.4 2013-10-27 19:07:15 +01:00
Peter Simons
fbe6b6cbff haskell-modular-arithmetic: update to version 1.1.0.0 2013-10-27 19:07:15 +01:00
Peter Simons
089506aac6 haskell-diagrams-svg: update to version 0.8.0.2 2013-10-27 19:07:15 +01:00