summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* chromium: Disable Hydra builds of -dev and -betaEelco Dolstra2016-05-04
| | | | | | It's not the job of Nixpkgs to distribute beta versions of upstream packages. More importantly, building these delays channel updates by several hours, which is bad for our security fix turnaround time.
* Merge pull request #15200 from Pleune/fix/bspwm-java-noreparentingJoachim Fasting2016-05-04
|\ | | | | bspwm: add _JAVA_AWT_WM_NONREPARENTING=1
| * bspwm: add _JAVA_AWT_WM_NONREPARENTING=1Mitchell Pleune2016-05-03
| | | | | | | | | | bspwm is not in java's internal list of non-reparrenting window managers. See https://awesomewm.org/wiki/Problems_with_Java
* | grsecurity: support disabling TCP simultaneous connectJoachim Fasting2016-05-04
|/ | | | | | | | | | Defaults to OFF because disabling TCP simultaneous connect breaks some legitimate use cases, notably WebRTC [1], but it's nice to provide the option for deployments where those features are unneeded anyway. This is an alternative to https://github.com/NixOS/nixpkgs/pull/4937 [1]: http://article.gmane.org/gmane.linux.documentation/9425
* jenkins service: improve curl call in postStartBjørn Forsman2016-05-03
| | | | | | | | | | | * Perform HTTP HEAD request instead of full GET (lighter weight) * Don't log output of curl to the journal (it's noise/debug) * Use explicit http:// URL scheme * Reduce poll interval from 10s to 2s (respond to state changes quicker). Probably not relevant on boot (lots of services compete for the CPU), but online service restarts/reloads should be quicker. * Pass --fail to curl (should be more robust against false positives) * Use 4 space indent for shell code.
* jenkins service: remove unneeded (and brittle) part of postStartBjørn Forsman2016-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | The current postStart code holds Jenkins off the "started" state until Jenkins becomes idle. But it should be enough to wait until Jenkins start handling HTTP requests to consider it "started". More reasons why the current approach is bad and we should remove it, from @coreyoconnor in https://github.com/NixOS/nixpkgs/issues/14991#issuecomment-216572571: 1. Repeatedly curling for a specific human-readable string to determine "Active" is fragile. For instance, what happens when jenkins is localized? 2. The time jenkins takes to initializes is variable. This (at least used to) depend on the number of jobs and any plugin upgrades requested. 3. Jenkins can be requested to restart from the UI. Which will not affect the status of the service. This means that the service being "active" does not imply jenkins is initialized. Downstream services cannot assume jenkins is initialized if the service is active. Might as well accept that and remove the initialized test from service startup. Fixes #14991.
* nixos/tests/netboot: Fix evaluation erroraszlig2016-05-03
| | | | | | | | | Regression introduced by dfe608c8a2ecfdf0ab2838a967440207250a0b95. The commit turns the two arguments into one attrset argument so we need to adapt that to use the new calling convention. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* Merge #15105: nixos manual: rephrase indented stringsVladimír Čunát2016-05-02
|\
| * Manual: rephrase definition for indented stringsiarizc Leuname2016-04-30
| | | | | | | | Closes #15076
* | grsecurity module: fix grsec-lock unit orderingJoachim Fasting2016-05-02
| | | | | | | | | | Requirement without ordering implies parallel execution; it is crucial that sysctl tunables are finalized before the lock is engaged, however.
* | Merge pull request #14700: olinks for NixOS manualaszlig2016-05-02
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to use <olink> tags inside NixOS options to reference sections from the manual. I've originally introduced it in #14476 to reference the Taskserver specific documentation from the options reference but as suggested by @nbp, this was done as a separate pull request to ensure greater visibility rather than being "hidden" in the Taskserver branch. The build time for the manual is around 30s on my machine without this change and 34s with this change, so it shouldn't have a very big impact on the build time of the manual. Olinks between the options reference and the manual now will look like this: "More instructions about NixOS in conjuction with Taskserver can be found in the NixOS manual at Chapter 15, Taskserver." More documentation about olinks can be found here: http://www.sagehill.net/docbookxsl/Olinking.html Acked-by: Eelco Dolstra <eelco.dolstra@logicblox.com>
| * | nixos/doc: Allow refs from options to the manualaszlig2016-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My first attempt to do this was to just use a conditional <refsection/> in order to not create exact references in the manpage but create the reference in the HTML manual, as suggested by @edolstra on IRC. Later I went on to use <olink/> to reference sections of the manual, but in order to do that, we need to overhaul how we generate the manual and manpages. So, that's where we are now: There is a new derivation called "manual-olinkdb", which is the olinkdb for the HTML manual, which in turn creates the olinkdb.xml file and the manual.db. The former contains the targetdoc references and the latter the specific targetptr elements. The reason why I included the olinkdb.xml verbatim is that first of all the DTD is dependent on the Docbook XSL sources and the references within the olinkdb.xml entities are relative to the current directory. So using a store path for that would end up searching for the manual.db directly in /nix/store/manual.db. Unfortunately, the <olinks/> that end up in the output file are relative, so for example if you're clicking on one of these within the PDF, the URL is searched in the current directory. However, the sections from the olink's text are still valid, so we could use an alternative URL for that in the future. The manual doesn't contain any links, so even referencing the relative URL shouldn't do any harm. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra
* | | Merge pull request #15094 from jraygauthier/jrg/brscan4_init_rebasedArseniy Seroka2016-05-01
|\ \ \ | | | | | | | | brscan4: init at 0.4.3-3
| * | | brscan4: init at 0.4.3-3Raymond Gauthier2016-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A sane backend for recent brother scanners. Depends on the presence of etc files generated by the nixos module of the same name. Supports network scanner specification through the nixos module.
* | | | Remove now useless proprietary Copy.com client and serviceTobias Geerinckx-Rice2016-05-01
| | | | | | | | | | | | | | | | | | | | | | | | <https://techlib.barracuda.com/Copy/FAQ> SaaS.
* | | | Merge pull request #14741 from cruegge/dbus-activation-environmentThomas Tuegel2016-05-01
|\ \ \ \ | | | | | | | | | | xsession: Update DBus activation environment
| * | | | xsession: make updating DBus environment optionalChristoph Ruegge2016-04-25
| | | | |
| * | | | xsession: Update DBus activation environmentChristoph Ruegge2016-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `dbus-launch` is executed early in the script, before desktop managers had a chance to setup the environment. If DBus activation is used, applications launched by this may therefore lack necessary environment variables. This patch sends the complete environment to DBus after launching the desktop manager.
* | | | | Merge pull request #14992 from avnik/rspamdFranz Pletz2016-05-01
|\ \ \ \ \ | | | | | | | | | | | | Rspamd/Rmilter update
| * | | | | rspamd: configurable bindSocket and bindUISocketAlexander V. Nikolaev2016-04-28
| | | | | |
| * | | | | rmilter: correct paths to socketsAlexander V. Nikolaev2016-04-28
| | | | | |
| * | | | | rmilter: socket activation in nixosAlexander V. Nikolaev2016-04-28
| | | | | |
* | | | | | netboot: fix evalDomen Kožar2016-05-01
| |_|_|_|/ |/| | | |
* | | | | Revert "Manual: rephrase definition for indented strings" (#15103)Domen Kožar2016-04-30
| | | | |
* | | | | Manual: rephrase definition for indented strings (#15086)NotaseCretagen2016-04-30
| |_|/ / |/| | | | | | | Closes #15076
* | | | netboot -> netboot.x86_64-linuxEelco Dolstra2016-04-29
| | | | | | | | | | | | | | | | | | | | For consistency, and in case we ever want to support another architecture.
* | | | Merge pull request #15078 from phile314/masterArseniy Seroka2016-04-29
|\ \ \ \ | | | | | | | | | | elasticsearch: Install elastic search modules properly
| * | | | elasticsearch: Install elastic search modules properly, fixes groovy script ↵Philipp Hausmann2016-04-29
| | | | | | | | | | | | | | | | | | | | support.
* | | | | Merge pull request #15063 from mayflower/upstream/graylogJoachim Fasting2016-04-29
|\ \ \ \ \ | |/ / / / |/| | | | Add graylog package and service
| * | | | graylog service: Initial graylog serviceTristan Helmich2016-04-28
| | | | |
* | | | | PXE boot: add manual section and note in changelogDomen Kožar2016-04-29
| | | | |
* | | | | installer: simple PXE bootable NixOS installerNahum Shalman2016-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Nix store squashfs is stored inside the initrd instead of separately (cherry picked from commit 976fd407796877b538c470d3a5253ad3e1f7bc68) Signed-off-by: Domen Kožar <domen@dev.si>
* | | | | Update EC2 AMIs to 16.03.659.011ea84Eelco Dolstra2016-04-29
| | | | | | | | | | | | | | | | | | | | This includes the binutils mass rebuild.
* | | | | Merge pull request #15014 from groxxda/refactor/fail2banJoachim Fasting2016-04-29
|\ \ \ \ \ | |/ / / / |/| | | | fail2ban: rework service
| * | | | fail2ban: rework serviceAlexander Ried2016-04-26
| | | | |
* | | | | Revert "pulseaudio: select correct outputs"Nikolay Amiantov2016-04-28
| | | | | | | | | | | | | | | | | | | | This reverts commit 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38.
* | | | | pulseaudio: select correct outputsNikolay Amiantov2016-04-28
| | | | | | | | | | | | | | | | | | | | Original fixes by ttuegel and peterhoeg.
* | | | | taskserver service: Really check that it is enabledTuomas Tynkkynen2016-04-28
| | | | |
* | | | | Merge pull request #14896 from elitak/rtl8723bsTuomas Tynkkynen2016-04-28
|\ \ \ \ \ | | | | | | | | | | | | rtl8723bs: improved build and split off firmware
| * | | | | rtl8723bs-firmware: init, split off from rtl8723bsEric Litak2016-04-25
| | | | | |
* | | | | | Update `etc` example to not use a real config fileGraham Christensen2016-04-27
| | | | | | | | | | | | | | | | | | A user noticed the example for `hosts`, took the `mode` permissions literally, and ended up with surprising behavior on their system. Updating the documentation to not reference a real config file which might have real permissions requirements.
* | | | | | logmein-hamachi: init at 2.1.0.139, add nixos serviceNikolay Amiantov2016-04-27
| | | | | |
* | | | | | pulseaudio service: fix service pathNikolay Amiantov2016-04-27
| | | | | |
* | | | | | containers: test imperative and ipv4 in small-release (#15015)Arnold Krille2016-04-26
| | | | | | | | | | | | | | | | | | | | | | | | Test imperative containers and declarative containers with ipv4. These two tests are basically the extraction of the containers test from before.
* | | | | | Merge commit 'refs/pull/14936/head' of git://github.com/NixOS/nixpkgsNikolay Amiantov2016-04-26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | postgresql service: initialScript fixupAl Zohali2016-04-23
| | | | | |
* | | | | | dbus service: fix path to the launch helperNikolay Amiantov2016-04-26
| | | | | |
* | | | | | symlinkJoin: accept set as an argument with additional optionsNikolay Amiantov2016-04-26
| | | | | |
* | | | | | Merge pull request #14977 from jerith666/crashplan-46-r3Arseniy Seroka2016-04-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Crashplan: 4.6.0-r2 -> 4.6.0-r3
| * | | | | | crashplan: always overwrite binaries in /var/lib/ to ensure that updates are ↵Matt McHenry2016-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | applied fully