···179179 </para>
180180</listitem>
181181182182+<listitem>
183183+ <para>
184184+ The <literal>locate</literal> service no longer indexes the Nix store
185185+ by default, preventing packages with potentially numerous versions from
186186+ cluttering the output. Indexing the store can be activated by setting
187187+ <literal>services.locate.includeStore = true</literal>.
188188+ </para>
189189+</listitem>
190190+182191</itemizedlist>
183192</para>
184193
···227227 riemanntools = 203;
228228 subsonic = 204;
229229 riak = 205;
230230+ shout = 206;
230231231232 # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
232233···432433 riemanntools = 203;
433434 subsonic = 204;
434435 riak = 205;
436436+ #shout = 206; #unused
435437436438 # When adding a gid, make sure it doesn't match an existing
437439 # uid. Users and groups with the same name should have equal
···7676 };
77777878 kernelPCRs = mkOption {
7979- default = "10,11";
7979+ default = "8,9,10,11,12";
8080 type = types.string;
8181 description = "PCR indices used in the TPM for kernel measurements.";
8282 };
+84-62
nixos/modules/services/misc/gitit.nix
···8899 homeDir = "/var/lib/gitit";
10101111+ toYesNo = b: if b then "yes" else "no";
1212+1113 gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version;
12141315 gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self));
···1719 in writeScript "gitit" ''
1820 #!${stdenv.shell}
1921 cd $HOME
2020- export PATH="${makeSearchPath "bin" (
2121- [ git curl ] ++ (if cfg.pdfExport == "yes" then [texLiveFull] else [])
2222- )}:$PATH";
2322 export NIX_GHC="${env}/bin/ghc"
2423 export NIX_GHCPKG="${env}/bin/ghc-pkg"
2524 export NIX_GHC_DOCDIR="${env}/share/doc/ghc/html"
···2726 ${env}/bin/gitit -f ${configFile}
2827 '';
29283030- gititOptions = let
3131-3232- yesNo = types.enum [ "yes" "no" ];
3333-3434- in {
2929+ gititOptions = {
35303631 enable = mkOption {
3732 type = types.bool;
···202197 };
203198204199 showLhsBirdTracks = mkOption {
205205- type = yesNo;
206206- default = "no";
200200+ type = types.bool;
201201+ default = false;
207202 description = ''
208203 Specifies whether to show Haskell code blocks in "bird style", with
209204 "> " at the beginning of each line.
···283278 };
284279285280 tableOfContents = mkOption {
286286- type = yesNo;
287287- default = "yes";
281281+ type = types.bool;
282282+ default = true;
288283 description = ''
289284 Specifies whether to print a tables of contents (with links to
290285 sections) on each wiki page.
···292287 };
293288294289 plugins = mkOption {
295295- type = types.path;
290290+ type = with types; listOf str;
296291 description = ''
297297- Specifies a list of plugins to load. Plugins may be specified either
298298- by their path or by their module name. If the plugin name starts
292292+ Specifies a list of plugins to load. Plugins may be specified either
293293+ by their path or by their module name. If the plugin name starts
299294 with Gitit.Plugin., gitit will assume that the plugin is an installed
300295 module and will not try to find a source file.
301301- Examples:
302302- plugins: plugins/DotPlugin.hs, CapitalizeEmphasisPlugin.hs
303303- plugins: plugins/DotPlugin
304304- plugins: Gitit.Plugin.InterwikiLinks
305296 '';
306297 };
307298308299 useCache = mkOption {
309309- type = yesNo;
310310- default = "no";
300300+ type = types.bool;
301301+ default = false;
311302 description = ''
312303 Specifies whether to cache rendered pages. Note that if use-feed is
313304 selected, feeds will be cached regardless of the value of use-cache.
···338329 };
339330340331 debugMode = mkOption {
341341- type = yesNo;
342342- default = "no";
332332+ type = types.bool;
333333+ default = false;
343334 description = "Causes debug information to be logged while gitit is running.";
344335 };
345336346337 compressResponses = mkOption {
347347- type = yesNo;
348348- default = "yes";
338338+ type = types.bool;
339339+ default = true;
349340 description = "Specifies whether HTTP responses should be compressed.";
350341 };
351342···357348 line of the file should contain two fields, separated by whitespace.
358349 The first field is the mime type, the second is a file extension.
359350 For example:
360360- video/x-ms-wmx wmx
351351+<programlisting>
352352+video/x-ms-wmx wmx
353353+</programlisting>
361354 If the file is not found, some simple defaults will be used.
362355 '';
363356 };
364357365358 useReCaptcha = mkOption {
366366- type = yesNo;
367367- default = "no";
359359+ type = types.bool;
360360+ default = false;
368361 description = ''
369369- If "yes", causes gitit to use the reCAPTCHA service
362362+ If true, causes gitit to use the reCAPTCHA service
370363 (http://recaptcha.net) to prevent bots from creating accounts.
371364 '';
372365 };
···471464 };
472465473466 useFeed = mkOption {
474474- type = yesNo;
475475- default = "no";
467467+ type = types.bool;
468468+ default = false;
476469 description = ''
477470 Specifies whether an ATOM feed should be enabled (for the site and
478471 for individual pages).
···484477 default = null;
485478 description = ''
486479 The base URL of the wiki, to be used in constructing feed IDs and RPX
487487- token_urls. Set this if use-feed is 'yes' or authentication-method
480480+ token_urls. Set this if useFeed is false or authentication-method
488481 is 'rpx'.
489482 '';
490483 };
491484492485 absoluteUrls = mkOption {
493493- type = yesNo;
494494- default = "no";
486486+ type = types.bool;
487487+ default = false;
495488 description = ''
496489 Make wikilinks absolute with respect to the base-url. So, for
497490 example, in a wiki served at the base URL '/wiki', on a page
498491 Sub/Page, the wikilink '[Cactus]()' will produce a link to
499499- '/wiki/Cactus' if absolute-urls is 'yes', and a relative link to
492492+ '/wiki/Cactus' if absoluteUrls is true, and a relative link to
500493 'Cactus' (referring to '/wiki/Sub/Cactus') if absolute-urls is 'no'.
501494 '';
502495 };
···514507 };
515508516509 pdfExport = mkOption {
517517- type = yesNo;
518518- default = "no";
510510+ type = types.bool;
511511+ default = false;
519512 description = ''
520520- If yes, PDF will appear in export options. PDF will be created using
513513+ If true, PDF will appear in export options. PDF will be created using
521514 pdflatex, which must be installed and in the path. Note that PDF
522515 exports create significant additional server load.
523516 '';
···537530 };
538531539532 xssSanitize = mkOption {
540540- type = yesNo;
541541- default = "yes";
533533+ type = types.bool;
534534+ default = true;
542535 description = ''
543543- If yes, all HTML (including that produced by pandoc) is filtered
536536+ If true, all HTML (including that produced by pandoc) is filtered
544537 through xss-sanitize. Set to no only if you trust all of your users.
545538 '';
546539 };
···560553 default-page-type: ${cfg.defaultPageType}
561554 math: ${cfg.math}
562555 mathjax-script: ${cfg.mathJaxScript}
563563- show-lhs-bird-tracks: ${cfg.showLhsBirdTracks}
556556+ show-lhs-bird-tracks: ${toYesNo cfg.showLhsBirdTracks}
564557 templates-dir: ${cfg.templatesDir}
565558 log-file: ${cfg.logFile}
566559 log-level: ${cfg.logLevel}
···568561 no-delete: ${cfg.noDelete}
569562 no-edit: ${cfg.noEdit}
570563 default-summary: ${cfg.defaultSummary}
571571- table-of-contents: ${cfg.tableOfContents}
572572- plugins: ${cfg.plugins}
573573- use-cache: ${cfg.useCache}
564564+ table-of-contents: ${toYesNo cfg.tableOfContents}
565565+ plugins: ${concatStringsSep "," cfg.plugins}
566566+ use-cache: ${toYesNo cfg.useCache}
574567 cache-dir: ${cfg.cacheDir}
575568 max-upload-size: ${cfg.maxUploadSize}
576569 max-page-size: ${cfg.maxPageSize}
577577- debug-mode: ${cfg.debugMode}
578578- compress-responses: ${cfg.compressResponses}
570570+ debug-mode: ${toYesNo cfg.debugMode}
571571+ compress-responses: ${toYesNo cfg.compressResponses}
579572 mime-types-file: ${cfg.mimeTypesFile}
580580- use-recaptcha: ${cfg.useReCaptcha}
573573+ use-recaptcha: ${toYesNo cfg.useReCaptcha}
581574 recaptcha-private-key: ${toString cfg.reCaptchaPrivateKey}
582575 recaptcha-public-key: ${toString cfg.reCaptchaPublicKey}
583576 access-question: ${cfg.accessQuestion}
···586579 rpx-key: ${toString cfg.rpxKey}
587580 mail-command: ${cfg.mailCommand}
588581 reset-password-message: ${cfg.resetPasswordMessage}
589589- use-feed: ${cfg.useFeed}
582582+ use-feed: ${toYesNo cfg.useFeed}
590583 base-url: ${toString cfg.baseUrl}
591591- absolute-urls: ${cfg.absoluteUrls}
584584+ absolute-urls: ${toYesNo cfg.absoluteUrls}
592585 feed-days: ${toString cfg.feedDays}
593586 feed-refresh-time: ${toString cfg.feedRefreshTime}
594594- pdf-export: ${cfg.pdfExport}
587587+ pdf-export: ${toYesNo cfg.pdfExport}
595588 pandoc-user-data: ${toString cfg.pandocUserData}
596596- xss-sanitize: ${cfg.xssSanitize}
589589+ xss-sanitize: ${toYesNo cfg.xssSanitize}
597590 '';
598591599592in
···608601 haskellPackages = mkDefault pkgs.haskellPackages;
609602 staticDir = gititShared + "/data/static";
610603 templatesDir = gititShared + "/data/templates";
611611- plugins = gititShared + "/plugins/Dot.hs";
604604+ plugins = [ ];
612605 };
613606614607 users.extraUsers.gitit = {
···628621 description = "Git and Pandoc Powered Wiki";
629622 after = [ "network.target" ];
630623 wantedBy = [ "multi-user.target" ];
624624+ path = with pkgs; [ curl ]
625625+ ++ optional cfg.pdfExport texLiveFull
626626+ ++ optional (cfg.repositoryType == "darcs") darcs
627627+ ++ optional (cfg.repositoryType == "mercurial") mercurial
628628+ ++ optional (cfg.repositoryType == "git") git;
631629632632- preStart = with cfg; ''
630630+ preStart = let
631631+ gm = "gitit@${config.networking.hostName}";
632632+ in
633633+ with cfg; ''
633634 chown ${uid}:${gid} -R ${homeDir}
634635 for dir in ${repositoryPath} ${staticDir} ${templatesDir} ${cacheDir}
635636 do
···641642 fi
642643 done
643644 cd ${repositoryPath}
644644- if [ ! -d .git ]
645645- then
646646- ${pkgs.git}/bin/git init
647647- ${pkgs.git}/bin/git config user.email "gitit@${config.networking.hostName}"
648648- ${pkgs.git}/bin/git config user.name "gitit"
649649- chown ${uid}:${gid} -R {repositoryPath}
650650- fi
651651- cd -
645645+ ${
646646+ if repositoryType == "darcs" then
647647+ ''
648648+ if [ ! -d _darcs ]
649649+ then
650650+ ${pkgs.darcs}/bin/darcs initialize
651651+ echo "${gm}" > _darcs/prefs/email
652652+ ''
653653+ else if repositoryType == "mercurial" then
654654+ ''
655655+ if [ ! -d .hg ]
656656+ then
657657+ ${pkgs.mercurial}/bin/hg init
658658+ cat >> .hg/hgrc <<NAMED
659659+[ui]
660660+username = gitit ${gm}
661661+NAMED
662662+ ''
663663+ else
664664+ ''
665665+ if [ ! -d .git ]
666666+ then
667667+ ${pkgs.git}/bin/git init
668668+ ${pkgs.git}/bin/git config user.email "${gm}"
669669+ ${pkgs.git}/bin/git config user.name "gitit"
670670+ ''}
671671+ chown ${uid}:${gid} -R ${repositoryPath}
672672+ fi
673673+ cd -
652674 '';
653675654676 serviceConfig = {
···8899 # Annoyingly, these files are updated without a change in URL. This means that
1010 # builds will start failing every month or so, until the hashes are updated.
1111- version = "2015-07-30";
1111+ version = "2015-08-03";
1212in
1313stdenv.mkDerivation {
1414 name = "geolite-legacy-${version}";
···2727 "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
2828 srcGeoIPASNum = fetchDB
2929 "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
3030- "16lfazhyhwmh8fyd7pxzwxp5sxszbqw4xdx3avv78hglhyb2ijkw";
3030+ "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";
3131 srcGeoIPASNumv6 = fetchDB
3232 "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
3333- "16jd6f2pwy8616jb78x8j6zda7h0p1bp786y86rq3ipgcw6g0jgn";
3333+ "06p9wnypnffsmqg5bszwygb73in4gc0h5l26wk0s43pdaldrdrx0";
34343535 meta = with stdenv.lib; {
3636 inherit version;
+1-1
pkgs/desktops/gnome-3/3.16/default.nix
···5353 gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
54545555 version = "3.16";
5656- maintainers = with pkgs.lib.maintainers; [ lethalman ];
5656+ maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];
57575858# Simplify the nixos module and gnome packages
5959 defaultIconTheme = adwaita-icon-theme;
···11diff -ruN a/src/config.py b/src/config.py
22---- a/src/config.py 2014-03-20 22:27:05.000000000 +0100
33-+++ b/src/config.py 2015-07-10 21:24:37.583136078 +0200
44-@@ -18,6 +18,7 @@
22+--- a/src/config.py 2015-07-31 19:35:37.000000000 +0000
33++++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000
44+@@ -14,6 +14,7 @@
5566+ import logging.config
67 import os
77- import logging
88+import stat
99+ import sys
1010+ import pkg_resources
9111010- from configparser import RawConfigParser, NoOptionError, NoSectionError
1111- from os import environ, makedirs, path, remove
1212-@@ -279,6 +280,13 @@
1313- copy2(default, options.filename)
1414- elif path.isfile(other):
1515- copy2(other, options.filename)
1212+@@ -563,6 +564,13 @@
1313+ copy2(default, options.filename)
1414+ elif path.isfile(other):
1515+ copy2(other, options.filename)
1616+
1717-+ # Inside the nixstore, the reference file is readonly, so is the copy.
1818-+ # Make it writable by the user who just created it.
1919-+ if os.path.exists(options.filename):
2020-+ os.chmod(options.filename,
2121-+ os.stat(options.filename).st_mode | stat.S_IWUSR)
1717++ # Inside the nixstore, the reference file is readonly, so is the copy.
1818++ # Make it writable by the user who just created it.
1919++ if os.path.exists(options.filename):
2020++ os.chmod(options.filename,
2121++ os.stat(options.filename).st_mode | stat.S_IWUSR)
2222+
2323- firstrun = True
2323+ global firstrun
2424+ firstrun = True
24252525- try: