Compare commits

...

898 Commits

Author SHA1 Message Date
Georges Dubus
770822493e gusb: fixed build, updated to 0.2.4
(cherry picked from commit 0ca664e996)
2016-03-01 14:10:57 +01:00
Eelco Dolstra
c191689afb vim: Fix download location
http://hydra.nixos.org/build/32085889
2016-02-17 09:44:19 +01:00
Eelco Dolstra
8c1bb397c4 Use updated bootstrap binaries
Fixes #5335.

(cherry picked from commit a5aa8f3efa)
2016-02-16 22:28:31 +01:00
Shea Levy
c210b69584 CVE-2015-7547: Adapt patch for glibc 2.20 2016-02-16 11:35:22 -05:00
Nathan Zadoks
9ad4159eae glibc: fix cve-2015-7547.patch so it applies cleanly
(cherry picked from commit fc48bf5a2c)
2016-02-16 11:28:32 -05:00
Nathan Zadoks
5a9202823e glibc: patch CVE-2015-7547
The glibc DNS client side resolver is vulnerable to a stack-based buffer
overflow when the getaddrinfo() library function is used. Software using
this function may be exploited with attacker-controlled domain names,
attacker-controlled DNS servers, or through a man-in-the-middle attack.
https://googleonlinesecurity.blogspot.co.uk/2016/02/cve-2015-7547-glibc-getaddrinfo-stack.html

(cherry picked from commit b5aa8a4e64)
2016-02-16 10:25:43 -05:00
Robert Helgesson
9d6ba7d831 keepassx: 0.4.3 -> 0.4.4
Fixes CVE-2015-8359 and CVE-2015-8378. Also switch URL to new download
location.
2015-12-21 08:09:16 +01:00
Pascal Wittmann
f2bdf674b7 audiofile: fix CVE-2015-7747
closes #10678

(cherry picked from commit 6aea1c55c0669540cffd5472fdf7c4b607d4c324 by
falsifian)
2015-11-04 18:53:48 -08:00
aszlig
a85150b2fa python-hetzner: Update to bugfix version 0.7.4.
Fixes pinned CA root certificate and probing for system CA bundle.

Closes NixOS/nixops#354.

I'm using fetchFromGitHub now because it's use of fetchzip is more
stable for autogenerated tarballs from GitHub.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 1d1cf4845f)
2015-11-04 14:08:14 +01:00
Domen Kožar
aafebd27ea unzip: CVE-2015-7696, CVE-2015-7697
(cherry picked from commit aff3a23d67)
2015-11-01 20:12:46 -08:00
aszlig
a8faa9d01a thttpd: Fix SHA256 of the upstream tarball.
It's a bit unfortunate to see this, but while looking online to download
the old version of the file I found that MacPorts and FreeBSD had the
same issue:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199562

I've checked the diff as well and found no big functional changes,
except a function rename, copyright updates and changed syslog
priorities:

https://bz-attachments.freebsd.org/attachment.cgi?id=155775

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit f15420b0fe)
2015-10-21 17:17:49 +02:00
aszlig
166fdcec80 nixpart0: Don't search for libudev using SO major.
The SO major is going to change in the upcoming update of the Hetzner
rescue system, which will cause NixOps to break because it's statically
using the SO major 0 while the new rescue system will have the major
number 1.

I'm still keeping the udevSoMajor attribute to retain backwards-
compatibility with older NixOps versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 3bf3d19759)
2015-10-21 17:17:49 +02:00
RoboNickBot
885ca28fa9 texlive-moderntimeline: 0.8 (broken) -> 0.9
Close #9612, close #10235.

The v0.8 build was broken because the CTAN package updated to v0.9 and
CTAN doesn't keep old versions of packages.

Besides bumping the version, this commit changes the src url from the
unversioned CTAN link (which would break the derivation every time a new
version of the package released, as it did yesterday) to the versioned
Github release link.

