summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* nixos/doc: Updates release date for 18.09•••(cherry picked from commit 82d1bf96910762eadfd94a5da4b9a8263c568b53) 18.09Samuel Dionne-Riel2018-10-051-1/+1
* README: 18.03 -> 18.09•••(cherry picked from commit 29b479eb72f3192ed67846dfa6a4ab5c49b6a268) Samuel Dionne-Riel2018-10-051-4/+4
* Updates 18.09 release notes for release.•••(cherry picked from commit 6487a4799621443de16b61c8c7206d4f11df1687) Samuel Dionne-Riel2018-10-051-2/+337
* Merge pull request #47925 from edef1c/git-2.18.1•••git: 2.18.0 -> 2.18.1 (CVE-2018-17456)Andreas Rammhold2018-10-051-2/+2
|\
| * git: 2.18.0 -> 2.18.1 (CVE-2018-17456)edef2018-10-051-2/+2
|/
* docs: Delete assert functions since they don't exist in 18.09Graham Christensen2018-10-052-119/+0
* Generate links to function definitions•••Hydra passes the full revision in to the input, which we pass through. If we don't get this ,we try to get it from other sources, or default to master which should have the definition in a close-ish location. All published docs should have theURL resolve properly, only local hackers will have the link break. (cherry picked from commit 5daee73ce41652d21743a7304b4fd3f9da926c35) Graham Christensen2018-10-058-6/+135
* version.nix: extract revision-fetching function•••(cherry picked from commit 4312cfdbda1855088905a3d9959a4fac362fd051) Graham Christensen2018-10-052-4/+11
* Merge pull request #47898 from peterhoeg/f/activation_1809•••nixos system-activation: support activation scripts run in a user contextSamuel Dionne-Riel2018-10-053-5/+57
|\
| * plasma5: run kbuildsycoca5 in the user context•••(cherry picked from commit 4dada63a174331151251cf8be093cd8fcdf28c12) Peter Hoeg2018-10-051-5/+2
| * switch-to-configuration.pl: activate the nixos-activation.service user service•••(cherry picked from commit 8118d6eb2e34b6f08511819b4e75650cf7f7d9cd) Peter Hoeg2018-10-051-0/+1
| * system-activation: support script fragments to run in a user context•••(cherry picked from commit 1353ba26787d398f3595deea28e21a134978df83) Peter Hoeg2018-10-051-0/+54
* | nixpkgs: Start documenting library functions in XML•••Covers assert functions and about half of the attrsets functions. Some internal consistency around IDs could be improved. (cherry picked from commit f835f77e02018c77b48fc7f4911f3fee97f9d777) Graham Christensen2018-10-055-1/+1069
* | matrix-synapse: 0.33.5 -> 0.33.6•••(cherry picked from commit 570b9bab252bdf316e1029def98ad30b3ae18ae0) Backport of #47880 Notkea2018-10-051-2/+2
|/
* GRV: Fix typos in description•••(cherry picked from commit 1bb4b16b3b150ba67d0afd44c058a735b125de98) Alex Leferry 22018-10-041-1/+1
* Merge #47699: nixos on hyperv improvementsVladimír Čunát2018-10-052-6/+32
|\
| * nixos on hyperv: hot-add CPU•••(cherry picked from commit 6e3e136f77b3103a0c3b3fe7578c5864932b649c) Peter Hoeg2018-10-031-4/+8
| * nixos-installer: use the hyperv module on hyperv•••(cherry picked from commit ca6d41ae654386562ef7f00ae268e6e9070a3f49) Peter Hoeg2018-10-031-2/+1
| * nixos on hyperv: load modules and set video mode•••(cherry picked from commit 3a76bc7a79e18020716ba063dcd1bd8ec11b0790) Peter Hoeg2018-10-031-0/+23
* | Merge pull request #47884 from primeos/security-backports-for-18.09•••[18.09] gollum, jekyll (security backports)Michael Weiss2018-10-047-119/+163
|\ \
| * | gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740)•••(cherry picked from commit 18b468ed8186131d5a8a6590ff10253e12d0195a) Reason: Security update: "Depend on new version of gollum-lib that relies on a patched version of sanitize, which solves a vulnerability (CVE-2018-3740). See https://github.com/gollum/gollum-lib/pull/296." Michael Weiss2018-10-042-11/+11
| * | jekyll: 3.8.3 -> 3.8.4 (security)•••(cherry picked from commit e8a35913e138c169e0a2bbcc06efadd9363b24e6) Reason: Security update: "fix include bypass of EntryFilter#filter symlink check". Michael Weiss2018-10-044-71/+71
| * | gollum: 4.1.2 -> 4.1.3•••(cherry picked from commit 265c5fc485267a2be8ca5d555bc247766bc72dbc) Reason: Security update: "Solves a vulnerability in the File view and All Pages view that would allow XSS." Michael Weiss2018-10-043-44/+88
* | | Merge pull request #47874 from andir/18.09/thunderbird•••[18.09] thunderbird: 60.0 -> 60.2.1, thunderbird-bin: 60.0 -> 60.2.1Andreas Rammhold2018-10-040-0/+0
|\ \ \
| * | | thunderbird-bin: 60.0 -> 60.2.1•••(cherry picked from commit d4de3b2d34100c3253f18b3404bfe041197324ef) taku02018-10-041-233/+233
| * | | thunderbird: 60.0 -> 60.2.1•••(cherry picked from commit d802524def3c7ca26e2c0206751b1ff7f1c702a6) taku02018-10-041-4/+14
* | | | elvish: provide the compiled version•••Without this fix, `elvish -version` displays "unknown" (cherry picked from commit 9d49cf1808d1cf90a0f9bc958163dffcb2a746de) zimbatm2018-10-041-0/+4
* | | | nixos-option: fix #47722 when missing ~/.nix-defexpr/channels•••The problem was that the non-fatal warning was not omitted from the output when constructing a nix expression. Now it seems OK for me. When return code is OK, the warnings don't get passed anywhere, but I expect that won't matter for this utility. Fatal errors are still shown. (cherry picked from commit de93b32f902fef6243af2edcf9b2d1c28763f9d0) Vladimír Čunát2018-10-041-2/+2
* | | | terraform-providers.matchbox: init at 0.2.2 (#47863)•••(cherry picked from commit e4f4e9fd1d05675be29149d5ac7ea4e12d7efe19) Florian Klink2018-10-042-0/+10
* | | | Merge pull request #47407 from kalbasit/nixpkgs_add-terraform-provider-nixos•••terraform: update all providers and move nixos provider under terraform.withPlugins (cherry picked from commit 5547a8b6a51e764fa21396f00f3582b4cf2068b7) Jörg Thalheim2018-10-0410-112/+214
* | | | Merge branch 'staging-18.09' into release-18.09Vladimír Čunát2018-10-042-4/+6
|\| | | | |/ / |/| |
| * | Merge pull request #47709 from et4te/rustbuild-fix-staging•••buildRustPackage: install binaries to bin and libraries to lib correctlyJörg Thalheim2018-10-041-2/+4
| |\ \
| | * | Shortened rmdir, improved regex to support shared libs with multiple integers...Edward Tate2018-10-031-4/+3
| | * | Use regex instead of -name in find with -print0 and xargs -0.Edward Tate2018-10-031-4/+5
| | * | buildRustPackage now correctly installs binaries to bin and libraries to lib.Edward Tate2018-10-031-1/+3
| * | | Merge branch 'release-18.09' into staging-18.09Uli Baum2018-10-0290-1817/+2140
| |\ \ \
| * | | | lz4: 1.8.2 -> 1.8.3 (#47547)•••(cherry picked from commit 55b6cad5376186affaebc2d990515ad5f1cef1c1) Will Dietz2018-10-021-2/+2
| | |/ / | |/| |
* | | | linux: 4.18.11 -> 4.18.12•••(cherry picked from commit 21db680d32522ece1cbb3999b8e468f2e8b57906) Tim Steinbach2018-10-031-2/+2
* | | | linux: 4.14.73 -> 4.14.74•••(cherry picked from commit 575c118a6469cd2148ed3092de90f0d8d3aaec53) Tim Steinbach2018-10-031-2/+2
* | | | linux: 4.9.130 -> 4.9.131•••(cherry picked from commit e6ff57b328e913ae656e038a819b12926eadd230) Tim Steinbach2018-10-031-2/+2
* | | | doc: installing-usb: removes notes about unetbootin.•••They are known to cause more issues than solving issues; futhermore using `dd` should work everywhere without fail. (cherry picked from commit 8467dc857bd1cc9c54a15cd36c062554b61234cf) Samuel Dionne-Riel2018-10-031-29/+0
* | | | doc: Reviews partitioning instructions to use parted.•••The tests in <nixos/tests/installer.nix> are using `parted`, so they are bound to be better tested than `fdisk`. This is brought on by a couple issues, plus reports on IRC that the `fdisk` instructions didn't work as expected. * #39354 * #46309 * #39942 * #45478 Care was taken so that the other documented steps did not need changes. In all this kerfufle, a slight re-organization of the Chapter has been made, allowing better deep linking. (cherry picked from commit 6cfbf403ca327017257ddbd742e312f3304b64cc) Samuel Dionne-Riel2018-10-031-298/+409
* | | | nixos/doc: Adds sub-folder to input files.•••(cherry picked from commit 2c0d56f00719f27533a3a1a89d2bd48710735a1e) Samuel Dionne-Riel2018-10-031-1/+1
* | | | doc: installing-usb make macOS note a note.•••While it seemingly brings more attention to the macOS notes with the default docbook template, it better represents which parts of the section are about macOS, and which parts are simply in the flow of the text; otherwise the last paragraph may be lost into the details for macOS. (cherry picked from commit 8192fcd0fdac8d17c5719994a0c60ae0bd1109ed) Samuel Dionne-Riel2018-10-031-9/+10
* | | | nixpkgs docs: formatGraham Christensen2018-10-039-612/+611
* | | | nixpkgs docs: Rebuild manual-full if nested XML docs changeGraham Christensen2018-10-031-1/+1
* | | | shell functions: rewrite as xmlGraham Christensen2018-10-033-23/+28
* | | | nixpkgs docs: move shell section to its own fileGraham Christensen2018-10-032-1/+1
* | | | nixpkgs docs: move dockertool to its own fileGraham Christensen2018-10-033-422/+416
* | | | nixpkgs docs: move fhs-environments to its own fileGraham Christensen2018-10-032-141/+145