Commit Graph

40386 Commits

Author SHA1 Message Date
Eelco Dolstra
b13a5d4cca Fix kmscon evaluation 2014-03-12 21:00:59 +01:00
Peter Simons
238a98fcbe Merge pull request #1927 from iyzsong/noweb
noweb: some fixes
2014-03-12 19:01:48 +01:00
Peter Simons
23807bbe97 Merge pull request #1925 from wkennington/master.notbit
notbit: Add Package
2014-03-12 19:00:31 +01:00
Eelco Dolstra
09c14cd8aa switch-to-configuration: Don't try to start masked units 2014-03-12 18:52:11 +01:00
Eelco Dolstra
f198c40608 Don't depend on the text of disabled units
This prevents pulling in unnecessary dependencies.
2014-03-12 18:52:11 +01:00
Eelco Dolstra
207c881df9 Don't include superfluous lines in generated units 2014-03-12 18:52:11 +01:00
Eelco Dolstra
d412245601 getty@ and autovt@: Use the upstream units 2014-03-12 18:52:10 +01:00
Eelco Dolstra
691c0cd72e systemd: Allow customisation of upstream units
You can now say:

  systemd.services.foo.baseUnit = "${pkgs.foo}/.../foo.service";

This will cause NixOS' generated foo.service file to include
foo.service from the foo package.  You can then apply local
customization in the usual way:

  systemd.services.foo.serviceConfig.MemoryLimit = "512M";

Note however that overriding options in the original unit may not
work.  For instance, you cannot override ExecStart.

It's also possible to customize instances of template units:

  systemd.services."getty@tty4" =
    { baseUnit = "/etc/systemd/system/getty@.service";
      serviceConfig.MemoryLimit = "512M";
    };

This replaces the unit options linkTarget (which didn't allow
customisation) and extraConfig (which did allow customisation, but in
a non-standard way).
2014-03-12 18:52:10 +01:00
Eelco Dolstra
3358906395 apcupsd: Description -> description 2014-03-12 18:52:10 +01:00
Domen Kozar
03c6c1608b add pythonPackages.dropbox 2014-03-12 17:48:09 +01:00
William A. Kennington III
635cb24bb1 notbit: Add Package 2014-03-12 11:28:16 -05:00
Ricardo M. Correia
4640a6b9db flashplayer: Update from 11.2.202.341 -> 11.2.202.346 2014-03-12 14:42:52 +01:00
Bjørn Forsman
844d246d2d Unbreak channel (fix license attribute in python-packages.nix) 2014-03-12 13:37:09 +01:00
Bjørn Forsman
3339f1e1f4 thrift: add meta.platforms, small cleanup
I set platforms to 'linux' because that's the only thing I have tested.
2014-03-12 13:23:27 +01:00
Sander van der Burg
2cb2be8161 titaniumsdk: Bump version to 3.2.2 2014-03-12 12:04:38 +01:00
宋文武
37e74d8cc0 noweb: some fixes
install libs to $out/lib/noweb
don't sed on binaries, eg markup
2014-03-12 18:54:50 +08:00
Peter Simons
b75a5e6f84 Merge pull request #1922 from jagajaga/haskell_pkgs_add
hoauth2 and bytestring-show add pkgs
2014-03-12 11:49:08 +01:00
Rickard Nilsson
4e23573138 phpfpm module: Make extraConfig and poolConfigs mergeable by switching option type to types.lines 2014-03-12 11:45:31 +01:00
Rickard Nilsson
562a8ca4a2 Add phpfpm NixOS service module 2014-03-12 11:38:50 +01:00
Peter Simons
c4784335d0 Merge pull request #1921 from kosmikus/ghc-7.8.1
Add GHC-7.8.1-rc2.
2014-03-12 11:33:01 +01:00
Domen Kozar
28069d6aad move windowManager.xbmc to desktopManager.xbmc 2014-03-12 09:20:59 +01:00
Rickard Nilsson
a3bf4df6e4 libvirt-python: Update from 1.2.0 to 1.2.2 2014-03-12 08:33:43 +01:00
Rickard Nilsson
773d886f51 libvirt: Clean up nix file, update meta 2014-03-12 08:27:05 +01:00
Vladimír Čunát
ef825eaca7 libproxy: attempt to fix build on Darwin
It seems it won't compile with too old compilers.
2014-03-12 07:11:15 +01:00
Vladimír Čunát
4c9bac5004 liferea: fix https URIs by adding glib_networking 2014-03-11 22:01:12 +01:00
Vladimír Čunát
4a0d464384 glib_networking: big update, cleanup, meta added 2014-03-11 21:56:28 +01:00
Arseniy Seroka
cf931434de hoauth2 and bytestring-show add pkgs 2014-03-12 00:20:27 +04:00
Andres Loeh
b2b4e46198 Add GHC-7.8.1-rc2. 2014-03-11 20:14:24 +01:00
Rickard Nilsson
28437226ae libvirt: Update from 1.2.0 to 1.2.2 2014-03-11 18:27:09 +01:00
Peter Simons
4c226fb88a haskell-hledger-web: jailbreak to fix build with recent versions of yesod 2014-03-11 17:33:09 +01:00
Eelco Dolstra
36ee5c61c3 Rename git -> git-minimal, git-full -> git
Since most people probably want the full Git.
2014-03-11 17:00:17 +01:00
Peter Simons
d35e61913b haskell-ghcjs-codemirror: add version 0.0.0.1 2014-03-11 13:50:51 +01:00
Peter Simons
27247b0325 haskell-ghcjs-dom: add version 0.0.4 2014-03-11 13:50:51 +01:00
Peter Simons
b46aac7d79 haskell-vado: add version 0.0.1 2014-03-11 13:50:51 +01:00
Peter Simons
1e662766fb haskell-vcsgui: add version 0.0.2 2014-03-11 13:50:51 +01:00
Peter Simons
d0734f8aaa haskell-vcswrapper: add version 0.0.3 2014-03-11 13:50:50 +01:00
Peter Simons
902d57fe40 haskell-http-reverse-proxy: update to version 0.3.1 2014-03-11 13:50:50 +01:00
Peter Simons
55f2f3b465 haskell-alsa-mixer: update to version 0.2.0.1 2014-03-11 13:50:50 +01:00
Peter Simons
66729b6dea haskell-lens: remove obsolete version 3.10.2 2014-03-11 13:50:50 +01:00
Peter Simons
d765d5ddbb haskell-keter: update to version 1.2.0 2014-03-11 13:50:50 +01:00
Peter Simons
2273294b50 haskell-HaRe: update to version 0.7.1.4 2014-03-11 13:50:50 +01:00
Peter Simons
4139ea10be haskell-zip-archive: update to version 0.2.2 2014-03-11 13:50:50 +01:00
Peter Simons
46145143fc haskell-yesod-form: update to version 1.3.6 2014-03-11 13:50:50 +01:00
Peter Simons
f1120ff4b5 haskell-yesod-core: update to version 1.2.7 2014-03-11 13:50:50 +01:00
Peter Simons
e5cf206741 haskell-yesod-bin: update to version 1.2.7 2014-03-11 13:50:50 +01:00
Peter Simons
b48704974a haskell-yesod-auth: update to version 1.2.7 2014-03-11 13:50:50 +01:00
Peter Simons
ccac7c5dca haskell-x509: update to version 1.4.11 2014-03-11 13:50:50 +01:00
Peter Simons
5acfd49d17 haskell-warp: update to version 2.1.0 2014-03-11 13:50:50 +01:00
Peter Simons
def8957c30 haskell-warp-tls: update to version 2.0.3.1 2014-03-11 13:50:50 +01:00
Peter Simons
6455c132c3 haskell-wai: update to version 2.1.0 2014-03-11 13:50:50 +01:00