(cherry picked from commit 126d8dba96)
2015-10-05 09:25:25 +02:00
Vincent Laporte
b373bf9c7d couchdb: fix build (fixes #10084)
(cherry picked from commit 4361a7a597)
2015-09-27 08:40:43 +02:00
Vladimír Čunát
41377038a7 vorbis-tools: security patches and fix meta
Patches: CVE-2014-9638, CVE-2014-9639, CVE-2015-6749, and some non-security.
Also drop glibc from buildInputs.

(cherry picked from commit 000a2108ba)
2015-09-25 11:52:32 +02:00
Lluís Batlle i Rossell
263c13481c Fix my-env so it includes gcc, as it used to do.
This is a reaction to 1014620bce, that
moved some paths from nix source to the builder.sh of stdenv.
2015-09-24 14:57:01 +02:00
Ricardo M. Correia
7e5c1e8395 flashplayer: 11.2.202.491 -> 11.2.202.508
(cherry picked from commit 4c8b2beb55)
2015-09-23 19:43:03 +02:00
Rob Vermaas
a968b70b71 Update libcloud to 0.18.0. Needed for newer nixops. 2015-09-17 19:31:56 +00:00
Pascal Wittmann
e3596798c5 Merge pull request #9868 from shen390s/working
add perl-Tk
2015-09-17 09:18:11 +02:00
Rongsong Shen
fbb8fa5e22 Tk: init at 804.033 2015-09-17 12:52:03 +08:00
Eelco Dolstra
42847f5d95 Fix broken use of <nixpkgs>
Nixpkgs should never use <nixpkgs>, because there is no guarantee that
<nixpkgs> refers to the same tree (e.g. when doing "nix-env -f . -qa").
2015-09-14 18:49:41 +02:00
Bjørn Forsman
0341382f15 meshlab: add missing patch (doh!)
Should have been included in af7d5f27d0 ("meshlab: 1.3.2 -> 1.3.3").

(cherry picked from commit c9c3a3cb72)
2015-08-27 11:19:29 +02:00
Bjørn Forsman
e9651c0769 meshlab: 1.3.2 -> 1.3.3
Remove patches that no longer apply (integrated upstream I guess), but
forward port the part that adds the missing "include <unistd.h>"[1].

Build and run tested.

[1]: http://sourceforge.net/p/meshlab/bugs/342/

(cherry picked from commit af7d5f27d0)
2015-08-27 11:19:12 +02:00
Bjørn Forsman
bb79e195c4 pcl: 1.6.0 -> 1.7.2 (unbreaks build)
New deps added: libXt (required), libpcap (optional).

Releases are now at github.

(cherry picked from commit ac8f2391f3)
2015-08-27 09:34:25 +02:00
Eelco Dolstra
4471b1eab2 nixUnstable: Update 2015-08-26 15:07:54 +02:00
Lluís Batlle i Rossell
d71e083563 mbsync: update to 1.2.0
it requires some config file updates. It requires SASL now, for some auth
methods like PLAIN on IMAP.
2015-08-25 15:35:53 +02:00
Lluís Batlle i Rossell
8f11a84c91 Make hydra build proxychains. 2015-08-25 14:21:56 +02:00
Eelco Dolstra
f2ec401001 Revert "Merge pull request #9428 from deepfire/maintain"
This reverts commit 090f523498. It
breaks evaluation: http://hydra.nixos.org/build/24984169
2015-08-25 11:14:29 +02:00
Vladimír Čunát
090f523498 Merge pull request #9428 from deepfire/maintain
maintain introduced packages
(cherry picked from commit ce6daa507a)
2015-08-24 22:59:19 +02:00
Anders Papitto
25317137a1 fix updmap invocation in texLive
Close #9430, fixes #9318.

(cherry picked from commit 6b892be9a8)
2015-08-24 22:48:00 +02:00
Eelco Dolstra
4e8d015878 Revert "openssh: Apply some Fedora security backports"
This reverts commit eace57c983. Oops.
2015-08-24 19:06:10 +02:00
Eelco Dolstra
eace57c983 openssh: Apply some Fedora security backports
(cherry picked from commit 2d4b6405b3)
2015-08-24 19:05:33 +02:00
Bob van der Linden
d02e9314a6 can-utils: updated homepage url (close #9425)
(cherry picked from commit 5cdf3d4f8e)
2015-08-24 18:56:32 +02:00
Eelco Dolstra
5e631b21d7 subversion: Update to 1.8.14
CVE-2015-3184, CVE-2015-3187.

(cherry picked from commit 24f1a7a5cb)
2015-08-24 12:53:01 +02:00
Vladimír Čunát
ad6e048b4f micropolis: fix patch hash, probably updated
Fixes #9414. Seems to run OK, as far as I can tell in a minute.

(cherry picked from commit d36e4f3063)
2015-08-24 08:25:09 +02:00
Thomas Tuegel
8faad6e163 Merge pull request #9373 from bendlas/dropbox-stable-revert
dropbox: 3.8.5 -> 3.6.9 [nixos-stable]
2015-08-20 16:13:50 -05:00
Herwig Hochleitner
190af0b5ce dropbox: 3.8.5 -> 3.6.9
dropbox as of 3.8.4 depends on qt 5.4, while nixos-14.12 is on qt 5.3
https://www.dropboxforum.com/hc/en-us/community/posts/204541685-Release-Candidate-3-8-4

This reverts commit f961f3d793.
fixes #9338
2015-08-20 20:27:15 +02:00
Eelco Dolstra
e6c54b5af2 Revert "cbc: Enable on Darwin"
This reverts commit 7d902b92b7. It
doesn't build on 14.12.
2015-08-19 13:10:44 +02:00
Eelco Dolstra
7d902b92b7 cbc: Enable on Darwin
(cherry picked from commit f423ba3863)
2015-08-19 11:56:52 +02:00
Eelco Dolstra
176139701c Add cbc, a mixed ILP solver
(cherry picked from commit 80c137c7a2)
2015-08-18 16:24:03 +02:00
William A. Kennington III
e809a2868f bundler-head: Correct hash
(cherry picked from commit 0f21f3e00b)
/cc #9005. The needed hash is different than on master,
perhaps due to fetchgit differences.
2015-08-17 11:34:58 +02:00
Bob van der Linden
eb325dd80b memtest86+: fixed reboot issues
(cherry picked from commit 3b40ec5012)
2015-08-14 14:48:54 +02:00
Rob Vermaas
57d290f34f Keep lib/strings.nix isStorePath compatible with nix 1.8. If builtin does not exist, fallback to hardcoded /nix/store. 2015-08-14 08:55:16 +00:00
Eelco Dolstra
d8f6a3a250 Revert "Add option system.stateVersion"
This reverts commit ab415725ed.
2015-08-13 16:28:44 +02:00
Eelco Dolstra
1c13abaeea Fix installer failure
http://hydra.nixos.org/build/24716029
2015-08-13 15:09:19 +02:00
Eelco Dolstra
43b640fa56 Fix Nix 1.7 compat 2015-08-13 14:56:37 +02:00
Eelco Dolstra
ab415725ed Add option system.stateVersion
This option requests compatibility with older NixOS releases with
respect to stateful data, in cases where new releases have defaults
that might be incompatible with system state of existing NixOS
deployments. For instance, if we change the default version of
PostgreSQL, existing deployments will break if the new version can't
read databases created by the old version.

So for example, setting

  system.stateVersion = "15.07";

requests that options like services.postgresql.package use defaults
corresponding to the 15.07 release branch. Note that
nixos-generate-config emits this option. (In the future, NixOps may
set system.stateVersion to the NixOS release in use when the machine
was created.)

See also #7939 for another motivating example.

(cherry picked from commit d166c854b6)
2015-08-13 11:58:39 +02:00
Eelco Dolstra
9a44fa3d5b Allow options with type "package" to be store paths
For example, this allows writing

  nix.package = /nix/store/786mlvhd17xvcp2r4jmmay6jj4wj6b7f-nix-1.10pre4206_896428c;

Also, document types.package in the manual.

(cherry picked from commit 214d4fb73c)

Conflicts:
	lib/strings.nix
2015-08-13 11:58:32 +02:00
Eelco Dolstra
f60e48ce81 Revert "blender: Update to 2.73"
This reverts commit 6dc172d9c7.
2015-08-12 13:32:53 +02:00
Eelco Dolstra
b5fc462b76 Revert "blender: fix build after update to 2.73"
This reverts commit 9e710a6cce.
2015-08-12 13:32:44 +02:00
Eelco Dolstra
b694058dd4 Revert "blender: Update to 2.73a"
This reverts commit 6ae70c86a1.
2015-08-12 13:32:39 +02:00
Eelco Dolstra
8c7931a363 Revert "Blender: enable blenderplayer"
This reverts commit 557ef9e1de.
2015-08-12 13:32:31 +02:00
Eelco Dolstra
3d60824a38 Revert "blender: Update to 2.74"
This reverts commit 1e3c112a23.
2015-08-12 13:32:25 +02:00
Eelco Dolstra
7a44642200 Revert "blender: Update to 2.75"
This reverts commit 709f95f8c5.
2015-08-12 13:32:18 +02:00
Eelco Dolstra
bb6327730c Revert "blender: Update to 2.75a"
This reverts commit 6375e18e31.
2015-08-12 13:32:16 +02:00
Eelco Dolstra
ae36c07210 Revert "openexr: 1.7.1 -> 2.2.0"
This reverts commit a0ca6f00b3.
2015-08-12 13:32:13 +02:00
Eelco Dolstra
525927c9fa Revert "ilmbase: Update to openexr version"
This reverts commit e5fd500733.
2015-08-12 13:32:09 +02:00
Eelco Dolstra
e9ca7bfa67 Revert "Making openimageio use parallel building."
This reverts commit ff31b14cc5.
2015-08-12 13:32:06 +02:00
Lluís Batlle i Rossell
ff31b14cc5 Making openimageio use parallel building. 2015-08-12 10:59:46 +02:00
William A. Kennington III
e5fd500733 ilmbase: Update to openexr version
(cherry picked from commit e9c1a56f97)
2015-08-12 10:59:46 +02:00
William A. Kennington III
a0ca6f00b3 openexr: 1.7.1 -> 2.2.0
(cherry picked from commit 51cc9612b7)
2015-08-12 10:59:46 +02:00
Eelco Dolstra
6375e18e31 blender: Update to 2.75a
(cherry picked from commit aca6eb1fdb)
2015-08-12 10:59:46 +02:00
Eelco Dolstra
709f95f8c5 blender: Update to 2.75
(cherry picked from commit 36779d90e2b7e93ec5387cc5b5d106a037eb3d11)
(cherry picked from commit f3e2b31297)
2015-08-12 10:59:45 +02:00
Eelco Dolstra
1e3c112a23 blender: Update to 2.74
(cherry picked from commit b8ccb390b3)
2015-08-12 10:59:45 +02:00
Cillian de Róiste
557ef9e1de Blender: enable blenderplayer
(cherry picked from commit 79f3689289)
2015-08-12 10:59:45 +02:00
Eelco Dolstra
6ae70c86a1 blender: Update to 2.73a
(cherry picked from commit 480602bea1)
2015-08-12 10:59:45 +02:00
Luca Bruno
9e710a6cce blender: fix build after update to 2.73
(cherry picked from commit 5f12045f34)
2015-08-12 10:59:45 +02:00
Eelco Dolstra
6dc172d9c7 blender: Update to 2.73
(cherry picked from commit b0321dadcb)
2015-08-12 10:59:45 +02:00
Eelco Dolstra
54ddd7a3b6 Revert "nixos/ISO profile: fix defaultLocales :-)"
This reverts commit e2ef5cc163. It broke
the installer tests:

http://hydra.nixos.org/build/24626135
2015-08-11 20:38:25 +02:00
Eelco Dolstra
f3ea802f85 php: Update to 5.4.44 2015-08-11 13:17:15 +02:00
William A. Kennington III
8da2cf4b11 kernel: 3.14.49 -> 3.14.50
(cherry picked from commit 52e55d85cb)

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.14.nix
	pkgs/os-specific/linux/kernel/patches.nix
2015-08-11 12:03:40 +02:00
Eelco Dolstra
56b84dc3c2 mysql: Update to 5.4.45
(cherry picked from commit a6f466065c)

Conflicts:
	pkgs/servers/sql/mysql/5.5.x.nix

http://hydra.nixos.org/build/24146564
2015-08-11 12:01:36 +02:00
Vladimír Čunát
e960991f51 lyx: maintenance update
(cherry picked from commit cf1b771b2e)
2015-08-10 15:59:56 +02:00
Rob Vermaas
55d9786289 Add initial Brightbox expression. 2015-08-08 19:49:38 +00:00
James Cook
892c4ffb8a firefox: 39.0 -> 39.0.3
(cherry picked from commit 9f79830345)
2015-08-07 11:27:28 +02:00
Vladimír Čunát
22e10f13e6 ikiwiki: maintenance update, and use a stable URL
CC maintainer @peti.

(cherry picked from commit f484050a81)
2015-08-06 17:52:56 +02:00
Vladimír Čunát
2efe8b6828 Revert "glibc-locales: check that all we build is supported"
This reverts commit 0ec3901383.

The checks work fine on master, but here they don't.
I don't see why and I'm not digging deeper. It might be
just some bad character in the checked file in this glibc version.

Now the locales for ISOs build again.
2015-08-06 13:14:40 +02:00
Vladimír Čunát
e2ef5cc163 nixos/ISO profile: fix defaultLocales :-)
https://github.com/NixOS/nixpkgs/commit/eb4a88d8fd2#commitcomment-12527102
(cherry picked from commit 7dc9450ed2)
2015-08-06 13:14:39 +02:00
Joachim Fasting
95ed62bd91 attic: 0.15 -> 0.16
(cherry picked from commit 0d6ef780c7)
2015-08-06 12:27:55 +02:00
Bjørn Forsman
e1407a3a1c attic: update source hash (unbreaks build)
Diff of old/new source trees:

  $ diff -uNr /nix/store/h600g290a0h8szjhdfvfn4x7janrhd8n-attic-0.15-src/ attic-0.15-today/
  diff -uNr /nix/store/h600g290a0h8szjhdfvfn4x7janrhd8n-attic-0.15-src/attic/_version.py attic-0.15-today/attic/_version.py
  --- /nix/store/h600g290a0h8szjhdfvfn4x7janrhd8n-attic-0.15-src/attic/_version.py	1970-01-01 01:00:01.000000000 +0100
  +++ attic-0.15-today/attic/_version.py	2015-04-15 21:49:03.000000000 +0200
  @@ -10,7 +10,7 @@
   # versioneer-0.7+ (https://github.com/warner/python-versioneer)

   # these strings will be replaced by git during git-archive
  -git_refnames = " (HEAD, tag: 0.15, master)"
  +git_refnames = " (tag: 0.15)"
   git_full = "e815d6da8e15be8ccd09b7a183bb22bad25cf3e6"

So it looks like dynamic git archives can still bite us. Hopefully this
can be fixed upstream (attic) in the future.
2015-08-06 12:25:00 +02:00
Arseniy Seroka
1e45c69d1c Merge pull request #9136 from bendlas/dropbox-stable-update
dropbox: 3.6.9 -> 3.8.5 [stable branch]
2015-08-06 03:08:12 +03:00
Herwig Hochleitner
f961f3d793 dropbox: 3.6.9 -> 3.8.5 2015-08-05 23:58:30 +02:00
Eelco Dolstra
09db60c5ef php: Update to 5.4.43 2015-08-04 17:49:05 +02:00
Eelco Dolstra
5cb71d3e11 subversion: Update to 1.8.13
(cherry picked from commit c98b8f4c11)
2015-08-04 17:48:45 +02:00
Rob Vermaas
8f493eb3ea Update awscli from 1.5.5 to 1.7.41 2015-08-04 14:16:56 +00:00
Eelco Dolstra
5bcff3d016 releaseTools.coverageAnalysis: Emit hydra-metrics
(cherry picked from commit 068f8abaa5)
2015-08-04 11:06:51 +02:00
Bjørn Forsman
ab550c85fe ntopng: update geoip hashes
These files are updated (in place) every month or so.
2015-08-03 13:00:48 +02:00
Bjørn Forsman
d65a8c81b5 ntopng: add extra download URL
It seems upstream have moved the ntopng-1.2.1.tgz into an "old/"
subdirectory.

(cherry picked from commit c2aadb38a7)
2015-08-03 12:45:02 +02:00
Robert Scott
f24eb7cb4f ghostscript: add patch fixing CVE-2015-3228 (from debian)
(cherry picked from commit 179cdbc62c)
2015-08-02 09:43:22 +02:00
Robert Scott
31a6c3c72b elfutils: upgrade to 0.163 due to security
... vaguely mentioned by upstream, see e.g. FEDORA-2015-11380.
Close #9084.

(cherry picked from commit aefc8b3ddf)
2015-08-02 09:37:58 +02:00
Vladimír Čunát
0ec3901383 glibc-locales: check that all we build is supported
Until now, if e.g. the user passed "en_US.UTF-8" instead of "en_US.UTF-8/UTF-8",
the locales would be generated without failing but wouldn't work well.
Now we guard against such mistakes. Real life examples:
https://github.com/fish-shell/fish-shell/issues/1927

(cherry picked from commit eb4a88d8fd)
2015-07-31 15:40:13 +02:00
aszlig
01cb65d269 chromium: Add another mirror for Chrome deb.
The only mirror left which still has the .deb for 44.0.2403.89 is
http://mirror.pcbeta.com/, but that one doesn't seem to be reachable
from certain contries.

And according to @CestDiego, it doesn't seem to be reachable from within
the US.

Closes #9021, thanks to @CestDiego for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Diego Berrocal <cestdiego@gmail.com>
Tested-by: Diego Berrocal <cestdiego@gmail.com>
(cherry picked from commit 8d34b4a46a)
2015-07-30 20:04:47 +02:00
Susan Potter
18bb8220cb jwhois: fix path to lynx in $lynx/etc/jwhois.conf
Close #8696.
Fixes issues found when jwhois attempts to launch terminal browser
(lynx) for HTTP whois queries, for example:

    $ whois blah.io
    [Querying http://www.io.io/cgi-bin/whois]
    [HTTP: Unable to run web browser: /usr/bin/lynx: No such file or directory]

Tested via:

    grep lynx \
      /nix/store/bymgmn2vvw1n7nbb1isy87xg94s8f2ml-jwhois-4.0/etc/jwhois.conf \
      | cut -f2 -d'"' \
      | xargs stat -t

(cherry picked from commit a9e2cf0af3)
2015-07-30 15:53:27 +02:00
Eelco Dolstra
602b80af82 nixUnstable: Update to 1.10pre4200_76cc8e9 2015-07-30 12:16:12 +02:00
Vladimír Čunát
87d170230c lsof: use a pair of URLs to work when upstream updates
Fixes #9043.

(cherry picked from commit af3261f7a2)
2015-07-29 17:48:09 +02:00
Spencer Janssen
be9732d2ed nvidia-x11: add a symlink for libGLESv2.so.2 (close #9024)
nvidia's EGL stack looks for libGLESv2.so.2 at runtime (confirmed by
watching strace), however builder.sh only provides a libGLESv2.so.1
symlink.

@vcunat ported to legacy_340; older ones don't produce GLES.

(cherry picked from commit ebe67d3c85)
2015-07-28 12:53:39 +02:00
James Cook
494a2b7d01 expat: patch for CVE-2015-1283 from Mozilla
(Cherry-picked from fba4a950685023bc792422665b2dbe9934ebc9c6.)
2015-07-27 22:40:49 -07:00
Robert Scott
221101a571 apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
(cherry picked from commit 1dca2fba7f)
2015-07-28 00:13:56 +02:00
Vladimír Čunát
e08192cd4a cups-filters: update, including security fixes
- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable

(Cherry-picked from 9147dee57f, with slight adjustments.)
2015-07-21 21:09:49 +02:00
Thomas Tuegel
e21dff1c9c Merge pull request #8922 from bendlas/dropbox-stable-update
dropbox: 3.6.7 -> 3.6.9 [stable backport]
2015-07-21 09:45:12 -05:00
Robert Helgesson
bae15904ad vsftpd: fix CVE-2015-1419
Adds patch from Debian.

(cherry picked from commit 66bc50a968)
2015-07-21 16:36:42 +02:00
taku0
b7545835aa flashplayer: 11.2.202.481 -> 11.2.202.491
(cherry picked from commit 6e5308df3f)
2015-07-21 16:35:52 +02:00
Herwig Hochleitner
e71c0cce44 dropbox: 3.6.7 -> 3.6.9 2015-07-21 16:24:08 +02:00
Tobias Geerinckx-Rice
3b8e2f7e7a jmtpfs: fix changed sha256 hash
...by switching to fetchFromGitHub. Also clean up (some
dependencies are no longer needed).

(cherry picked from commit dda255f938)
2015-07-18 11:17:47 +02:00
Lluís Batlle i Rossell
55072502d2 Updating retroshare 0.6.0 from some svn to rc2 2015-07-18 00:15:44 +02:00
Lluís Batlle i Rossell
67317b47d5 updating the old tor to 0.2.6.10
I fix the build, which was not using compiler optimisations since 2013, commit
9a5ca5aced.

I add seccomp. I guess it is good to have.
2015-07-17 18:13:26 +02:00
Lluís Batlle i Rossell
db04589f48 Updating gtkwave 3.3.64 to 3.3.66
(cherry picked from commit a9c4f2db351d8e968cf29989f17c00169a5b4bbc)
2015-07-17 18:13:26 +02:00
Rob Vermaas
4c35598ad0 Make fetchBower a bit more like a normal mkDerivation, which is easier to test.
Also, in some cases, the result of fetchBower is different depending on the
value of $out. For now, it seems that it works best if using a local output
directory before copying to $out.
2015-07-16 14:42:44 +00:00
William A. Kennington III
a2b95b9059 Merge pull request #8842 from Beauhurst/djangoupdates-14.12
update django minor versions (including security fixes) - 14.12 backport
2015-07-15 17:42:22 -07:00
Robert Scott
6e59ff838d update django minor versions (including security fixes) 2015-07-15 15:21:19 +00:00
Eelco Dolstra
9172c7d530 Make OpenJDK release-critical
Currently there are no tests that depend on the JDK. Since we don't
want a release with a broken JDK, make it an explicit dependency of
the "tested" jobs.

(cherry picked from commit 4c0e44c34c)

Conflicts:
	nixos/release-small.nix
2015-07-14 16:07:02 +02:00
Vladimír Čunát
c2755c1d10 /etc/ssh/ssh_known_hosts: refactor and fix #5612
Generating the file was refactored to be completely in nix.
Functionally it should create the same content as before,
only adding the newlines.

CC recent updaters: @aszlig, @rickynils.

(cherry picked from commit 72d2d59cd4)
2015-07-13 16:13:11 +02:00
Eelco Dolstra
f398845d68 Add options nix.{trustedUsers,allowedUsers}
These are just trusted-users and allowed-users in nix.conf. It's
useful to have options for them so that different modules can specify
trusted/allowed users.

(cherry picked from commit 1f3f31b2a8)

Conflicts:
	nixos/modules/services/misc/nix-daemon.nix
2015-07-13 15:04:08 +02:00
Bjørn Forsman
35bfea0566 nixos/minidlna: rename minidlna -> minidlnad (unbreak service)
Upstream renamed their binary. This fix is needed since commit
27e0536fb4 ("Updating minidlna to 1.1.4 (2009→2014)").

On master branch there was a different commit (42a5ad5c5e) that
updated both minidlna package and the NixOS service at the same time, so
this commit is just for the release-14.12 branch.
2015-07-13 11:02:37 +02:00
Domen Kožar
89185887ff flashplayer: 11.2.202.468 -> 11.2.202.481
(cherry picked from commit 59cc99990e)
2015-07-12 13:11:19 +02:00
Karn Kallio
1b0caeaf1e openjdk : Patch to extend valid currency change dates to 20 years.
(cherry picked from commit 9b81769950)

Conflicts:
	pkgs/development/compilers/openjdk/default.nix
2015-07-10 11:28:28 +02:00
Eelco Dolstra
8615d193ba Revert "Ugly hack until we can update openjdk. Without this openjdk fails with:"
This reverts commit 3279579bc4.
2015-07-10 11:10:55 +02:00
Eelco Dolstra
a39ce56266 openssl: Update to 1.0.1p 2015-07-10 01:20:30 +02:00
Eelco Dolstra
5390f11ffa Revert "apache-httpd: Don't set default content encodings"
This reverts commit 6f88c6c210 since it
breaks existing installations, so it shouldn't be applied to the
stable branch.
2015-07-09 15:20:43 +02:00
Eelco Dolstra
ff7520eb34 linux: 3.14.46 -> 3.14.47
CVE-2014-7822

(cherry picked from commit 5c9f437d2f)

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.14.nix
	pkgs/os-specific/linux/kernel/patches.nix
2015-07-09 15:20:30 +02:00
Eelco Dolstra
6f88c6c210 apache-httpd: Don't set default content encodings
In general, you don't want a .tar.gz file to be served with
"Content-Encoding: x-gzip", because this causes browsers (like Chrome
or "curl --compressed") to decompress the file on the fly. So you end
up with a .tar rather than .tar.gz file, which is unexpected.

If people want such encodings, they should set them in their own NixOS
configuration.

(cherry picked from commit 9fa19cfcea)
2015-07-09 13:03:27 +00:00
aszlig
b3fcde49a8 python-hetzner: Update to bugfix version 0.7.3.
Fixes creating of admin accounts, which is used by NixOps to deploy new
servers. Props to @rbvermaa for reporting the issue and testing it with
NixOps.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 9b8f66180f)
2015-07-09 12:45:15 +02:00
Vladimír Čunát
d24705ebb2 symbola font: update to fix download (fixes #8717)
(cherry picked from commit bf86c228b9)
2015-07-09 12:30:20 +02:00
Michael Raskin
8e8b964fad Firefox: update 38.0.6 -> 39.0
(cherry picked from commit 62da31931c)
2015-07-07 14:26:26 +02:00
William A. Kennington III
6cae037316 firefox: 38.0.5 -> 38.0.6
(cherry picked from commit c5b17670e1)
2015-07-07 14:26:23 +02:00
William A. Kennington III
1b1244e2e7 nss: 3.19.1 -> 3.19.2
(cherry picked from commit f80dc98ca9)
2015-07-07 14:24:06 +02:00
Alexander Foremny
4397fc255f Update flashplayer-11
(cherry picked from commit ba7e7e1c9a)

Conflicts:
	pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
2015-07-06 12:51:16 +02:00
Lluís Batlle i Rossell
27e0536fb4 Updating minidlna to 1.1.4 (2009→2014) 2015-07-04 18:31:26 +02:00
Eelco Dolstra
a08167ca47 Revert "Adding internetarchive 0.8.3"
This reverts commit 3cf96ffa6b. It
breaks Nixpkgs evaluation due to the "bsd" attribute.
2015-07-02 08:36:49 +02:00
Eelco Dolstra
8a771535b2 Revert "Fix python-json-pointer meta."
This reverts commit f1f5441b50.
2015-07-02 08:36:37 +02:00
Lluís Batlle i Rossell
bdcb09bedb Updating syncthing to 0.11.11. 2015-07-01 15:10:40 +02:00
William A. Kennington III
00bcaf93b9 nbd: 3.8 -> 3.10 2015-07-01 15:10:26 +02:00
Sou Bunnbu
1cad147969 Merge pull request #8525 from phunehehe/yak
Yakuake: hardcode path to konsole
2015-06-29 22:53:54 +08:00
Kirill Elagin
ae9ff0e142 Yakuake: hardcode path to konsole 2015-06-27 18:51:03 +08:00
Lluís Batlle i Rossell
f1f5441b50 Fix python-json-pointer meta. 2015-06-25 15:43:08 +02:00
Lluís Batlle i Rossell
50afa41efb Updating podofo to 0.9.3.
(cherry picked from commit e7d10c4190)
2015-06-25 15:41:14 +02:00
Lluís Batlle i Rossell
3cf96ffa6b Adding internetarchive 0.8.3
I updated requests2 to a newer version, because of an important bug in uploads.
https://github.com/jjjake/internetarchive/issues/80

This is more or less equivalent to
master commit 66bd251a7c .
2015-06-25 12:11:40 +02:00
Rickard Nilsson
891701ed25 google-cloud-sdk: Update from 0.9.58 to 0.9.65
(cherry picked from commit af5472a739)
2015-06-23 11:24:52 +02:00
Stephen Weinberg
a8343207f7 Add the google-cloud-sdk package
(cherry picked from commit da2aef3685)
2015-06-23 11:24:44 +02:00
William A. Kennington III
2b834940c3 kernel: 3.14.43 -> 3.14.44
(cherry picked from commit 24042f3803)
2015-06-22 12:50:59 +02:00
Michael Raskin
7ce1e5ab74 Update PostgreSQL to latest point-releases
(cherry picked from commit 5d5bb71567)
2015-06-22 12:48:23 +02:00
Eelco Dolstra
076c0a2219 postgresql: Latest versions
(cherry picked from commit f08c8bc752)
2015-06-22 12:48:12 +02:00
Tobias Geerinckx-Rice
8e13f6ad04 eagle 6.5.0 -> 6.6.0
CC @bjornfor:

Version 6.5.0 has disappeared from Cadsoft's FTP site. This is the
closest version that's still available. Not extensively tested, but
works fine here.

Current version is 7.3.0. I leave that to someone more interested.

(cherry picked from commit 655cda730d)
2015-06-22 07:19:57 +02:00
Domen Kožar
48b41f0e95 update flash player 2015-06-21 09:22:39 +02:00
Thomas Tuegel
99783b8e8b Merge pull request #8409 from bendlas/update-dropbox-stable
dropbox: 3.4.6 -> 3.6.7 (stable backport)
2015-06-19 07:24:18 -05:00
Herwig Hochleitner
1366bcb61b dropbox: 3.4.6 -> 3.6.7 (stable backport) 2015-06-19 13:55:09 +02:00
Bjørn Forsman
6c3286c122 nixos: move environment.{variables => sessionVariables}.MODULE_DIR
This solves the problem that modprobe does not know about $MODULE_DIR
when run via sudo, and instead wrongly tries to read /lib/modules/:

  $ sudo strace -efile modprobe foo |& grep modules
  open("/lib/modules/3.14.37/modules.softdep", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.alias.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)

Without this patch, one would have to use sudo -E (preserves environment
vars). But that option is reserved for sudo users with extra rights
(SETENV), so it's not a solution.

environment.sessionVariables are set by PAM, so they are included in the
environment used by sudo.

(cherry picked from commit 74d5adcb4d)
2015-06-17 21:05:28 +02:00
Shea Levy
51c11574fd Disable failing DBIxClass tests
Seems to be random

(cherry picked from commit 5273166f53)
2015-06-17 16:46:33 +02:00
Peter Simons
4fde9fdfca fetchgit: add 'deepClone' argument to disable shallow fetching
This patch resolves https://github.com/NixOS/nixpkgs/issues/6395. Deep
cloning is useful in combination with 'leaveDotGit' for builds that want
to run "git describe" to obtain a proper version string, etc., like the
'haskellngPackages.cabal2nix' package does.

(cherry picked from commit 5d02f0e854)

Conflicts:
	pkgs/build-support/fetchgit/default.nix
2015-06-17 09:36:38 +02:00
Vladimír Čunát
d954a695e7 libarchive: fix CVE-2015-1197 by upstream patch
Fixes #6799.

(cherry picked from commit f2c84ffeb2)
2015-06-16 18:35:26 +02:00
Vladimír Čunát
76a54e8458 libtasn1: pick updates from master, including security
Fixes #7333. Changelog indicates compatible ABI.
2015-06-16 17:58:36 +02:00
Casey Ransom
84ea837896 Allow custom tags to be set for datadog monitoring
(cherry picked from commit d3212beff9)
2015-06-16 08:30:44 +00:00
Vladimír Čunát
a1e250c248 imagemagick: remove mirrors that don't work
/cc #8302.

(cherry picked from commit 6c382151fb)
2015-06-15 11:30:59 +02:00
Bjørn Forsman
cfa1c0b80f gtkglextmm: unbreak build
* Add missing build inputs: pangox_compat, libXmu
* Add patch from debian to fix build with newer gtk

(cherry picked from commit 903183d9e4)

Conflicts (fetchurl -> fetchurlGnome):
	pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
2015-06-14 19:59:44 +02:00
Eelco Dolstra
d863066283 sqlite: Update to 3.8.10.2
(cherry picked from commit cb6daa036b)
2015-06-13 11:58:33 +02:00
Michael Raskin
07ff139232 Update SQLite
(cherry picked from commit 1a407e9311)
2015-06-13 11:58:33 +02:00
koral
adf70a3e29 sqlite: 3.8.8.3 -> 3.8.9
(cherry picked from commit 3fe9fae62c)
2015-06-13 11:58:33 +02:00
Nicolas Pouillard
0667cd2dca Update sqlite to 3.8.8.3
(cherry picked from commit eee31a2c97)

[Bjørn: add maintainer alias for Nicolas Pouillard from master branch,
to not break eval.]
2015-06-13 11:57:39 +02:00
Eelco Dolstra
04efac258b php: Update to 5.4.42
CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
2015-06-12 15:28:51 +02:00
Eelco Dolstra
5c544486a1 Debian: Update to 8.1
(cherry picked from commit 69829dd4ff)
2015-06-12 11:25:25 +02:00
Vladimír Čunát
a5444111bc mesa: fix download - moved due to version being old 2015-06-11 21:56:14 +02:00
Arseniy Seroka
e738fb152e Merge pull request #8196 from taku0/flashplayer_2.2.202.460
flashplayer: Update from 11.2.202.457 -> 11.2.202.460
(cherry picked from commit 5395128a36)
2015-06-11 21:43:45 +02:00
Rickard Nilsson
961ee1bca6 scollector: Change type of collectors to allow proper merging
(cherry picked from commit 7a0ca52267)
2015-06-11 16:50:26 +02:00
Rickard Nilsson
89d691d819 jetty: Update from 9.2.5 to 9.2.11
(cherry picked from commit 8a7c23456d)
2015-06-11 13:34:06 +02:00
Domen Kožar
310427c49f Merge pull request #8218 from bjornfor/python-bump-stable
python: 2.7.9 -> 2.7.10
2015-06-11 10:24:06 +02:00
Domen Kožar
bc4f18506c greenlet: delete problematic test
(cherry picked from commit 3efefb5baa)
2015-06-08 10:55:34 +02:00
Domen Kožar
43439620e5 pythonPackages.greenlet: 0.4.5 -> 0.4.7
(cherry picked from commit 4c67102a59)

[Bjørn: this unbreaks gevent]
2015-06-08 10:55:17 +02:00
Domen Kožar
a0724b0644 python: 2.7.9 -> 2.7.10
(cherry picked from commit c918903381)
2015-06-08 10:47:10 +02:00
Lengyel Balázs
7b38ae2617 Updated apcupsd to version 3.14.13
(cherry picked from commit c3d9e90f0e)
2015-06-08 09:04:34 +02:00
Bjørn Forsman
fb4d491302 nixos/postfix: make symlink /var/mail -> /var/spool/mail
This solves the problem of e.g. mutt not finding mail unless the user
sets MAIL=/var/spool/mail/$USER.

The default MAIL variable seems come from bash. Reasons for adding
symlink instead of changing MAIL default in bash:

- No need to rebuild world
- FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix
  NixOS mail location than change MAIL in bash to something that doesn't
  work on non-NixOS (however unlikely that users run nixpkgs bash on a
  non-NixOS distro...).

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES

(cherry picked from commit 12e84c6378)
2015-06-07 19:10:44 +02:00
Eelco Dolstra
c06f066f22 Remove installer.grub1 from the release-critical builds
It randomly crashes

  Kernel panic - not syncing: assertion "i && sym_get_cam_status(cp->cmd) == DID_SOFT_ERROR" failed: file "/tmp/nix-build-linux-3.14.43.drv-0/linux-3.14.43/drivers/scsi/sym53c8xx_2/sym_hipd.c", line 3399

Rumour has it this is fixed in newer versions of QEMU or the kernel,
so I'm only disabling it on the 14.12 branch.

http://hydra.nixos.org/build/22836392
2015-06-04 20:11:16 +02:00
William A. Kennington III
d3322c069b nss: 3.19 -> 3.19.1
(cherry picked from commit 5483697ab1)
2015-06-03 13:26:53 +02:00
Eelco Dolstra
e6d7f2aa49 firefox: Update to 38.0.5
(cherry picked from commit 4564a0e5e2)
2015-06-03 13:26:18 +02:00
Eelco Dolstra
61fe3b6ecb VM tests: Don't produce output on failure
Producing output makes it hard to restart builds that failed for
intermittent reasons (like timeouts). So let's not do that.

(cherry picked from commit 13dcb35233)
2015-06-03 13:25:33 +02:00
Vladimír Čunát
582ee6ec34 cairo: maintenance update
The removed patch was included in the release.

(cherry picked from commit d3399ca45b)
2015-06-02 19:40:14 +02:00
Vladimír Čunát
3853528e84 libav(-11): maintenance update, including security
(cherry picked from commit c86c1b79af)
2015-06-02 11:03:11 +02:00
William A. Kennington III
2c9065ccdf nixUnstable: Bump
(cherry picked from commit f51d38214d)

Conflicts:
	pkgs/tools/package-management/nix/unstable.nix
2015-06-01 18:21:31 +02:00
Henry Till
84ee754a7f dunst: allow user configuration (fixes #5222)
This commit eliminates a patch which hard-coded an example configuration file as the program's default settings and prevented the program from reading a user's configuration file.

(cherry picked from commit 37fb8fb9ca)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-05-31 17:49:55 +02:00
Pascal Wittmann
bdc24fc5ed wireshark: update from 1.12.4 to 1.12.5, fixes CVE-2015-3808
(cherry picked from commit c0a5ffc438)
2015-05-30 13:17:22 +02:00
Eelco Dolstra
b400189493 Add libpqxx
(cherry picked from commit faff3a44a7)
2015-05-29 12:15:05 +02:00
Benjamin Staffin
eaf67fe0a1 Typo fix! s/wheezy/jessie/
(cherry picked from commit 1db5bafc94)
2015-05-29 11:53:57 +02:00
Benjamin Staffin
073131e443 Add Debian 8.0
Had to add file type logic in debClosureGenerator because Packages.bz2
is not available for Jessie - only Packages.xz is.

(cherry picked from commit c7ac0ed3eb)
2015-05-29 11:53:56 +02:00
Sami BOUHLEL
eeaad09fe4 added support for boto 2.38.0 2015-05-29 07:17:22 +00:00
Bjørn Forsman
7b6fd7682b python-pyev: new package
Python bindings for the libev library.

https://code.google.com/p/pyev/
(cherry picked from commit 201059f728)

Conflicts:
	pkgs/top-level/python-packages.nix
2015-05-27 23:07:25 +02:00
Peter Simons
79effb88a0 irssi: add second download mirror because irrsi.org is offline 2015-05-25 00:12:16 +02:00
skityl
d7e38ef19f Bumped version of irssi-0.8.16 to irssi-0.8.17
Signed-off-by: skityl <mopofhair@gmail.com>
(cherry picked from commit 400adb7ec4)
2015-05-24 23:58:36 +02:00
Bjørn Forsman
cbeee4db43 fail2ban: fix broken download/hash
The (dynamically generated) compressed archive has changed. Switch from
fetchurl to fetchzip to not get bitten by that again.

(cherry picked from commit b217d9a4dd)
2015-05-24 23:03:44 +02:00
Peter Simons
92c52c3297 Merge pull request #7975 from samueldr/release-14.12
Fix midori; was building but not working.
2015-05-24 22:26:30 +02:00
Samuel Dionne-Riel
5c9d55280b midori: Fixed wrong desktop schemas path wrapped.
A buildInput was missing to get the right schemas path.

The symptoms of the issue this fixes are:

  ** (WebKitWebProcess:): WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
  (process:): GLib-GIO-ERROR **: Settings schema 'org.gnome.system.proxy' is not installed
  (WebKitWebProcess:): GLib-GIO-ERROR **: Settings schema 'org.gnome.system.proxy' is not installed
2015-05-24 16:02:00 -04:00
Samuel Dionne-Riel
f1de592fc4 Add a mirror for midori 2015-05-24 15:09:18 -04:00
Peter Simons
8115e8cff5 nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:

 | #! /usr/bin/env bash
 |
 | moduliFiles=()
 |
 | generateModuli()
 | {
 |   ssh-keygen -G "moduli-$1.candidates" -b "$1"
 |   ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
 |   rm "moduli-$1.candidates"
 | }
 |
 | for (( i=0 ; i <= 16 ; ++i )); do
 |   let bitSize="2048 + i * 128"
 |   generateModuli "$bitSize" &
 |   moduliFiles+=( "moduli-$bitSize" )
 | done
 | wait
 |
 | echo >moduli "# Time Type Tests Tries Size Generator Modulus"
 | cat >>moduli "${moduliFiles[@]}"
 | rm "${moduliFiles[@]}"

Note that generating moduli takes a long time, i.e. several hours on a fast
machine!

This patch resolves https://github.com/NixOS/nixpkgs/pull/5870.

(cherry picked from commit 86d299bc6e)
2015-05-23 15:01:54 +02:00
Domen Kožar
ada9ca773d gevent: 1.0.1 -> 1.0.2
(cherry picked from commit 42d9fe8b09)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	pkgs/top-level/python-packages.nix
2015-05-23 14:32:08 +02:00
Peter Simons
ec2ca3183d jailbreak-cabal: update to latest version 1.3-r2
This patch fixes https://github.com/NixOS/nixpkgs/issues/7940.
2015-05-22 15:06:20 +02:00
Eelco Dolstra
10c9cee08f Add Ubuntu 15.04
(cherry picked from commit 178c52e7ad)
2015-05-22 13:24:02 +02:00
Eelco Dolstra
f0c1308875 firefox: Use internal SQLite
The version of SQLite in Nixpkgs is too old.
2015-05-22 11:47:17 +02:00
Eelco Dolstra
d5732b01f5 thunderbird: Update to 31.7.0
Also enable parallel building, as it seems to work reliably for
Firefox.

(cherry picked from commit 99e9710348)
2015-05-22 11:47:10 +02:00
Eelco Dolstra
0986d3dae1 thunderbird: Update to 31.6.0
Fixes various critical vulnerabilities.

(cherry picked from commit 748be0b5d0)
2015-05-22 11:47:04 +02:00
Eelco Dolstra
b5c8e09414 php: Update to 5.4.41
CVE-2006-7243
2015-05-22 11:46:45 +02:00
Bjørn Forsman
38ae836bee nixos/libvirtd: remove --verbose flag
Because it spams the log:

  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
  .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
  .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: [137B blob data]

(cherry picked from commit db991a4024)
2015-05-20 12:25:17 +02:00
Bjørn Forsman
31796c5d94 nixos/libvirtd: add 'extraOptions' option
And move the '--verbose' flag to extraOptions, so that users can easily
disable it.

(cherry picked from commit 3d2d78cb39)
2015-05-20 12:25:17 +02:00
Evgeny Egorochkin
08e829cabb azure-image: common: add sg3_utils 2015-05-20 13:23:12 +03:00
William A. Kennington III
802e783237 kernel: 3.14.41 -> 3.14.43 2015-05-19 22:26:31 -07:00
William A. Kennington III
7a928b39b6 kernel: 4.0.2 -> 4.0.4 2015-05-19 22:25:18 -07:00
William A. Kennington III
66e1731369 kernel: 3.2.68 -> 3.2.69 2015-05-19 22:25:17 -07:00
William A. Kennington III
91b395c871 kernel: 3.19.7 -> 3.19.8 2015-05-19 22:25:16 -07:00
William A. Kennington III
2adeabb6fe kernel: 3.10.77 -> 3.10.79 2015-05-19 22:23:00 -07:00
William A. Kennington III
1f41d1c9ac nss: 3.18.1 -> 3.19
(cherry picked from commit 9f337e8cc7)

Conflicts:
	pkgs/development/libraries/nss/default.nix
2015-05-19 18:16:56 +02:00
William A. Kennington III
de0a7421f6 firefox: 38.0 -> 38.0.1
(cherry picked from commit 0700e844e2)
2015-05-19 18:14:20 +02:00
William A. Kennington III
97ac345791 firefox: 37.0.2 -> 38.0
(cherry picked from commit 8ffc461f91)
2015-05-19 18:14:08 +02:00
Tobias Geerinckx-Rice
4cce8c6747 tzdata 2015c -> 2015d
(cherry picked from commit 7931799a0f)
2015-05-19 16:36:36 +02:00
Tobias Geerinckx-Rice
669a8a4c90 tzdata 2015a -> 2015c
(cherry picked from commit 4679104133)
2015-05-19 12:47:27 +02:00
Thomas Tuegel
3756017dee dropbox: install icons 2015-05-18 15:49:02 -05:00
Thomas Tuegel
eabf79bba1 dropbox: move updateable attributes to the top 2015-05-18 15:49:01 -05:00
Herwig Hochleitner
624049d786 dropbox: 3.4.4 -> 3.4.6 2015-05-18 15:48:26 -05:00
Ricardo M. Correia
1c0a126655 flashplayer: Update from 11.2.202.451 -> 11.2.202.457
(cherry picked from commit 7dddf8a68c)
2015-05-18 11:30:49 +02:00
taku0
ce2a1718d9 firefox-bin: update to version 38.0.1
(cherry picked from commit fa2102b463)
2015-05-18 11:30:42 +02:00
taku0
4ba9a8746e firefox-bin: update to version 38.0
(cherry picked from commit c22b03db0c)
2015-05-18 11:30:36 +02:00
taku0
1948ea862b firefox-bin: update to version 37.0.2
(cherry picked from commit cc3d0913d3)
2015-05-18 11:30:31 +02:00
taku0
bcaa9fd0ce firefox-bin: update to version 37.0.1
(cherry picked from commit dcb61624e7)
2015-05-18 11:30:25 +02:00
taku0
1bad77ee6a firefox-bin: update to version 37.0; thunderbird-bin: update to version 31.6.0
(cherry picked from commit ce7481e129)
2015-05-18 11:30:18 +02:00
taku0
680b74d545 firefox-bin: update to version 36.0.4
(cherry picked from commit f4f340e833)
2015-05-18 11:30:11 +02:00
taku0
5ae3970e20 firefox-bin: update to version 36.0.1 (close #6691)
(cherry picked from commit 08e41f7a58)
2015-05-18 11:30:05 +02:00
taku0
bfc6d272c3 firefox-bin: update to version 36.0; thunderbird-bin: update to version 31.5.0
(cherry picked from commit 2e8f2d6477)
2015-05-18 11:30:00 +02:00
taku0
c756236293 Update firefox-bin to 35.0.1
(cherry picked from commit c5079ee886)
2015-05-18 11:29:53 +02:00
taku0
4350ae2b83 firefox-bin: update to version 35.0; thunderbird-bin: update to version 31.4.0
(cherry picked from commit 9d2cf54c6a)
2015-05-18 11:29:48 +02:00
Evgeny Egorochkin
0672315759 azure sdk for python: update from 0.9.0 to 0.11.0 2015-05-17 19:27:39 +03:00
Joachim Schiele
a6dd603b69 tig-2.1.1: version bump
(cherry picked from commit 50fb7b312b)
2015-05-16 16:09:42 +02:00
William A. Kennington III
0ad951419d tig: 2.0.3 -> 2.1
(cherry picked from commit cd3b460200)
2015-05-16 16:09:27 +02:00
William A. Kennington III
836dc68872 cgit: 0.10.2 -> 0.11.2
(cherry picked from commit 06ea226495)
2015-05-16 15:50:36 +02:00
Lluís Batlle i Rossell
815c8d6e30 Fix for the build of the xorg openchrome driver 2015-05-15 13:57:11 +02:00
aszlig
7963a45b99 linux/kernel: Remove EXT2_FS_XIP for version 4.0.
The option has been removed in torvalds/linux@6cd176a and thus we
shouldn't try to set it for kernel version 4.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 791b970c6e)
2015-05-14 23:51:48 +02:00
Franz Pletz
46db4d8ad3 Check if /proc/sys/kernel/hotplug exists before writing
If a kernel without CONFIG_UEVENT_HELPER set is used with NixOS, the file
/proc/sys/kernel/hotplug does not exist. Before writing to it to disable
this deprecated mechanism, we have to ensure it actually exists because
otherwise the activation script will fail.

(cherry picked from commit 16d25f4fa6)
2015-05-12 11:18:36 +02:00
William A. Kennington III
a9280e086d btrfs: Remove btrfs deadlock patch 2015-05-08 05:28:35 -07:00
William A. Kennington III
b4cf0bb944 kernel: Add 4.0 and fix grsecurity message 2015-05-07 20:42:49 -07:00
William A. Kennington III
8123467a38 kernel: 3.14.40 -> 3.14.41 2015-05-07 20:42:49 -07:00
William A. Kennington III
a341d8e146 kernel: 4.0.1 -> 4.0.2 2015-05-07 20:42:49 -07:00
William A. Kennington III
048aa3e54d kernel: 3.19.6 -> 3.19.7 2015-05-07 20:42:49 -07:00
William A. Kennington III
a18e23f914 kernel: 3.18.12 -> 3.18.13 2015-05-07 20:42:49 -07:00
William A. Kennington III
1998c49674 kernel: 3.12.40 -> 3.12.42 2015-05-07 20:42:49 -07:00
William A. Kennington III
b73134f6bf kernel: 3.10.76 -> 3.10.77 2015-05-07 20:42:49 -07:00
Rob Vermaas
ccf672ca6b Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared. 2015-05-07 08:50:47 +00:00
Rob Vermaas
ce83865800 le: add psutil to dependencies
(cherry picked from commit b114eab794)
2015-05-05 13:27:15 +00:00
Eelco Dolstra
e79a47b007 fetch-ec2-data: Don't restart
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.

(cherry picked from commit 4239e276ea)
2015-05-05 12:40:57 +00:00
Rob Vermaas
63def04891 Update nixUnstable to a build that is there. 2015-05-04 19:40:29 +00:00
Rob Vermaas
34326bcbcc D'ohhh 2015-05-04 19:19:32 +00:00
Rob Vermaas
bb1081abbd Disable httpretty tests as some tests fail because tests do not complete within 2 microseconds. 2015-05-04 19:05:18 +00:00
Vladimír Čunát
62b4419294 texLiveModerntimeline: fix download by updating
Unfortunately I only see them providing an unversioned tarball :-/
CC #6747.

(cherry picked from commit 263ac41c18)
2015-05-04 10:44:15 +00:00
Evgeny Egorochkin
30c812d026 azure-image: fix, split into bootstrap and regular configurations 2015-05-03 20:18:18 +03:00
William A. Kennington III
a690f3f585 curl: 7.42.0 -> 7.42.1 2015-05-01 15:09:56 -07:00
William A. Kennington III
863728b9c3 kernel: 3.12.40 -> 3.12.41 2015-05-01 15:09:29 -07:00
Rob Vermaas
c7f7f12f2b Add logentries agent 1.4.13
(cherry picked from commit 33984cfeee)
2015-04-30 16:45:43 +00:00
William A. Kennington III
e942188876 kernel: 3.14.39 -> 3.14.40 2015-04-29 15:46:08 -07:00
William A. Kennington III
62c22cebb4 kernel: 3.19.5 -> 3.19.6 2015-04-29 15:45:55 -07:00
William A. Kennington III
d94c3efa93 kernel: 3.10.75 -> 3.10.76 2015-04-29 15:41:54 -07:00
Eelco Dolstra
4c29879b20 php: Update to 5.4.40
(cherry picked from commit 552ea209d0)

Conflicts:
	pkgs/development/interpreters/php/5.4.nix
2015-04-29 16:13:37 +02:00
Domen Kožar
3a8ddee143 boto: 2.34.0 -> 2.36.0
(cherry picked from commit 5da0d18a0a)
2015-04-28 13:50:57 +00:00
Eelco Dolstra
b514f66400 Don't require sslServerChain to be set
(cherry picked from commit 534b84a9ac)
2015-04-27 18:24:45 +02:00
Eelco Dolstra
78ca36b2fc firefox: Update to 37.0.2
(cherry picked from commit 9f3370a9c9)
2015-04-27 18:07:53 +02:00
Peter Simons
f86a148dad R: port version 3.2.0 update from master
Resolves https://github.com/NixOS/nixpkgs/issues/7581.
2015-04-27 12:53:51 +02:00
Bjørn Forsman
42c5cd8723 jquery: bump 1.11.1 -> 1.11.2
(cherry picked from commit 173da15f75)
2015-04-25 20:32:58 +02:00
Joachim Schiele
fc4c99db15 wpa-supplicant: CVE-2015-1863 (close #7526)
http://w1.fi/security/2015-1/
(cherry picked from commit e3e8aebdc1)
2015-04-23 20:25:15 +02:00
Vladimír Čunát
cf46c88a8d mariadb: remove ~250MB of superfluous files
Picked lines from master, discussion:
https://github.com/NixOS/nixpkgs/issues/7117#issuecomment-95657579

The output is still ~190 MB, but it's much better.
On master there's a splitting solution anyway.
2015-04-23 20:14:43 +02:00
William A. Kennington III
9ce9f85cec nss: 3.18 -> 3.18.1 2015-04-22 16:52:04 -07:00
William A. Kennington III
f96835cac1 gnutls: 3.2.20 -> 3.2.21 2015-04-22 16:27:16 -07:00
William A. Kennington III
6eaaaaa1d2 grsec_path: Update patch 2015-04-22 16:21:29 -07:00
William A. Kennington III
7a03dbce26 kernel: Add kernel 3.19 2015-04-22 16:19:13 -07:00
William A. Kennington III
94a95ff537 kernel: 3.18.10 -> 3.18.12 2015-04-22 16:11:53 -07:00
William A. Kennington III
c11a02e492 kernel: 3.14.37 -> 3.14.39 2015-04-22 15:52:52 -07:00
William A. Kennington III
d67fb4f007 kernel: 3.4.106 -> 3.4.107 2015-04-22 15:52:52 -07:00
William A. Kennington III
c1d57646a7 kernel: 3.12.38 -> 3.12.40 2015-04-22 15:42:03 -07:00
William A. Kennington III
6a4c334268 kernel: 3.10.71 -> 3.10.75 2015-04-22 15:42:01 -07:00
William A. Kennington III
471512b619 curl: 7.39.0 -> 7.42.0 2015-04-22 15:41:12 -07:00
Lluís Batlle i Rossell
b0d594ca9b Updating cjdns to 20150422.
(cherry picked from commit 5a21c015c7)
2015-04-22 17:13:26 +02:00
William A. Kennington III
f21c8c7a0e Merge pull request #6919 from ehmry/cjdns
cjdns: update pkg and fix nixos test
(cherry picked from commit 9d9a393a4b)
2015-04-22 17:13:06 +02:00
Peter Feigl
cb3bc913e4 apache-httpd: adding support for sslServerChain
(cherry picked from commit e5b3918f85)
2015-04-20 17:03:01 +02:00
Thomas Tuegel
55c55db0ab Merge pull request #7478 from bendlas/dropbox-stable
dropbox-[cli]: latest versions for stable branch
2015-04-20 09:33:35 -05:00
Eelco Dolstra
6a8c9ed59a Typo
(cherry picked from commit d5f187de03)
2015-04-20 16:12:42 +02:00
Eelco Dolstra
776e671e3a Use "mkdir -p" when creating ~/.nix-defexpr
Otherwise, simultaneous invocations of /etc/profile can fail, e.g.

  mkdir: cannot create directory ‘/.nix-defexpr’: File exists

(cherry picked from commit 11a9774c75)
2015-04-20 13:06:52 +02:00
Eelco Dolstra
6277b1f58f nodejs: Update to 0.10.38 2015-04-20 13:06:08 +02:00
Herwig Hochleitner
84323e0639 dropbox-[cli]: latest versions for stable branch
dropbox: 3.4.4
    dropbox-cli: 2015.02.12

This contains the following commits from staging:

29398fd6b1 dropbox[-cli]: update to latest versions
7ed4beec55 Update dropbox[-cli] to latest
75c4f136ca dropbox-cli: make `dropbox start` work
f12536f151 dropbox: use bundled librsync (working)
bd6a15d6d3 dropbox: rm qt.conf
115e8110f7 dropbox: wrap for LD_LIBRARY_PATH (runtime loads)
d36af8e0ae dropbox: don't wrap with Mesa
32643c010e dropbox: update to 3.2.6 (fixed)
52cc26eb3e Revert "Revert "dropbox: update to version 3.2.6""
a9b2dee6e6 Revert "dropbox: update to version 3.2.6"
7c37b4d672 dropbox: update to version 3.2.6
2015-04-20 12:34:07 +02:00
Alexander Flatter
b6b8f025ef Compile postgresql with openssl
(cherry picked from commit e8df73e508)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-18 18:24:54 -04:00
j-keck
c86a1279bd postgresql: Update to 9.0.19, 9.1.15, 9.2.10, 9.3.6, 9.4.1
(cherry picked from commit 1c45287baf)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-18 18:24:54 -04:00
j-keck
08d8b51e83 postgresql: add version 9.4.0
(cherry picked from commit 356d05dbc0)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-18 18:24:54 -04:00
Lluís Batlle i Rossell
fec14fba4e Updating trigger rally to 0.6.1
A lot more tracks

(cherry picked from commit 7937bd7039)
2015-04-17 10:46:38 +02:00
Lluís Batlle i Rossell
e95d381e48 Adding alsa/pulseaudio to mikmod
I also write the sf urls with mirror://.

(cherry picked from commit 19a96c7c30)
2015-04-17 09:39:39 +02:00
Peter Simons
32ced25cb4 mikmod: update to version 3.2.6
(cherry picked from commit 31ecab7b7e)
2015-04-17 09:39:25 +02:00
Peter Simons
1efbf87ee0 libmikmod: update to version 3.3.7
(cherry picked from commit a98c79d6a1)
2015-04-17 09:39:18 +02:00
taku0
bd42bce8bd oraclejdk: bump to 8u45, 7u79, and 7u80
(cherry picked from commit 256cd8046c)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	pkgs/development/compilers/oraclejdk/jdk7-linux.nix
	pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
	pkgs/development/compilers/oraclejdk/jdk8-linux.nix
2015-04-16 19:11:10 -04:00
Eelco Dolstra
8bb0101333 dnsmasq: Add some types
(cherry picked from commit a0f69df10e)
2015-04-16 19:14:37 +02:00
Eelco Dolstra
ec0d153ed8 dbus: Reload if /etc/dbus-1 changes
Specifically, this fixes dnsmasq, which failed with

  Apr 16 19:00:30 mandark dnsmasq[23819]: dnsmasq: DBus error: Connection ":1.260" is not allowed to own the service "uk.org.thekelleys.dnsmasq" due to security policies in the configuration file
  Apr 16 19:00:30 mandark dnsmasq[23819]: DBus error: Connection ":1.260" is not allowed to own the service "uk.org.thekelleys.dnsmasq" due to security policies in the configuration file

after being enabled, due to dbus not being reloaded.

(cherry picked from commit 5a5a43ea25)
2015-04-16 19:14:36 +02:00
William A. Kennington III
4f2ab67bd9 nixos/dnsmasq: Fix service name typo
(cherry picked from commit f27fa79aa9)
2015-04-16 19:14:24 +02:00
aszlig
9d71536a72 virtualbox: Add an alias for the hardened version.
This is to ensure that Hydra will build the hardened version of
VirtualBox and it's also lowPrio to avoid being accidentally installed
into a user's environment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 142b12c864)
2015-04-16 17:49:08 +02:00
Wayne Scott
ea6815a8b4 Upgrade backup/attic to 0.15
(cherry picked from commit 0520f7a938)
2015-04-16 08:27:35 +02:00
Ricardo M. Correia
dd0f98f1c0 flashplayer: Update from 11.2.202.442 -> 11.2.202.451
(cherry picked from commit c6c3016406)
2015-04-15 19:44:43 +02:00
Rickard Nilsson
49edb6d0a4 scollector module: Add extraOpts option
(cherry picked from commit bdbdaee3c0)
2015-04-15 13:16:23 +02:00
Rickard Nilsson
05a95dd84e nginx: Add fluentd module
(cherry picked from commit c61dff28ae)
2015-04-15 13:15:05 +02:00
Lluís Batlle i Rossell
0e214408a4 Updating gdb to 7.9.
I can remove the patch of edit-signals. It seems to work without it.

I tested the change over release-14.12.

(cherry picked from commit 745b1ce04a)
2015-04-14 17:26:34 +02:00
Thomas Strobel
60e515641c Fix/update Xpra
(cherry picked from commit c6ef0727c3)
2015-04-12 17:43:56 +02:00
Bjørn Forsman
6500243503 python-pelican: add missing 'markupsafe' dependency
Needed to be able to run 'make serve' in a pelican directory, else this
happens:

  $ make serve
  cd /home/bfo/pelican-test/output && python -m pelican.server
  /run/current-system/sw/bin/python: No module named markupsafe
  make: *** [serve] Error 1

(cherry picked from commit 48b5ad912f)
2015-04-12 17:19:52 +02:00
Pavan Rikhi
23b48bf2d2 python pelican: v3.4.0 -> v3.5.0
(cherry picked from commit c08310c62d)
2015-04-12 17:19:47 +02:00
Bjørn Forsman
8d46191ddc mutt: use "sendmail" instead of "/usr/bin/sendmail"
That way sending mail with mutt works on NixOS too, without having to
manually change mutt's config on your system. sendmail will be found in
$PATH at runtime, and thus the setuid wrapper will be used, if
available.

(cherry picked from commit 6e0d0636a1)
2015-04-12 10:49:04 +02:00
Bjørn Forsman
ecb7c34a83 hping: set platforms = all
From http://www.hping.org/:

  "Hping works on the following unix-like systems: Linux, FreeBSD,
   NetBSD, OpenBSD, Solaris, MacOs X, Windows."

(cherry picked from commit c1556f70d7)
2015-04-11 15:27:27 +02:00
Bjørn Forsman
67c9b3a78e lftp: update 4.6.0 -> 4.6.1
2014-12-29: lftp-4.6.1 released. Some bugs fixed, minor feature added.
(cherry picked from commit 965129cdac)
2015-04-11 15:07:42 +02:00
Bjørn Forsman
1fa37c4393 qmmp: update 0.8.2 -> 0.8.4
(cherry picked from commit 124bdd5114)
2015-04-11 14:56:39 +02:00
Bjørn Forsman
91c5b64d85 python-robotframework: update 2.8.6 -> 2.8.7
Release notes:
https://github.com/robotframework/robotframework/releases/tag/2.8.7

(cherry picked from commit 2c6f9b0c62)
2015-04-11 14:23:57 +02:00
Bjørn Forsman
f5e5001b31 wireshark: update from 1.12.3 to 1.12.4
Potentially fixes CVE-2015-2188, CVE-2015-2189, CVE-2015-2191

(cherry picked from commit 890534bedc)
2015-04-11 13:48:34 +02:00
Vladimír Čunát
5f22660e53 linux: remove 3.17 and disable depending grsecurity
Having gr*security* with an outdated kernel was probably useless.
2015-04-09 19:44:26 +02:00
Nikolay Amiantov
f01dd23aaf kernel: add patch to fix btrfs deadlocks to affected kernels
(cherry picked from commit 285d64d2f0)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-08 20:17:33 +02:00
Eelco Dolstra
fdce0a6a88 tests/misc.nix: Ensure that the Nix DB is initialised correctly
(cherry picked from commit facd53315b)
2015-04-07 15:52:41 +02:00
Eelco Dolstra
6015f6a01f Revert "Set stricter permissions on /nix/store"
This reverts commit 066758758e because
it breaks NixOS VM tests.

(cherry picked from commit a38f130126)
2015-04-07 15:52:41 +02:00
Michael Raskin
acfb8abcb6 Update Firefox to 37.0.1
(cherry picked from commit 4b0e70f89a)
2015-04-07 15:52:20 +02:00
Bjørn Forsman
2d6291cc41 perl-threads: new package
A dependency of newer Slic3r (at least v1.2.6 needs it).

(cherry picked from commit 884713bf09)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-07 12:22:27 +02:00
Bjørn Forsman
6c6768d5ec slic3r: update 1.2.1 -> 1.2.6
Release notes: http://slic3r.org/releases/1.2.6

Slic3r needs additional dependency, 'threads'. Add it.

In addition to bug fixes and some new features, this update stops Slic3r
from printing this on startup:

  Running Slic3r under Perl >= 5.16 is not supported nor recommended

We don't have perl < 5.16 anymore, so we better update slic3r.

(cherry picked from commit 962690cc18)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-07 12:22:22 +02:00
Vladimír Čunát
e0c06a0de4 xorg: pick supposedly safe changes and additions
/cc #5583 (hopefully fixes that problem).
2015-04-06 22:53:41 +02:00
Nikolay Amiantov
7e373750fb xorg-server: add Xephyr (close #6715)
(cherry picked from commit edaa3a7643)
2015-04-06 22:49:50 +02:00
aszlig
513170e980 xorg.mxfontscale: Fix segfault with some fonts.
The update to version 1.1.2 in 9c22c1b introduces a segfault when
mkfontscale is processing fonts where the family name is missing.

Applies a patch from Stefan Dirsch <sndirsch@suse.com> to be found at:

https://bugs.freedesktop.org/show_bug.cgi?id=89409

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 0ccf34039c)
2015-04-06 22:49:39 +02:00
Vladimír Čunát
9ce5be7367 xf86-video-vmware: drop patch included in update
(cherry picked from commit 6c20e1d0bd)
2015-04-06 22:49:02 +02:00
Vladimír Čunát
6f141f345c xf86-video-vmware: update
(cherry picked from commit a3e0ee10e5)
2015-04-06 22:49:02 +02:00
Vladimír Čunát
a576448a4d xorg: update various modules
(cherry picked from commit 9c22c1b3d7)
The sessreg update is omitted, as it doesn't seem to be a minor update.
2015-04-06 22:46:41 +02:00
Alexander V. Nikolaev
0d98e16a80 Proper default path for XKB config files
(cherry picked from commit 279d5af119)
2015-04-06 22:44:18 +02:00
Vladimír Čunát
df677ae5ce xorg.xf86-video-intel: maintenance update
(cherry picked from commit 0bc5228fd2)
2015-04-06 22:42:16 +02:00
David Virgilio
b69e4e47f2 new package: xwayland
(cherry picked from commit 9a2b2e7b34)
2015-04-06 22:39:58 +02:00
Bjørn Forsman
7efbe87ecd slic3r: remove unneeded dependency on BoostGeometryUtils
Slic3r dropped this dependency in v1.1.0 and we have v1.2.x.

And more importantly, BoostGeometryUtils is currently broken (fails on
newer Perl versions), so this patch unbreaks Slic3r.

(cherry picked from commit 7273ca19b3)
2015-04-06 16:04:07 +02:00
Bjørn Forsman
d3a2973fe8 perl-App-cpanminus: new package
cpanm is one of three(?) CPAN clients, see
http://stackoverflow.com/questions/5861292/which-cpan-installer-is-the-right-one-cpan-pm-cpanplus-cpanminus.

Generated with "nix-generate-from-cpan App::cpanminus", plus I added
platforms = all;

(cherry picked from commit 4cecfe9ab7)
2015-04-06 16:04:07 +02:00
Alexander V. Nikolaev
bd75ca4cd3 Fix build for perl-Alien-Wx and friends
This should fix at least one problem, preventing build master on
Travis-CI.

(cherry picked from commit a1ca3dbd08)
2015-04-06 16:04:06 +02:00
Bjørn Forsman
6c5dbb9a23 perl-Math-Clipper: update 1.22 -> 1.23 (fixes build)
Version 1.22 is broken on newer Perl ("Out of memory" test failures).

 Bug #121948 for perl5: Bleadperl breaks Math-Clipper-1.22.tar.gz ("Out of memory")
 https://rt.perl.org/Public/Bug/Display.html?id=121948

(cherry picked from commit 1ecd116c78)
2015-04-06 15:25:39 +02:00
Vladimír Čunát
073d70f2ae libzip: fix CVE-2015-2331 by Debian patch
Rebuild impact seems low, except for LibreOffice.

(cherry picked from commit 4041fc3e85)
2015-04-06 12:13:32 +02:00
Lluís Batlle i Rossell
ef475fb309 Updating syncthing to 0.10.30.
The builder in master is completely different, so this commit can't be
shared between master & release-14.12.
2015-04-05 15:51:33 +02:00
Lluís Batlle i Rossell
a3bd913d55 Updating get_iplayer to 2.92.
Version 2.86 wasn't compatible with the current web.
2015-04-05 15:51:33 +02:00
Moritz Ulrich
4e2669fb00 audacity: Fix nyquist support.
(cherry picked from commit 30e577cdfe)
2015-04-05 15:51:33 +02:00
William A. Kennington III
f22ab7058f kernel: 3.14.36 -> 3.14.37
(cherry picked from commit 304b3c077c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-04-04 16:21:25 +02:00
William A. Kennington III
be3415f5da kernel: 3.18.9 -> 3.18.10
(cherry picked from commit a040e15a48)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.18.nix
2015-04-04 16:19:56 +02:00
Eelco Dolstra
8515a124d1 Reload, don't restart, dbus.service
Many bus clients get hopelessly confused when dbus-daemon is
restarted. So let's not do that.

Of course, this is not ideal either, because we end up stuck with a
possibly outdated dbus-daemon. But that issue will become irrelevant
in the glorious kdbus-based future.

Hopefully this also gets rid of systemd getting stuck after
dbus-daemon is restarted:

Apr 01 15:37:50 mandark systemd[1]: Failed to register match for Disconnected message: Connection timed out
Apr 01 15:37:50 mandark systemd[1]: Looping too fast. Throttling execution a little.
Apr 01 15:37:51 mandark systemd[1]: Looping too fast. Throttling execution a little.
...

(cherry picked from commit 1c39a47ac8)
2015-04-03 12:10:45 +02:00
Eelco Dolstra
c76f954247 nixUnstable: Update to 1.9pre4087
(cherry picked from commit f713e7033e)
2015-04-03 11:40:35 +02:00
Eelco Dolstra
b8838f2c00 php: Update to 5.4.39
CVE-2015-2787, CVE-2015-2348, CVE-2015-2305, CVE-2015-2331.

(cherry picked from commit 33dfdbd0df)
2015-04-03 11:34:30 +02:00
William A. Kennington III
e262c19ad2 nss: 3.17.4 -> 3.18
(cherry picked from commit 7215167342)
2015-04-03 11:34:30 +02:00
Eelco Dolstra
77f7c6afbb firefox: Update to 37.0
(cherry picked from commit 4c8f0e8d1c)
2015-04-03 11:34:30 +02:00
Eelco Dolstra
a494359d15 switch-to-configuration: Don't print already active target units
Since we restart all active target units (of which there are many),
it's hard to see the units that actually matter. So don't print that
we're starting target units that are already active.

(cherry picked from commit 475df1a350)
2015-04-03 11:34:29 +02:00
Eelco Dolstra
2715d81958 nixos-rebuild: Add ‘dry-activate’ command
‘nixos-rebuild dry-activate’ builds the new configuration and then
prints what systemd services would be stopped, restarted etc. if the
configuration were actually activated. This could be extended later to
show other activation actions (like uids being deleted).

To prevent confusion, ‘nixos-rebuild dry-run’ has been renamed to
‘nixos-rebuild dry-build’.

(cherry picked from commit a574065a81)
2015-04-03 11:34:29 +02:00
Eelco Dolstra
b32e72e2c2 Add perf-tools
(cherry picked from commit dfc6809215)
2015-04-03 11:34:29 +02:00
Eelco Dolstra
1f06c1d597 perf: Use libunwind and libbfd
This gives better stack traces.

(cherry picked from commit fa3bcc4f1c)
2015-04-03 11:34:29 +02:00
Bjørn Forsman
3c4b8c3888 attic: update source derivation name
0.14.tar.gz => attic-0.14-src.

(cherry picked from commit 16730fa87a)
2015-04-03 08:54:41 +02:00
Bjørn Forsman
8f22f78f74 attic: update source hash
I don't know what changed, but apparently something did. We're using
fetchzip and the 0.14 tag doesn't seem to have moved (AFAICS).

Build and run-tested.

For reference, the (current) annotated tag '0.14' is dated
"Wed Dec 17 23:32:11 2014 +0100" and points to commit
f342621dff8065b29aeda238ccce5ac92d04f5b6 ("Preparing release").

(cherry picked from commit 2c89d0b82d)
2015-04-03 08:54:40 +02:00
Eelco Dolstra
99bfc89a97 Merge pull request #7086 from retrry/spotify-backport
Backport new Spotify version to 14.12
2015-03-30 16:12:35 +02:00
Tadas Barzdzius
acbbb01627 Add udev to dependencies and remove workaround 2015-03-30 17:09:06 +03:00
Tadas Barzdzius
fbbd0df8b0 Remove obsolete part of comment 2015-03-30 16:33:33 +03:00
Siarhei Zirukin
02fd9e5d75 spotify: 0.9.11.27 -> 0.9.17.1 2015-03-30 15:47:43 +03:00
Rickard Nilsson
1b3dae4f54 dovecot: Update from 2.2.15 to 2.2.16
(cherry picked from commit 9fde4cc2f0)
2015-03-29 12:42:39 +02:00
William A. Kennington III
1f14275f51 kernel: 3.14.35 -> 3.14.36
(cherry picked from commit 36ada70250)

Conflicts:
	pkgs/os-specific/linux/kernel/patches.nix
2015-03-26 19:53:43 +01:00
Michael Raskin
10cc3bc885 Update Firefox. Second take.
(cherry picked from commit 166614ee41)
2015-03-26 19:49:38 +01:00
Ricardo M. Correia
a832bb2313 firefox: Update from 36.0.1 -> 36.0.3
(cherry picked from commit a246b849eb)
2015-03-26 19:49:30 +01:00
Domen Kožar
f26ca1fd64 fira: 3.x -> 4.004
(cherry picked from commit 636b25af67)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	pkgs/data/fonts/fira/default.nix
2015-03-26 11:56:57 +01:00
Thomas Tuegel
35c0e0a768 robomongo: fix build with openssl-1.0.1m 2015-03-25 07:45:53 -05:00
Bjørn Forsman
4e0e0cfbe2 lttng-modules: update to latest stable (fixes build)
Fixes build against linux 3.14.36+.

Also
* It works with linux 3.12 now, so remove that assert
* Remove unneeded patches (merged upstream)

(cherry picked from commit ff9bc81946)
2015-03-25 00:13:06 +01:00
Vladimír Čunát
dc8da14b8d octave: disable parallel building again
http://hydra.nixos.org/build/19917018
(cherry picked from commit 7abccbe81c)
2015-03-24 21:32:41 +01:00
Rob Vermaas
cc9e1930ae Do not build nodePackages. 2015-03-24 14:13:38 +00:00
Jaka Hudoklin
7094efc5da nodePackages: fix builder
- reuse unpack and patch phase
- patch shebangs of source code
- properly patch depdency versions (thanks @svanderburg)
- add patching for github version names
- add some inline docs
- fix recursive depdencies runtime handling by copying files instead of
  symlinking if package has recursive dependencies

(cherry picked from commit 86744fef91)
2015-03-24 14:05:39 +00:00
Eelco Dolstra
f9a8cc63c1 libguestfs: Don't build on Hydra
It produces a package over 4 GB large, and takes several hours to
build (probably because of the overhead of copying that 4 GB image).

(cherry picked from commit 433d30b877)
2015-03-24 15:01:40 +01:00
Eelco Dolstra
2178fd281f nixUnstable: Update to 1.9pre4083_5114a07
(cherry picked from commit 5cc05f6cf2)
2015-03-24 15:01:29 +01:00
Domen Kožar
6a64465c69 Merge pull request #6943 from goodwillcoding/release-14.12
fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m.
2015-03-23 10:34:20 +01:00
goodwillcoding
30dd174520 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1
2015-03-22 20:00:04 -07:00
Brian McKenna
2dab7cf8d5 tigerVNC: fix by updating (close #6852)
The default xorgserver is now on 1.16 and so the patch needs to change.
The 116 patch is not in 1.3.1 so we also need to upgrade.

I don't know how to compute this filename since the xorgserver derivation
doesn't have a version attribute.

(cherry picked from commit dc1ea2e968)
2015-03-22 20:29:27 +01:00
Domen Kožar
356c70aea7 Merge pull request #6921 from goodwillcoding/release-14.12
security update for openssl: 1.0.1l -> 1.0.1m
2015-03-21 18:57:11 +01:00
goodwillcoding
2d130c000b Merge branch 'release-14.12' of github.com:goodwillcoding/nixpkgs into release-14.12 2015-03-21 10:48:49 -07:00
goodwillcoding
89522dc12d security update for openssl: 1.0.1l -> 1.0.1m
Errata: https://github.com/openssl/openssl/blob/OpenSSL_1_0_1-stable/NEWS

Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [19 Mar 2015]
o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
o Removed the export ciphers from the DEFAULT ciphers
2015-03-21 10:48:35 -07:00
goodwillcoding
eaa3934a6a security update for openssl: 1.0.1l -> 1.0.2m
Errata: https://github.com/openssl/openssl/blob/OpenSSL_1_0_1-stable/NEWS

Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.1m [19 Mar 2015]
o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
o Removed the export ciphers from the DEFAULT ciphers
2015-03-21 10:45:28 -07:00
Eelco Dolstra
535018fab8 nvidia-x11: Update to 340.76
(cherry picked from commit fb72208bcf)
2015-03-18 20:26:38 +01:00
Vladimír Čunát
c6fb75b950 xorg.libXfont: security update
Fixes CVE-2015-{1802,1803,1804}.
http://lists.x.org/archives/xorg-announce/2015-March/002550.html
Almost nothing needs rebuilding.

(cherry picked from commit 6a230188c6)
2015-03-17 18:37:12 +01:00
Cillian de Róiste
545d06e136 xf86_input_wacom: update from 0.27.0 to 0.28.0
(cherry picked from commit c40a5a4322)
2015-03-17 10:16:02 +01:00
Nikita Karetnikov
abed7e7171 pcmcia-utils: update to 017
Cherry picked from commit d8ff010255. This
fixes https://github.com/NixOS/nixpkgs/issues/6809.
2015-03-14 18:00:39 +01:00
Sander van der Burg
297ec179ac disnix: use libiconvOrEmpty 2015-03-13 21:12:46 +00:00
Sander van der Burg
d3f5da5c61 disnix: bump to version 0.3 2015-03-13 21:10:24 +00:00
Vladimír Čunát
98b8eb66bd libav*: maintenance updates, including security
(cherry picked from commit 07e49e6952)
2015-03-12 20:17:07 +01:00
Nikolay Amiantov
b37188eddb stage-1: fix hibernation (close #6675)
Fixes #6617.

(cherry picked from commit b802018482)
2015-03-12 20:17:07 +01:00
Eelco Dolstra
28c0d0fe41 nixos: enhance squashfs handling during boot
Merge pull request #6477 from ts468/stage-1-2
(cherry picked from commit 24c10d0612)
2015-03-12 20:17:07 +01:00
Rickard Nilsson
ff0b2a3861 syslog-ng: Update from 3.6.1 to 3.6.2
(cherry picked from commit 2d00826ac9)
2015-03-11 02:08:36 +01:00
Lluís Batlle i Rossell
2db8293855 Updating gobby and libinfinity.
(cherry picked from commit 44c3256017)
2015-03-10 14:37:41 +01:00
William A. Kennington III
3a9de8f25a gnupg: 2.0.26 -> 2.0.27
(cherry picked from commit e1703a836e)
2015-03-10 11:56:53 +01:00
William A. Kennington III
4f00f1e1a2 gnupg: Fix default path to pcsclite
(cherry picked from commit 9631f5a718)

Conflicts:
	pkgs/tools/security/gnupg/20.nix
2015-03-10 11:56:52 +01:00
Domen Kožar
cb21db1c77 fix eval 2015-03-10 11:43:53 +01:00
koral
7c12c7830e opensmtpd: 5.4.2p1 -> 5.4.4p1
(cherry picked from commit 3bc7dfdf22)
2015-03-10 11:30:27 +01:00
Luca Bruno
fce401fa07 povray: fix build and add platforms
(cherry picked from commit ca2d7774e0)
2015-03-09 18:00:32 +01:00
Lluís Batlle i Rossell
f8ff105d7d Add pcsc-tools, to test ccid cards.
(cherry picked from commit a2f4b94dbe)
2015-03-09 15:38:50 +01:00
Lluís Batlle i Rossell
10b693dbee Fixing judy for gcc 4.8
gtkwave crashes often, without this fix.
http://sourceforge.net/p/judy/mailman/message/31995144/

(cherry picked from commit a22c19f56a)
2015-03-09 15:38:40 +01:00
Eelco Dolstra
5baf87bc72 subversion: Update to 1.8.11
(cherry picked from commit 49282dd1af)
2015-03-09 13:07:40 +01:00
Thomas Tuegel
537008118a clementine: wrap for GST_PLUGINS_PATH 2015-03-09 06:45:28 -05:00
William A. Kennington III
3fb7fab03f libu2f-host: 0.0.2 -> 0.0.4
(cherry picked from commit a1f6084fc8)
2015-03-09 11:43:50 +01:00
William A. Kennington III
c6e76335f9 libu2f-host: 0.0.1 -> 0.0.2
(cherry picked from commit 9a56a86f5e)
2015-03-09 11:43:42 +01:00
Eelco Dolstra
5a2099b254 php: Update to 5.4.38
(cherry picked from commit 7f90cc40b4)
2015-03-09 11:37:17 +01:00
Eelco Dolstra
6261d6c079 nixUnstable: Update to 1.9pre4074_e659978
(cherry picked from commit e02d926ca9)
2015-03-09 11:37:13 +01:00
William A. Kennington III
de393636ff kernel: 3.12.37 -> 3.12.38 2015-03-08 15:31:20 -07:00
William A. Kennington III
1ded7008c1 kernel: 3.10.70 -> 3.10.71 2015-03-08 15:28:35 -07:00
William A. Kennington III
34023141cf kernel: 3.2.67 -> 3.2.68 2015-03-08 15:28:11 -07:00
William A. Kennington III
d9ce51d8f7 kernel: 3.18.8 -> 3.18.9 2015-03-08 15:27:30 -07:00
William A. Kennington III
5e23a2fed8 kernel: 3.14.34 -> 3.14.35 2015-03-08 15:26:27 -07:00
Domen Kožar
9e72a07066 fix #6548
(cherry picked from commit 0fd3db4ba1)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-07 22:32:13 +01:00
Domen Kožar
04be36e000 gevent: update Python 2.7.9 compatibility patch
(cherry picked from commit 0e0bc3ac86)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-07 22:32:07 +01:00
Vladimír Čunát
2635bde9ee libav*.tools: remove overlapping paths, fixes #6682
(cherry picked from commit cdd00f47fa)
2015-03-06 12:55:46 +01:00
Ricardo M. Correia
aba9ff9a11 firefox: Update from 36.0 -> 36.0.1
(cherry picked from commit 02b91f93c4)
2015-03-06 12:12:31 +01:00
Ricardo M. Correia
4f557ea774 firefox: Fix hash
(cherry picked from commit 1e4287645c)
2015-03-06 12:12:27 +01:00
Eelco Dolstra
77d78cf029 Ensure that the home directory exists even if the user already exists
(cherry picked from commit 16cf3ee9da)
2015-03-05 15:40:21 +01:00
Tom
ef0b35e28d [SECURITY] Update git to 2.1.4
This fixes CVE-2014-9390

http://article.gmane.org/gmane.linux.kernel/1853266
(cherry picked from commit 7800270ae4)
2015-03-05 15:20:15 +01:00
aszlig
5f7d37480d virtualbox: Update to new upstream version 4.3.24.
New maintenance release, changes:

 * VMM: emulation fix for the ENTER instruction under certain
   conditions; fixes Solaris 10 guests (VT-x without unrestricted guest
   execution)
 * VMM: fix for handling NMIs on Linux hosts with X2APIC enabled
 * NAT/NAT Network: fix connection drops when the host's DHCP lease was
   renewed (4.3.22 regression; Windows hosts only)
 * NAT: don't crash on an empty domain list when switching the DNS host
   configuration (4.3.22 regression; Mac OS X hosts only)
 * PXE: re-enable it on Windows hosts (4.3.22 regression; Windows hosts
   only)
 * Shared Folders: fixed a problem with Windows guests (4.3.22
   regression)
 * Audio: improved record quality when using the DirectSound audio
   backend
 * VBoxManage: when executing the controlvm command take care that the
   corresponding VM runtime changes are saved permanently
 * Windows Installer: properly install the 32-bit version of VBoxRes.dll
   on 32-bit hosts
 * Linux hosts / guests: Linux 4.0 fixes
 * OS/2 Additions: fixed mouse integration (4.3.22 regression)
 * X11 Additions: fixed a sporadic failure to deactivate virtual screens

Full changelog with bug IDs can be found at:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 54a8e13f2a)
2015-03-04 16:20:28 +01:00
Tobias Geerinckx-Rice
064d391bdf virtualbox 4.3.20 -> 4.3.22
(cherry picked from commit 39ff896253)
2015-03-04 16:20:27 +01:00
Eelco Dolstra
f5e00fc080 Add "input" group
This is required by systemd >= 215.

(cherry picked from commit 1002fb6433)

Conflicts:
	nixos/modules/misc/ids.nix
2015-03-04 12:02:36 +01:00
Eelco Dolstra
3d70aa085e Create /dev/nvidia-uvm for CUDA support
(cherry picked from commit a4e0278fcd)
2015-03-04 12:01:54 +01:00
James Cook
e4971bb713 Merge pull request #6627 from falsifian/graphviz_cve-2014-9157_14.12
graphviz: Patch to fix CVE-2014-9157 (release-14.12)
2015-03-03 09:29:20 -08:00
Eelco Dolstra
095d4ea75a linux: Disable CONFIG_DEBUG_STACKOVERFLOW
This got enabled accidentally in
e64e3ad88a.

(cherry picked from commit 584ca36462)
2015-03-03 14:31:36 +01:00
William A. Kennington III
5ff06c63f3 kernel: 3.14.33 -> 3.14.34
(cherry picked from commit 103f9820f6)

Conflicts:
	pkgs/os-specific/linux/kernel/patches.nix
2015-03-03 14:30:48 +01:00
Peter Simons
3ce68399e3 Merge pull request #6643 from falsifian/procmail_cve_2014-3618_14.12
procmail: Patch to fix CVE-2014-3618 (cherry-pick to release-14.12)
2015-03-03 11:23:43 +01:00
James Cook
1db0fe1b9a procmail: Patch to fix CVE-2014-3618.
(Cherry-picked from f7066d4.)
2015-03-02 23:40:46 -08:00
Bjørn Forsman
9a4157580c microscheme: update to latest release (0.9.2)
* Don't "externalize url/rev/sha256 to permit easier override".
  Just override 'src' itself. Then you can get the source from anywhere,
  not just git. I needed to touch this anyway, because I want to use
  fetchzip instead of fetchgit for releases (no need to clone repo).
* Latest release has "make install" improvements, simplifying our
  install.

(cherry picked from commit c47a3b0663)
2015-03-02 21:56:49 +01:00
James Cook
168295e9fe graphviz: Patch to fix CVE-2014-9157.
Cherry-picked from 3688b85.
2015-03-02 00:15:11 -08:00
William A. Kennington III
d5d435fe99 kernel: 3.14.32 -> 3.14.33
(cherry picked from commit 58a04a9359)

Conflicts:
	pkgs/top-level/all-packages.nix
2015-02-28 19:29:49 +01:00
Eelco Dolstra
e9901bcc11 firefox: Update to 36.0
(cherry picked from commit 8196962097)
2015-02-28 19:28:03 +01:00
Eelco Dolstra
3b5941cbfa nss: Update to 3.17.4
(cherry picked from commit 843f21fd6a)
2015-02-28 19:28:00 +01:00
Eelco Dolstra
ec085dc5c0 sqlite: Update to 3.8.7.4
(cherry picked from commit 3facd6b66d)
2015-02-28 19:27:56 +01:00
Eelco Dolstra
40a65c6812 sudo: Fix incorrect runtime path
(cherry picked from commit 9e9e446880)
2015-02-28 19:27:49 +01:00
Eelco Dolstra
9c9da0505f tzdata: Update to 2015a
(cherry picked from commit 586b9d9525)
2015-02-28 19:27:38 +01:00
Eelco Dolstra
842cac1412 Fix "systemctl reload container@"
Fixes #5179.

(cherry picked from commit 22d2fc3657)
2015-02-28 19:27:17 +01:00
Eelco Dolstra
aa6babf188 Disable the cjdns test
The cjdns module uses "import from derivation", which is a bad thing
(it causes building at evaluation time).

(cherry picked from commit 568df3f4a9)
2015-02-28 19:27:07 +01:00
Eelco Dolstra
290d31d3a2 Don't use machinectl to shut down containers
If the host is shutting down, machinectl may fail because it's
bus-activated and D-Bus will be shutting down. So just send a signal
to the leader process directly.

Fixes #6212.

(cherry picked from commit 307064ceb5)
2015-02-28 19:26:54 +01:00
Eelco Dolstra
62d5fad26b fillDiskWithRPMs: Pass --extract-over-symlinks to cpio
http://hydra.nixos.org/build/20003320
(cherry picked from commit 3a31043b43)
2015-02-27 14:00:38 +01:00
Domen Kožar
d961f80ec6 dbus-glib: 0.102 -> 0.104 (fixes nm-applet empty menu)
(cherry picked from commit 83b9a19390)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-27 13:01:11 +01:00
Domen Kožar
f5406e6715 openssl: 1.0.1k -> 1.0.1l
(cherry picked from commit 1fb78f8994)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-27 13:01:11 +01:00
Bjørn Forsman
45c5af4594 gradle: don't hardcode gradle-launcher-VERSION.jar
Instead, figure out VERSION at build-time. This simplifies using
overrideDerivation (no need to copy and modify installPhase).

Also add a check that the file exists (catch potential failure early).

(cherry picked from commit fc966aead0)

Conflicts:
	pkgs/development/tools/build-managers/gradle/default.nix
2015-02-27 12:10:06 +01:00
Rob Vermaas
2639faa896 Only start fetch-keys for GCE image after ip-up.
(cherry picked from commit 24e0565407)
2015-02-27 10:48:38 +00:00
Vladimír Čunát
1f09b77634 cpio: fix CVE-2015-1197 by Suse patch
(cherry picked from commit f3bf4505a9)
2015-02-26 21:26:04 +01:00
Rob Vermaas
8e54447ccf Backport GCE image from master. 2015-02-26 19:27:24 +00:00
lethalman
39b85c9db0 Merge pull request #6542 from nathanielbaxter/release-14.12
Libvirt security updates
2015-02-26 13:34:29 +01:00
Lluís Batlle i Rossell
b799804d05 Updating gtkwave to 3.3.64
(cherry picked from commit aa188a27a2)
2015-02-26 10:36:28 +01:00
Pascal Wittmann
5555a158e3 cv: update to 0.6
(cherry picked from commit 19a979d9a2)
2015-02-26 10:03:53 +01:00
Bjørn Forsman
e580cb5602 nix-prefetch-git: print commit date (close #6522)
The commit date can be used as a version number in packages that don't
have proper releases.

(cherry picked from commit 06f5651ef5)
2015-02-24 23:03:47 +01:00
Bjørn Forsman
4b67cdf99e xclip: set meta.platforms
(cherry picked from commit 6667e964e9)
2015-02-24 19:37:47 +01:00
lethalman
0902cfe5e9 Merge pull request #6552 from nslqqq/master
Correct NetworkManager documentation
(cherry picked from commit 2fdad12a8d)
2015-02-24 18:43:20 +01:00
Lluís Batlle i Rossell
b8f7da25c7 fix pam (OATH related)
the pam config was wrong.

Issue #6551

(cherry picked from commit b26e939111)
2015-02-24 17:53:38 +01:00
Eelco Dolstra
d5b7382e16 apache-httpd: Update to 2.4.12
CVE-2014-3583, CVE-2014-3581, CVE-2014-8109, CVE-2013-5704.

(cherry picked from commit b1ec8e6c64)
2015-02-24 16:31:07 +01:00
Lluís Batlle i Rossell
d93c6ffa10 Adding ddar, unix de-duplicating archiver. 2015-02-24 12:53:18 +01:00
Nathaniel Baxter
37c5a816d5 pythonPackages.libvirt: fix python executable path 2015-02-24 08:37:09 +11:00
Nathaniel Baxter
8b784ee5cc libvirt: update from 1.2.9 to 1.2.12
libvirt-glib: update from 0.1.9 to 0.2.0
pythonPackages.libvirt: update from 1.2.9 to 1.2.12

Potentially fixes CVE-2014-7823 CVE-2015-0236
2015-02-24 08:34:15 +11:00
Eelco Dolstra
c64c2ff254 samba: Update to 3.6.25, 4.1.17
CVE-2015-0240, CVE-2014-0178

(cherry picked from commit 1dd423e651)
2015-02-23 17:04:52 +01:00
Lluís Batlle i Rossell
a6f1024b1f octave: generate the documentation
I find octave quite unusable, without its help pages. Recently it started to
require gnuplot to generate them (even the text-only).

I also enabled parallel building. A comment from 2012 said about spurious
failures if it were enabled, but I don't know if these happen again. Let's
enable it to see.
2015-02-23 10:21:28 +01:00
Lluís Batlle i Rossell
58a004999b Update xclip to a more recent version (svn)
This can do -target, so it can work with images.
2015-02-22 15:24:57 +01:00
aszlig
5b3383b288 Revert "chromium: remove preferLocalBuild"
This reverts commit 84bd62da0a.

The reason I'm reverting this is that the implications this had on the
IO load of Hydra are fixed by ba0f957d7b.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:38:46 +01:00
aszlig
8a13fb2482 nixos/tests/chromium: Check new userns sandbox.
Since Chromium version 42, we have a new user namespaces sandbox in the
upstream project. It's more integrated so the chrome://sandbox page
reports it as "Namespace Sandbox" instead of SUID sandbox, which we were
re-using (or abusing?) in our patch.

So if either "SUID Sandbox" or "Namespace Sandbox" reports with "Yes",
it's fine on our side.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 9de4caddc1)
2015-02-22 08:03:06 +01:00
aszlig
ba0f957d7b chromium: Split up the source tarball on the fly.
So far we've done the source code split up by using the generic
unpackPhase and copying it all over into the different outputs.

However, this had the problem of generating the I/O load of about three
times the size of the source tree: First at fetchurl of the tarball
(although it's not as much because it's compressed), second at
unpackPhase and third at installPhase.

Now we don't use installPhase anymore and directly unpack into the
output paths, which unfortunately becomes quite a bit more complex
because we need to transform the paths of the tar file on the fly.

I've also tried using GNU Tar's --to-command option to even untar *and*
patch it at the same time, but forking for every single file in the
tarball gets REALLY slow and also gets even more complex than this two
stage approach because you need to make sure that the patch file is
applied correctly, for example for files that don't yet exist but are to
be created by the patch file.

We're using --anchored and --no-wildcards-match-slash here to prevent
accidentally excluding files we don't want to exclude. One example is
something like v8/tools/gyp/v8.gyp.

So the current approach is some compromise between complexity and speed
and should hopefully get rid of the Hydra build timeouts by lowering I/O
load.

See here for examples of builds having this issue:

http://hydra.nixos.org/build/19045023
http://hydra.nixos.org/build/19044973
http://hydra.nixos.org/build/19044968
http://hydra.nixos.org/build/19045019

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit c92dbffeac)
2015-02-22 08:03:06 +01:00
aszlig
02110707f6 chromium: Update all channels to latest versions.
Overview of the updated versions:

stable: 40.0.2214.91 -> 40.0.2214.115
beta:   41.0.2272.16 -> 41.0.2272.64
dev:    41.0.2272.16 -> 42.0.2305.3

Introduces 42.0.2305.3 as the new dev version, which no longer requires
our user namespaces sandbox patch. Thanks to everyone participating in
https://crbug.com/312380 for finally having this upstream.

In the course of supporting the official namespace sandbox (that's what
the user namespace sandbox is called), a few things needed to be fixed
for version 42:

 * Add an updated nix_plugin_paths.patch, because the old
   one tries to patch the path for libpdf, which is now natively included
   in Chromium.

 * Don't copy libpdf.so to libexec path for version 42, it's no longer
   needed as it's completely built-in now.

 * Disable SUID sandbox directly in the source instead of going the easy
   route of passing --disable-setuid-sandbox. The reason is that with
   the command line flag a nasty nagbar will appear.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 0aad4b7ee4)
2015-02-22 08:02:26 +01:00
Vladimír Čunát
949adbbb22 nixos/nvidia: use correct 32-bit legacy libs; refactor
Fixes #6127.
Now we avoid multiple switches among the version possibilities.

(cherry picked from commit a3a467ce77)
2015-02-21 16:36:38 +01:00
Rickard Nilsson
fd4d6c2937 elasticsearch: Update from 1.4.3 to 1.4.4
(cherry picked from commit 0fbe589331)
2015-02-20 23:56:32 +01:00
Rob Vermaas
5ef99d845a elasticsearch: update from 1.4.2 to 1.4.3, potentially fixes CVE-2015-1427
(cherry picked from commit e1f08578aa)
2015-02-20 11:04:21 +00:00
Rickard Nilsson
24c2f95285 elasticsearch: Update from 1.3.4 to 1.4.2
(cherry picked from commit 0dedcdf29d)
2015-02-20 11:04:16 +00:00
Vladimír Čunát
3d2552657c uthash: new package
It's headers only. Newer fontforge needs it.

(cherry picked from commit 9274093a34)
2015-02-19 21:40:33 +01:00
Vladimír Čunát
a21057f8b6 fontforge: large update with large changes implied
- Things didn't work very well before, as libs were only dlopened and
  not found. Fixes #5716.
- Newer releases need autotools to build (and git), leading to some bloat.
- Also, more things are installed by default, increasing the output size.

(cherry picked from commit f9c59ca168)
2015-02-19 20:54:33 +01:00
Eelco Dolstra
efba0f9bc7 nixUnstable: Update
(cherry picked from commit cbab474cea)
2015-02-19 11:20:18 +01:00
Vladimír Čunát
073a4a0a44 poppler-qt4: fix rendering, fixes #6366
The subpixel patches seem to cause trouble in recent versions.

(cherry picked from commit a9e4fc1079)
2015-02-18 21:39:47 +01:00
Eelco Dolstra
72ba458362 nixUnstable: Update to 1.9pre4028_0d1dafa
(cherry picked from commit 038a837f02)
2015-02-18 10:51:02 +01:00
Daniel Peebles
5c125ccbbf Bump nixUnstable build
(cherry picked from commit ea5594679c)
2015-02-18 10:50:59 +01:00
Daniel Peebles
c86cc84a64 Turn nixUnstable back on
(cherry picked from commit 65522d05d4)
2015-02-18 10:50:54 +01:00
Eelco Dolstra
1316755bac Apply upstream fix for Nix on XFS
Fixes #6424.

(cherry picked from commit d6c88eaeb8)
2015-02-18 10:42:47 +01:00
Bjørn Forsman
e5c8bd8f48 speedtest-cli: drop the "python2.7-" name prefix
(cherry picked from commit 9b79a35371)
2015-02-17 20:24:26 +01:00
Bjørn Forsman
cca35eddc8 speedtest-cli: align attrname with pkgname
(cherry picked from commit ea6a9a2281)
2015-02-17 20:24:24 +01:00
Rob Vermaas
2b0b92f8f3 Fixes #6374. Now for real, dohhh.
(cherry picked from commit 8495c101dc)
2015-02-17 13:10:44 +00:00
Rob Vermaas
00bb9cfd5b Fixes #6374.
(cherry picked from commit 1a0e6f0039)
2015-02-17 13:08:43 +00:00
Antoine R. Dumont
8840240db3 Add microscheme derivation
(A Scheme subset for Atmel microcontrollers.)

Use of the actual git HEAD because the actual tarball compiles but
segfault at runtime.

Upload the BLINK.ms sample on arduino board (/dev/ttyACM0):

```sh
$ sudo ./result/bin/microscheme -m UNO -d /dev/ttyACM0 -auc ~/repo/perso/microscheme/examples/BLINK.ms
Microscheme 0.8, (C) Ryan Suchocki
>> Treeshaker: After 4 rounds: 84 globals purged! 22 bytes will be
reserved.
>> 18 lines compiled OK
>> Assembling...
>> Uploading...

avrdude: AVR device initialized and ready to accept instructions

Reading | ################################################## | 100%
0.00s

avrdude: Device signature = 0x1e950f
avrdude: reading input file
"/home/tony/repo/perso/microscheme/examples/BLINK.hex"
avrdude: writing flash (2080 bytes):

Writing | ################################################## | 100%
0.35s

avrdude: 2080 bytes of flash written

avrdude: safemode: Fuses OK (E:00, H:00, L:00)

avrdude done.  Thank you.

>> Cleaning Up...
>> Finished.
```

(cherry picked from commit 172d78923b)
2015-02-16 23:19:27 +01:00
Antoine R. Dumont
79df9d1dd4 Fix avr-gcc url
New releases have been made and the current one is now an old one.

(cherry picked from commit 9b81fa284f)
2015-02-16 23:19:26 +01:00
James Cook
eea0364f3f Merge pull request #6353 from falsifian/sox_CVE-2014-8145-14.12
sox: cherry-pick for release-14.12: Patches for CVE-2014-8145
2015-02-16 13:39:13 -08:00
Eelco Dolstra
d00116f609 Fix bad licenses on CUDA packages
They were marked as "nonfree" rather than "unfree", causing them to be
allowed with allowUnfree = false.

(cherry picked from commit 2ba9ae0129)
2015-02-16 11:25:42 +01:00
Rob Vermaas
213fe8427c Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends. 2015-02-16 09:56:08 +00:00
Eelco Dolstra
3e6cedab0d Provide symlinks to ca-bundle.crt for compat with other distros
There is no "standard" location for the certificate bundle, so many
programs/libraries have various hard-coded default locations that
don't exist on NixOS. To make these more likely to work, provide
some symlinks.

(cherry picked from commit d180a67b4223b35a39defff115723719190e6362)
2015-02-15 19:08:07 +01:00
James Cook
c719e10876 sox: Patches for CVE-2014-8145
Found via RedHat bug 1174792.  It was not clear whether these address a
NULL dereference and a division by zero.

(Cherry-picked from cf11e285997d7c06e546987212a7a2c69f9e08d7.)
2015-02-15 00:18:45 -08:00
James Cook
acfbdf7f91 Merge pull request #6240 from falsifian/ppp_2.4.7_squash-14.12
PPP: Update to 2.4.7.
2015-02-14 21:18:59 -08:00
Lluís Batlle i Rossell
cb3cba54a1 nixos: Adding OATH in pam. 2015-02-15 00:34:00 +01:00
Florian Friesdorf
6ef25caf8a mirrors: move more reliable postgresql mirror up
Picked from #6101.

(cherry picked from commit e82e14ef60)
2015-02-14 10:33:46 +01:00
Lluís Batlle i Rossell
cd417206f9 Updating weka to 3.6.12. 2015-02-13 16:20:22 +01:00
Peter Simons
4043e6b2d6 cabal-install-1.18.0.3: fix build with GHC 7.8.4
Fixes https://github.com/NixOS/nixpkgs/issues/6081.
2015-02-13 15:32:31 +01:00
Rickard Nilsson
b515dada09 vimb: Update from 2.8 to 2.9
(cherry picked from commit da6abad31a)
2015-02-13 15:13:13 +01:00
Ivan Sorokin
0354fe2888 bash-completion: fix bad array subscript error. Closes #6117
(cherry picked from commit 20ab4027da)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-12 21:19:47 +01:00
Vladimír Čunát
abfa2b27af p7zip: small update to fix CVE-2015-1038
(cherry picked from commit d3b25752f1)
2015-02-12 20:53:11 +01:00
Vladimír Čunát
f5319bac0c vala-0.26: minor update to fix CVE-2014-8154
@lethalman: it seems strange to me to have the 0.23.* version as
the default, as it's even an unstable release.

(cherry picked from commit 8afa77cb07)
2015-02-12 20:44:12 +01:00
Vladimír Čunát
6aae54021b fix eval (typo)
Notified thanks to Travis.
2015-02-12 20:31:58 +01:00
Vladimír Čunát
30ad3a7306 lyx: maintenance update
(cherry picked from commit 4dfafb8ff7)
2015-02-12 20:23:42 +01:00
Vladimír Čunát
ef0ceb0a88 xorg-server: security+bugfix, including CVE-2015-0255
Tested briefly against 14.12.

(cherry picked from commit cf1550cbbf)
2015-02-12 20:15:52 +01:00
Eelco Dolstra
ff916010ac Fix conflict between fedora-release and generic-release
http://hydra.nixos.org/build/19594340
(cherry picked from commit fa47d347a4)
2015-02-12 17:56:09 +01:00
Eelco Dolstra
1d4319286d Remove tabs
(cherry picked from commit ff37dc6fb6)
2015-02-12 17:56:09 +01:00
Eelco Dolstra
ee1b046a39 fillDiskWithRPMs: Shut up some warnings
(cherry picked from commit da73688e3d)
2015-02-12 17:56:09 +01:00
Eelco Dolstra
d313d5202b Drop tests.installer.grub1 as release critical
This test sometimes fails with

  Kernel panic - not syncing: assertion "i && sym_get_cam_status(cp->cmd) == DID_SOFT_ERROR" failed: file "/tmp/nix-build-linux-3.14.32.drv-0/linux-3.14.32/drivers/scsi/sym53c8xx_2/sym_hipd.c", line 3399

after "sd 2:0:0:0: ABORT operation timed-out."

Since we don't care all that much about GRUB 1 anymore, don't make the
release depend on it.

http://hydra.nixos.org/build/19563197
(cherry picked from commit 1907ca8a2a)
2015-02-12 16:22:33 +01:00
Shea Levy
b14e51d78a Backport pleasant ruby 2015-02-11 12:03:55 -05:00
Bjørn Forsman
baa9878eee nixos/tests/jenkins: increase timeout to 6 minutes
Fixes the test failure, at least on my system.

(cherry picked from commit 7a6af47cca)
2015-02-10 16:52:37 +01:00
Vladimír Čunát
aaddf52c43 linux_3_{10,12,14}: fix upstream regression, fixes #6231
Some modules wouldn't load crc32c dependency due to module renaming.

(cherry picked from commit 57f2d329ac)

Conflicts (simple):
	pkgs/top-level/all-packages.nix
2015-02-10 13:50:05 +01:00
William A. Kennington III
b9d607f4aa kernel: 3.14.31 -> 3.14.32
(cherry picked from commit c4d21cf1c4)
2015-02-10 12:54:11 +01:00
Eelco Dolstra
9e472b6dc6 Add Fedora 21
(cherry picked from commit 3786f08d25)
2015-02-10 11:55:07 +01:00
Vladimír Čunát
65300abfc1 thunderbird: update, and refactor the expression
- use mach for building (the way Mozilla devs use),
- use --disable-debug-symbols to reduce build-time resource consumption

(cherry picked from commit 07966befee)
2015-02-09 12:32:24 +01:00
Eelco Dolstra
98afc992d1 Add options for installing additional root certificates
(cherry picked from commit d2bfb5ceb0)
2015-02-09 11:24:48 +01:00
Domen Kožar
cdfb1e0b58 Merge pull request #6248 from nathanielbaxter/release-14.12
flashplayer: Minor security update to 11.2.202.442
2015-02-09 05:45:34 +01:00
Nathaniel Baxter
9551e74e2c flashplayer: Minor security update to 11.2.202.442 2015-02-09 10:06:13 +11:00
James Cook
58c9dc1e25 PPP: Update to 2.4.7.
Fixes CVE-2014-3158.

Also remove postPatch and postInstall that don't seem to be needed (any
more?).
2015-02-08 12:51:02 -08:00
Lluís Batlle i Rossell
0e860da001 Updating cjdns to 20150207.
Version without memory leaks.
2015-02-08 18:05:45 +01:00
Bjørn Forsman
af261a263c arduino: set meta.platforms and add myself as maintainer
(cherry picked from commit daec5d6f25)
2015-02-07 12:25:54 +01:00
Bjørn Forsman
edac9203f0 arduino: new package (2nd attempt). Close #6159.
[Now without the "stdenv.glibc" reference, which is unavailable on
darwin. It seems the dynamic linker finds libc/libm without it being
explicitly in RPATH, so we can just drop it.]

This commit adds the graphical Arduino IDE, built from the arduino-core
expression.

Also:
  - Add libusb to RPATH for avrdude. Without this, avrdude is broken.
    Possible TODO: replace bundled avrdude with the one from nixpkgs.
  - Use "cp -r ./build/linux/work/*", so example sketeches, the HTML
    reference documentation and the 'arduino' shell script that starts the
    IDE gets included.
  - Make meta.description slightly more generic, to cover both GUI/core
    variants.

(cherry picked from commit e10704335a)
2015-02-07 10:00:26 +01:00
Bjørn Forsman
8e96a53b81 Remove mistakenly committed file 'tags'
The file was added in 8bae32afb5 (update jack2 to version 1.9.10).
2015-02-07 09:58:27 +01:00
Vladimír Čunát
489532cd48 xdg-utils: update from git to fix CVE-2014-9622
Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.

(cherry picked from commit 346c8d7a98)

Conflicts (simple):
	pkgs/tools/X11/xdg-utils/default.nix
2015-02-07 07:38:45 +01:00
cillianderoiste
7cdb8dfd83 Merge pull request #6205 from magnetophon/14.12-jack2v1.9.10
update jack2 to version 1.9.10
2015-02-06 18:38:59 +01:00
Bart Brouns
8bae32afb5 update jack2 to version 1.9.10 2015-02-06 18:16:13 +01:00
Domen Kožar
84bd62da0a chromium: remove preferLocalBuild due to intense IO in VM tests 2015-02-06 12:07:49 +01:00
Domen Kožar
d562614d52 Revert "Disable the chromium tests"
This reverts commit 95101a8876.

See
95101a8876
for discussion
2015-02-06 11:48:14 +01:00
Vladimír Čunát
596cf1b731 ffmpeg-2.2: update (still used by vlc)
(cherry picked from commit 474aeb0b3d)
2015-02-05 11:30:58 +01:00
Thomas Tuegel
e911b1864e fontconfig: stringify dpi correctly
(cherry picked from commit 0fee7a2b21)
2015-02-05 10:13:22 +01:00
Vladimír Čunát
99df1f3e98 kernel-*: updates from master 2015-02-04 21:14:13 +01:00
Domen Kožar
bc73086149 Revert "arduino: new package"
This reverts commit ec0ff0dee4.

Breaks eval. cc @bjornfor
2015-02-04 13:49:53 +01:00
Domen Kožar
bf7ef8a1dd varnish: 3.0.5 -> 3.0.6
(cherry picked from commit 98a480363c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:54:27 +01:00
Domen Kožar
ff8452d766 Remove Varnish 2.1.5
Last release was in 2010, has vulns CVE-2013-4484, cc @garbas

(cherry picked from commit cb6706c22f)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:54:24 +01:00
Domen Kožar
4fa25ee93a solr: 4.10.2 -> 4.10.3, CVE-2014-3628 2015-02-04 11:48:13 +01:00
Domen Kožar
fe7d32d904 jasper: CVE-2014-8157, CVE-2014-8158, fixes #6114
(cherry picked from commit eaeef0377f)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:38:05 +01:00
Domen Kožar
d5faa39847 unzip: CVE-2014-9636, fixes #6128
(cherry picked from commit d50bfd7515)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:17:44 +01:00
Brendan Long
a7fc60c382 go: Update to version 1.4.1.
Also had to fix the code that was trying to make sure the go-* folders get renamed to just "go".

Resolves #5797

(cherry picked from commit 51902ba32d)
2015-02-04 11:05:32 +01:00
Brendan Long
92374ba137 go: Update to 1.4
(cherry picked from commit 8c3399f4d8)

I leave the main go to 1.3 though, so I could skip many changes from 8c3399.
2015-02-04 11:05:32 +01:00
Bjørn Forsman
ec0ff0dee4 arduino: new package
This commit adds the graphical Arduino IDE, built from the arduino-core
expression.

Also:
  - Add libusb to RPATH for avrdude. Without this, avrdude is broken.
    Possible TODO: replace bundled avrdude with the one from nixpkgs.
  - Use "cp -r ./build/linux/work/*", so example sketeches, the HTML
    reference documentation and the 'arduino' shell script that starts the
    IDE gets included.
  - Make meta.description slightly more generic, to cover both GUI/core
    variants.

(cherry picked from commit ca982158bf)
2015-02-04 07:34:21 +01:00
Bjørn Forsman
cfb2030e63 arduino-core: align attrname with package name
arduino_core => arduino-core. Retain copy of old attrname for backward
compatibility.

(cherry picked from commit 83e3f38593)
2015-02-04 07:34:19 +01:00
Eelco Dolstra
12846214f2 valgrind: Update to 3.10.1
(cherry picked from commit fcd4aa44d5)
2015-02-03 18:11:35 +01:00
Eelco Dolstra
cdb450f94d ntpd: Fork into the background
With -n, ntpd will write log messages to both syslog and stderr, which
is ugly.

(cherry picked from commit b61d4ac6a5)
2015-02-03 10:40:41 +01:00
Eelco Dolstra
16bf47df11 nspr: Update to 4.10.8
(cherry picked from commit 32183b2ea4)
2015-02-03 10:40:31 +01:00
Eelco Dolstra
262d7a4a78 Restrict the length of container names
(cherry picked from commit 378006f0f2)
2015-02-03 10:40:23 +01:00
Edward O'Callaghan
4cd7b0fce5 php: update from 5.4.35 to 5.4.37
Potentially fixes CVE-2014-8142, CVE-2014-9427, CVE-2015-0231, CVE-2015-0232

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
(cherry picked from commit ed232ef5f8)
2015-02-03 10:40:05 +01:00
Vladimír Čunát
0021ffab7a fix 404 URLs (CC #6105)
Cherry-picked from b9cc04329b and 740c6ae240
2015-02-03 10:12:30 +01:00
Rob Vermaas
61adf9e27f Update node-packages, re-added fetch-bower, to make fetchbower function eval succeed 2015-02-02 14:55:55 +00:00
Bjørn Forsman
65383e531a nixos/tftpd: add option types and fixup descriptions
The first description is a (incorrect) copy/paste from the 'vsftpd'
module, and the second option lacks a 'dot' at the end.

(cherry picked from commit ee52a61e3a)
2015-02-01 16:03:57 +01:00
Bjørn Forsman
c64fd2b1cb spek: new package
spek is an accoustic spectrum analyzer. It helps analyse your audio
files by showing their spectrogram.

http://spek.cc/
(cherry picked from commit b26a6e8a23)
2015-02-01 15:22:15 +01:00
Lluís Batlle i Rossell
cd80d050cb cjdns: updating with bugfix, and readd nodejs tools 2015-01-30 09:25:21 +01:00
Eelco Dolstra
95101a8876 Disable the chromium tests
These are timing out a lot.

http://hydra.nixos.org/build/19179868
2015-01-30 00:57:34 +01:00
Lluís Batlle i Rossell
bdc630e7e9 gpa: using mirror url. 2015-01-29 22:38:06 +01:00
Lluís Batlle i Rossell
24a89c028a Adding GPA, The GNU Privacy Assistant. 2015-01-29 20:28:18 +01:00
Lluís Batlle i Rossell
b99fb2383e Updating gpgme to 1.5.3 2015-01-29 20:27:25 +01:00
Lluís Batlle i Rossell
aeefbe552a Update cjdns to v15 2015-01-29 19:47:40 +01:00
Lluís Batlle i Rossell
56e0562cdb Install more rkflashtools. 2015-01-29 19:47:40 +01:00
Ricardo M. Correia
4a0fa82731 flashplayer: Update from 11.2.202.438 -> 11.2.202.440
(cherry picked from commit f46a6c92c0)
2015-01-29 17:36:13 +01:00
Ricardo M. Correia
e7bfc04769 flashplayer: Update from 11.2.202.429 -> 11.2.202.438
(cherry picked from commit f315b7d74a)
2015-01-29 17:36:07 +01:00
Ricardo M. Correia
2461992fc9 flashplayer: Update from 11.2.202.425 -> 11.2.202.429
(cherry picked from commit 7d1d89e532)
2015-01-29 17:35:58 +01:00
Ricardo M. Correia
51cc523a2a firefox: Update from 35.0 -> 35.0.1
(cherry picked from commit 934ea63e8f)
2015-01-28 13:22:51 +01:00
Eelco Dolstra
1fbf6e4bd9 spotify: Drop more unused dependencies
(cherry picked from commit 6c4d79191c)

Conflicts:
	pkgs/applications/audio/spotify/default.nix
2015-01-27 19:01:07 +01:00
Eelco Dolstra
1a936bebf5 spotify: Drop unused qt4webkit dependency
(cherry picked from commit 836cc2f64d)
2015-01-27 19:00:38 +01:00
Eelco Dolstra
3d5134962d spotify: Install in $out/lib/spotify instead of $out/lib
This prevents nix-env collisions with other packages like Hipchat due
to private copies of libQtWebKit.so.4 and other libraries.

(cherry picked from commit 3ea88fec96)

Conflicts:
	pkgs/applications/audio/spotify/default.nix
2015-01-27 19:00:26 +01:00
Eelco Dolstra
63ced498e4 gdb: Update to 7.8.2
(cherry picked from commit f3ee32559d)
2015-01-27 18:59:32 +01:00
Eelco Dolstra
33152356da nixos-rebuild: Update fallback code to update Nix
(cherry picked from commit 53710c752a)
2015-01-27 18:59:10 +01:00
Eelco Dolstra
a54b75fc45 Remove executable bits from non-executable files
(cherry picked from commit 6f8fad2253)
2015-01-27 18:59:06 +01:00
Domen Kožar
10792c5035 if we abort with too old Nix, hint docs
(cherry picked from commit 1defdb972e)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	default.nix
2015-01-27 18:46:16 +01:00
Cillian de Róiste
8cf5faeba6 DISTRHO: remove from 14.12, upstream repo has moved and the build fails
I will debug and fix this in unstable, but probably won't backport the changes
2015-01-27 13:04:06 +01:00
aszlig
b880176921 chromium: Ensure runtime deps for enabled plugins.
We're propagating the plugin flags by importing from another Nix
expression file, which in turn exports the Nix path to the wrapper. This
causes that the store path isn't referenced in the wrapper and the path
isn't recognized by scanning the wrapper script (only those already
referenced at build time are).

So let's add the activated plugins to the buildInputs of the wrapper.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 9343f6f461)
2015-01-26 09:40:10 +01:00
aszlig
5d02f3c1e5 nixos/tests/chromium: Increase VM memory size.
Chromium is quite memory hungry and we frequently get random crashes in
the tests, so let's set it to 1024 MB because new releases of Chromium
most probably won't consume *less* memory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit eae32fb798)
2015-01-26 09:39:59 +01:00
aszlig
d6916eedf0 chromium: Update all channels to latest versions.
This brings a new stable version 40.0.2214.91 along with a beta update
to version 41.0.2272.16, the dev channel is still stuck at version
41.0.2272.12 and within the next days will jump to version 42.

For this reason, I've done some cheating here and brought the beta
channel in par with the dev channel, because dev is older than beta on
OmahaProxy.

Here's an overview of the channel upgrades:

stable: 39.0.2171.65 -> 40.0.2214.91 [1]
beta:   40.0.2214.10 -> 41.0.2272.16 [1] [2] [3]
dev:    41.0.2224.3  -> 41.0.2272.16 [1] [2] [3]

[1]: We needed to patch in locations of lib{pci,udev}.so, because
     Chromium tries to load them at runtime. For version 41 startup will
     fail if it is unable to load libudev, but it also has the advantage
     that this fixes GPU detection using libpci in the stable version,
     which in turn could fix a few bugs on NixOS.

[2]: The upstream Debian package for the binary plugins now uses XZ
     compression for the enclosed data tarball.

[3]: Chromium 41 needs {shapshot,natives}_blob.bin in order to start up,
     so let's cp it among with the .pak files to avoid adding a
     conditional for version 40.

The release annoucement of the stable channel update can be found here:

http://googlechromereleases.blogspot.de/2015/01/stable-update.html

Note that this release contains 62 security fixes(!) and I'm hereby
apologizing for the delay of this update.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit ced5afc38c even
 though it's a major version upgrade, it simply has too many security
 updates to even *think* about trying to backport them)
2015-01-26 09:37:17 +01:00
aszlig
d566f3009e nixos/manual: Re-add development section.
I think this has been accidentally dropped by a099ca4, at least there is
no reason stated, why it shouldn't be included, so I'm bringing it back.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 6308cba3fa)
2015-01-25 20:18:49 +01:00
Lluís Batlle i Rossell
442148e20a Adding a pgf command line tool. 2015-01-23 16:08:21 +01:00
Lluís Batlle i Rossell
f6856be9ee Making freeimage build and install freeimageplus too.
I need it for the pgf command line tool (next commit)
2015-01-23 16:08:05 +01:00
Lluís Batlle i Rossell
91b63783e1 Updating digikam to 4.6.0 and adding libpgf.
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.
2015-01-23 10:26:35 +01:00
aszlig
e04d02e404 nixos/rename: Fix merging multiple destinations.
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.

We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 127c928c23)
2015-01-23 09:37:35 +01:00
Lluís Batlle i Rossell
c9449172f4 Updating cjdns to protocol version 14
(cherry picked from commit 8dd230aa09)
2015-01-23 09:35:45 +01:00
aszlig
47c741fa60 chromium: Fix userns patch for kernel 3.18.2.
Writing the gid_map is already non-fatal, but the actual sandbox process
still tries to setresgid() to nogroup (usually 65534). This however
fails, because if user namespace sandboxing is present, the namespace
doesn't have CAP_SETGID at this point.

Fortunately, the effective GID is already 65534, so we just need to
check whether the target gid matches and only(!) setresgid() if it
doesn't.

So if someone would run a SUID version of the sandbox, it would still
work nonetheless without a negative impact on security.

Fixes #5730, thanks to @wizeman for reporting and initial debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 536feffc68)
2015-01-23 00:46:51 +01:00
Longrin Wischnewski
545d71a9bb php: make curl wrappers optional
cURL wrappers are experimental and break any application/library
that rely on $http_response_header

(cherry picked from commit 96f4758d09)
2015-01-22 13:04:32 +01:00
Cillian de Róiste
cc6b4f7094 simplescreenrecorder: update from 0.3.2 to 0.3.3
(cherry picked from commit 523644e48903dd488d2fc15003d7a688f6174972)
2015-01-22 12:14:25 +01:00
Cillian de Róiste
f15c535319 SimpleScreenRecorder: 0.3.1 -> 0.3.2
(cherry picked from commit 9a5da8168d)
2015-01-22 12:14:08 +01:00
Eelco Dolstra
dc18915ce8 Fix release notes
(cherry picked from commit f637e27138)
2015-01-21 16:28:08 +01:00
Rickard Nilsson
b018853bdb nginx: Add set-misc-nginx-module
(cherry picked from commit c7c917dfff)
2015-01-21 12:39:32 +01:00
Domen Kožar
f7b68679a5 gevent: fix ssl patch
(cherry picked from commit 5cd76cd85e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-20 22:41:16 +01:00
Kosyrev Serge
d4a7019892 debootstrap: 1.0.64.tar.xz -> 1.0.66.tar.gz (close #5548)
It was 404.
@vcunat: convert URLs to mirror://debian.

(cherry picked from commit bd3f891c1c)
2015-01-20 16:52:03 +01:00
Domen Kožar
676e8d7aa4 eventlet: disable tests, too much of a burden 2015-01-20 13:47:26 +01:00
Lluís Batlle i Rossell
87c637ae15 Updating megatools to 1.9.94.
Fixing the glib network part splice, which wasn't working.

(cherry picked from commit 8aaac406bf)
2015-01-20 12:50:57 +01:00
William A. Kennington III
b7393c939d kernel: 3.14.28 -> 3.14.29
(cherry picked from commit 2c02b7caff)
2015-01-20 12:31:08 +01:00
Rickard Nilsson
337058ce25 new package: httping 2.3.4
(cherry picked from commit b64eeaf727)
2015-01-19 03:54:16 +01:00
Domen Kožar
23a202519c python2.6: add a patch to fix parallel make failure 2015-01-18 19:19:40 +01:00
Domen Kožar
1c489ee2a8 eventlet: increase TEST_TIMEOUT 2015-01-18 19:19:40 +01:00
Michael Raskin
4a056a27b7 Make stumpwm-contrib separately available: StumpWM currently recommends installing it separately and adding to ASDF search path 2015-01-18 20:59:36 +03:00
Bjørn Forsman
3cb749f796 ardour: report correct version number
Even though we build from git tag 3.5.403, `ardour --version` reports
3.5-380-g2f6065b. Fix it.

(Another way to fix this is to clone the whole git repo, preserve the
.git/ directory and add git as buildInput so that Ardour can figure out
all this version info stuff by itself.)

(cherry picked from commit 0e3007ec88)
2015-01-18 15:25:34 +01:00
Bjørn Forsman
ce41de13a6 munin: remove /usr/{bin,sbin}/ references from plugins
Instead, run things out of $PATH.

Fixes errors like these (on NixOS):
  munin-available-plugins/.mysql_slowqueries-wrapped: line 67: /usr/bin/printf: No such file or directory

(Basically, this unbreaks some plugins.)

(cherry picked from commit 412cb5a3a2)
2015-01-18 14:41:15 +01:00
Bjørn Forsman
7ad4af120a taskwarrior: enable bash completion
By adding the missing link between the (already installed) completion
script and $out/etc/bash_completion.d/.

(cherry picked from commit 02458a939a)
2015-01-18 14:15:56 +01:00
Evgeny Egorochkin
5836ed0ea6 kde4: fix silent missing kde-workspace dependencies needed for kfontinst and kfontview 2015-01-18 09:37:55 +02:00
Domen Kožar
a769e87199 fix gevent/eventlet on python 2.7.9, fixes #5782
(cherry picked from commit c611f5837c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-17 14:15:32 +01:00
Eelco Dolstra
916430748c Fix a warning in initrd generation
${pkgs.busybox}/bin and ${pkgs.busybox}/sbin are now the same
directory, so don't copy both.

(cherry picked from commit 7358b8dfda)
2015-01-15 21:08:45 +01:00
Eelco Dolstra
4599bfcc3b nixos-install: Create /root with 700 permission
(cherry picked from commit b9c4569b6b)
2015-01-15 21:08:08 +01:00
Eelco Dolstra
d693d4432f NixOS containers: Create /root with 700 permission
Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.

(cherry picked from commit 3ca275d7ba)
2015-01-15 21:08:07 +01:00
Eelco Dolstra
bc195e2feb Paranoia
(cherry picked from commit efa8fc2b0a)

Conflicts:
	nixos/modules/virtualisation/google-compute-image.nix
2015-01-15 21:06:28 +01:00
Eelco Dolstra
a71ce6abb5 Update Debian to 7.8
(cherry picked from commit 1b1e015e6e)
2015-01-15 14:52:22 +01:00
Eelco Dolstra
68378336a6 test-instrumentation.nix: Prevent calling a pager
(cherry picked from commit 24ce7ff3ea)
2015-01-15 14:52:22 +01:00
Vladimír Čunát
674d33a516 firefox: major bump 34.0.5 -> 35.0
(cherry picked from commit 1072635cf0)
2015-01-14 22:51:20 +01:00
Luca Bruno
314c5e9ac6 nixos-rebuild: use reload-or-restart for dbus. Closes #5767
Now that dbus reload has been moved before restarting units,
the reload may fail if dbus has been stopped before.
The reload-or-restart will reload dbus if it's active,
otherwise start it.
2015-01-14 17:09:29 +01:00
aszlig
d9de59a46b lighttpd: Fix building with magnet support.
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit c5354fafce)
2015-01-13 08:38:37 +01:00
Eelco Dolstra
89807d4221 Fix CentOS 6.5 URLs
(cherry picked from commit 02df7cdaa0)
2015-01-12 15:14:55 +01:00
Emery Hemingway
96a481b1d0 cjdns: bump to protocol version 13
(cherry picked from commit 5b8e1be7ba)
2015-01-12 11:33:19 +01:00
Lluís Batlle i Rossell
5da890f725 Porting the jdk hack about the 10-year timezones to icedtea
(Based on 3279579bc4)
2015-01-12 11:04:55 +01:00
Rob Vermaas
65a89fcce7 Use callPackage for nodePackages, to allow easier overriding of node-packages set. 2015-01-12 10:04:38 +01:00
Evgeny Egorochkin
48288fcc34 kde4.calligra: update from 2.8.6 to 2.8.7 2015-01-11 18:21:57 +02:00
Evgeny Egorochkin
0f301bcb1c calligra: fix dependencies, and add several new ones 2015-01-11 17:04:36 +02:00
cillianderoiste
56f0fb3ffb Merge pull request #5691 from magnetophon/faustbugfix
Faust: bugfix for 14.12
2015-01-10 17:24:05 +01:00
Bart Brouns
9c5856496d Faust: bugfix for 14.12
use patchshebangs instead of manual patching
patch .faust2* as well as faust2*
2015-01-10 16:04:51 +01:00
Domen Kožar
70a7d4bd16 openssl: 1.0.1j -> 1.0.1k 2015-01-09 20:21:41 +01:00
Evgeny Egorochkin
d8cda00a10 KDE4: update 4.14.1 to 4.14.3 2015-01-09 18:51:39 +02:00
Bjørn Forsman
82578aec9c graphviz: patch vimdot to lookup 'vim' in $PATH
Without this it tries to run /usr/bin/vim. Patch is already accepted
upstream.

(cherry picked from commit e90d316f19)
2015-01-09 07:12:44 +01:00
Rob Vermaas
3279579bc4 Ugly hack until we can update openjdk. Without this openjdk fails with:
Error: time is more than 10 years from present: 1104530400000

See also:
   http://permalink.gmane.org/gmane.os.netbsd.devel.pkgsrc.user/20888
2015-01-08 22:31:15 +01:00
James Cook
db24035952 unzip: Patch for CVE-2014-81{39,40,41}.
(Cherry-picked from 173f41cf0bc618f0b2c313b1915fee8d8a6d0ee2.)
2015-01-08 11:34:00 -08:00
Bjørn Forsman
a431e3ad3b wireshark: update 1.12.2 -> 1.12.3 (security update)
The following vulnerabilities have been fixed.

- wnpa-sec-2015-01
  The WCCP dissector could crash. (Bug 10720, Bug 10806) CVE-2015-0559,
  CVE-2015-0560

- wnpa-sec-2015-02
  The LPP dissector could crash. (Bug 10773) CVE-2015-0561

- wnpa-sec-2015-03
  The DEC DNA Routing Protocol dissector could crash. (Bug 10724) CVE-2015-0562

- wnpa-sec-2015-04
  The SMTP dissector could crash. (Bug 10823) CVE-2015-0563

- wnpa-sec-2015-05
  Wireshark could crash while decypting TLS/SSL sessions. Discovered by Noam
  Rathaus. CVE-2015-0564

See more at https://www.wireshark.org/docs/relnotes/wireshark-1.12.3.html

(cherry picked from commit 7a1e652130)
2015-01-08 19:46:11 +01:00
Michael Raskin
1e60d1f8ba LibreOffice: install icons
(cherry picked from commit f329eb0137)
2015-01-08 18:20:29 +01:00
Michael Raskin
df3d687a81 LibreOffice: 4.3.3.2->4.3.5.2
(cherry picked from commit d7bc5835c8)
2015-01-08 18:20:28 +01:00
Eelco Dolstra
066758758e Set stricter permissions on /nix/store
The nixbld group doesn't need read permission, it only needs write and
execute permission.
2015-01-08 16:57:34 +01:00
Shea Levy
037af9ffcc Revert "Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages"
Unnecessary change to the haskell packages infrastructure, will move
this to haskellng packages.

This reverts commit a9d8413737.
2015-01-08 09:40:36 -05:00
Peter Simons
8ab68f8f91 Add GHC 7.8.4 and create haskellPackages_ghc784 package set.
(cherry picked from commit 8311973759)
2015-01-08 09:29:44 -05:00
Peter Simons
7e43433012 haskell-configuration-ghc-7.9.x: improve configuration to fix some builds
(cherry picked from commit 197e7672e6)
2015-01-08 09:10:08 -05:00
Peter Simons
805870f1e6 haskell-configuration-common: cosmetic
(cherry picked from commit 0811375a69)
2015-01-08 09:09:39 -05:00
Peter Simons
e500e7c5c8 Say hello to our brand-new Haskell infrastructure.
(cherry picked from commit 54baa53df1)

Trivial conflict

Conflicts:
	pkgs/top-level/all-packages.nix
2015-01-08 09:09:02 -05:00
Domen Kožar
6d99bcdd89 pypy: trivial change to trigger rebuild 2015-01-08 10:52:30 +01:00
Domen Kožar
7a5db26b8a Merge pull request #5617 from flosse/prosody-097
nixpkgs: prosody 0.9.6 -> 0.9.7
2015-01-08 01:52:43 +01:00
Eelco Dolstra
92272d48eb Doh^2 2015-01-07 19:20:10 +01:00
Eelco Dolstra
09ab06f79a Doh 2015-01-07 12:55:07 +01:00
Eelco Dolstra
c839a6beab Revert "php: Update to 5.4.36"
This reverts commit e7d4d39c6e. The
build fails in a chroot because it tries to download a PEAR from the
network:

http://hydra.nixos.org/build/18517333
(cherry picked from commit 37ac9deb3d)
2015-01-07 12:54:06 +01:00
Eelco Dolstra
fc9c486f7b php: Update to 5.4.36
CVE-2014-8142

(cherry picked from commit e7d4d39c6e)
2015-01-07 11:36:47 +01:00
Eelco Dolstra
d39bae9c3e Disable the macvlan test
This test currently fails and blocks NixOS releases.

http://hydra.nixos.org/build/18394742
2015-01-07 11:20:46 +01:00
Markus Kohlhase
6ff4d51ab1 nixpkgs: prosody 0.9.6 -> 0.9.7 2015-01-07 09:47:19 +00:00
Shea Levy
a9d8413737 Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages
Required adding a deep override mechanism to haskell packages

(cherry picked from commit 0f04707953)
2015-01-06 14:45:44 -05:00
Domen Kožar
8be9ba0dbd Merge pull request #5611 from vlstill/14.12-perl-IdleTime
perlPackages: Add X11-IdleTime.
2015-01-06 20:08:42 +01:00
Vladimir Still
708b71cdd5 perlPackages: Add X11-IdleTime. 2015-01-06 19:32:36 +01:00
Domen Kožar
acb34ebdfb document options to nixos-install script
(cherry picked from commit c876f7a25d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-06 14:49:40 +01:00
Eelco Dolstra
86fc464dbd mercurial: Update to 3.2.4
(cherry picked from commit 0b8ac6b791)
2015-01-06 14:29:44 +01:00
Eelco Dolstra
e71b376b49 mercurial: Update to 3.2.2
(cherry picked from commit cb5433b8de)
2015-01-06 14:29:44 +01:00
Karn Kallio
0cc38ae2ed pakcs: advance version 1.11.3 to 1.11.4, also fixing the build.
(cherry picked from commit 19cd862a6d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-06 11:16:26 +01:00
aszlig
5e08d9aa98 chromium: Precompile pycs instead of deleting.
This is more of an attempt rather than a real fix (or maybe it is? let's
see) for the corrupted .pyc files during build. I believe the reason we
get these are likely due to several instances of the Python interpreter
that run in parallel and one of these processes might still be writing
the .pyc file.

So, rather than deleting all .pyc files, we now precompile then in order
to avoid any build process trying to generate any .pyc file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 597373bbd5)
2015-01-06 10:58:41 +01:00
Eelco Dolstra
af8d8673b1 gdb: Fix manpages
(cherry picked from commit 8af48d9428)
2015-01-06 10:56:59 +01:00
Eelco Dolstra
14f1b057e8 geeqie: Revert to 1.1
Version 1.2 has some relatively critical issues:

  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762257
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765437

Until these are fixed, it's better to stick to 1.1.

(cherry picked from commit fee59b1235)
2015-01-06 10:54:58 +01:00
Peter Simons
fa97e9a861 nixos/modules/services/misc/nix-daemon.nix: document meaning of '0' for the buildCores attribute
(cherry picked from commit ea94a6d653)
2015-01-05 20:05:18 +01:00
Jaka Hudoklin
afbef4ff4d nginx: syslog extension, fix git revision 2015-01-05 14:35:11 +01:00
Rob Vermaas
7f02b1f350 Update dd-agent to 5.1.1 2015-01-05 12:58:04 +01:00
Rob Vermaas
c67204dec2 dd-agent: set SSL_CERT_FILE for dogstatsd. 2015-01-05 12:57:49 +01:00
Rob Vermaas
3e73b5888e Add pythonPackages.ntplib, needed for dd-agent update. 2015-01-05 11:05:22 +01:00
Rob Vermaas
96904915d9 Minor fixes to EC2 image generation script. Set autoresponder, so no interaction is necessary. Write output in a format that can be easily included in ec2-amis.nix of nixops. 2015-01-05 09:34:34 +01:00
Rob Vermaas
bdd3a3bac8 Use nixos-images bucket for GCE images. 2015-01-05 09:32:49 +01:00
Rob Vermaas
42c0bc4b8f Fixes for script that builds and uploads EC2 s3 backed images. Mostly credential related. 2015-01-05 09:32:21 +01:00
Rob Vermaas
98af87cd4a Fix GCE image build. 2015-01-05 09:31:22 +01:00
Domen Kožar
49c0ce1dbf Add Type information into manual and manpages, fixes #4600
(cherry picked from commit d1019c3c54d8c788c91df16cba8b13d4a1c91583)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-04 15:41:17 +01:00
Franz Pletz
a2b7bc2841 t1lib: Use metalab mirrors (close #5552)
(cherry picked from commit 261e31c186)
2015-01-03 22:19:02 +01:00
Domen Kožar
65157bfe9d fix manual
(cherry picked from commit 3d7ff07258)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-03 16:32:33 +01:00
Peter Simons
5cda741c9f youtube-dl: enable the documentation build
(cherry picked from commit 64cef6eaa7)
2015-01-03 12:30:39 +01:00
Peter Simons
76ecfff019 Switch users of 'pandoc' to the lean version.
(cherry picked from commit 8235e8c544)

Conflicts:
	pkgs/servers/nosql/hyperdex/default.nix
2015-01-03 12:30:39 +01:00
Peter Simons
085bdf876a Add a 'pandoc' variant to the top-level that has no run-time dependencies on GHC or any other Haskell package.
(cherry picked from commit c2b1ff33fe)
2015-01-03 12:30:39 +01:00
Domen Kožar
35d4d87625 clarify things about hashed passwords and mutableUsers
(cherry picked from commit 1f523bb23d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-03 11:54:57 +01:00
Domen Kožar
cb58784fb9 k3b: 2.0.2 -> 2.0.3 2015-01-03 11:54:57 +01:00
Bjørn Forsman
6bce6bb452 attic: add missing dependency on 'llfuse'
Without this one cannot mount the backup repository:

 $ attic mount /backups/backup.attic mnt
 attic: the "llfuse" module is required to use this feature
 attic: Exiting with failure status due to previous errors

(cherry picked from commit ca9d370f56)
2015-01-02 15:19:48 +01:00
Bjørn Forsman
967867d6d7 python-llfuse: new package
Python bindings for the low-level FUSE API. (Needed by attic, the backup
program.)

(cherry picked from commit b8e860682b)
2015-01-02 15:19:46 +01:00
Bjørn Forsman
739bf38b49 attic: new package
attic is a deduplication backup program.

This commit is a cherry-pick + squash of the following commits from the
master branch:

1a79e7ffdc attic: fetchurl -> fetchzip
bee4a4e5dc attic: fix sha256
ec5e916f6f attic: add maintainer and platforms
1fde0738ca attic: fix missing modules at runtime
4a0aff5f3b attic: upgrade to 0.14
a8af7f16ce attic: expression cleanup
110333abd3 attic: fix path to OPENSSL headers.
6dc9ea2a2c Package attic-backup.org
2015-01-02 14:09:21 +01:00
Bjørn Forsman
ab138b4d2e libsigrok: install missing firmware files
Without this, hardware that requires firmware (e.g. Saleae Logic) is
unuseable.

Example error that this fixes:

  sr: ezusb: Unable to open firmware file /nix/store/rqgppsz3gwy8jailflf3049fzyzrgkdb-libsigrok-0.3.0/share/sigrok-firmware/fx2lafw-saleae-logic.fw for reading: No such file or directory
  sr: fx2lafw: Firmware upload failed for device 0.

(cherry picked from commit e4dd2dcad4)
2015-01-01 20:06:39 +01:00
Bjørn Forsman
7196511abc eclipse: add webkit as dependency
This makes the Eclipse internal web browser work.

The internal web browser is the default browser, and Eclipse requires
manual configuration for any other (external) web browser. To me this
means the internal browser should be working by default, unless users
will get an error popup if they click any links.

This change increases the closure size from 714 to 880 MiB
(attribute eclipses.eclipse_cpp_43).

(cherry picked from commit f364e3f8e8)
2015-01-01 13:41:19 +01:00
Vladimír Čunát
d6d7876cfb handbrake: fix download URL
(cherry picked from commit 04d410cc4d)
2015-01-01 10:15:33 +01:00
Eelco Dolstra
8a998cac50 Tweak
(cherry picked from commit c2af4f3ea8)
2015-01-01 00:55:56 +01:00
Lluís Batlle i Rossell
013705113b Fix gltron. Sinterklaas present for iElectric. 2014-12-31 10:51:39 +01:00
aszlig
814dcbea10 nixos/release-notes: Fix typo in VirtualBox notes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit d137ff33e2)
2014-12-30 23:43:24 +01:00
Eelco Dolstra
d940c7b4a8 pstack: Remove
It doesn't work anymore. And anyway, this probably shouldn't have been
a package in the first place (it's just some gdb options).

(cherry picked from commit 4a63787b78)
2014-12-30 22:41:46 +01:00
Eelco Dolstra
35c15d6e96 blender: Add OpenCOLLADA support
(cherry picked from commit 49f53f63f5)
2014-12-30 22:41:38 +01:00
Eelco Dolstra
a750cf4e02 Document small channels
(cherry picked from commit 3370ee6a13)
2014-12-30 22:41:23 +01:00
Eelco Dolstra
e137ebd5bd Release notes tweak
(cherry picked from commit cf1d9ed317)
2014-12-30 22:41:19 +01:00
Eelco Dolstra
9bc67924f0 Sort stuff
(cherry picked from commit 4df1ca0875)
2014-12-30 22:41:15 +01:00
Eelco Dolstra
9a27eac6a2 Disambiguate util-linux package names
(cherry picked from commit 035e502b5b)
2014-12-30 22:41:09 +01:00
Eelco Dolstra
8775f104f5 Create AMIs in the lb-nixos account
(cherry picked from commit 512d788a68)
2014-12-30 22:41:06 +01:00
Eelco Dolstra
6126aadbe9 Drop reference to obsolete ControlGroupAttribute option
(cherry picked from commit adf62ba9c1)
2014-12-30 22:41:02 +01:00
Eelco Dolstra
a5a7f5afb7 Release notes
(cherry picked from commit c502369a23)
2014-12-30 22:40:56 +01:00
Eelco Dolstra
c1e6f45dd5 Release date
(cherry picked from commit 5f2d5fcc12)
2014-12-30 22:40:52 +01:00
Damien Cassou
25828fa5bb Add systemd.user.timers
(cherry picked from commit dcc93abe74)
2014-12-30 22:40:01 +01:00
Igor Pashev
25e22678d2 Strongswan: preserve PATH
(cherry picked from commit 17d8029150)
2014-12-30 13:16:13 -05:00
Igor Pashev
9868631cb4 Strongswan: updown script uses ip and iptables utilities
(cherry picked from commit 2b91b9b594)
2014-12-30 13:16:13 -05:00
Igor Pashev
5776334cae Strongswan: use full path to ipsec
This fixes issue:

... charon[6135]: 11[CHD] updown: /bin/sh: ipsec: command not found

(cherry picked from commit 9bbe674927)
2014-12-30 13:16:12 -05:00
Igor Pashev
54aee1152c autoreconf may need gettext
E. g. for AC_LIB_PREFIX

(cherry picked from commit d57927748a)
2014-12-30 13:16:12 -05:00
Bjørn Forsman
a55eb1a8b9 xidel: new package
Command line tool to download and extract data from html/xml page.

http://videlibri.sourceforge.net/xidel.html

(cherry picked from commit 7f06428544)
2014-12-30 14:04:37 +01:00
Domen Kožar
b3f9ef07df Merge pull request #5504 from nckx/cleanups
Fix user-facing typos (mainly in descriptions)
(cherry picked from commit c76fb4c6ba)

Conflicts (skipped fixing missing files):
	nixos/modules/services/monitoring/cadvisor.nix
	nixos/modules/services/networking/tox-bootstrapd.nix
2014-12-30 11:09:02 +01:00
Shea Levy
139ead2b42 Add rubyLibs.redis
(cherry picked from commit 3cf0677087)
2014-12-29 16:27:35 -05:00
Shea Levy
1ac98038cc Add rubyLibs.rabbitmq_manager
(cherry picked from commit 487325a68c)
2014-12-29 16:27:35 -05:00
Shea Levy
6a6a42a2eb Add rubyLibs.newrelic_plugin
(cherry picked from commit a1e0944263)
2014-12-29 16:27:35 -05:00
Shea Levy
09ebd5331f gummiboot-builder.py: run nix with no build-users-group
During install, the bootloader script gets run inside a chroot after the
/etc/group bind-mount is unmounted. Since we're not doing any building,
this should be safe, but really nix should just not care if the group
does not exist when no build is needed.

Fixes #5494

(cherry picked from commit 9245516b46)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-29 13:16:54 +01:00
Lluís Batlle i Rossell
7eda68709e Adding scantailor. 2014-12-29 10:23:00 +01:00
Vladimír Čunát
18270196ce libpng: security update (no CVE yet)
http://www.securitytracker.com/id/1031444
(cherry picked from commit 5d903d850a)
2014-12-28 20:33:22 +01:00
Eelco Dolstra
8f8604d8d4 Fix ntpd
Since the 4.2.8 upgrade, ntpd is broken on NixOS:

  Dec 28 19:06:54 hagbard ntpd[27723]: giving up resolving host 1.nixos.pool.ntp.org: Servname not supported for ai_socktype (-8)

This appears to be because DNS resolution doesn't work in chroots
anymore (due to /etc being missing). So disable chroots for now. It's
probably better to use systemd's containment facilities anyway.

(cherry picked from commit ea9d391bb5)
2014-12-28 20:24:23 +01:00
Eelco Dolstra
f51342c6cf ntp: Don't depend on openssl, don't install docs
(cherry picked from commit 782440310d)
2014-12-28 20:24:23 +01:00
Vladimír Čunát
2b1213cd38 ntp: security update, and use libcrypto
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities

The package would no longer build without libcrypto,
and it wouldn't find it without pkgconfig.
I checked that Debian and Arch do use openssl as a dependency,
so it's probably not so bad a thing to have.

CC maintainer @edolstra.

(cherry picked from commit 0fbc5ddadb)
2014-12-28 20:24:23 +01:00
Marco Maggesi
ed2f05c04d Bumb BLCR 2014-12-28 19:48:32 +01:00
Benno Fünfstück
1d3215304c firefox-wrapper: more gstreamer plugins
The previous commit effaa51 broke some of soundcloud in firefox.
2014-12-28 12:45:06 +01:00
Eduard Bachmakov
bdfa31b4e4 Add photoqt-1.1.0.1
Also, add myself to maintainers.

(cherry picked from commit 5e4a8d9fd8)
2014-12-27 22:15:48 +01:00
Domen Kožar
af8f76c256 network-manager: specify full path to sytemctl binary 2014-12-27 11:52:42 +01:00
Domen Kožar
ea540f8fc6 udiskie: specify correct dependencies for the version bump 2014-12-27 11:52:42 +01:00
tv
4e10afdfc4 journal-mailer: camelCasify attribute name
(cherry picked from commit ce100a5d58)
2014-12-26 10:51:56 -05:00
tv
515d136af5 journal-mailer: add version 0.1.1.0
(cherry picked from commit 7015c61686)
2014-12-26 10:51:55 -05:00
muflax
5e323b44b5 bup: update to 0.26 and adopt it
[Bjørn: use patchShebangs to unbreak chroot build (fixes up references
to /usr/bin/env {python,bash}]

(cherry picked from commit e5480cab83)
2014-12-26 14:11:41 +01:00
muflax
ceb090dd2c par2cmdline: update to 0.6.11 and adopt it
[Bjørn: break overlong longDescription line]

(cherry picked from commit 001f2110bd)
2014-12-26 14:11:39 +01:00
Bjørn Forsman
b7ee71ed19 nixos/munin: add /var/setuid-wrappers to PATH
/var/setuid-wrappers is an extension of the system profile, so it
belongs in PATH for the munin service.

(cherry picked from commit 0a8623d6a9)
2014-12-25 15:44:33 +01:00
Brandon Dimcheff
cd3f849717 squish cups patches all into one statement
(cherry picked from commit 139d7f6e1a)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-24 11:01:47 +01:00
Brandon Dimcheff
ea2977d520 Fix compiled-in /bin/bash in foomatic filters
Foomatic filters contained a 64-char c string hardcoded to /bin/bash.
This caused some filters (at least pdftops) to fail.

I also had to increase the size of the string because nix paths are too
long.

(cherry picked from commit 6a2195c3a5)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-24 11:01:43 +01:00
Vladimír Čunát
116e19f0e9 nvidia_x11: maintenance+security updates
It's supposed to fix GLX problems CVE-2014-8298, see:
http://nvidia.custhelp.com/app/answers/detail/a_id/3610

Tested building all atop 14.12, and running 340.* there.

(cherry picked from commit 5a4feadd58)
2014-12-23 23:38:27 +01:00
Nikolay Amiantov
c67ab57e78 nixos-install: fix -I flag
(cherry picked from commit 22eb0e22d3)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-23 20:41:03 +01:00
Thomas Strobel
5b448a02d4 Update: Enlightenment: 0.19.1 -> 0.19.2
(cherry picked from commit 5c620a998d)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-23 20:41:03 +01:00
Matthias C. M. Troffaes
8e79570fa4 easytag: Fix "Using the 'memory' GSettings backend" (see issue #4415).
(cherry picked from commit 6c9eb020ab)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-23 20:41:02 +01:00
Matthias C. M. Troffaes
64b84d2ac0 shotwell: Fix "Using the 'memory' GSettings backend" (fix suggested by lethalman, see issue #5433).
(cherry picked from commit 1aacda5490)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-23 20:41:02 +01:00
Domen Kožar
c92cd80c4f fix selenium python bindings
(cherry picked from commit 667b97b5c2)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-23 20:41:02 +01:00
Siarhei Zirukin
9487dc19b6 gqrx: update 2.3.0 -> 2.3.2
[Bjørn: use 'gqrx:' commit message prefix]

(cherry picked from commit 3bd2c4dabf)
2014-12-23 10:26:38 +01:00
Luca Bruno
e3986e3a7a nixos: Add -verbose to xserverArgs example 2014-12-22 22:13:51 +01:00
lethalman
cdbc7b82c5 Merge pull request #5346 from svenkeidel/disable-xserver-verbose-logging
disable verbose logging for XServer, fixes #4333
2014-12-22 22:13:39 +01:00
Shea Levy
a2c14143e9 Add newrelic-sysmond
(cherry picked from commit 4e558732e7)
2014-12-22 15:13:18 -05:00
James Cook
163ccb886c jasper: Patch for CVE-2014-8138 via RedHat.
(Cherry-picked from commit 1b5c9c24dea9d5241f4a46a471d77d185b31b524.)
2014-12-22 08:21:11 -08:00
James Cook
c3902e944e jasper: Patch for CVE-2014-8137 via RedHat.
(Cherry-picked from commit 951ac10ae15bf53ea919802a8c3570518f34d86b.)
2014-12-22 08:20:51 -08:00
James Cook
95dae8ecbc jasper: Patch for CVE-2014-9029 via RedHat.
Also update homepage.

(Cherry-picked from commit 90162e7dbd5b96f04e277e6d208c9a9940d818a9.)
2014-12-22 08:20:37 -08:00
Emery Hemingway
986dfe1545 transmission-remote-gtk: meta fixup (close #5420)
(cherry picked from commit 86213a1f23)
2014-12-21 10:35:59 +01:00
Vladimír Čunát
80dbe035f3 libssh: security+maintenance to fix CVE-2014-8132
Also switched to openssl instead of libgcrypt (wouldn't compile otherwise),
and fixed meta.license.

(cherry picked from commit 7357f0ae24)
2014-12-20 14:51:23 +01:00
Vladimír Čunát
dabd851726 kde4.kmplayer: use gentoo mirror (fixes #5407)
The upstream server is down.

(cherry picked from commit ca850deb9e)
2014-12-20 10:34:54 +01:00
Domen Kožar
42b2c1f3cf crashplan: install desktop file 2014-12-19 23:25:27 +01:00
Eelco Dolstra
479d937e8a systemd: Apply upstream fixes
In particular, upstream commit 3072eecf3c714e3ed88c882623c40aca15445f64
fixes 15-character network interface names (as generated by ID_NET_NAME_MAC).

(cherry picked from commit e47ed98f9b)
2014-12-19 16:08:50 +01:00
Shea Levy
36202621ea systemd: read units from /etc/systemd-mutable
This allows for persistent units managed outside of configuration.nix

(cherry picked from commit e3825b47ec)
2014-12-19 16:08:50 +01:00
Matej Cotman
e626576c2e vlc: change url
(cherry picked from commit eebc60d7f9)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-19 15:49:49 +01:00
Mathijs Kwik
47e863666a virtualisation.qemuNetworkingOptions -> virtualisation.qemu.networkingOptions
(cherry picked from commit 6e728a42ec)
2014-12-19 13:49:46 +01:00
Mathijs Kwik
787f5a16dd nixos/qemu-vm: make networking options configurable
(cherry picked from commit 6cdacdd4a2)
2014-12-19 13:49:46 +01:00
Eelco Dolstra
2f11c9a189 Shut up a warning from udev
Issue #5260.

(cherry picked from commit 3d834a464ad63c8a4a4aa869fb1869fef1734702)
2014-12-19 13:07:56 +01:00
Eelco Dolstra
28c95385dd ssh-agent: Don't have a timeout by default
IMHO, having a short timeout (1h) defeats the point of using
ssh-agent, which is not to have to retype passphrases all the time. Of
course, users who want timeouts can set programs.ssh.agentTimeout.

This restores the 14.04 behaviour.

(cherry picked from commit 63c14e259d)
2014-12-19 13:03:24 +01:00
Bjørn Forsman
e4ecddcf3b gdmap: set meta attributes (license, platforms, maintainers)
(cherry picked from commit 4b65f53652)
2014-12-19 08:01:45 +01:00
Evgeny Egorochkin
6dc110ff00 resurrect torsocks-faster 2014-12-19 08:09:48 +02:00
Evgeny Egorochkin
44fd836210 rename torify to tsocks, to avoid name clashes and make it clear which wrapper library is used 2014-12-19 08:09:35 +02:00
Evgeny Egorochkin
c37a9adc09 torsocks: enable by default if tor client functionality is enabled 2014-12-19 08:09:26 +02:00
Evgeny Egorochkin
5dcfeeceef tor: restore the Privoxy setup, but configure the system Privoxy instead of running a separate instance. 2014-12-19 08:09:16 +02:00
Evgeny Egorochkin
d946826b25 tor: restore strong circuit isolation 2014-12-19 08:08:57 +02:00
Evgeny Egorochkin
5cd8ecd8ba Revert "nixos: Remove torify module"
tsocks is still useful because it's less strict

This reverts commit 1b26faeb69.
2014-12-19 08:08:43 +02:00
aszlig
336d6a6dca picard: Fix derivation name.
Name has been changed in c9282c65f4.

Users would probably expect "nix-env -i picard" to work, and as picard
isn't a library it doesn't make sense to set a prefix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 718666204a)
2014-12-18 23:21:20 +01:00
aszlig
b414d9df79 nixos: Add VBox hardening to 14.12 release notes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit efb2b27a8f)
2014-12-18 23:00:58 +01:00
aszlig
54c826c980 nixos/virtualbox: Revert disable hardening.
This reverts commit 5d67b17901.

The issues have been resolved by ac603e208c.

Tested this with hostonlyifs and USB support with extension pack.

Conflicts:
	nixos/modules/programs/virtualbox-host.nix

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Tested-by: tv <tv@shackspace.de>
Tested-by: Domen Kožar <domen@dev.si>
(cherry picked from commit f7384b8c75)
2014-12-18 22:43:59 +01:00
aszlig
11925d64aa nixos/tests/virtualbox: Disable debug logging.
Especially if the user isn't in the vboxusers group anymore, this gets
VERY noisy, because the VBoxSVC process emits warnings for every single
USB device noting that it's only possible to access it when the user is
in the vboxusers group.

So, we now have a debug attribute, where we can enable it when
necessary.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit d45649b415)
2014-12-18 22:43:35 +01:00
aszlig
7697962a28 nixos/tests/virtualbox: Don't use vboxusers group.
At least when we're running in hardening mode, because it's needed there
only for USB support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit ef691d5c30)
2014-12-18 22:43:35 +01:00
aszlig
e91cd4e5c2 virtualbox: Fix runtime paths in hardening mode.
Because we have to rely on setuid wrappers on NixOS, we can't easily
hardcode the executable paths and set it 4755. So for all calls, we need
to change the runtime path executable directory to /var/setuid-wrappers/
and for verification we need to retain the executable directory.

Also note, that usually VBoxNetAdpCtl, VBoxNetDHCP, VBoxNetNAT, VBoxSDL
and VBoxVolInfo don't reside in directories that are commonly in PATH,
but in /usr/lib/virtualbox in most mainstream distros. But because the
names of these executables are distinctive enough to not cause
collisions with other setuid programs, I'll leave it like that and not
patch up setuid-wrappers.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit ac603e208c)
2014-12-18 22:43:34 +01:00
aszlig
20d02244ce virtualbox: Allow to easily change the build type.
Not really changes anything in functionality, but makes it easier to
change the build type to "debug", for example.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit b69ac6c159)
2014-12-18 22:43:34 +01:00
aszlig
6c4d5f7e4d virtualbox: Fix hardcoded /sbin/ifconfig path.
Just accidentally found this while debugging and it's needed for
fetching a few interface details, not sure however whether because of
this anything has been broken so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 14ef3446e1)
2014-12-18 22:43:33 +01:00
aszlig
90c6ae5e43 virtualbox: Explicitly excempt src during install.
Instead of coping it to $out and later deleting it, we now exclude the
src directory during copy. Also, we no longer cd into the release
directory during installPhase, which should make sure that we are
constantly in $sourceRoot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 5a8c5d2768)
2014-12-18 22:43:16 +01:00
Vladimír Čunát
3865ab9e69 nixos/doc release notes: mention intel GPU driver 2014-12-18 19:03:05 +01:00
Sebastián Bernardo Galkin
9ec8d3e0ac xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.

(cherry picked from commit 06e6d7def2)
2014-12-18 19:03:05 +01:00
Eelco Dolstra
b57ea539c6 Fix container test
http://hydra.nixos.org/build/17989795
(cherry picked from commit bf0f2adbeb)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 15:57:38 +01:00
Rob Vermaas
597007f8b7 Fix sysstat build. 2014-12-18 14:47:00 +01:00
aszlig
876b0828fc nixos/tests/blivet: Fix by avoiding "nix-store".
The "nix-store" command within the VM test is running without
NIX_REMOTE=daemon and since Nix 1.8 tries to open the store database in
read-write mode even for nix-store -qR.

Now, we're doing this properly and rely on setup hooks, which is the
same method that's used when you're building a library which depends on
blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 2af435b5cd)
2014-12-18 14:12:41 +01:00
William A. Kennington III
a287614ecb kernel: 3.14.26 -> 3.14.27
(cherry picked from commit 7e8c5b578a)
2014-12-18 14:07:02 +01:00
Eelco Dolstra
142e9a9d06 sudo: Update to 1.8.11p2
(cherry picked from commit 6866712a39)
2014-12-18 12:58:42 +01:00
Eelco Dolstra
e928eeb1fd Improve /etc/sudoers message
(cherry picked from commit 89697b0fc1)
2014-12-18 12:58:34 +01:00
Domen Kožar
8566f66ea4 release notes: reindent, remove renames (redudant) 2014-12-18 12:21:45 +01:00
Domen Kožar
9bc8bcbbdc fix users.mutableUsers = false; install in iso 2014-12-18 12:18:24 +01:00
Domen Kožar
0d4acad489 crashplan: fix CrashPlanDesktop binary 2014-12-18 10:12:37 +01:00
Domen Kožar
827a9bbd44 ulex: set platforms 2014-12-18 10:01:32 +01:00
宋文武
66087ead07 jenkins: update to 1.594
(cherry picked from commit f40a613577)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 09:59:23 +01:00
Domen Kožar
b0a0fb60df dropbox: 2.0.0 -> 2.2.0, disable tests 2014-12-18 09:22:29 +01:00
Domen Kožar
33e9a0503a update release notes 2014-12-18 02:00:49 +01:00
Eelco Dolstra
9e06a26471 switch-to-configuration: Ignore slice units
(cherry picked from commit c812e45292)
2014-12-18 01:47:54 +01:00
William A. Kennington III
8f71e04e9f btrfs-progs: 3.17.2 -> 3.17.3
(cherry picked from commit 0cfd61bdea)
2014-12-18 00:40:38 +01:00
William A. Kennington III
990b5a1b3e xfsprogs: 3.2.1 -> 3.2.2
(cherry picked from commit 02f75f91f1)
2014-12-18 00:40:29 +01:00
Domen Kožar
692f5958e3 remove btrfsProgs-3_16, not needed anymore
(cherry picked from commit 9de5eb6ade)
2014-12-18 00:40:20 +01:00
William A. Kennington III
ffb104750d kernel: Remove 3.16
(cherry picked from commit 4b73212241)
2014-12-18 00:38:52 +01:00
William A. Kennington III
30e74be80f kernel: 3.14.26 -> 3.14.27
(cherry picked from commit 4eaecca7b1)
2014-12-18 00:38:37 +01:00
Eelco Dolstra
ec539dc8ff Revert "enable bash autocomplete by default"
This reverts commit ee8e15fe76. See
discussion at ee8e15fe76.

(cherry picked from commit bde9ae18cf)
2014-12-18 00:37:45 +01:00
Eelco Dolstra
6038215e9c Remove udev from /run/opengl-drivers
/run/opengl-drivers should contain only libGL-related libraries, not
stuff like udev. Injecting anything into LD_LIBRARY_PATH is dangerous
because it can break applications that expect a different version of
the library.

Caused by eef9a8ac2a. Fixes #5371.

(cherry picked from commit d34c600414)
2014-12-18 00:26:25 +01:00
Domen Kožar
44ed738567 skrooge: add boost dependency
(cherry picked from commit 179c7344cc)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-17 20:14:08 +01:00
vi
dc23b0ee8f Added mirrors for MySQL.
(cherry picked from commit 0c49b2942e)
2014-12-17 11:13:30 -05:00
Domen Kožar
5bafb9cf0f nixos/tests/gitlab.nix: set TimeoutStartSec to 10min 2014-12-17 16:40:26 +01:00
Rob Vermaas
b2d5e79e6d icecast: update from 2.4.0 to 2.4.1, potentially fixes CVE-2014-9018
(cherry picked from commit f72c7e93ce)
2014-12-17 15:51:19 +01:00
Rob Vermaas
8e527b5ef8 nodejs: update from 0.10.32 to 0.10.33, potentially fixes CVE-2014-7192
(cherry picked from commit 81f6af4a54)
2014-12-17 15:51:14 +01:00
Rob Vermaas
f41c34529f docker: update from 1.3.1 to 1.3.3, potentially fixes CVE-2014-6407, CVE-2014-6408
(cherry picked from commit 90c3dc79c5)
2014-12-17 15:51:10 +01:00
Mathijs Kwik
40b9186d58 nixos: allow adding extra modules through environment
This is useful for adding extra functionality or defaults to _every_
nixos evaluation.

My use case is overriding behaviour for all nixos tests, for example
setting packageOverrides to newer versions and changing some default
dependencies/settings.

By making this accessible through an environment variable, this can now
be fully accomplished externally. No more need to fork
nixos/nixpkgs (which becomes a maintenance burden), just use the channel
instead and plug in via this envvar.

(cherry picked from commit 73f18fd42f)
2014-12-17 09:52:59 +01:00
Vladimír Čunát
0dbc415e9d ffmpeg_2_3: use 2.2 instead of 2.3
2.3 branch is unmaintained and was critically vulnerable (I thank to monitor).

(cherry picked from commit 304484a753)
2014-12-16 21:34:06 +01:00
Eelco Dolstra
087e6895c9 cups: Build with SERVERROOT set to /etc/cups
(cherry picked from commit be0e73b938)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra
ca042d2c18 cups: Get rid of obsolete banners
These use bannertops, which no longer exists. And they conflicted with
the working banners in cups-filters.

(cherry picked from commit ffdabf02b9)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra
eb375fdec3 cupsd.nix: Clean up environment.etc
(cherry picked from commit dc6c8b9714)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra
e6fe8a3fd0 cups-filters: Fix gstoraster
It was trying to find "gs" via execve, so use execvpe instead. It's
probably better to use gs's absolute path, but maybe not every
cups-filters user needs it.

(cherry picked from commit fb079432b0)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra
2928e8d8f2 cups-filters: Fix finding GS in several filters
(cherry picked from commit 6c00d9f7e4)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:47 +01:00
Eelco Dolstra
c981a89bce cups-filters: Fix banners
It was looking in cups' prefix for the PDF templates. So for instance
printing a CUPS test page wouldn't work.

(cherry picked from commit 0aa452e179)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:47 +01:00
tv@shackspace.de
b0a2c6281a nixos/cupsd: use cups-files.conf
(cherry picked from commit b71f3c4315)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:47 +01:00
Vladimír Čunát
4a261914e6 xorg-server: security update to RC1 of 1.16.3
Close #5292. There are almost no other changes since 1.16.2
than fixing that CVE-2014-8092. See also:
http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/

(cherry picked from commit 84d6debf46)
2014-12-16 19:29:06 +01:00
Domen Kožar
118fd6f526 pypy: disable whole ssl test suit instead of a single test 2014-12-16 17:11:34 +01:00
Bjørn Forsman
5a3b1a4d40 virt-viewer: fix missing schema error
Fixes this error, as seen when trying to open a guest VM when
virt-viewer is accessed over ssh with X forwarding:

  GLib-GIO-ERROR **: Settings schema 'org.gnome.system.proxy' is not installed

A similar issue was fixed for virt-manager in commit
fb8a2b3be7 ("virt-manager: fix missing
schema error")

(cherry picked from commit a2bb84a936)
2014-12-16 14:09:15 +01:00
Eelco Dolstra
9ad2b0988b Document screen incompatibility
(cherry picked from commit 997531d172)
2014-12-16 11:28:34 +01:00
Peter Simons
839bf37647 nixos/doc/manual/release-notes/rl-1412.xml: document change of default time zone
https://github.com/NixOS/nixpkgs/pull/5332
(cherry picked from commit 60f21f983f)
2014-12-16 11:28:29 +01:00
Eelco Dolstra
0bbe723191 php-5.3: Remove
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.

(cherry picked from commit 4d918cb6c7)
2014-12-16 11:28:22 +01:00
Eelco Dolstra
df6daae1f8 Rename release notes
(cherry picked from commit df1f751f03)
2014-12-16 11:28:14 +01:00
Eelco Dolstra
aafb7aee1b virtualbox: Get tid of runtime dependency on linux.dev
(cherry picked from commit d9ce3ae57f)
2014-12-16 11:27:11 +01:00
Eelco Dolstra
237f9fc866 kdepimlibs: Get rid of a dependency on boost.dev
(cherry picked from commit 0e8373143e)
2014-12-16 11:27:11 +01:00
aszlig
d3c277710e virtualbox: Fix extension pack without hardening.
We divert to the $out/share/virtualbox directory only if we have
hardening enabled, so let's put the extension pack into
$out/libexec/virtualbox instead if we're compiling without hardening.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit eb561f0798)
2014-12-16 11:25:39 +01:00
aszlig
40e3672258 nixos/virtualbox: Fix warning on enableHardening.
The warning was displayed whenever services.virtualboxHost.enable was
true, but if people were to enable hardening, they'd still get that
annoying message.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit e36bec661c)
2014-12-16 11:25:38 +01:00
Bjørn Forsman
b43e2c752b virt-viewer: fix SPICE support
* Add missing dependency on 'spice_protocol'

* Fix new build error which came now that ./configure enables SPICE support:

  building virt-viewer
    CCLD     virt-viewer
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lgdbm
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lcap
  collect2: error: ld returned 1 exit status

  Fix by adding gddbm and libcap as inputs. Yes, libcap is needed
  _in addition_ to libcap_ng (I tested removing libcap_ng, it failed).

Without this change, virt-viewer cannot be used with guests machines
that uses SPICE.

(cherry picked from commit 477bc03568)
2014-12-16 10:51:39 +01:00
Bjørn Forsman
9e678dde06 avr8-burn-omat: update to version 2.1.2
* Update homepage / download url
* Set meta.platforms (= all)

(cherry picked from commit 39dc905310)
2014-12-15 22:32:48 +01:00
aszlig
000c24a43f nixos/tests/virtualbox: Improve logging.
This also makes showvminfo obsolete, as we get the same information from
the hosts log.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 8bbf1dc80e)
2014-12-15 19:19:45 +01:00
aszlig
0a5535ffd6 nixos/virtualbox/hostonlyif: Fix writing to /root.
Creates unnecessary cruft in the root users home directory, which we
really don't need. Except the log, but therefore we now cat the log to
stderr and the private temporary directory is cleaned up afterwards.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit d85fabd68c)
2014-12-15 19:19:44 +01:00
aszlig
c141582aaf nixos/virtualbox: Disable hardening for now.
This should display a big fat warning that people can hardly miss until
we have fixed the issues with the host-only-interfaces that persist when
hardining is enabled.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 5d67b17901)
2014-12-15 18:54:56 +01:00
aszlig
8fbe48804f nixos/tests/virtualbox: Add test for hostonlyif.
Essentially adds two more VirtualBox VMs to the test and also increases
the memory size of the qemu VM to 768 MB to make sure we don't run out
of memory too soon.

We're testing whether those two VMs can talk to either each other
(currently via ICMP only) or to/from the host via TCP/IP.

Also, this restructures the VM test a bit, so that we now pass in a
custom stage2Init script that has access to the store via a private
mount over the /nix/store that's already in the initrd. The reason why
this is a private mount is that we don't want to shadow the Nix store of
the initrd, essentially breaking cleanup functionality after the custom
stage 2 script (currently this is only "poweroff -f").

Note that setting the hostname inside the VirtualBox VM is *not* for
additional fanciness but to produce a different store path for the VM
image, so that VirtualBox doesn't bail out when trying to use an image
which is already attached to another VM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 9bf16a9c33)
2014-12-15 17:56:45 +01:00
aszlig
d50a7cc5bb nixos/virtualbox: Note about "vboxusers" group.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 245baeb2f6)
2014-12-15 17:56:45 +01:00
aszlig
6fe6960d19 virtualbox package: Disable hardening by default.
Yes, this is only on the package level, so it's possible to use
VirtualBox for example installed by nix-env -i, which of course doesn't
have access to the functionality provided by the various VirtualBox
kernel modules.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit a199eedfce)
2014-12-15 17:56:45 +01:00
aszlig
23c40d21b9 nixos/virtualbox: Allow to disable hardening.
Hardening mode in VirtualBox is quite restrictive and on some systems it
could make sense to disable hardening mode, especially while we still
have issues with hostonly networking and other issues[TM] we don't know
or haven't tested yet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit e03e0ff42a)
2014-12-15 17:56:44 +01:00
aszlig
6242e62cd6 nixos/tests/virtualbox: Generalize expression.
We're going to create more than one VirtualBox VM, so let's dynamically
generate subs specific to a particular VirtualBox VM, merging everything
into the testScript and machine expressions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 77831e8467)
2014-12-15 17:56:44 +01:00
aszlig
9cf63120e8 nixos: Add VM test for VirtualBox.
Currently it pretty much tests starting up virtual machines and just
shutting down afterwards, but for both VBoxManage and the VirtualBox
GUI.

This helps catching errors in hardened mode, however we still need to
test whether networking works the way intended (and I fear that this is
broken at the moment).

The VirtualBox VM is _not_ using hardware virtualization support (thus
we use system = "i686-linux", because x86_64 has no emulation support),
because we're already within a qemu VM, which means it's going to be
slow as hell (that's why I've written own subs just for testing
startup/shutdown/whatnot with respective timeouts).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 69858d7743)
2014-12-15 17:56:44 +01:00
Thomas Tuegel
87d8deef6c nixos: fix config.fonts.fontconfig.ultimate.allowBitmaps
The option was incorrectly negated, so that 'allowBitmaps = true'
actually disabled bitmap fonts.
2014-12-15 09:18:11 -06:00
Thomas Tuegel
ccce6171e9 fontconfig-ultimate: do not replace terminus or proggy fonts 2014-12-15 09:18:02 -06:00
Rob Vermaas
2b143522c9 cron: make into systemd.service and make it depend on /etc/localtime
so that changes in timezone will trigger a restart of cron service.

(cherry picked from commit b48e41b8d7)
2014-12-15 14:52:27 +01:00
Eelco Dolstra
58bc726d76 strace: Update to 4.9
(cherry picked from commit 1a504e3fb7)
2014-12-15 14:50:15 +01:00
Eelco Dolstra
84cc6a14a9 Fix using Apache httpd 2.2
(cherry picked from commit cfe26e4438)
2014-12-15 14:50:15 +01:00
Domen Kožar
59fa67e5a0 pypy: disable cpickle test..
(cherry picked from commit 5819f29875)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-15 14:18:17 +01:00
Eelco Dolstra
f82ab5981c Fix ANSI escape in warning messages
Seems to have been broken by accident in 7d1ddae58e.
2014-12-15 12:08:31 +01:00
Jaka Hudoklin
ec2a51519d nixos/gitlab: enable tests in release 2014-12-15 00:39:04 +01:00
Vladimír Čunát
8938e6a224 gcc-4.6: bump to 4.6.4
The dropped patch was applied upstream within the update.

(cherry picked from commit 9cdd231ad3)
2014-12-14 22:48:18 +01:00
Thomas Tuegel
e32a0ad78c zotero: use firefox instead of xulrunner to fix i686 build 2014-12-14 13:50:12 -06:00
Shea Levy
44da04f80d nix-exec: use nix stable
(cherry picked from commit e82aed56f9)
2014-12-14 13:11:49 -05:00
Domen Kožar
24cba87e7f libsepol: fix download url 2014-12-14 19:05:26 +01:00
Domen Kožar
1f059cd5a9 python: 2.7.8 -> 2.7.9 2014-12-14 19:05:26 +01:00
Bjørn Forsman
a05c5d6762 libreoffice: fix Exec= in .desktop files
Before we do substitutions, the Exec= line is (currently)
"Exec=libreofficedev4.3 --some-arg". Our substitution logic doesn't handle
that, resulting in broken "Exec=$out/bin/sofficedev4.3 --some-arg"
($out/bin/sofficedev4.3 doesn't exist).

Looking at libreoffice source, the .desktop files refer to a UNIXBASISROOTNAME
variable which come from instsetoo_native/util/openoffice.lst.in. Currently, it
can have one of two values, presumably depending on whether the build is
"normal" or "development":

  libreoffice${major}.${minor}

  libreofficedev${major}.${minor}

Handle both these cases, and also leave the old non-versioned substitution
around, just in case.

Fixes issue #3463.

(cherry picked from commit 64661f0597)
2014-12-14 18:10:54 +01:00
Vladimír Čunát
743157a95f gnat: make it build again (close #5307)
Problems are worked around by using older gcc wrapper for gnat bootstrap.
(from ca441636f1^)

I tried nicer solutions first, but I was unable to fix all problems for hours.

(cherry picked from commit 1a0a161920)
2014-12-14 17:12:41 +01:00
Domen Kožar
fa4e45f20c add chromium test to the tested job 2014-12-14 13:46:48 +01:00
Domen Kožar
fde7e1286e fix quake3 test 2014-12-14 13:34:04 +01:00
Sebastián Bernardo Galkin
a8510482d9 Fix networkmanager resumeCommands
Small typo prevented the post resume script to restart network manager

(cherry picked from commit aba0d8a73d)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 13:09:59 +01:00
Domen Kožar
ad4e371acf typo 2014-12-14 11:28:58 +01:00
Domen Kožar
0e37a9fa41 http://nixos.org -> https://nixos.org 2014-12-14 11:26:21 +01:00
Vladimír Čunát
2d600bd184 broadcom_sta: fix build with kernel 3.18 (close #5315)
I couldn't find any source that looked reliable, but I guess it's better
than nothing: it's fairly simple patch that fixes the build.

(cherry picked from commit 274a9419c1)
2014-12-14 10:53:31 +01:00
Eelco Dolstra
b1f8f90e52 nix-repl: Update
(cherry picked from commit bd0d1e836c)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 09:51:58 +01:00
Eelco Dolstra
d6373f2ac4 nix: Update to 1.8
(cherry picked from commit e115bdecd8)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 09:51:54 +01:00
Eelco Dolstra
cef8e2df7d Add nix-serve
(cherry picked from commit 188c038897)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 09:51:48 +01:00
Jaka Hudoklin
97ec11c43b nixos/gitlab: imporove tests 2014-12-14 09:49:50 +01:00
Jaka Hudoklin
5e41ab79f7 gitlab: fix i686-linux build and module
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 09:49:50 +01:00
Jaka Hudoklin
e048d38d4e nixos/kubernetes: fix test, make more deterministic by having more ram 2014-12-14 02:44:10 +01:00
Mathijs Kwik
a1b77e0f9a ghc-head: upgrade to 2014-12-10
(cherry picked from commit 04f73ed2e4)
2014-12-13 21:18:54 +01:00
Mathijs Kwik
a266855d15 dvdauthor: fix building against glibc 2.20
and 2 other patches from redhat

(cherry picked from commit 9a7d425edd)
2014-12-13 21:18:41 +01:00
Mathijs Kwik
27df8a588f mkvtoolnix: fix to find boost lib
(cherry picked from commit 752554cdcb)
2014-12-13 21:18:34 +01:00
Domen Kožar
94c1406951 fix perl build failures 2014-12-13 16:32:09 +01:00
Domen Kožar
6425765553 lzma-conduit: broken on 32bit linux, see #5313
(cherry picked from commit 4709c950f0)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-13 15:28:35 +01:00
Domen Kožar
b7894032b4 hhvm: use upstream patches to fix the build 2014-12-13 15:22:38 +01:00
aszlig
2460b40331 nixos/virtualbox: Fix setuid wrappers.
We only need to have setuid-root wrappers for VBox{Headless,SDL} and
VirtualBox, otherwise VBoxManage will run as root and NOT drop
privileges!

Fixes #5283.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 0d71ec8a6e)
2014-12-13 07:52:59 +01:00
Domen Kožar
b1140ab80c Merge pull request #5314 from offlinehacker/teh-gitlab-release-14.12
[14.12] nixos: Add gitlab and gitlab-shell
2014-12-12 19:56:46 +01:00
Domen Kožar
896036d8e5 whitespace change to fix k2pdfopt build 2014-12-12 18:37:50 +01:00
Domen Kožar
23d01bb90c gltron: mark as broken 2014-12-12 18:36:15 +01:00
Jaka Hudoklin
b82803983b nixos/gitlab: fixes
- fix timezone data not found
- fix module, add simple test
- allow to set port
2014-12-12 18:09:08 +01:00
Thomas Hunger
0c95c87758 nixos: Add gitlab and gitlab-shell
I had to make several adjustments to make it work with nixos:

* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
  pre-receive.
* Modify gitlab-shell to write some environment variables into
  the .authorized_keys file to make sure gitlab-shell reads the
  correct config file.
* Log unicorn output to syslog.
  I tried various ways of adding a syslog package but the bundler would
  not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
  This is useful to run e.g. backups etc. with the correct
  environment set up.
2014-12-12 18:09:06 +01:00
Domen Kožar
9d0d9ae9f7 hhvm: 3.2.0 -> 3.3.0, fix build 2014-12-12 17:08:28 +01:00
Domen Kožar
6c406b9425 Merge pull request #5310 from offlinehacker/kubernetes_fleet_rename
[14.12] nixos: move kubernetes & fleet to services/cluster
2014-12-12 15:37:16 +01:00
Jaka Hudoklin
d88567ed08 nixos: move kubernetes & fleet to services/cluster 2014-12-12 14:39:51 +01:00
Michael Raskin
5a104cdcd9 Fix fetchzip for actuall zip files
(cherry picked from commit 9ed097ab50)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 13:58:29 +01:00
Michael Raskin
3461855316 Improve eudev paths in the same way as they are set in the original package 2014-12-12 13:58:17 +01:00
Domen Kožar
a9590e474d Merge pull request #5280 from vcunat/p/hibernation
nixos: check resumeDevice is absolute path and document
2014-12-12 11:11:15 +01:00
Massimo Zaniboni
a3ed55b99a redmine: use libc libciconv implementation on Linux.
(cherry picked from commit 32f9644943)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:48:11 +01:00
ambrop7@gmail.com
c19ca69ac8 virtualbox: Unbreak the nixos module.
(cherry picked from commit 65393ca8d3)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:47:35 +01:00
ambrop7@gmail.com
268f3f4cc7 virtualbox: Allow disabling the network interface.
The current nixos module for VirtualBox unconditionally configures a vboxnet0
network interface at boot. This may be undesired, especially when the user wants
to manage network interfaces in a centralized manner.

(cherry picked from commit 9fa2c35ec8)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:46:46 +01:00
aszlig
4504b12bc1 nixos-install: Pass CA cert bundle to chroot.
Since we're using HTTPS for the binary cache (introduced in faf0797) by
default, the binary cache should also be available during installation.

The file that is defined in SSL_CERT_FILE outside of the chroot is
copied over to /tmp/ca-cert.crt inside the chroot, so we have an
absolute path we can reference during nixos-install. However, this might
end up with the file not being cleaned up properly from outside of the
store, but neither would be /tmp/root so the cleanup issue needs to be
solved in another place (or commit to be more exact).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit cf7f15c92c)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:46:11 +01:00
Bjørn Forsman
d410622cdf nixos/gnome: enable MTP support in gvfs
To support browsing files on Android phones in Nautilus (and other GVFS
based file browsers).

(cherry picked from commit f3a46c3858)
2014-12-12 07:58:37 +01:00
Vladimír Čunát
a1c1589b52 Merge #5286: ati-driver: Update to 4.12
(cherry picked from commit 80e3018bc0)
2014-12-11 22:13:46 +01:00
Domen Kožar
9629a59a4c deluge: 1.3.10 -> 1.3.11 2014-12-11 15:40:35 +01:00
Domen Kožar
c8d9073c0e pythonPackages.pyptlib: disable tests 2014-12-11 11:22:55 +01:00
Domen Kožar
6ce4ea5482 remove libvlc, unused package
cc @ttuegel

(cherry picked from commit aaf998f604)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 10:39:42 +01:00
Domen Kožar
d58fd144ac folly: disable on 32bit (unsupported)
(cherry picked from commit 776d796221)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 10:39:34 +01:00
Domen Kožar
20fdf0fab1 classpath: fix build
(cherry picked from commit 3c9828fd77)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 10:39:26 +01:00
Domen Kožar
322607e6ce opentsdb: patch shebangs in correct directory 2014-12-11 09:17:23 +01:00
Michael Raskin
8b55030957 Update/Fix OVMF
(cherry picked from commit a199693cab)
2014-12-11 08:53:23 +03:00
Domen Kožar
d92b7b7a67 fix builds for rest of kernel modules on 3.18
(cherry picked from commit 27281f660c)
2014-12-11 02:04:15 +01:00
Vladimír Čunát
a4afaf15e8 kde: fix CVE-2014-8600 by upstream patches
https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.

(cherry picked from commit 15b9626a3d)
2014-12-10 21:53:54 +01:00
Vladimír Čunát
55d793f2fb libyaml: fix CVE-2014-9130 by upstream patch
(cherry picked from commit c8a53923fc)
2014-12-10 21:53:54 +01:00
Vladimír Čunát
3fb1e7ed7c cpio: fix CVE-2014-9112 by Fedora patch
(cherry picked from commit 225ddcda9a)
2014-12-10 21:53:54 +01:00
Domen Kožar
6efba89335 Revert "xulrunner: use gold linker"
This reverts commit fc31d6dbc7.

Error occurs randomly: http://hydra.nixos.org/eval/1165369
2014-12-10 21:14:27 +01:00
Domen Kožar
79387f419d python3Packages.dateutil_2_1: fix build 2014-12-10 21:10:40 +01:00
Peter Simons
1bfa102c9b vimus: disable Linux 32 bit builds
https://ghc.haskell.org/trac/ghc/ticket/9825
(cherry picked from commit 57c5b8f5e1)
2014-12-10 19:31:57 +01:00
Emery Hemingway
7a0036d129 glibc_multi: fix package name (close #5284)
"multi" should be between the "glibc" and the version

(cherry picked from commit be2060f1e7)
2014-12-10 18:33:54 +01:00
Eelco Dolstra
3a491aaacb php: Really update to 5.4.34
75738437a4 only updated the version string...

(cherry picked from commit 55d59eefb3)
2014-12-10 17:19:56 +01:00
Vladimír Čunát
d7b053a44c apparmor: fix build by using older perl
This is work around #5270.
Also bogus path in wrapper got fixed.

CC: maintainers @phreedom, @thoughtpolice.
It would be better to test this as well by someone who actually uses it.

(cherry picked from commit 62e5e2a880)
2014-12-10 16:14:49 +01:00
Eelco Dolstra
6b63c46167 Update version delta for 14.12 2014-12-10 15:50:19 +01:00
Eelco Dolstra
f7410b4119 Shorten the version string
As suggested by Bjørn Forsman, use the number of commits in the
release branch.

(cherry picked from commit 21e8cfac80)
2014-12-10 15:50:19 +01:00
Eelco Dolstra
4497f1e7f0 Set the channel for this release 2014-12-10 15:50:18 +01:00
Vladimír Čunát
bdf161ed8d dolphin-emu-master: disable unsupported i686 platform
(cherry picked from commit e815624b67)
CC maintainer @MP2E.
2014-12-10 15:44:02 +01:00
Vladimír Čunát
9530bb2174 shotcut: mark as broken for now
(cherry picked from commit b65c8ffc37)
2014-12-10 15:36:26 +01:00
Mathijs Kwik
fc31d6dbc7 xulrunner: use gold linker 2014-12-10 13:56:40 +01:00
Vladimír Čunát
9532b0b1f4 luminance-hdr: fix build by Debian patch
(cherry picked from commit 8ca78f0376)
2014-12-10 13:37:35 +01:00
Vladimír Čunát
d5428a8ea9 qt5SDK: fix build by not building docs
Feel free to find a proper fix.

(cherry picked from commit d7a7b72353)
2014-12-10 13:21:45 +01:00
Vladimír Čunát
f7ad0d2e19 root: fix build by upstream patch
Also refactor the expression a little.

(cherry picked from commit 7ce485ff0f)
2014-12-10 13:11:42 +01:00
Domen Kožar
fbc784c22c flexget: fix runtime dependencies 2014-12-10 12:53:53 +01:00
Domen Kožar
671efd23de lttng-modules: fix build on kernel 3.18 2014-12-10 12:53:53 +01:00
Domen Kožar
cab4205ad7 v4l2loopback: fix build in kernel 3.18 2014-12-10 12:53:53 +01:00
Vladimír Čunát
0681d61c37 nixos: check resumeDevice is absolute path and document
Fixes #5219 after merging #4995.
2014-12-10 11:49:25 +01:00
aszlig
6757f0c7fc tomahawk: Fix resolver signature verification.
Requires the OpenSSL QCA plugin, otherwise QCA is unable to load the
Tomahawk public key.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-10 10:29:16 +01:00
Domen Kožar
5b8544337f tcpcrypt: 2011.07.22 -> 0.3rc1, fix nixos service 2014-12-10 10:23:28 +01:00
Domen Kožar
d3df56dfa1 gmpc: fix build 2014-12-10 09:55:22 +01:00
Domen Kožar
3703e4d00a fix a bunch of perl modules 2014-12-10 01:37:37 +01:00
Bjørn Forsman
f8047b48a1 lttng-modules: fix build on linux 3.14.x
By applying patch from upstream mailing list[1] (should be in the next
release).

[1]: http://lists.lttng.org/pipermail/lttng-dev/2014-December/023914.html

(cherry picked from commit 507e78fb94)
2014-12-09 19:35:43 +01:00
Bjørn Forsman
2f430a1ac4 buildbot-slave: align attrname with pkgname
Keep old attrname (buildbotSlave) around for backward compatibility.

(cherry picked from commit 1b396c7ae9)
2014-12-09 19:16:10 +01:00
Bjørn Forsman
0e9216f653 buildbot{,-slave}: update 0.8.8 -> 0.8.10
Build tested. Source distribution is now on pypi instead of googlecode.

(cherry picked from commit 99eab9f1e2)
2014-12-09 19:16:08 +01:00
Ricardo M. Correia
61fa393169 flashplayer: Update from 11.2.202.424 -> 11.2.202.425 2014-12-09 19:08:58 +01:00
Eelco Dolstra
eb7e458d2a Use https://cache.nixos.org
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-09 15:18:57 +01:00
Domen Kožar
1049988db4 14.11 -> 14.12 2014-12-09 15:03:41 +01:00
Domen Kožar
9ffe20cbff pyptlib: disable py3k and pypy 2014-12-09 13:22:20 +01:00
Domen Kožar
c92f24a815 PyQt: fix build 2014-12-09 13:20:25 +01:00
Domen Kožar
87cdd944da gosmore: fix build 2014-12-09 12:40:21 +01:00
Domen Kožar
c219abb81a ccp-netlib: fix build by downgrading boost 2014-12-09 12:36:23 +01:00
Domen Kožar
1b10d224c8 boringssl: fix build 2014-12-09 12:32:08 +01:00
Domen Kožar
ef0eac28e5 remove cppnetlib, we already have cpp-netlib 2014-12-09 12:24:42 +01:00
Domen Kožar
7a396ad522 nixos.tests.bittorrent: mark torrent as private
Hopefully that resolves transient errors with DHT
such as http://hydra.nixos.org/build/17784957
2014-12-09 12:08:13 +01:00
Domen Kožar
b8d5958ccc mariadb: 10.0.14 -> 10.0.15 2014-12-09 11:27:37 +01:00
Domen Kožar
1937962e79 xfdesktop: 4.10.2 -> 4.10.3 2014-12-09 11:27:18 +01:00
Domen Kožar
a327bb6f17 xfce4.xfce4-power-manager: 1.3.0 -> 1.3.2 2014-12-09 11:12:24 +01:00
aszlig
fca406ca8e tomahawk: Fix finding Phonon VLC backend.
Using propagatedBuildInputs only works for environment.systemPackages
but not for using nix-env, because on NixOS we already have a default
QT_PLUGIN_PATH set there.

The main reason why I'm using the VLC backend and not providing options
for other Phonon backends is because it's recommended upstream and also
will be directly used (via libvlc) in the upcoming 0.9 release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-09 10:19:28 +01:00
aszlig
dea4ef3497 tomahawk: Update to bugfix release 0.8.2.
Fixes a few annoying bugs (in my case it's the painting issue that's
most annoying):

 * Show error message if saving tags failed.
 * Fixed painting issue on search page.
 * (OS X & Windows) Fixed crash during collection scan.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-09 10:19:23 +01:00
William A. Kennington III
74d1336c67 kernel: 3.14.25 -> 3.14.26 2014-12-09 10:18:48 +01:00
William A. Kennington III
6469098f1c kernel: 3.17.4 -> 3.17.6 2014-12-09 10:18:42 +01:00
William A. Kennington III
c73f4aba55 kernel: 3.4.104 -> 3.4.105 2014-12-09 10:18:35 +01:00
William A. Kennington III
8b4ae0d8f1 kernel: 3.12.33 -> 3.12.34 2014-12-09 10:18:25 +01:00
William A. Kennington III
8ea79ac189 kernel: 3.10.61 -> 3.10.62 2014-12-09 10:18:19 +01:00
William A. Kennington III
611419beba kernel: Add 3.18 2014-12-09 10:18:12 +01:00
Bjørn Forsman
bfaf5e0652 thrift: update 0.9.1 -> 0.9.2
* Drop unneeded patch to fix build error; now included upstream
* Fetch tarball instead of using git
* Drop unneeded autotools deps since we're building from tarball

TODO: Package boost-test library, so that we can run the test suite.
(cherry picked from commit 3871539d3b)
2014-12-08 22:54:44 +01:00
687 changed files with 151152 additions and 11081 deletions

View File

@@ -1 +1 @@
14.11
14.12

View File

@@ -1,10 +1,10 @@
Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package
manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code.
Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package
manager. Nixpkgs also includes [NixOS](https://nixos.org/nixos/) linux distribution source code.
* [NixOS installation instructions](http://nixos.org/nixos/manual/#ch-installation)
* [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](http://nixos.org/nixos/manual/)
* [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)
* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Continuous build](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Tests](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Mailing list](https://lists.science.uu.nl/mailman/listinfo/nix-dev)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)

View File

@@ -1,6 +1,6 @@
if ! builtins ? nixVersion || builtins.compareVersions "1.7" builtins.nixVersion == 1 then
abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade!"
abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade! See https://nixos.org/wiki/How_to_update_when_nix_is_too_old_to_evaluate_nixpkgs"
else

View File

@@ -222,6 +222,16 @@ rec {
isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
/* Convert a store path to a fake derivation. */
toDerivation = path:
let path' = builtins.storePath path; in
{ type = "derivation";
name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path'));
outPath = path';
outputs = [ "out" ];
};
/* If the Boolean `cond' is true, return the attribute set `as',
otherwise an empty attribute set. */
optionalAttrs = cond: as: if cond then as else {};

View File

@@ -17,6 +17,7 @@
AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
antono = "Antono Vasiljev <self@antono.info>";
ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
arobyn = "Alexei Robyn <shados@shados.net>";
asppsa = "Alastair Pharo <asppsa@gmail.com>";
@@ -53,6 +54,7 @@
dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
doublec = "Chris Double <chris.double@double.co.nz>";
ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
eikek = "Eike Kettner <eike.kettner@posteo.de>";
@@ -112,6 +114,7 @@
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
@@ -151,6 +154,7 @@
smironov = "Sergey Mironov <ierton@gmail.com>";
sprock = "Roger Mason <rmason@mun.ca>";
spwhitt = "Spencer Whitt <sw@swhitt.me>";
stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
tailhook = "Paul Colomiets <paul@colomiets.name>";
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
@@ -176,6 +180,7 @@
wjlroe = "William Roe <willroe@gmail.com>";
wkennington = "William A. Kennington III <william@wkennington.com>";
wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
wscott = "Wayne Scott <wsc9tt@gmail.com>";
wyvie = "Elijah Rum <elijahrum@gmail.com>";
yarr = "Dmitry V. <savraz@gmail.com>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";

View File

@@ -79,6 +79,7 @@ rec {
declarations = filter (x: x != unknownModule) opt.declarations;
internal = opt.internal or false;
visible = opt.visible or true;
type = opt.type.name or null;
}
// (if opt ? example then { example = scrubOptionValue opt.example; } else {})
// (if opt ? default then { default = scrubOptionValue opt.default; } else {})

View File

@@ -208,4 +208,8 @@ rec {
# standard GNU Autoconf scripts.
enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
# Check whether a value is a store path.
isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == (builtins.storeDir or "/nix/store");
}

View File

@@ -93,8 +93,10 @@ rec {
# derivation is a reserved keyword.
package = mkOptionType {
name = "derivation";
check = isDerivation;
merge = mergeOneOption;
check = x: isDerivation x || isStorePath x;
merge = loc: defs:
let res = mergeOneOption loc defs;
in if isDerivation res then res else toDerivation res;
};
path = mkOptionType {

View File

@@ -1,7 +1,7 @@
FROM busybox
RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \
wget -O- http://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \
wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \
mkdir -m 0755 /nix && USER=root sh $dir/*/install && \
echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile

View File

@@ -58,12 +58,10 @@ controls memory allocation limits; by default, all processes are in
the top-level cgroup, so any service or session can exhaust all
available memory. Per-cgroup memory limits can be specified in
<filename>configuration.nix</filename>; for instance, to limit
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap)
and 640 MiB of RAM (including swap):
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
<programlisting>
systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ];
</programlisting>
</para>
@@ -72,4 +70,4 @@ systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.lim
continuously updated list of all cgroups with their CPU and memory
usage.</para>
</chapter>
</chapter>

View File

@@ -12,9 +12,9 @@ pre-built binary. That is, whenever a command like
<command>nixos-rebuild</command> needs a path in the Nix store, Nix
will try to download that path from the Internet rather than build it
from source. The default binary cache is
<uri>http://cache.nixos.org/</uri>. If this cache is unreachable, Nix
operations may take a long time due to HTTP connection timeouts. You
can disable the use of the binary cache by adding <option>--option
<uri>https://cache.nixos.org/</uri>. If this cache is unreachable,
Nix operations may take a long time due to HTTP connection timeouts.
You can disable the use of the binary cache by adding <option>--option
use-binary-caches false</option>, e.g.
<screen>
@@ -30,4 +30,4 @@ $ nixos-rebuild switch --option binary-caches http://my-cache.example.org/
</para>
</section>
</section>

View File

@@ -10,7 +10,7 @@
use NetworkManager. You can enable NetworkManager by setting:
<programlisting>
services.networkmanager.enable = true;
networking.networkmanager.enable = true;
</programlisting>
some desktop managers (e.g., GNOME) enable NetworkManager
@@ -19,8 +19,8 @@ automatically for you.</para>
<para>All users that should have permission to change network settings
must belong to the <code>networkmanager</code> group.</para>
<note><para><code>services.networkmanager</code> and
<code>services.wireless</code> can not be enabled at the same time:
<note><para><code>networking.networkmanager</code> and
<code>networking.wireless</code> can not be enabled at the same time:
you can still connect to the wireless networks using
NetworkManager.</para></note>

View File

@@ -20,7 +20,8 @@ let
declarations = map (fn: stripPrefix fn) opt.declarations;
}
// optionalAttrs (opt ? example) { example = substFunction opt.example; }
// optionalAttrs (opt ? default) { default = substFunction opt.default; });
// optionalAttrs (opt ? default) { default = substFunction opt.default; }
// optionalAttrs (opt ? type) { type = substFunction opt.type; });
prefix = toString ../../..;

View File

@@ -106,6 +106,15 @@ options = {
</listitem>
</varlistentry>
<varlistentry>
<term><varname>types.package</varname></term>
<listitem>
<para>A derivation (such as <literal>pkgs.hello</literal>) or a
store path (such as
<filename>/nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10</filename>).</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>types.listOf</varname> <replaceable>t</replaceable></term>
<listitem>
@@ -138,4 +147,4 @@ You can also create new types using the function
<varname>mkOptionType</varname>. See
<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
</section>
</section>

View File

@@ -50,8 +50,8 @@ Or, to base your local branch on the latest version available in the
NixOS channel:
<screen>
$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location
Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
$ curl -sI https://nixos.org/channels/nixos-unstable/ | grep Location
Location: https://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
$ git checkout -b local acaf4a6
</screen>
@@ -92,4 +92,4 @@ to <command>nix-env</command>, as it will break after interpreting expressions
in <filename>nixos/</filename> as packages.</para>
-->
</chapter>
</chapter>

View File

@@ -14,8 +14,8 @@ been built. These channels are:
<itemizedlist>
<listitem>
<para>Stable channels, such as <literal
xlink:href="http://nixos.org/channels/nixos-14.04">nixos-14.04</literal>.
<para><emphasis>Stable channels</emphasis>, such as <literal
xlink:href="https://nixos.org/channels/nixos-14.12">nixos-14.12</literal>.
These only get conservative bug fixes and package upgrades. For
instance, a channel update may cause the Linux kernel on your
system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
@@ -23,26 +23,40 @@ been built. These channels are:
3.11.<replaceable>x</replaceable> (a major change that has the
potential to break things). Stable channels are generally
maintained until the next stable branch is created.</para>
<para></para>
</listitem>
<listitem>
<para>The unstable channel, <literal
xlink:href="http://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
<para>The <emphasis>unstable channel</emphasis>, <literal
xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
This corresponds to NixOSs main development branch, and may thus
see radical changes between channel updates. Its not recommended
for production systems.</para>
</listitem>
<listitem>
<para><emphasis>Small channels</emphasis>, such as <literal
xlink:href="https://nixos.org/channels/nixos-14.12-small">nixos-14.12-small</literal>
or <literal
xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These
are identical to the stable and unstable channels described above,
except that they contain fewer binary packages. This means they
get updated faster than the regular channels (for instance, when a
critical security patch is committed to NixOSs source tree), but
may require more packages to be built from source than
usual. Theyre mostly intended for server environments and as such
contain few GUI applications.</para>
</listitem>
</itemizedlist>
To see what channels are available, go to <link
xlink:href="http://nixos.org/channels"/>. (Note that the URIs of the
xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
various channels redirect to a directory that contains the channels
latest version and includes ISO images and VirtualBox
appliances.)</para>
<para>When you first install NixOS, youre automatically subscribed to
the NixOS channel that corresponds to your installation source. For
instance, if you installed from a 14.04 ISO, you will be subscribed to
the <literal>nixos-14.04</literal> channel. To see which NixOS
instance, if you installed from a 14.12 ISO, you will be subscribed to
the <literal>nixos-14.12</literal> channel. To see which NixOS
channel youre subscribed to, run the following as root:
<screen>
@@ -53,20 +67,26 @@ nixos https://nixos.org/channels/nixos-unstable
To switch to a different NixOS channel, do
<screen>
$ nix-channel --add http://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
$ nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
</screen>
(Be sure to include the <literal>nixos</literal> parameter at the
end.) For instance, to use the NixOS 14.04 stable channel:
end.) For instance, to use the NixOS 14.12 stable channel:
<screen>
$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
$ nix-channel --add https://nixos.org/channels/nixos-14.12 nixos
</screen>
But if you want to live on the bleeding edge:
If you have a server, you may want to use the “small” channel instead:
<screen>
$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos
$ nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos
</screen>
And if you want to live on the bleeding edge:
<screen>
$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos
</screen>
</para>

View File

@@ -11,12 +11,29 @@
<refnamediv>
<refname><command>nixos-install</command></refname>
<refpurpose>install NixOS</refpurpose>
<refpurpose>install bootloader and NixOS</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>nixos-install</command>
<arg>
<arg choice='plain'><option>-I</option></arg>
<replaceable>path</replaceable>
</arg>
<arg>
<arg choice='plain'><option>--root</option></arg>
<replaceable>root</replaceable>
</arg>
<arg>
<arg choice='plain'><option>--show-trace</option></arg>
</arg>
<arg>
<arg choice='plain'><option>--chroot</option></arg>
</arg>
<arg>
<arg choice='plain'><option>--help</option></arg>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -55,6 +72,56 @@ it.</para>
</refsection>
<refsection><title>Options</title>
<para>This command accepts the following options:</para>
<variablelist>
<varlistentry>
<term><option>--root</option></term>
<listitem>
<para>Defaults to <filename>/mnt</filename>. If this option is given, treat the directory
<replaceable>root</replaceable> as the root of the NixOS installation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-I</option></term>
<listitem>
<para>Add a path to the Nix expression search path. This option may be given multiple times.
See the NIX_PATH environment variable for information on the semantics of the Nix search path.
Paths added through <replaceable>-I</replaceable> take precedence over NIX_PATH.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--show-trace</option></term>
<listitem>
<para>Causes Nix to print out a stack trace in case of Nix expression evaluation errors.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--chroot</option></term>
<listitem>
<para>Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--help</option></term>
<listitem>
<para>Synonym for <command>man nixos-install</command>.</para>
</listitem>
</varlistentry>
</variablelist>
</refsection>
<refsection><title>Examples</title>
@@ -72,6 +139,7 @@ $ mount /dev/sda1 /mnt
$ nixos-generate-config --root /mnt
$ # edit /mnt/etc/nixos/configuration.nix
$ nixos-install
$ reboot
</screen>
</para>

View File

@@ -1,7 +1,7 @@
<refentry xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude">
<refmeta>
<refentrytitle><command>nixos-rebuild</command></refentrytitle>
<manvolnum>8</manvolnum>
@@ -22,7 +22,8 @@
<arg choice='plain'><option>boot</option></arg>
<arg choice='plain'><option>test</option></arg>
<arg choice='plain'><option>build</option></arg>
<arg choice='plain'><option>dry-run</option></arg>
<arg choice='plain'><option>dry-build</option></arg>
<arg choice='plain'><option>dry-activate</option></arg>
<arg choice='plain'><option>build-vm</option></arg>
<arg choice='plain'><option>build-vm-with-bootloader</option></arg>
</group>
@@ -114,10 +115,22 @@ $ nix-build /path/to/nixpkgs/nixos -A system
</varlistentry>
<varlistentry>
<term><option>dry-run</option></term>
<term><option>dry-build</option></term>
<listitem>
<para>Simply show what store paths would be built or downloaded
by any of the operations above.</para>
<para>Show what store paths would be built or downloaded by any
of the operations above, but otherwise do nothing.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>dry-activate</option></term>
<listitem>
<para>Build the new configuration, but instead of activating it,
show what changes would be performed by the activation (i.e. by
<command>nixos-rebuild test</command>). For
instance, this command will print which systemd units would be
restarted. The list of changes is not guaranteed to be
complete.</para>
</listitem>
</varlistentry>

View File

@@ -15,7 +15,7 @@
</author>
<copyright>
<year>2007-2013</year>
<year>2007-2015</year>
<holder>Eelco Dolstra</holder>
</copyright>

View File

@@ -32,6 +32,7 @@
<xi:include href="configuration/configuration.xml" />
<xi:include href="administration/running.xml" />
<!-- <xi:include href="userconfiguration.xml" /> -->
<xi:include href="development/development.xml" />
<xi:include href="release-notes/release-notes.xml" />
<appendix xml:id="ch-options">

View File

@@ -34,6 +34,14 @@
select="attr[@name = 'description']/string/@value" />
</para>
<xsl:if test="attr[@name = 'type']">
<para>
<emphasis>Type:</emphasis>
<xsl:text> </xsl:text>
<xsl:apply-templates select="attr[@name = 'type']" mode="top" />
</para>
</xsl:if>
<xsl:if test="attr[@name = 'default']">
<para>
<emphasis>Default:</emphasis>

View File

@@ -10,7 +10,7 @@
<para>This section lists the release notes for each stable version of NixOS.</para>
</partintro>
<xi:include href="rl-1411.xml" />
<xi:include href="rl-1412.xml" />
<xi:include href="rl-1404.xml" />
<xi:include href="rl-1310.xml" />

View File

@@ -1,37 +0,0 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-14.11">
<title>Release 14.11 (“Caterpillar”, 2014/11/??)</title>
<para>When upgrading from a previous release, please be aware of the
following incompatible changes:
<itemizedlist>
<listitem><para>The default version of Apache httpd is now 2.4. If
you use the <option>extraConfig</option> option to pass literal
Apache configuration text, you may need to update it — see <link
xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apaches
documentation</link> for details. If you wish to continue to use
httpd 2.2, add the following line to your NixOS configuration:
<programlisting>
services.httpd.package = pkgs.apacheHttpd_2_2;
</programlisting>
</para></listitem>
<listitem><para>The host side of a container virtual Ethernet pair
is now called <literal>ve-<replaceable>container-name</replaceable></literal>
rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
<listitem><para>GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.</para></listitem>
</itemizedlist>
</para>
</chapter>

View File

@@ -0,0 +1,177 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-14.12">
<title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
<para>In addition to numerous new and upgraded packages, this release has the following highlights:
<itemizedlist>
<listitem><para>Systemd has been updated to version 217, which has numerous
<link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link></para></listitem>
<listitem><para><link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
Nix has been updated to 1.8.</link></para></listitem>
<listitem><para>NixOS is now based on Glibc 2.20.</para></listitem>
<listitem><para>KDE has been updated to 4.14.</para></listitem>
<listitem><para>The default Linux kernel has been updated to 3.14.</para></listitem>
<listitem><para>If <option>users.mutableUsers</option> is enabled (the
default), changes made to the declaration of a user or group will be
correctly realised when running <command>nixos-rebuild</command>. For
instance, removing a user specification from
<filename>configuration.nix</filename> will cause the actual user
account to be deleted. If <option>users.mutableUsers</option> is
disabled, it is no longer necessary to specify UIDs or GIDs; if
omitted, they are allocated dynamically.</para></listitem>
</itemizedlist></para>
<para>Following new services were added since the last release:
<itemizedlist>
<listitem><para><literal>atftpd</literal></para></listitem>
<listitem><para><literal>bosun</literal></para></listitem>
<listitem><para><literal>bspwm</literal></para></listitem>
<listitem><para><literal>chronos</literal></para></listitem>
<listitem><para><literal>collectd</literal></para></listitem>
<listitem><para><literal>consul</literal></para></listitem>
<listitem><para><literal>cpuminer-cryptonight</literal></para></listitem>
<listitem><para><literal>crashplan</literal></para></listitem>
<listitem><para><literal>dnscrypt-proxy</literal></para></listitem>
<listitem><para><literal>docker-registry</literal></para></listitem>
<listitem><para><literal>docker</literal></para></listitem>
<listitem><para><literal>etcd</literal></para></listitem>
<listitem><para><literal>fail2ban</literal></para></listitem>
<listitem><para><literal>fcgiwrap</literal></para></listitem>
<listitem><para><literal>fleet</literal></para></listitem>
<listitem><para><literal>fluxbox</literal></para></listitem>
<listitem><para><literal>gdm</literal></para></listitem>
<listitem><para><literal>geoclue2</literal></para></listitem>
<listitem><para><literal>gitlab</literal></para></listitem>
<listitem><para><literal>gitolite</literal></para></listitem>
<listitem><para><literal>gnome3.gnome-documents</literal></para></listitem>
<listitem><para><literal>gnome3.gnome-online-miners</literal></para></listitem>
<listitem><para><literal>gnome3.gvfs</literal></para></listitem>
<listitem><para><literal>gnome3.seahorse</literal></para></listitem>
<listitem><para><literal>hbase</literal></para></listitem>
<listitem><para><literal>i2pd</literal></para></listitem>
<listitem><para><literal>influxdb</literal></para></listitem>
<listitem><para><literal>kubernetes</literal></para></listitem>
<listitem><para><literal>liquidsoap</literal></para></listitem>
<listitem><para><literal>lxc</literal></para></listitem>
<listitem><para><literal>mailpile</literal></para></listitem>
<listitem><para><literal>mesos</literal></para></listitem>
<listitem><para><literal>mlmmj</literal></para></listitem>
<listitem><para><literal>monetdb</literal></para></listitem>
<listitem><para><literal>mopidy</literal></para></listitem>
<listitem><para><literal>neo4j</literal></para></listitem>
<listitem><para><literal>nsd</literal></para></listitem>
<listitem><para><literal>openntpd</literal></para></listitem>
<listitem><para><literal>opentsdb</literal></para></listitem>
<listitem><para><literal>openvswitch</literal></para></listitem>
<listitem><para><literal>parallels-guest</literal></para></listitem>
<listitem><para><literal>peerflix</literal></para></listitem>
<listitem><para><literal>phd</literal></para></listitem>
<listitem><para><literal>polipo</literal></para></listitem>
<listitem><para><literal>prosody</literal></para></listitem>
<listitem><para><literal>radicale</literal></para></listitem>
<listitem><para><literal>redmine</literal></para></listitem>
<listitem><para><literal>riemann</literal></para></listitem>
<listitem><para><literal>scollector</literal></para></listitem>
<listitem><para><literal>seeks</literal></para></listitem>
<listitem><para><literal>siproxd</literal></para></listitem>
<listitem><para><literal>strongswan</literal></para></listitem>
<listitem><para><literal>tcsd</literal></para></listitem>
<listitem><para><literal>teamspeak3</literal></para></listitem>
<listitem><para><literal>thermald</literal></para></listitem>
<listitem><para><literal>torque/mrom</literal></para></listitem>
<listitem><para><literal>torque/server</literal></para></listitem>
<listitem><para><literal>uhub</literal></para></listitem>
<listitem><para><literal>unifi</literal></para></listitem>
<listitem><para><literal>znc</literal></para></listitem>
<listitem><para><literal>zookeeper</literal></para></listitem>
</itemizedlist>
</para>
<para>When upgrading from a previous release, please be aware of the
following incompatible changes:
<itemizedlist>
<listitem><para>The default version of Apache httpd is now 2.4. If
you use the <option>extraConfig</option> option to pass literal
Apache configuration text, you may need to update it — see <link
xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apaches
documentation</link> for details. If you wish to continue to use
httpd 2.2, add the following line to your NixOS configuration:
<programlisting>
services.httpd.package = pkgs.apacheHttpd_2_2;
</programlisting>
</para></listitem>
<listitem><para>PHP 5.3 has been removed because it is no longer
supported by the PHP project. A <link
xlink:href="http://php.net/migration54">migration guide</link> is
available.</para></listitem>
<listitem><para>The host side of a container virtual Ethernet pair
is now called <literal>ve-<replaceable>container-name</replaceable></literal>
rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
<listitem><para>GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.</para></listitem>
<listitem><para>VirtualBox has been upgraded to 4.3.20 release. Users
may be required to run <command>rm -rf /tmp/.vbox*</command>. The line
<literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is
no longer necessary, use <literal>services.virtualboxHost.enable =
true</literal> instead.
</para>
<para>Also, hardening mode is now enabled by default, which means that unless you want to use
USB support, you no longer need to be a member of the <literal>vboxusers</literal> group.
</para></listitem>
<listitem><para>Chromium has been updated to 39.0.2171.65. <option>enablePepperPDF</option> is now enabled by default.
<literal>chromium*Wrapper</literal> packages no longer exist, because upstream removed NSAPI support.
<literal>chromium-stable</literal> has been renamed to <literal>chromium</literal>.
</para></listitem>
<listitem><para>Python packaging documentation is now part of nixpkgs manual. To override
the python packages available to a custom python you now use <literal>pkgs.pythonFull.buildEnv.override</literal>
instead of <literal>pkgs.pythonFull.override</literal>.
</para></listitem>
<listitem><para><literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most users will
want to leave it undefined, which takes the swap partitions automatically. There is an evaluation
assertion to ensure that the string starts with a slash.
</para></listitem>
<listitem><para>The system-wide default timezone for NixOS installations
changed from <literal>CET</literal> to <literal>UTC</literal>. To choose
a different timezone for your system, configure
<literal>time.timeZone</literal> in
<literal>configuration.nix</literal>. A fairly complete list of possible
values for that setting is available at <link
xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.</para></listitem>
<listitem><para>GNU screen has been updated to 4.2.1, which breaks
the ability to connect to sessions created by older versions of
screen.</para></listitem>
<listitem><para>The Intel GPU driver was updated to the 3.x prerelease
version (used by most distributions) and supports DRI3
now.</para></listitem>
</itemizedlist>
</para>
</chapter>

View File

@@ -11,15 +11,16 @@
, prefix ? []
}:
let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
rec {
let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system;
extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
in if e == "" then [] else [(import (builtins.toPath e))];
in rec {
# Merge the option definitions in all modules, forming the full
# system configuration.
inherit (pkgs.lib.evalModules {
inherit prefix;
modules = modules ++ baseModules;
modules = modules ++ extraModules ++ baseModules;
args = extraArgs;
check = check && options.environment.checkConfigurationOptions.value;
}) config options;

View File

@@ -47,7 +47,7 @@ rec {
''
mkdir -p $out/nix-support
LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver || failed=1
LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
# Generate a pretty-printed log.
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
@@ -63,8 +63,6 @@ rec {
mkdir -p $out/coverage-data
mv $i $out/coverage-data/$(dirname $(dirname $i))
done
[ -z "$failed" ] || touch $out/nix-support/failed
''; # */
};

View File

@@ -12,7 +12,7 @@ from nixops.statefile import StateFile, get_default_state_file
parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
parser.add_argument('--region', dest='region', required=True, help='EC2 region to create the image in')
parser.add_argument('--channel', dest='channel', default="13.10", help='Channel to use')
parser.add_argument('--channel', dest='channel', default="14.12", help='Channel to use')
parser.add_argument('--keep', dest='keep', action='store_true', help='Keep NixOps machine after use')
parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM image')
parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob")
@@ -34,13 +34,13 @@ ebs_size = 20
# Start a NixOS machine in the given region.
f = open("ebs-creator-config.nix", "w")
f.write('''{{
resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
resources.ec2KeyPairs.keypair.accessKeyId = "lb-nixos";
resources.ec2KeyPairs.keypair.region = "{0}";
machine =
{{ pkgs, ... }}:
{{
deployment.ec2.accessKeyId = "logicblox-dev";
deployment.ec2.accessKeyId = "lb-nixos";
deployment.ec2.region = "{0}";
deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {1};
}};
@@ -54,7 +54,7 @@ try:
except Exception:
depl = db.create_deployment()
depl.name = "ebs-creator"
depl.auto_response = "y"
depl.logger.set_autoresponse("y")
depl.nix_exprs = [os.path.abspath("./ebs-creator.nix"), os.path.abspath("./ebs-creator-config.nix")]
if not args.keep: depl.destroy_resources()
depl.deploy(allow_reboot=True)
@@ -75,7 +75,7 @@ m.run_command("mount {0} /mnt".format(device))
m.run_command("touch /mnt/.ebs")
m.run_command("mkdir -p /mnt/etc/nixos")
m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel))
m.run_command("nix-channel --add https://nixos.org/channels/nixos-{} nixos".format(args.channel))
m.run_command("nix-channel --update")
version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion '<nixpkgs>'", capture_stdout=True).split(' ')[0].replace('"','').strip()
@@ -140,6 +140,7 @@ common_args = dict(
)
if not args.hvm:
common_args['kernel_id']=aki.id
ami_id = m._conn.register_image(**common_args)
print >> sys.stderr, "registered AMI {0}".format(ami_id)
@@ -161,16 +162,16 @@ f.write(
{{
network.description = "NixOS EBS test";
resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
resources.ec2KeyPairs.keypair.accessKeyId = "lb-nixos";
resources.ec2KeyPairs.keypair.region = "{0}";
machine = {{ config, pkgs, resources, ... }}: {{
deployment.targetEnv = "ec2";
deployment.ec2.accessKeyId = "logicblox-dev";
deployment.ec2.accessKeyId = "lb-nixos";
deployment.ec2.region = "{0}";
deployment.ec2.instanceType = "{2}";
deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
deployment.ec2.securityGroups = [ "admin" ];
deployment.ec2.securityGroups = [ "public-ssh" ];
deployment.ec2.ami = "{1}";
}};
}}
@@ -185,23 +186,31 @@ test_depl.deploy(create_only=True)
test_depl.machines['machine'].run_command("nixos-version")
# Log the AMI ID.
f = open("{0}.{1}.ami-id".format(args.region, image_type), "w")
f.write("{0}".format(ami_id))
f.close()
f = open("ec2-amis.nix".format(args.region, image_type), "w")
f.write("{\n")
for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1']:
copy_image = None
if args.region != dest:
print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
conn = boto.ec2.connect_to_region(dest)
copy_image = conn.copy_image(args.region, ami_id, ami_name, description=None, client_token=None)
try:
print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
conn = boto.ec2.connect_to_region(dest)
copy_image = conn.copy_image(args.region, ami_id, ami_name, description=None, client_token=None)
except :
print >> sys.stderr, "FAILED!"
# Log the AMI ID.
f = open("{0}.{1}.ami-id".format(dest, image_type), "w")
f.write("{0}".format(copy_image.image_id))
f.close()
if copy_image != None:
f.write(' "{0}"."{1}".{2} = "{3}";\n'.format(args.channel,dest,"hvm" if args.hvm else "ebs",copy_image.image_id))
else:
f.write(' "{0}"."{1}".{2} = "{3}";\n'.format(args.channel,args.region,"hvm" if args.hvm else "ebs",ami_id))
f.write("}\n")
f.close()
if not args.keep:
test_depl.logger.set_autoresponse("y")
test_depl.destroy_resources()
test_depl.delete()

View File

@@ -31,17 +31,22 @@ buildAndUploadFor() {
-a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" --location "$s3location" \
--url http://s3.amazonaws.com
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.03-$arch*" --region "$region" | cut -f 2)
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2)
echo "using PV-GRUB kernel $kernel"
ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" \
ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY" \
--region "$region" --kernel "$kernel" | cut -f 2)
echo "AMI ID is $ami"
echo $ami >> $region.s3.ami-id
echo " \"14.12\".\"$region\".s3 = \"$ami\";" >> ec2-amis.nix
ec2-modify-image-attribute --region "$region" "$ami" -l -a all
ec2-modify-image-attribute --region "$region" "$ami" -l -a all -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY"
for cp_region in us-east-1 us-west-1 us-west-2 eu-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 sa-east-1; do
new_ami=$(aws ec2 copy-image --source-image-id $ami --source-region $region --region $cp_region --name "$name" | json ImageId)
echo " \"14.12\".\"$cp_region\".s3 = \"$new_ami\";" >> ec2-amis.nix
done
done
}

View File

@@ -5,10 +5,9 @@
{ config, pkgs, resources, ... }:
{ deployment.targetEnv = "ec2";
deployment.ec2.instanceType = "c3.large";
deployment.ec2.securityGroups = [ "admin" ];
deployment.ec2.securityGroups = [ "public-ssh" ];
deployment.ec2.ebsBoot = false;
deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
deployment.ec2.zone = "us-east-1e";
environment.systemPackages = [ pkgs.parted ];
};
}

View File

@@ -1,6 +1,6 @@
#! /bin/sh -e
BUCKET_NAME=${BUCKET_NAME:-nixos}
BUCKET_NAME=${BUCKET_NAME:-nixos-images}
export NIX_PATH=nixpkgs=../../../..
export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
export TIMESTAMP=$(date +%Y%m%d%H%M)

View File

@@ -122,7 +122,7 @@ in
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
${optionalString ultimate.allowBitmaps ''
${optionalString (!ultimate.allowBitmaps) ''
<!-- Reject bitmap fonts -->
<selectfont>
<rejectfont>

View File

@@ -204,7 +204,7 @@ with lib;
${optionalString (fontconfig.dpi != 0) ''
<match target="pattern">
<edit name="dpi" mode="assign">
<double>${fontconfig.dpi}</double>
<double>${toString fontconfig.dpi}</double>
</edit>
</match>
''}

View File

@@ -174,12 +174,12 @@ foreach my $u (@{$spec->{users}}) {
} elsif (defined $u->{initialHashedPassword}) {
$u->{hashedPassword} = $u->{initialHashedPassword};
}
}
# Create a home directory.
if ($u->{createHome}) {
make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
chown $u->{uid}, $u->{gid}, $u->{home};
}
# Create a home directory.
if ($u->{createHome} && ! -e $u->{home}) {
make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
chown $u->{uid}, $u->{gid}, $u->{home};
}
if (defined $u->{passwordFile}) {

View File

@@ -25,6 +25,11 @@ let
options.
'';
hashedPasswordDescription = ''
To generate hashed password install <literal>mkpassword</literal>
package and run <literal>mkpasswd -m sha-512</literal>.
'';
userOpts = { name, config, ... }: {
options = {
@@ -165,6 +170,7 @@ let
description = ''
Specifies the hashed password for the user.
${passwordDescription}
${hashedPasswordDescription}
'';
};
@@ -202,6 +208,8 @@ let
password can be changed subsequently using the
<command>passwd</command> command. Otherwise, it's
equivalent to setting the <option>password</option> option.
${hashedPasswordDescription}
'';
};
@@ -366,21 +374,24 @@ in {
type = types.bool;
default = true;
description = ''
If true, you are free to add new users and groups to the system
If set to <literal>true</literal>, you are free to add new users and groups to the system
with the ordinary <literal>useradd</literal> and
<literal>groupadd</literal> commands. On system activation, the
existing contents of the <literal>/etc/passwd</literal> and
<literal>/etc/group</literal> files will be merged with the
contents generated from the <literal>users.extraUsers</literal> and
<literal>users.extraGroups</literal> options. If
<literal>mutableUsers</literal> is false, the contents of the user and
group files will simply be replaced on system activation. This also
holds for the user passwords; if this option is false, all changed
passwords will be reset according to the
<literal>users.extraUsers</literal> configuration on activation. If
this option is true, the initial password for a user will be set
<literal>users.extraGroups</literal> options.
The initial password for a user will be set
according to <literal>users.extraUsers</literal>, but existing passwords
will not be changed.
<warning><para>
If set to <literal>false</literal>, the contents of the user and
group files will simply be replaced on system activation. This also
holds for the user passwords; all changed
passwords will be reset according to the
<literal>users.extraUsers</literal> configuration on activation.
</para></warning>
'';
};
@@ -478,6 +489,7 @@ in {
utmp.gid = ids.gids.utmp;
adm.gid = ids.gids.adm;
grsecurity.gid = ids.gids.grsecurity;
input.gid = ids.gids.input;
};
system.activationScripts.users = stringAfter [ "etc" ]

View File

@@ -16,7 +16,6 @@ let
[ p.mesa_drivers
p.mesa_noglu # mainly for libGL
(if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
p.udev
];
};

View File

@@ -11,20 +11,21 @@ let
# FIXME: should introduce an option like
# hardware.video.nvidia.package for overriding the default NVIDIA
# driver.
enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers
|| elem "nvidiaLegacy304" drivers || elem "nvidiaLegacy340" drivers;
nvidia_x11 =
nvidiaForKernel = kernelPackages:
if elem "nvidia" drivers then
config.boot.kernelPackages.nvidia_x11
kernelPackages.nvidia_x11
else if elem "nvidiaLegacy173" drivers then
config.boot.kernelPackages.nvidia_x11_legacy173
kernelPackages.nvidia_x11_legacy173
else if elem "nvidiaLegacy304" drivers then
config.boot.kernelPackages.nvidia_x11_legacy304
kernelPackages.nvidia_x11_legacy304
else if elem "nvidiaLegacy340" drivers then
config.boot.kernelPackages.nvidia_x11_legacy340
else throw "impossible";
kernelPackages.nvidia_x11_legacy340
else null;
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
enabled = nvidia_x11 != null;
in
{
@@ -40,12 +41,21 @@ in
'';
hardware.opengl.package = nvidia_x11;
hardware.opengl.package32 = pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; };
hardware.opengl.package32 = nvidia_libs32;
environment.systemPackages = [ nvidia_x11 ];
boot.extraModulePackages = [ nvidia_x11 ];
# nvidia-uvm is required by CUDA applications.
boot.kernelModules = [ "nvidia-uvm" ];
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
services.udev.extraRules =
''
KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
'';
boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ];
services.acpid.enable = true;

View File

@@ -80,7 +80,7 @@ had booted this nixos. Run:
* `grep local-cmds run/current-system/init`
Then you can proceed normally subscribing to a nixos channel:
nix-channel --add http://nixos.org/channels/nixos-unstable
nix-channel --add https://nixos.org/channels/nixos-unstable
nix-channel --update
Testing:

View File

@@ -30,8 +30,7 @@ while [ "$#" -gt 0 ]; do
case "$i" in
-I)
given_path="$1"; shift 1
absolute_path=$(readlink -m $given_path)
extraBuildFlags+=("$i" "/mnt$absolute_path")
extraBuildFlags+=("$i" "$given_path")
;;
--root)
mountPoint="$1"; shift 1
@@ -78,6 +77,7 @@ mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/et
mkdir -m 01777 -p $mountPoint/tmp
mkdir -m 0755 -p $mountPoint/tmp/root
mkdir -m 0755 -p $mountPoint/var/setuid-wrappers
mkdir -m 0700 -p $mountPoint/root
mount --rbind /dev $mountPoint/dev
mount --rbind /proc $mountPoint/proc
mount --rbind /sys $mountPoint/sys
@@ -89,6 +89,12 @@ ln -s /run $mountPoint/var/run
rm -f $mountPoint/etc/{resolv.conf,hosts}
cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/
if [ -e "$SSL_CERT_FILE" ]; then
cp -Lf "$SSL_CERT_FILE" "$mountPoint/tmp/ca-cert.crt"
export SSL_CERT_FILE=/tmp/ca-cert.crt
# For Nix 1.7
export CURL_CA_BUNDLE=/tmp/ca-cert.crt
fi
if [ -n "$runChroot" ]; then
if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
@@ -244,7 +250,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
# Ask the user to set a root password.
if [ -t 0 ] ; then
if [ "$(chroot $mountPoint nix-instantiate --eval '<nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
echo "setting root password..."
chroot $mountPoint /var/setuid-wrappers/passwd
fi

View File

@@ -26,7 +26,8 @@ while [ "$#" -gt 0 ]; do
--help)
showSyntax
;;
switch|boot|test|build|dry-run|build-vm|build-vm-with-bootloader)
switch|boot|test|build|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader)
if [ "$i" = dry-run ]; then i=dry-build; fi
action="$i"
;;
--install-grub)
@@ -137,7 +138,7 @@ fi
# First build Nix, since NixOS may require a newer version than the
# current one.
if [ -n "$rollback" -o "$action" = dry-run ]; then
if [ -n "$rollback" -o "$action" = dry-build ]; then
buildNix=
fi
@@ -148,15 +149,15 @@ if [ -n "$buildNix" ]; then
if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
machine="$(uname -m)"
if [ "$machine" = x86_64 ]; then
nixStorePath=/nix/store/d34q3q2zj9nriq4ifhn3dnnngqvinjb3-nix-1.7
nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8
elif [[ "$machine" =~ i.86 ]]; then
nixStorePath=/nix/store/qlah0darpcn6sf3lr2226rl04l1gn4xz-nix-1.7
nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8
else
echo "$0: unsupported platform"
exit 1
fi
if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
--option extra-binary-caches http://cache.nixos.org/; then
--option extra-binary-caches https://cache.nixos.org/; then
echo "warning: don't know how to get latest Nix" >&2
fi
# Older version of nix-store -r don't support --add-root.
@@ -180,7 +181,7 @@ if [ -n "$canRun" ]; then
fi
if [ "$action" = dry-run ]; then
if [ "$action" = dry-build ]; then
extraBuildFlags+=(--dry-run)
fi
@@ -193,7 +194,7 @@ if [ -z "$rollback" ]; then
if [ "$action" = switch -o "$action" = boot ]; then
nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixpkgs/nixos>' --set -A system
pathToConfig="$profile"
elif [ "$action" = test -o "$action" = build -o "$action" = dry-run ]; then
elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then
nix-build '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}" > /dev/null
pathToConfig=./result
elif [ "$action" = build-vm ]; then
@@ -224,7 +225,7 @@ fi
# If we're not just building, then make the new configuration the boot
# default and/or activate it now.
if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then
if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then
if ! $pathToConfig/bin/switch-to-configuration "$action"; then
echo "warning: error(s) occured while switching to the new configuration" >&2
exit 1

View File

@@ -172,6 +172,7 @@
kubernetes = 162;
peerflix = 163;
chronos = 164;
gitlab = 165;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -308,6 +309,8 @@
bosun = 157;
kubernetes = 158;
fleet = 159;
gitlab = 160;
input = 174;
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!

View File

@@ -33,7 +33,7 @@ with lib;
system.defaultChannel = mkOption {
internal = true;
type = types.str;
default = https://nixos.org/channels/nixos-unstable;
default = https://nixos.org/channels/nixos-14.12;
description = "Default NixOS channel to which the root user is subscribed.";
};

8
nixos/modules/module-list.nix Executable file → Normal file
View File

@@ -102,6 +102,8 @@
./services/backup/rsnapshot.nix
./services/backup/sitecopy-backup.nix
./services/backup/tarsnap.nix
./services/cluster/fleet.nix
./services/cluster/kubernetes.nix
./services/computing/torque/server.nix
./services/computing/torque/mom.nix
./services/continuous-integration/jenkins/default.nix
@@ -174,6 +176,7 @@
./services/misc/etcd.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix
./services/misc/gitlab.nix
./services/misc/gitolite.nix
./services/misc/gpsd.nix
./services/misc/mesos-master.nix
@@ -303,6 +306,7 @@
./services/security/fprot.nix
./services/security/frandom.nix
./services/security/haveged.nix
./services/security/torify.nix
./services/security/tor.nix
./services/security/torsocks.nix
./services/system/dbus.nix
@@ -400,11 +404,9 @@
./virtualisation/container-config.nix
./virtualisation/containers.nix
./virtualisation/docker.nix
./virtualisation/fleet.nix
./virtualisation/kubernetes.nix
./virtualisation/libvirtd.nix
./virtualisation/lxc.nix
#./virtualisation/nova.nix
./virtualisation/amazon-options.nix
./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix
./virtualisation/virtualbox-guest.nix

View File

@@ -105,7 +105,7 @@ in
};
enableCompletion = mkOption {
default = true;
default = false;
description = ''
Enable Bash completion for all interactive bash shells.
'';

View File

@@ -53,7 +53,7 @@ in
# Set up a default Nix expression from which to install stuff.
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
rm -f $HOME/.nix-defexpr
mkdir $HOME/.nix-defexpr
mkdir -p $HOME/.nix-defexpr
if [ "$USER" != root ]; then
ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
fi

View File

@@ -61,7 +61,8 @@ in
agentTimeout = mkOption {
type = types.nullOr types.string;
default = "1h";
default = null;
example = "1h";
description = ''
How long to keep the private keys in memory. Use null to keep them forever.
'';

View File

@@ -3,34 +3,74 @@
with lib;
let
virtualbox = config.boot.kernelPackages.virtualbox;
cfg = config.services.virtualboxHost;
virtualbox = config.boot.kernelPackages.virtualbox.override {
inherit (cfg) enableHardening;
};
in
{
options = {
services.virtualboxHost.enable = mkEnableOption "VirtualBox Host support";
options.services.virtualboxHost = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable host-side support for VirtualBox.
<note><para>
In order to pass USB devices from the host to the guests, the user
needs to be in the <literal>vboxusers</literal> group.
</para></note>
'';
};
addNetworkInterface = mkOption {
type = types.bool;
default = true;
description = ''
Automatically set up a vboxnet0 host-only network interface.
'';
};
enableHardening = mkOption {
type = types.bool;
default = true;
description = ''
Enable hardened VirtualBox, which ensures that only the binaries in the
system path get access to the devices exposed by the kernel modules
instead of all users in the vboxusers group.
<important><para>
Disabling this can put your system's security at risk, as local users
in the vboxusers group can tamper with the VirtualBox device files.
</para></important>
'';
};
};
config = mkIf config.services.virtualboxHost.enable {
config = mkIf cfg.enable (mkMerge [{
boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
boot.extraModulePackages = [ virtualbox ];
environment.systemPackages = [ virtualbox ];
security.setuidOwners = let
mkVboxStub = program: {
mkSuid = program: {
inherit program;
source = "${virtualbox}/libexec/virtualbox/${program}";
owner = "root";
group = "vboxusers";
setuid = true;
};
in map mkVboxStub [
"VBoxBFE"
"VBoxBalloonCtrl"
in mkIf cfg.enableHardening (map mkSuid [
"VBoxHeadless"
"VBoxManage"
"VBoxNetAdpCtl"
"VBoxNetDHCP"
"VBoxNetNAT"
"VBoxSDL"
"VBoxVolInfo"
"VirtualBox"
];
]);
users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers;
@@ -46,7 +86,7 @@ in
'';
# Since we lack the right setuid binaries, set up a host-only network by default.
} (mkIf cfg.addNetworkInterface {
systemd.services."vboxnet0" =
{ description = "VirtualBox vboxnet0 Interface";
requires = [ "dev-vboxnetctl.device" ];
@@ -55,10 +95,13 @@ in
path = [ virtualbox ];
serviceConfig.RemainAfterExit = true;
serviceConfig.Type = "oneshot";
serviceConfig.PrivateTmp = true;
environment.VBOX_USER_HOME = "/tmp";
script =
''
if ! [ -e /sys/class/net/vboxnet0 ]; then
VBoxManage hostonlyif create
cat /tmp/VBoxSVC.log >&2
fi
'';
postStop =
@@ -68,5 +111,5 @@ in
};
networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
};
})]);
}

View File

@@ -33,7 +33,8 @@ let
zipModules = list:
zipAttrsWith (n: v:
if tail v != [] then
if n == "_type" then (head v)
if all (o: isAttrs o && o ? _type) v then mkMerge v
else if n == "_type" then head v
else if n == "warnings" then concatLists v
else if n == "description" || n == "apply" then
abort "Cannot rename an option to multiple options."
@@ -115,8 +116,8 @@ in zipModules ([]
++ obsolete [ "nix" "proxy" ] [ "networking" "proxy" "default" ]
# KDE
++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
# ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work!
++ deprecated [ "kde" "extraPackages" ] [ "environment" "systemPackages" ]
++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ]
# Multiple efi bootloaders now
++ obsolete [ "boot" "loader" "efi" "efibootmgr" "enable" ] [ "boot" "loader" "efi" "canTouchEfiVariables" ]

View File

@@ -2,15 +2,66 @@
with lib;
let
caBundle = pkgs.runCommand "ca-bundle.crt"
{ files =
config.security.pki.certificateFiles ++
[ (builtins.toFile "extra.crt" (concatStringsSep "\n" config.security.pki.certificates)) ];
}
''
cat $files > $out
'';
in
{
options = {
security.pki.certificateFiles = mkOption {
type = types.listOf types.path;
default = [];
example = literalExample "[ \"\${pkgs.cacert}/etc/ca-bundle.crt\" ]";
description = ''
A list of files containing trusted root certificates in PEM
format. These are concatenated to form
<filename>/etc/ssl/certs/ca-bundle.crt</filename>, which is
used by many programs that use OpenSSL, such as
<command>curl</command> and <command>git</command>.
'';
};
security.pki.certificates = mkOption {
type = types.listOf types.string;
default = [];
example = singleton ''
NixOS.org
=========
-----BEGIN CERTIFICATE-----
MIIGUDCCBTigAwIBAgIDD8KWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
...
-----END CERTIFICATE-----
'';
description = ''
A list of trusted root certificates in PEM format.
'';
};
};
config = {
environment.etc =
[ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
target = "ssl/certs/ca-bundle.crt";
}
];
security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ca-bundle.crt" ];
environment.etc."ssl/certs/ca-bundle.crt".source = caBundle;
# CentOS/Fedora compatibility.
environment.etc."pki/tls/certs/ca-bundle.crt".source = caBundle;
# Debian/Ubuntu/Arch/Gentoo compatibility.
environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;
environment.sessionVariables =
{ SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";

View File

@@ -110,7 +110,7 @@ in
default = false;
description = ''
Print the contents of <literal>/etc/motd</literal> to screen
after a succesful login.
after a successful login.
'';
};
@@ -145,7 +145,7 @@ in
When $DUO_PASSCODE is non-empty, it will override
autopush. The SSH client will need SendEnv DUO_PASSCODE in
its configuration, and the SSH server will similarily need
its configuration, and the SSH server will similarly need
AcceptEnv DUO_PASSCODE.
'';
};

View File

@@ -54,6 +54,14 @@ let
'';
};
oathAuth = mkOption {
default = config.security.pam.enableOATH;
type = types.bool;
description = ''
If set, the OATH Toolkit will be used.
'';
};
sshAgentAuth = mkOption {
default = false;
type = types.bool;
@@ -185,6 +193,8 @@ let
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"}
${optionalString cfg.otpwAuth
"auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
${optionalString cfg.oathAuth
"auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
${optionalString config.users.ldap.enable
"auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
${optionalString config.krb5.enable ''
@@ -220,6 +230,8 @@ let
"session optional ${pam_krb5}/lib/security/pam_krb5.so"}
${optionalString cfg.otpwAuth
"session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
${optionalString cfg.oathAuth
"session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
${optionalString cfg.startSession
"session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
${optionalString cfg.forwardXAuth
@@ -317,6 +329,13 @@ in
'';
};
security.pam.enableOATH = mkOption {
default = false;
description = ''
Enable the OATH (one-time password) PAM module.
'';
};
users.motd = mkOption {
default = null;
example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178.";
@@ -336,7 +355,8 @@ in
[ pkgs.pam ]
++ optional config.users.ldap.enable pam_ldap
++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ];
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ];
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;

View File

@@ -64,7 +64,7 @@ in
security.sudo.configFile =
''
# Don't edit this file. Set the NixOS options security.sudo.configFile
# and security.sudo.extraConfig instead.
# or security.sudo.extraConfig instead.
# Environment variables to keep for root and %wheel.
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
@@ -90,11 +90,10 @@ in
environment.etc = singleton
{ source =
pkgs.runCommand "sudoers"
{src = pkgs.writeText "sudoers-in" cfg.configFile; }
{ src = pkgs.writeText "sudoers-in" cfg.configFile; }
# Make sure that the sudoers file is syntactically valid.
# (currently disabled - NIXOS-66)
"${pkgs.sudo}/sbin/visudo -f $src -c &&
cp $src $out";
"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
target = "sudoers";
mode = "0440";
};

View File

@@ -3,12 +3,12 @@
with lib;
let
cfg = config.virtualisation.fleet;
cfg = config.services.fleet;
in {
##### Interface
options.virtualisation.fleet = {
options.services.fleet = {
enable = mkOption {
type = types.bool;
default = false;

View File

@@ -3,13 +3,13 @@
with lib;
let
cfg = config.virtualisation.kubernetes;
cfg = config.services.kubernetes;
in {
###### interface
options.virtualisation.kubernetes = {
options.services.kubernetes = {
package = mkOption {
description = "Kubernetes package to use.";
type = types.package;
@@ -420,15 +420,15 @@ in {
})
(mkIf (any (el: el == "master") cfg.roles) {
virtualisation.kubernetes.apiserver.enable = mkDefault true;
virtualisation.kubernetes.scheduler.enable = mkDefault true;
virtualisation.kubernetes.controllerManager.enable = mkDefault true;
services.kubernetes.apiserver.enable = mkDefault true;
services.kubernetes.scheduler.enable = mkDefault true;
services.kubernetes.controllerManager.enable = mkDefault true;
})
(mkIf (any (el: el == "node") cfg.roles) {
virtualisation.docker.enable = mkDefault true;
virtualisation.kubernetes.kubelet.enable = mkDefault true;
virtualisation.kubernetes.proxy.enable = mkDefault true;
services.kubernetes.kubelet.enable = mkDefault true;
services.kubernetes.proxy.enable = mkDefault true;
})
(mkIf (any (el: el == "node" || el == "master") cfg.roles) {
@@ -442,7 +442,7 @@ in {
cfg.kubelet.enable ||
cfg.proxy.enable
) {
virtualisation.kubernetes.package = mkDefault pkgs.kubernetes;
services.kubernetes.package = mkDefault pkgs.kubernetes;
environment.systemPackages = [ cfg.package ];

View File

@@ -1,6 +1,6 @@
# gvfs backends
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
with lib;
@@ -37,6 +37,8 @@ in
services.dbus.packages = [ gnome3.gvfs ];
services.udev.packages = [ pkgs.libmtp ];
};
}

View File

@@ -236,7 +236,10 @@ in
system.activationScripts.udevd =
''
echo "" > /proc/sys/kernel/hotplug
# The deprecated hotplug uevent helper is not used anymore
if [ -e /proc/sys/kernel/hotplug ]; then
echo "" > /proc/sys/kernel/hotplug
fi
# Regenerate the hardware database /var/lib/udev/hwdb.bin
# whenever systemd changes.

View File

@@ -90,7 +90,7 @@ in
enable = true;
recipientDelimiter= "+";
extraMasterConf = ''
mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-recieve -F -L ${spoolDir}/$nextHop
mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop
'';
extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists;

View File

@@ -380,6 +380,7 @@ in
${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
${pkgs.coreutils}/bin/chown root:root /var/spool/mail
${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail
ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf

View File

@@ -0,0 +1,206 @@
# The following was taken from github.com/crohr/syslogger and is BSD
# licensed.
require 'syslog'
require 'logger'
require 'thread'
class Syslogger
VERSION = "1.6.0"
attr_reader :level, :ident, :options, :facility, :max_octets
attr_accessor :formatter
MAPPING = {
Logger::DEBUG => Syslog::LOG_DEBUG,
Logger::INFO => Syslog::LOG_INFO,
Logger::WARN => Syslog::LOG_WARNING,
Logger::ERROR => Syslog::LOG_ERR,
Logger::FATAL => Syslog::LOG_CRIT,
Logger::UNKNOWN => Syslog::LOG_ALERT
}
#
# Initializes default options for the logger
# <tt>ident</tt>:: the name of your program [default=$0].
# <tt>options</tt>:: syslog options [default=<tt>Syslog::LOG_PID | Syslog::LOG_CONS</tt>].
# Correct values are:
# LOG_CONS : writes the message on the console if an error occurs when sending the message;
# LOG_NDELAY : no delay before sending the message;
# LOG_PERROR : messages will also be written on STDERR;
# LOG_PID : adds the process number to the message (just after the program name)
# <tt>facility</tt>:: the syslog facility [default=nil] Correct values include:
# Syslog::LOG_DAEMON
# Syslog::LOG_USER
# Syslog::LOG_SYSLOG
# Syslog::LOG_LOCAL2
# Syslog::LOG_NEWS
# etc.
#
# Usage:
# logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0)
# logger.level = Logger::INFO # use Logger levels
# logger.warn "warning message"
# logger.debug "debug message"
#
def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil)
@ident = ident
@options = options || (Syslog::LOG_PID | Syslog::LOG_CONS)
@facility = facility
@level = Logger::INFO
@mutex = Mutex.new
@formatter = Logger::Formatter.new
end
%w{debug info warn error fatal unknown}.each do |logger_method|
# Accepting *args as message could be nil.
# Default params not supported in ruby 1.8.7
define_method logger_method.to_sym do |*args, &block|
return true if @level > Logger.const_get(logger_method.upcase)
message = args.first || block && block.call
add(Logger.const_get(logger_method.upcase), message)
end
unless logger_method == 'unknown'
define_method "#{logger_method}?".to_sym do
@level <= Logger.const_get(logger_method.upcase)
end
end
end
# Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger
def write(msg)
add(Logger::INFO, msg)
end
# Logs a message at the Logger::INFO level.
def <<(msg)
add(Logger::INFO, msg)
end
# Low level method to add a message.
# +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN
# +message+:: the message string.
# If nil, the method will call the block and use the result as the message string.
# If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger.
# +progname+:: optionally, overwrite the program name that appears in the log message.
def add(severity, message = nil, progname = nil, &block)
if message.nil? && block.nil? && !progname.nil?
message, progname = progname, nil
end
progname ||= @ident
@mutex.synchronize do
Syslog.open(progname, @options, @facility) do |s|
s.mask = Syslog::LOG_UPTO(MAPPING[@level])
communication = clean(message || block && block.call)
if self.max_octets
buffer = "#{tags_text}"
communication.bytes do |byte|
buffer.concat(byte)
# if the last byte we added is potentially part of an escape, we'll go ahead and add another byte
if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte)
s.log(MAPPING[severity],buffer)
buffer = ""
end
end
s.log(MAPPING[severity],buffer) unless buffer.empty?
else
s.log(MAPPING[severity],"#{tags_text}#{communication}")
end
end
end
end
# Set the max octets of the messages written to the log
def max_octets=(max_octets)
@max_octets = max_octets
end
# Sets the minimum level for messages to be written in the log.
# +level+:: one of <tt>Logger::DEBUG</tt>, <tt>Logger::INFO</tt>, <tt>Logger::WARN</tt>, <tt>Logger::ERROR</tt>, <tt>Logger::FATAL</tt>, <tt>Logger::UNKNOWN</tt>
def level=(level)
level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol)
unless level.is_a?(Fixnum)
raise ArgumentError.new("Invalid logger level `#{level.inspect}`")
end
@level = level
end
# Sets the ident string passed along to Syslog
def ident=(ident)
@ident = ident
end
# Tagging code borrowed from ActiveSupport gem
def tagged(*tags)
new_tags = push_tags(*tags)
yield self
ensure
pop_tags(new_tags.size)
end
def push_tags(*tags)
tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags|
current_tags.concat new_tags
end
end
def pop_tags(size = 1)
current_tags.pop size
end
def clear_tags!
current_tags.clear
end
protected
# Borrowed from SyslogLogger.
def clean(message)
message = message.to_s.dup
message.strip! # remove whitespace
message.gsub!(/\n/, '\\n') # escape newlines
message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
message
end
private
def tags_text
tags = current_tags
if tags.any?
tags.collect { |tag| "[#{tag}] " }.join
end
end
def current_tags
Thread.current[:syslogger_tagged_logging_tags] ||= []
end
end
worker_processes 2
working_directory ENV["GITLAB_PATH"]
pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
listen "127.0.0.1:8080", :tcp_nopush => true
timeout 60
logger Syslogger.new
preload_app true
GC.respond_to?(:copy_on_write_friendly=) and
GC.copy_on_write_friendly = true
check_client_connection false
after_fork do |server, worker|
defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
end

View File

@@ -132,7 +132,7 @@ in
restartIfChanged = false;
path = [ pkgs.nix pkgs.disnix dysnomia ];
path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ];
environment = {
HOME = "/root";

View File

@@ -0,0 +1,295 @@
{ config, lib, pkgs, ... }:
# TODO: support non-postgresql
with lib;
let
cfg = config.services.gitlab;
ruby = pkgs.ruby;
rubyLibs = pkgs.rubyLibs;
databaseYml = ''
production:
adapter: postgresql
database: ${cfg.databaseName}
host: ${cfg.databaseHost}
password: ${cfg.databasePassword}
username: ${cfg.databaseUsername}
encoding: utf8
'';
gitlabShellYml = ''
user: gitlab
gitlab_url: "http://${cfg.host}:${toString cfg.port}/"
http_settings:
self_signed_cert: false
repos_path: "${cfg.stateDir}/repositories"
log_file: "${cfg.stateDir}/log/gitlab-shell.log"
redis:
bin: ${pkgs.redis}/bin/redis-cli
host: 127.0.0.1
port: 6379
database: 0
namespace: resque:gitlab
'';
unicornConfig = builtins.readFile ./defaultUnicornConfig.rb;
gitlab-runner = pkgs.stdenv.mkDerivation rec {
name = "gitlab-runner";
buildInputs = [ pkgs.gitlab pkgs.rubyLibs.bundler pkgs.makeWrapper ];
phases = "installPhase fixupPhase";
buildPhase = "";
installPhase = ''
mkdir -p $out/bin
makeWrapper ${rubyLibs.bundler}/bin/bundle $out/bin/gitlab-runner\
--set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'\
--set UNICORN_PATH "${cfg.stateDir}/"\
--set GITLAB_PATH "${pkgs.gitlab}/share/gitlab/"\
--set GITLAB_APPLICATION_LOG_PATH "${cfg.stateDir}/log/application.log"\
--set GITLAB_SATELLITES_PATH "${cfg.stateDir}/satellites"\
--set GITLAB_SHELL_PATH "${pkgs.gitlab-shell}"\
--set GITLAB_REPOSITORIES_PATH "${cfg.stateDir}/repositories"\
--set GITLAB_SHELL_HOOKS_PATH "${cfg.stateDir}/shell/hooks"\
--set BUNDLE_GEMFILE "${pkgs.gitlab}/share/gitlab/Gemfile"\
--set GITLAB_EMAIL_FROM "${cfg.emailFrom}"\
--set GITLAB_SHELL_CONFIG_PATH "${cfg.stateDir}/shell/config.yml"\
--set GITLAB_SHELL_SECRET_PATH "${cfg.stateDir}/config/gitlab_shell_secret"\
--set GITLAB_HOST "${cfg.host}"\
--set GITLAB_PORT "${toString cfg.port}"\
--set GITLAB_BACKUP_PATH"${cfg.backupPath}"\
--set RAILS_ENV "production"
'';
};
in {
options = {
services.gitlab = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable the gitlab service.
'';
};
satelliteDir = mkOption {
type = types.str;
default = "/var/gitlab/git-satellites";
description = "Gitlab directory to store checked out git trees requires for operation.";
};
stateDir = mkOption {
type = types.str;
default = "/var/gitlab/state";
description = "Gitlab state directory, logs are stored here.";
};
backupPath = mkOption {
type = types.str;
default = cfg.stateDir + "/backup";
description = "Gitlab path for backups.";
};
databaseHost = mkOption {
type = types.str;
default = "127.0.0.1";
description = "Gitlab database hostname.";
};
databasePassword = mkOption {
type = types.str;
default = "";
description = "Gitlab database user password.";
};
databaseName = mkOption {
type = types.str;
default = "gitlab";
description = "Gitlab database name.";
};
databaseUsername = mkOption {
type = types.str;
default = "gitlab";
description = "Gitlab database user.";
};
emailFrom = mkOption {
type = types.str;
default = "example@example.org";
description = "The source address for emails sent by gitlab.";
};
host = mkOption {
type = types.str;
default = config.networking.hostName;
description = "Gitlab host name. Used e.g. for copy-paste URLs.";
};
port = mkOption {
type = types.int;
default = 8080;
description = "Gitlab server listening port.";
};
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ gitlab-runner pkgs.gitlab-shell ];
assertions = [
{ assertion = cfg.databasePassword != "";
message = "databasePassword must be set";
}
];
# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;
# We use postgres as the main data store.
services.postgresql.enable = mkDefault true;
services.postgresql.package = mkDefault pkgs.postgresql;
# Use postfix to send out mails.
services.postfix.enable = mkDefault true;
users.extraUsers = [
{ name = "gitlab";
group = "gitlab";
home = "${cfg.stateDir}/home";
shell = "${pkgs.bash}/bin/bash";
uid = config.ids.uids.gitlab;
} ];
users.extraGroups = [
{ name = "gitlab";
gid = config.ids.gids.gitlab;
} ];
systemd.services.gitlab-sidekiq = {
after = [ "network.target" "redis.service" ];
wantedBy = [ "multi-user.target" ];
environment.HOME = "${cfg.stateDir}/home";
environment.UNICORN_PATH = "${cfg.stateDir}/";
environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites";
environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories";
environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks";
environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}";
environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml";
environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret";
environment.GITLAB_HOST = "${cfg.host}";
environment.GITLAB_PORT = "${toString cfg.port}";
environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}";
environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}";
environment.RAILS_ENV = "production";
path = with pkgs; [
config.services.postgresql.package
gitAndTools.git
ruby
openssh
nodejs
];
serviceConfig = {
Type = "simple";
User = "gitlab";
Group = "gitlab";
TimeoutSec = "300";
WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
ExecStart="${rubyLibs.bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.stateDir}/tmp/sidekiq.pid\"";
};
};
systemd.services.gitlab = {
after = [ "network.target" "postgresql.service" "redis.service" ];
wantedBy = [ "multi-user.target" ];
environment.HOME = "${cfg.stateDir}/home";
environment.UNICORN_PATH = "${cfg.stateDir}/";
environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites";
environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories";
environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks";
environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}";
environment.GITLAB_HOST = "${cfg.host}";
environment.GITLAB_PORT = "${toString cfg.port}";
environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}";
environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}";
environment.RAILS_ENV = "production";
path = with pkgs; [
config.services.postgresql.package
gitAndTools.git
ruby
openssh
nodejs
];
preStart = ''
# TODO: use env vars
mkdir -p ${cfg.stateDir}
mkdir -p ${cfg.stateDir}/log
mkdir -p ${cfg.stateDir}/satellites
mkdir -p ${cfg.stateDir}/repositories
mkdir -p ${cfg.stateDir}/shell/hooks
mkdir -p ${cfg.stateDir}/tmp/pids
mkdir -p ${cfg.stateDir}/tmp/sockets
rm -rf ${cfg.stateDir}/config
mkdir -p ${cfg.stateDir}/config
# TODO: What exactly is gitlab-shell doing with the secret?
head -c 20 /dev/urandom > ${cfg.stateDir}/config/gitlab_shell_secret
mkdir -p ${cfg.stateDir}/home/.ssh
touch ${cfg.stateDir}/home/.ssh/authorized_keys
cp -rf ${pkgs.gitlab}/share/gitlab/config ${cfg.stateDir}/
cp ${pkgs.gitlab}/share/gitlab/VERSION ${cfg.stateDir}/VERSION
ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml
ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.stateDir}/config/unicorn.rb
chown -R gitlab:gitlab ${cfg.stateDir}/
chmod -R 755 ${cfg.stateDir}/
if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
if ! test -e "${cfg.stateDir}/db-created"; then
psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
touch "${cfg.stateDir}/db-created"
# force=yes disables the manual-interaction yes/no prompt
# which breaks without an stdin.
force=yes ${rubyLibs.bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile gitlab:setup RAILS_ENV=production
fi
fi
# Install the shell required to push repositories
ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml
export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml
${pkgs.gitlab-shell}/bin/install
# Change permissions in the last step because some of the
# intermediary scripts like to create directories as root.
chown -R gitlab:gitlab ${cfg.stateDir}/
chmod -R 755 ${cfg.stateDir}/
'';
serviceConfig = {
PermissionsStartOnly = true; # preStart must be run as root
Type = "simple";
User = "gitlab";
Group = "gitlab";
TimeoutSec = "300";
WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
ExecStart="${rubyLibs.bundler}/bin/bundle exec \"unicorn -c ${cfg.stateDir}/config/unicorn.rb -E production\"";
};
};
};
}

View File

@@ -41,6 +41,8 @@ let
build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths)
binary-caches = ${toString cfg.binaryCaches}
trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
trusted-users = ${toString cfg.trustedUsers}
allowed-users = ${toString cfg.allowedUsers}
$extraOptions
END
'';
@@ -82,9 +84,10 @@ in
description = ''
This option defines the maximum number of concurrent tasks during
one build. It affects, e.g., -j option for make. The default is 1.
Some builds may become non-deterministic with this option; use with
care! Packages will only be affected if enableParallelBuilding is
set for them.
The special value 0 means that the builder should use all
available CPU cores in the system. Some builds may become
non-deterministic with this option; use with care! Packages will
only be affected if enableParallelBuilding is set for them.
'';
};
@@ -225,7 +228,7 @@ in
binaryCaches = mkOption {
type = types.listOf types.str;
default = [ http://cache.nixos.org/ ];
default = [ https://cache.nixos.org/ ];
description = ''
List of binary cache URLs used to obtain pre-built binaries
of Nix packages.
@@ -244,6 +247,36 @@ in
'';
};
trustedUsers = mkOption {
type = types.listOf types.str;
default = [ "root" ];
example = [ "root" "alice" "@wheel" ];
description = ''
A list of names of users that have additional rights when
connecting to the Nix daemon, such as the ability to specify
additional binary caches, or to import unsigned NARs. You
can also specify groups by prefixing them with
<literal>@</literal>; for instance,
<literal>@wheel</literal> means all users in the wheel
group.
'';
};
allowedUsers = mkOption {
type = types.listOf types.str;
default = [ "*" ];
example = [ "@wheel" "@builders" "alice" "bob" ];
description = ''
A list of names of users (separated by whitespace) that are
allowed to connect to the Nix daemon. As with
<option>nix.trustedUsers</option>, you can specify groups by
prefixing them with <literal>@</literal>. Also, you can
allow all users by specifying <literal>*</literal>. The
default is <literal>*</literal>. Note that trusted users are
always allowed to connect.
'';
};
};
};

View File

@@ -23,6 +23,7 @@ let
# proxy_password: password
# tags: mytag0, mytag1
${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
# collect_ec2_tags: no
# recent_point_threshold: 30
@@ -80,6 +81,13 @@ in {
type = types.str;
};
tags = mkOption {
description = "The tags to mark this Datadog agent";
example = [ "test" "service" ];
default = null;
type = types.nullOr (types.listOf types.str);
};
hostname = mkOption {
description = "The hostname to show in the Datadog dashboard (optional)";
default = null;
@@ -140,6 +148,7 @@ in {
Restart = "always";
RestartSec = 2;
};
environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ];
};

View File

@@ -34,7 +34,7 @@ let
cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file)
wrapProgram $file \
--set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \
--set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \
--set MUNIN_LIBDIR "${pkgs.munin}/lib" \
--set MUNIN_PLUGSTATE "/var/run/munin"
@@ -194,7 +194,7 @@ in
mkdir -p /etc/munin/plugins
rm -rf /etc/munin/plugins/*
PATH="/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash
PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash
'';
serviceConfig = {
ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";

View File

@@ -20,6 +20,10 @@ let
cfg.collectors)}
'';
cmdLineOpts = concatStringsSep " " (
[ "-h=${cfg.bosunHost}" "-c=${collectors}" ] ++ cfg.extraOpts
);
in {
options = {
@@ -69,7 +73,7 @@ in {
};
collectors = mkOption {
type = types.attrs;
type = with types; attrsOf (listOf path);
default = {};
example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }";
description = ''
@@ -79,6 +83,15 @@ in {
'';
};
extraOpts = mkOption {
type = with types; listOf str;
default = [];
example = [ "-d" ];
description = ''
Extra scollector command line options
'';
};
};
};
@@ -95,9 +108,7 @@ in {
PermissionsStartOnly = true;
User = cfg.user;
Group = cfg.group;
ExecStart = ''
${cfg.package}/bin/scollector -h=${cfg.bosunHost} -c=${collectors}
'';
ExecStart = "${cfg.package}/bin/scollector ${cmdLineOpts}";
};
};

View File

@@ -53,7 +53,7 @@ in
};
mgmt_address = mkOption {
description = "Address to run managment TCP interface on";
description = "Address to run management TCP interface on";
default = "127.0.0.1";
type = types.str;
};
@@ -65,7 +65,7 @@ in
};
backends = mkOption {
description = "List of backends statsd will use for data persistance";
description = "List of backends statsd will use for data persistence";
default = ["graphite"];
example = ["graphite" pkgs.nodePackages."statsd-influxdb-backend"];
type = types.listOf (types.either types.str types.package);

View File

@@ -61,7 +61,7 @@ in
default = null;
example = 4002;
description = ''
Use fixed port for rpc.mountd, usefull if server is behind firewall.
Use fixed port for rpc.mountd, useful if server is behind firewall.
'';
};

View File

@@ -28,6 +28,7 @@ in
services.dnsmasq = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to run dnsmasq.
@@ -35,14 +36,16 @@ in
};
resolveLocalQueries = mkOption {
type = types.bool;
default = true;
description = ''
Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to
/etc/resolv.conf)
/etc/resolv.conf).
'';
};
servers = mkOption {
type = types.listOf types.string;
default = [];
example = [ "8.8.8.8" "8.8.4.4" ];
description = ''
@@ -51,11 +54,11 @@ in
};
extraConfig = mkOption {
type = types.string;
type = types.lines;
default = "";
description = ''
Extra configuration directives that should be added to
<literal>dnsmasq.conf</literal>
<literal>dnsmasq.conf</literal>.
'';
};
@@ -81,8 +84,8 @@ in
};
systemd.services.dnsmasq = {
description = "dnsmasq daemon";
after = [ "network.target" "systemd-resolved.conf" ];
description = "Dnsmasq Daemon";
after = [ "network.target" "systemd-resolved.service" ];
wantedBy = [ "multi-user.target" ];
path = [ dnsmasq ];
preStart = ''

View File

@@ -142,7 +142,7 @@ in
type = types.int;
default = 80;
description = ''
Port to forward incoming trafic to. 80 by default.
Port to forward incoming traffic to. 80 by default.
'';
};
keyFile = mkOption {
@@ -195,4 +195,4 @@ in
};
};
}
#
#

View File

@@ -97,7 +97,7 @@ in
Type = "forking";
PIDFile = "/run/minidlna/pid";
ExecStart =
"@${pkgs.minidlna}/sbin/minidlna minidlna -P /run/minidlna/pid" +
"@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" +
" -f ${pkgs.writeText "minidlna.conf" cfg.config}";
};
};

View File

@@ -194,7 +194,7 @@ in {
};
powerManagement.resumeCommands = ''
Systemctl restart network-manager
${config.systemd.package}/bin/systemctl restart network-manager
'';
security.polkit.extraConfig = polkitConf;

View File

@@ -11,19 +11,15 @@ let
ntpUser = "ntp";
configFile = pkgs.writeText "ntp.conf" ''
# Keep the drift file in ${stateDir}/ntp.drift. However, since we
# chroot to ${stateDir}, we have to specify it as /ntp.drift.
driftfile /ntp.drift
driftfile ${stateDir}/ntp.drift
restrict default kod nomodify notrap nopeer noquery
restrict -6 default kod nomodify notrap nopeer noquery
restrict 127.0.0.1
restrict -6 ::1
${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
'';
ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup -i ${stateDir}";
ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup";
in
@@ -64,7 +60,7 @@ in
config = mkIf config.services.ntp.enable {
# Make tools such as ntpq available in the system path
# Make tools such as ntpq available in the system path.
environment.systemPackages = [ pkgs.ntp ];
users.extraUsers = singleton
@@ -74,20 +70,21 @@ in
home = stateDir;
};
jobs.ntpd =
systemd.services.ntpd =
{ description = "NTP Daemon";
wantedBy = [ "multi-user.target" ];
path = [ ntp ];
preStart =
''
mkdir -m 0755 -p ${stateDir}
chown ${ntpUser} ${stateDir}
'';
exec = "ntpd -g -n ${ntpFlags}";
serviceConfig = {
ExecStart = "@${ntp}/bin/ntpd ntpd -g ${ntpFlags}";
Type = "forking";
};
};
};

View File

@@ -17,13 +17,11 @@ let
knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
knownHostsFile = pkgs.runCommand "ssh_known_hosts" {} ''
touch "$out"
${flip concatMapStrings knownHosts (h: ''
pubkeyfile=${builtins.toFile "host.pub" (if h.publicKey == null then readFile h.publicKeyFile else h.publicKey)}
${pkgs.gnused}/bin/sed 's/^/${concatStringsSep "," h.hostNames} /' $pubkeyfile >> "$out"
'')}
'';
knownHostsText = flip (concatMapStringsSep "\n") knownHosts
(h:
concatStringsSep "," h.hostNames + " "
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
);
userOptions = {
@@ -277,6 +275,16 @@ in
};
};
moduliFile = mkOption {
example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;";
type = types.path;
description = ''
Path to <literal>moduli</literal> file to install in
<literal>/etc/ssh/moduli</literal>. If this option is unset, then
the <literal>moduli</literal> file shipped with OpenSSH will be used.
'';
};
};
users.extraUsers = mkOption {
@@ -297,11 +305,13 @@ in
home = "/var/empty";
};
services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
environment.etc = authKeysFiles ++ [
{ source = "${cfgc.package}/etc/ssh/moduli";
{ source = cfg.moduliFile;
target = "ssh/moduli";
}
{ source = knownHostsFile;
{ text = knownHostsText;
target = "ssh/ssh_known_hosts";
}
];

View File

@@ -118,7 +118,7 @@ in
systemd.services.strongswan = {
description = "strongSwan IPSec Service";
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ kmod ]; # XXX Linux
path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
wants = [ "keys.target" ];
after = [ "network.target" "keys.target" ];
environment = {

View File

@@ -44,6 +44,8 @@ in
path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ];
preStart = ''
mkdir -p /var/run/tcpcryptd
chown tcpcryptd /var/run/tcpcryptd
sysctl -n net.ipv4.tcp_ecn >/run/pre-tcpcrypt-ecn-state
sysctl -w net.ipv4.tcp_ecn=0

View File

@@ -9,16 +9,18 @@ with lib;
options = {
services.tftpd.enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the anonymous FTP user.
Whether to enable tftpd, a Trivial File Transfer Protocol server.
'';
};
services.tftpd.path = mkOption {
type = types.path;
default = "/home/tftp";
description = ''
Where the tftp server files are stored
Where the tftp server files are stored.
'';
};

View File

@@ -11,20 +11,16 @@ let
additionalBackends = pkgs.runCommand "additional-cups-backends" { }
''
mkdir -p $out
if [ ! -e ${pkgs.cups}/lib/cups/backend/smb ]; then
if [ ! -e ${cups}/lib/cups/backend/smb ]; then
mkdir -p $out/lib/cups/backend
ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
fi
# Provide support for printing via HTTPS.
if [ ! -e ${pkgs.cups}/lib/cups/backend/https ]; then
if [ ! -e ${cups}/lib/cups/backend/https ]; then
mkdir -p $out/lib/cups/backend
ln -sv ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
fi
# Import filter configuration from Ghostscript.
mkdir -p $out/share/cups/mime/
ln -v -s "${pkgs.ghostscript}/etc/cups/"* $out/share/cups/mime/
'';
# Here we can enable additional backends, filters, etc. that are not
@@ -90,6 +86,15 @@ in
'';
};
cupsFilesConf = mkOption {
type = types.lines;
default = "";
description = ''
The contents of the configuration file of the CUPS daemon
(<filename>cups-files.conf</filename>).
'';
};
extraConf = mkOption {
type = types.lines;
default = "";
@@ -153,13 +158,9 @@ in
environment.systemPackages = [ cups ];
environment.variables.CUPS_SERVERROOT = "/etc/cups";
environment.etc = [
{ source = pkgs.writeText "client.conf" cfg.clientConf;
target = "cups/client.conf";
}
];
environment.etc."cups/client.conf".text = cfg.clientConf;
environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
environment.etc."cups/cupsd.conf".text = cfg.cupsdConf;
services.dbus.packages = [ cups ];
@@ -186,35 +187,26 @@ in
'';
serviceConfig.Type = "forking";
serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf}";
serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd";
restartTriggers =
[ config.environment.etc."cups/cups-files.conf".source
config.environment.etc."cups/cupsd.conf".source
];
};
services.printing.drivers =
[ pkgs.cups pkgs.ghostscript pkgs.cups_filters additionalBackends
[ cups pkgs.ghostscript pkgs.cups_filters additionalBackends
pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
];
services.printing.cupsdConf =
services.printing.cupsFilesConf =
''
LogLevel info
SystemGroup root wheel
${concatMapStrings (addr: ''
Listen ${addr}
'') cfg.listenAddresses}
Listen /var/run/cups/cups.sock
# Note: we can't use ${cups}/etc/cups as the ServerRoot, since
# CUPS will write in the ServerRoot when e.g. adding new printers
# through the web interface.
ServerRoot /etc/cups
ServerBin ${bindir}/lib/cups
DataDir ${bindir}/share/cups
SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
AccessLog syslog
ErrorLog syslog
PageLog syslog
@@ -227,6 +219,18 @@ in
# these programs to run as `lp' as well.
User cups
Group lp
'';
services.printing.cupsdConf =
''
LogLevel info
${concatMapStrings (addr: ''
Listen ${addr}
'') cfg.listenAddresses}
Listen /var/run/cups/cups.sock
SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
Browsing On
BrowseOrder allow,deny
@@ -272,6 +276,7 @@ in
Order deny,allow
</Limit>
</Policy>
${cfg.extraConf}
'';

View File

@@ -97,12 +97,10 @@ in
environment.systemPackages = [ cronNixosPkg ];
jobs.cron =
systemd.services.cron =
{ description = "Cron Daemon";
startOn = "startup";
path = [ cronNixosPkg ];
wantedBy = [ "multi-user.target" ];
preStart =
''
@@ -119,7 +117,8 @@ in
fi
'';
exec = "cron -n";
restartTriggers = [ config.environment.etc.localtime.source ];
serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
};
};

View File

@@ -17,7 +17,8 @@ let
''
# Client connection config
+ optionalString cfg.client.enable ''
SOCKSPort ${cfg.client.socksListenAddress}
SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr
SOCKSPort ${cfg.client.socksListenAddressFaster}
${opt "SocksPolicy" cfg.client.socksPolicy}
''
# Relay config
@@ -93,10 +94,23 @@ in
example = "192.168.0.1:9100";
description = ''
Bind to this address to listen for connections from
Socks-speaking applications.
Socks-speaking applications. Provides strong circuit
isolation, separate circuit per IP address.
'';
};
socksListenAddressFaster = mkOption {
type = types.str;
default = "127.0.0.1:9063";
example = "192.168.0.1:9101";
description = ''
Bind to this address to listen for connections from
Socks-speaking applications. Same as socksListenAddress
but uses weaker circuit isolation to provide performance
suitable for a web browser.
'';
};
socksPolicy = mkOption {
type = types.nullOr types.str;
default = null;
@@ -108,6 +122,22 @@ in
SocksListenAddress.
'';
};
privoxy.enable = mkOption {
default = true;
description = ''
Whether to enable and configure the system Privoxy to use Tor's
faster port, suitable for HTTP.
To have anonymity, protocols need to be scrubbed of identifying
information, and this can be accomplished for HTTP by Privoxy.
Privoxy can also be useful for KDE torification. A good setup would be:
setting SOCKS proxy to the default Tor port, providing maximum
circuit isolation where possible; and setting HTTP proxy to Privoxy
to route HTTP traffic over faster, but less isolated port.
'';
};
};
relay = {
@@ -322,5 +352,16 @@ in
};
environment.systemPackages = [ pkgs.tor ];
services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) {
enable = true;
extraConfig = ''
forward-socks4a / ${cfg.client.socksListenAddressFaster} .
toggle 1
enable-remote-toggle 0
enable-edit-actions 0
enable-remote-http-toggle 0
'';
};
};
}

View File

@@ -0,0 +1,69 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.tor;
torify = pkgs.writeTextFile {
name = "tsocks";
text = ''
#!${pkgs.stdenv.shell}
TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@"
'';
executable = true;
destination = "/bin/tsocks";
};
in
{
###### interface
options = {
services.tor.tsocks = {
enable = mkOption {
default = cfg.enable && cfg.client.enable;
description = ''
Whether to build tsocks wrapper script to relay application traffic via TOR.
'';
};
server = mkOption {
default = "localhost:9050";
example = "192.168.0.20";
description = ''
IP address of TOR client to use.
'';
};
config = mkOption {
default = "";
description = ''
Extra configuration. Contents will be added verbatim to TSocks
configuration file.
'';
};
};
};
###### implementation
config = mkIf cfg.tsocks.enable {
environment.systemPackages = [ torify ]; # expose it to the users
services.tor.tsocks.config = ''
server = ${toString(head (splitString ":" cfg.tsocks.server))}
server_port = ${toString(tail (splitString ":" cfg.tsocks.server))}
local = 127.0.0.0/255.128.0.0
local = 127.128.0.0/255.192.0.0
'';
};
}

View File

@@ -6,9 +6,9 @@ let
cfg = config.services.tor.torsocks;
optionalNullStr = b: v: optionalString (b != null) v;
configFile = ''
TorAddress ${toString (head (splitString ":" cfg.server))}
TorPort ${toString (tail (splitString ":" cfg.server))}
configFile = server: ''
TorAddress ${toString (head (splitString ":" server))}
TorPort ${toString (tail (splitString ":" server))}
OnionAddrRange ${cfg.onionAddrRange}
@@ -19,13 +19,24 @@ let
AllowInbound ${if cfg.allowInbound then "1" else "0"}
'';
wrapTorsocks = name: server: pkgs.writeTextFile {
name = name;
text = ''
#!${pkgs.stdenv.shell}
TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@"
'';
executable = true;
destination = "/bin/${name}";
};
in
{
options = {
services.tor.torsocks = {
enable = mkOption {
type = types.bool;
default = false;
default = config.services.tor.enable && config.services.tor.client.enable;
description = ''
Whether to build <literal>/etc/tor/torsocks.conf</literal>
containing the specified global torsocks configuration.
@@ -42,6 +53,16 @@ in
'';
};
fasterServer = mkOption {
type = types.str;
default = "127.0.0.1:9063";
example = "192.168.0.20:1234";
description = ''
IP/Port of the Tor SOCKS server for torsocks-faster wrapper suitable for HTTP.
Currently, hostnames are NOT supported by torsocks.
'';
};
onionAddrRange = mkOption {
type = types.str;
default = "127.42.42.0/24";
@@ -89,10 +110,10 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.torsocks ];
environment.systemPackages = [ pkgs.torsocks (wrapTorsocks "torsocks-faster" cfg.fasterServer) ];
environment.etc =
[ { source = pkgs.writeText "torsocks.conf" configFile;
[ { source = pkgs.writeText "torsocks.conf" (configFile cfg.server);
target = "tor/torsocks.conf";
}
];

View File

@@ -130,6 +130,11 @@ in
config.system.path
];
# Don't restart dbus-daemon. Bad things tend to happen if we do.
systemd.services.dbus.reloadIfChanged = true;
systemd.services.dbus.restartTriggers = [ configDir ];
environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
};

View File

@@ -98,9 +98,6 @@ let
# Authorization: is the user allowed access?
"authz_user" "authz_groupfile" "authz_host"
# For compatibility with old configurations, the new module mod_access_compat is provided.
(if version24 then "access_compat" else "")
# Other modules.
"ext_filter" "include" "log_config" "env" "mime_magic"
"cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
@@ -115,6 +112,8 @@ let
"cache" "cache_disk"
"slotmem_shm"
"socache_shmcb"
# For compatibility with old configurations, the new module mod_access_compat is provided.
"access_compat"
]
++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
++ optional enableSSL "ssl"
@@ -229,6 +228,9 @@ let
${if cfg.sslServerCert != null then ''
SSLCertificateFile ${cfg.sslServerCert}
SSLCertificateKeyFile ${cfg.sslServerKey}
${if cfg.sslServerChain != null then ''
SSLCertificateChainFile ${cfg.sslServerChain}
'' else ""}
'' else ""}
${if cfg.enableSSL then ''

View File

@@ -56,6 +56,13 @@ with lib;
description = "Path to server SSL certificate key.";
};
sslServerChain = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/ca.pem";
description = "Path to server SSL extra chain file.";
};
adminAddr = mkOption ({
type = types.nullOr types.str;
example = "admin@example.org";

View File

@@ -24,7 +24,7 @@ let
http_address = mkOption {
default = "localhost:8080";
type = types.string;
description = "Give a port and adress for the HTTP server.";
description = "Give a port and address for the HTTP server.";
};
user = mkOption {

View File

@@ -70,14 +70,6 @@ in
description = "Custom kde-workspace, used for NixOS rebranding.";
};
};
environment.kdePackages = mkOption {
default = [];
example = literalExample "[ pkgs.kde4.kdesdk ]";
type = types.listOf types.package;
description = "This option is obsolete. Please use <option>environment.systemPackages</option> instead.";
};
};

View File

@@ -25,7 +25,7 @@ let
fontconfig = config.fonts.fontconfig;
xresourcesXft = pkgs.writeText "Xresources-Xft" ''
${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${fontconfig.dpi}''}
${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''}
Xft.antialias: ${if fontconfig.antialias then "1" else "0"}
Xft.rgba: ${fontconfig.subpixel.rgba}
Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter}
@@ -189,7 +189,7 @@ in
xserverArgs = mkOption {
type = types.listOf types.str;
default = [];
example = [ "-ac" "-logverbose" "-nolisten tcp" ];
example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ];
description = "List of arguments for the X server.";
apply = toString;
};

View File

@@ -483,8 +483,6 @@ in
services.xserver.displayManager.xserverArgs =
[ "-ac"
"-logverbose"
"-verbose"
"-terminate"
"-logfile" "/var/log/X.${toString cfg.display}.log"
"-config ${configFile}"

View File

@@ -9,19 +9,21 @@ use Cwd 'abs_path';
my $out = "@out@";
# To be robust against interruption, record what units need to be started etc.
my $startListFile = "/run/systemd/start-list";
my $restartListFile = "/run/systemd/restart-list";
my $reloadListFile = "/run/systemd/reload-list";
my $action = shift @ARGV;
if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test")) {
if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) {
print STDERR <<EOF;
Usage: $0 [switch|boot|test]
switch: make the configuration the boot default and activate now
boot: make the configuration the boot default
test: activate the configuration, but don\'t make it the boot default
switch: make the configuration the boot default and activate now
boot: make the configuration the boot default
test: activate the configuration, but don\'t make it the boot default
dry-activate: show what would be done if this configuration were activated
EOF
exit 1;
}
@@ -56,8 +58,6 @@ EOF
exit 100;
}
syslog(LOG_NOTICE, "switching to system configuration $out");
# Ignore SIGHUP so that we're not killed if we're running on (say)
# virtual console 1 and we restart the "tty1" unit.
$SIG{PIPE} = "IGNORE";
@@ -116,6 +116,11 @@ sub boolIsTrue {
return $s eq "yes" || $s eq "true";
}
sub recordUnit {
my ($fn, $unit) = @_;
write_file($fn, { append => 1 }, "$unit\n") if $action ne "dry-activate";
}
# As a fingerprint for determining whether a unit has changed, we use
# its absolute path. If it has an override file, we append *its*
# absolute path as well.
@@ -124,9 +129,20 @@ sub fingerprintUnit {
return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : "");
}
# Stop all services that no longer exist or have changed in the new
# configuration.
my (@unitsToStop, @unitsToSkip);
# Figure out what units need to be stopped, started, restarted or reloaded.
my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload);
my %unitsToFilter; # units not shown
$unitsToStart{$_} = 1 foreach
split('\n', read_file($startListFile, err_mode => 'quiet') // "");
$unitsToRestart{$_} = 1 foreach
split('\n', read_file($restartListFile, err_mode => 'quiet') // "");
$unitsToReload{$_} = 1 foreach
split '\n', read_file($reloadListFile, err_mode => 'quiet') // "";
my $activePrev = getActiveUnits;
while (my ($unit, $state) = each %{$activePrev}) {
my $baseUnit = $unit;
@@ -141,7 +157,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
push @unitsToStop, $unit;
$unitsToStop{$unit} = 1;
}
elsif ($unit =~ /\.target$/) {
@@ -155,7 +171,10 @@ while (my ($unit, $state) = each %{$activePrev}) {
# should not be the case. Just ignore it.
if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") {
unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) {
write_file($startListFile, { append => 1 }, "$unit\n");
$unitsToStart{$unit} = 1;
recordUnit($startListFile, $unit);
# Don't spam the user with target units that always get started.
$unitsToFilter{$unit} = 1;
}
}
@@ -171,7 +190,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
# (unless there is a PartOf dependency), so this is just a
# bookkeeping thing to get systemd to do the right thing.
if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "no")) {
push @unitsToStop, $unit;
$unitsToStop{$unit} = 1;
}
}
@@ -180,16 +199,18 @@ while (my ($unit, $state) = each %{$activePrev}) {
# Do nothing. These cannot be restarted directly.
} elsif ($unit =~ /\.mount$/) {
# Reload the changed mount unit to force a remount.
write_file($reloadListFile, { append => 1 }, "$unit\n");
} elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/) {
$unitsToReload{$unit} = 1;
recordUnit($reloadListFile, $unit);
} elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) {
# FIXME: do something?
} else {
my $unitInfo = parseUnit($newUnitFile);
if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) {
write_file($reloadListFile, { append => 1 }, "$unit\n");
$unitsToReload{$unit} = 1;
recordUnit($reloadListFile, $unit);
}
elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) {
push @unitsToSkip, $unit;
$unitsToSkip{$unit} = 1;
} else {
# If this unit is socket-activated, then stop the
# socket unit(s) as well, and restart the
@@ -202,8 +223,9 @@ while (my ($unit, $state) = each %{$activePrev}) {
}
foreach my $socket (@sockets) {
if (defined $activePrev->{$socket}) {
push @unitsToStop, $socket;
write_file($startListFile, { append => 1 }, "$socket\n");
$unitsToStop{$unit} = 1;
$unitsToStart{$unit} = 1;
recordUnit($startListFile, $socket);
$socketActivated = 1;
}
}
@@ -213,7 +235,8 @@ while (my ($unit, $state) = each %{$activePrev}) {
# This unit should be restarted instead of
# stopped and started.
write_file($restartListFile, { append => 1 }, "$unit\n");
$unitsToRestart{$unit} = 1;
recordUnit($restartListFile, $unit);
} else {
@@ -222,10 +245,11 @@ while (my ($unit, $state) = each %{$activePrev}) {
# We write this to a file to ensure that the
# service gets restarted if we're interrupted.
if (!$socketActivated) {
write_file($startListFile, { append => 1 }, "$unit\n");
$unitsToStart{$unit} = 1;
recordUnit($startListFile, $unit);
}
push @unitsToStop, $unit;
$unitsToStop{$unit} = 1;
}
}
@@ -268,14 +292,16 @@ foreach my $mountPoint (keys %$prevFss) {
my $unit = pathToUnitName($mountPoint) . ".mount";
if (!defined $new) {
# Filesystem entry disappeared, so unmount it.
push @unitsToStop, $unit;
$unitsToStop{$unit} = 1;
} elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) {
# Filesystem type or device changed, so unmount and mount it.
write_file($startListFile, { append => 1 }, "$unit\n");
push @unitsToStop, $unit;
$unitsToStop{$unit} = 1;
$unitsToStart{$unit} = 1;
recordUnit($startListFile, $unit);
} elsif ($prev->{options} ne $new->{options}) {
# Mount options changes, so remount it.
write_file($reloadListFile, { append => 1 }, "$unit\n");
$unitsToReload{$unit} = 1;
recordUnit($reloadListFile, $unit);
}
}
@@ -294,14 +320,51 @@ foreach my $device (keys %$prevSwaps) {
# FIXME: update swap options (i.e. its priority).
}
if (scalar @unitsToStop > 0) {
@unitsToStop = unique(@unitsToStop);
print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
system("systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
# Should we have systemd re-exec itself?
my $restartSystemd = abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd");
sub filterUnits {
my ($units) = @_;
my @res;
foreach my $unit (sort(keys %{$units})) {
push @res, $unit if !defined $unitsToFilter{$unit};
}
return @res;
}
print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n"
if scalar @unitsToSkip > 0;
my @unitsToStopFiltered = filterUnits(\%unitsToStop);
my @unitsToStartFiltered = filterUnits(\%unitsToStart);
# Show dry-run actions.
if ($action eq "dry-activate") {
print STDERR "would stop the following units: ", join(", ", @unitsToStopFiltered), "\n"
if scalar @unitsToStopFiltered > 0;
print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
if scalar(keys %unitsToSkip) > 0;
print STDERR "would restart systemd\n" if $restartSystemd;
print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"
if scalar(keys %unitsToRestart) > 0;
print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n"
if scalar @unitsToStartFiltered;
print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n"
if scalar(keys %unitsToReload) > 0;
exit 0;
}
syslog(LOG_NOTICE, "switching to system configuration $out");
if (scalar (keys %unitsToStop) > 0) {
print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n"
if scalar @unitsToStopFiltered;
system("systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
}
print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
if scalar(keys %unitsToSkip) > 0;
# Activate the new configuration (i.e., update /etc, make accounts,
# and so on).
@@ -310,7 +373,7 @@ print STDERR "activating the configuration...\n";
system("$out/activate", "$out") == 0 or $res = 2;
# Restart systemd if necessary.
if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) {
if ($restartSystemd) {
print STDERR "restarting systemd...\n";
system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
}
@@ -321,16 +384,19 @@ system("@systemd@/bin/systemctl", "reset-failed");
# Make systemd reload its units.
system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
# Signal dbus to reload its configuration before starting other units.
# Other units may rely on newly installed policy files under /etc/dbus-1
system("@systemd@/bin/systemctl", "reload", "dbus.service");
# Reload units that need it. This includes remounting changed mount
# units.
if (scalar(keys %unitsToReload) > 0) {
print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n";
system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4;
unlink($reloadListFile);
}
# Restart changed services (those that have to be restarted rather
# than stopped and started).
my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
if (scalar @restart > 0) {
print STDERR "restarting the following units: ", join(", ", sort(@restart)), "\n";
system("@systemd@/bin/systemctl", "restart", "--", @restart) == 0 or $res = 4;
if (scalar(keys %unitsToRestart) > 0) {
print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n";
system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4;
unlink($restartListFile);
}
@@ -340,20 +406,11 @@ if (scalar @restart > 0) {
# that are symlinks to other units. We shouldn't start both at the
# same time because we'll get a "Failed to add path to set" error from
# systemd.
my @start = unique("default.target", "timers.target", "sockets.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
print STDERR "starting the following units: ", join(", ", sort(@start)), "\n";
system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n"
if scalar @unitsToStartFiltered;
system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4;
unlink($startListFile);
# Reload units that need it. This includes remounting changed mount
# units.
my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // "");
if (scalar @reload > 0) {
print STDERR "reloading the following units: ", join(", ", sort(@reload)), "\n";
system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4;
unlink($reloadListFile);
}
# Print failed and new units.
my (@failed, @new, @restarting);

View File

@@ -88,7 +88,7 @@ let
failed = map (x: x.message) (filter (x: !x.assertion) config.assertions);
showWarnings = res: fold (w: x: builtins.trace "^[[1;31mwarning: ${w}^[[0m" x) res config.warnings;
showWarnings = res: fold (w: x: builtins.trace "warning: ${w}" x) res config.warnings;
# Putting it all together. This builds a store path containing
# symlinks to the various parts of the built configuration (the

View File

@@ -63,7 +63,8 @@ def get_generations(profile):
"@nix@/bin/nix-env",
"--list-generations",
"-p",
"/nix/var/nix/profiles/%s" % (profile)
"/nix/var/nix/profiles/%s" % (profile),
"--option", "build-users-group", ""
])
gen_lines = gen_list.split('\n')
gen_lines.pop()

View File

@@ -94,7 +94,7 @@ with lib;
echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
'';
environment.variables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
};

View File

@@ -56,9 +56,10 @@ echo
# Mount special file systems.
mkdir -p /etc
mkdir -p /etc/udev
touch /etc/fstab # to shut up mount
touch /etc/mtab # to shut up mke2fs
touch /etc/udev/hwdb.bin # to shut up udeev
touch /etc/initrd-release
mkdir -p /proc
mount -t proc proc /proc
@@ -174,20 +175,24 @@ fi
if test -e /sys/power/resume -a -e /sys/power/disk; then
if test -n "@resumeDevice@"; then
resumeDev="@resumeDevice@"
resumeInfo="$(udevadm info -q property "$resumeDev" )"
else
for sd in @resumeDevices@; do
# Try to detect resume device. According to Ubuntu bug:
# https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
# When there are multiple swap devices, we can't know where will hibernate
# image reside. We can check all of them for swsuspend blkid.
if [ "$(udevadm info -q property "$sd" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
resumeInfo="$(udevadm info -q property "$sd" )"
if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
resumeDev="$sd"
break
fi
done
fi
if test -n "$resumeDev"; then
readlink -f "$resumeDev" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
if test -e "$resumeDev"; then
resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')"
resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')"
echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..."
fi
fi
@@ -215,6 +220,9 @@ checkFS() {
# Don't check resilient COWs as they validate the fs structures at mount time
if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi
# Skip fsck for inherently readonly filesystems.
if [ "$fsType" = squashfs ]; then return 0; fi
# If we couldn't figure out the FS type, then skip fsck.
if [ "$fsType" = auto ]; then
echo 'cannot check filesystem with type "auto"!'

View File

@@ -240,8 +240,9 @@ in
example = "/dev/sda3";
description = ''
Device for manual resume attempt during boot. This should be used primarily
if you want to resume from file. Specify here the device where the file
resides. You should also use <varname>boot.kernelParams</varname> to specify
if you want to resume from file. If left empty, the swap partitions are used.
Specify here the device where the file resides.
You should also use <varname>boot.kernelParams</varname> to specify
<literal><replaceable>resume_offset</replaceable></literal>.
'';
};
@@ -355,10 +356,17 @@ in
config = mkIf (!config.boot.isContainer) {
assertions = singleton
assertions = [
{ assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems);
message = "The fileSystems option does not specify your root file system.";
};
}
{ assertion = let inherit (config.boot) resumeDevice; in
resumeDevice == "" || builtins.substring 0 1 resumeDevice == "/";
message = "boot.resumeDevice has to be an absolute path."
+ " Old \"x:y\" style is no longer supported.";
}
];
system.build.bootStage1 = bootStage1;
system.build.initialRamdisk = initialRamdisk;

View File

@@ -50,8 +50,10 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
# Make /nix/store a read-only bind mount to enforce immutability of
# the Nix store. Note that we can't use "chown root:nixbld" here
# because users/groups might not exist yet.
chown 0:30000 /nix/store
chmod 1775 /nix/store
# Silence chown/chmod to fail gracefully on a readonly filesystem
# like squashfs.
chown -f 0:30000 /nix/store
chmod -f 1775 /nix/store
if [ -n "@readOnlyStore@" ]; then
if ! readonly-mountpoint /nix/store; then
mount --bind /nix/store /nix/store
@@ -91,6 +93,7 @@ mkdir -m 01777 -p /tmp
mkdir -m 0755 -p /var /var/log /var/lib /var/db
mkdir -m 0755 -p /nix/var
mkdir -m 0700 -p /root
chmod 0700 /root
mkdir -m 0755 -p /bin # for the /bin/sh symlink
mkdir -m 0755 -p /home
mkdir -m 0755 -p /etc/nixos

View File

@@ -695,21 +695,21 @@ in
default = {};
type = types.attrsOf types.optionSet;
options = [ linkOptions ];
description = "Definiton of systemd network links.";
description = "Definition of systemd network links.";
};
systemd.network.netdevs = mkOption {
default = {};
type = types.attrsOf types.optionSet;
options = [ netdevOptions ];
description = "Definiton of systemd network devices.";
description = "Definition of systemd network devices.";
};
systemd.network.networks = mkOption {
default = {};
type = types.attrsOf types.optionSet;
options = [ networkOptions networkConfig ];
description = "Definiton of systemd networks.";
description = "Definition of systemd networks.";
};
systemd.network.units = mkOption {
@@ -858,6 +858,13 @@ in
description = "Definition of systemd per-user service units.";
};
systemd.user.timers = mkOption {
default = {};
type = types.attrsOf types.optionSet;
options = [ timerOptions unitConfig ];
description = "Definition of systemd per-user timer units.";
};
systemd.user.sockets = mkOption {
default = {};
type = types.attrsOf types.optionSet;
@@ -978,8 +985,9 @@ in
// mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.network.networks;
systemd.user.units =
mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets;
mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets
// mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.user.timers;
system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
[ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"

View File

@@ -38,7 +38,7 @@ in
default = null;
example = 4000;
description = ''
Use fixed port for rpc.statd, usefull if NFS server is behind firewall.
Use fixed port for rpc.statd, useful if NFS server is behind firewall.
'';
};
lockdPort = mkOption {
@@ -46,7 +46,7 @@ in
example = 4001;
description = ''
Use fixed port for NFS lock manager kernel module (lockd/nlockmgr),
usefull if NFS server is behind firewall.
useful if NFS server is behind firewall.
'';
};
};

View File

@@ -101,7 +101,7 @@ in
ips = interfaceIps i;
in
nameValuePair "network-addresses-${i.name}"
{ description = "Addresss configuration of ${i.name}";
{ description = "Address configuration of ${i.name}";
wantedBy = [ "network-interfaces.target" ];
before = [ "network-interfaces.target" ];
bindsTo = [ (subsystemDevice i.name) ];

View File

@@ -38,6 +38,11 @@ let kernel = config.boot.kernelPackages.kernel; in
systemd.services."serial-getty@ttyS0".enable = false;
systemd.services."serial-getty@hvc0".enable = false;
# Don't use a pager when executing backdoor actions. Because we
# use a tty, commands like systemctl or nix-store get confused
# into thinking they're running interactively.
environment.variables.PAGER = "";
boot.initrd.postDeviceCommands =
''
# Using acpi_pm as a clock source causes the guest clock to

View File

@@ -7,17 +7,6 @@ in
{
imports = [ ../profiles/headless.nix ./ec2-data.nix ];
options = {
ec2 = {
hvm = mkOption {
default = false;
description = ''
Whether the EC2 instance is a HVM instance.
'';
};
};
};
config = {
system.build.amazonImage =
pkgs.vmTools.runInLinuxVM (

View File

@@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
{
options = {
ec2 = {
hvm = lib.mkOption {
default = false;
internal = true;
description = ''
Whether the EC2 instance is a HVM instance.
'';
};
};
};
config = {};
}

Some files were not shown because too many files have changed in this diff Show More