summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Fix incorrect mergeGregor Kleen2018-04-21
|
* Merge branch 'master' of github.com:NixOS/nixpkgs into feat/acme/delayGregor Kleen2018-04-21
|\
| * Merge pull request #30908 from kierdavis/boinc-fhsMatthew Justin Bauer2018-04-21
| |\ | | | | | | boinc service: use an FHS environment (CI now passing)
| | * boinc service: use an FHS environmentKier Davis2017-11-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While BOINC itself is open source, many of the project applications it runs are not. Additionally, these project applications are checksummed before they are run, so they can't be patched. This means we can't make the project applications find required binaries/libraries on a NixOS system. The solution is therefore to make said binaries and libraries appear in the expected locations, by wrapping BOINC in an FHS-compatible environment [1]. An `extraEnvPackages` is also added to allow more packages to be added into this environment. The documentation for this option describes some practical use cases for it. [1] https://nixos.org/nixpkgs/manual/#sec-fhs-environments Version 2: fixed Docbook list formatting, minor rewording Version 3: rebase onto master (9c048f4fb66adc33c6b379f2edefcb615fd53de6) Version 4: fix usage of targetPkgs argument to buildFHSUserEnv
| * | Merge branch 'master' into feat/nsd/dnssecMatthew Justin Bauer2018-04-21
| |\ \
| * | | nixos/nsd: automatic DNSSEC using BIND toolsetGregor Kleen2017-11-16
| | | |
* | | | Merge branch 'master' into feat/acme/delayMatthew Justin Bauer2018-04-21
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #31969 from Assassinkin/masterMatthew Justin Bauer2018-04-21
| |\ \ \ | | | | | | | | | | Update sssd integration with pam as documented by RedHat
| | * | | Update sssd integration with pam as documented by RedHatAssassinkin2017-11-22
| | | | |
| * | | | Merge pull request #38816 from Ekleog/dovecot-lda-testJörg Thalheim2018-04-21
| |\ \ \ \ | | | | | | | | | | | | dovecot module: test dovecot's LDA
| | * | | | dovecot module: test dovecot's LDALéo Gaspard2018-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's apparently not enough to catch the bug I ran into with the update to 2.3.1, but at least it will check the LDA appears to work.
| * | | | | Merge pull request #35541 from xeji/containers-extraflagsJörg Thalheim2018-04-21
| |\ \ \ \ \ | | | | | | | | | | | | | | nixos/containers: add extraFlags option
| | * | | | | nixos/containers: add extraFlags optionxeji2018-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to pass extra flags to systemd-nspawn
| * | | | | | Merge pull request #39300 from erikarvstedt/openvpn-no-timestampsJörg Thalheim2018-04-21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | openvpn: remove redundant timestamps from log output
| | * | | | | | openvpn: remove redundant timestamps from log outputErik Arvstedt2018-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The systemd journal is already logging and showing timestamps
| * | | | | | | Merge pull request #39297 from xeji/tests/gnome3-gdmJörg Thalheim2018-04-21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | nixos/tests/gnome3-gdm: fix broken test
| | * | | | | | nixos/tests/gnome3-gdm: fix broken testxeji2018-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test always failed due to multiple bugs
| * | | | | | | nixos/restic: init (#38948)Lassulus2018-04-21
| | | | | | | |
| * | | | | | | Merge pull request #39232 from Infinisil/sshd-optionsPeter Hoeg2018-04-21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos/sshd: add options for kexAlgorithms, ciphers and MACs
| | * | | | | | | nixos/sshd: add options for kexAlgorithms, ciphers and MACsSilvan Mosberger2018-04-20
| | | | | | | | |
| * | | | | | | | Merge pull request #38979 from xeji/tests-systemdMatthew Justin Bauer2018-04-20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos/tests/systemd: fix broken test
| | * | | | | | | | nixos/test/systemd: fix broken testxeji2018-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timing bug resulted in sporadic test failures on hydra
| * | | | | | | | | nix: 2.0 -> 2.0.1Eelco Dolstra2018-04-20
| | | | | | | | | |
| * | | | | | | | | Merge pull request #38356 from Infinisil/fix/environmentDaiderd Jordan2018-04-20
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | nixos/systemd: Fix environment type -> allows overriding
| | * | | | | | | | | nixos/systemd: Fix environment type -> allows overridingSilvan Mosberger2018-04-03
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #38918 from gnidorah/gitwebWout Mertens2018-04-20
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nixos/gitweb: add gitwebTheme option
| | * | | | | | | | | | nixos/gitweb: add gitwebTheme optiongnidorah2018-04-17
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #39165 from WilliButz/update-postfix-exporterFranz Pletz2018-04-20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | prometheus-postfix-exporter: 2017-06-01 -> 0.1.1, update module
| | * | | | | | | | | | | nixos/prometheus-postfix-exporter: update moduleWilliButz2018-04-19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #39164 from ngortheone/masterDaniel Peebles2018-04-20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | Fix root volume resizing on EC2 KVM instances (M5, C5, etc)
| | * | | | | | | | | | | growPartition: fix volume resizing on EC2 NVME instancesIhor Antonov2018-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code for this accidentally picked up a "p" when computing the partition number. This logic should be more robust
| * | | | | | | | | | | | nixos/tests/containers-imperative: Fix evalaszlig2018-04-20
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit c6f7d4367894047592cc412740f0c1f5b2ca2b59 changed the system attribute to be below config.nixpkgs.localSystem, but the test still uses the old attribute. I have not tested whether the test actually succeeds but just checked whether evaluation works and it evaluates successfully now. Signed-off-by: aszlig <aszlig@nix.build>
| * | | | | | | | | | | Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-optionsJohn Ericson2018-04-19
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | nixpkgs module: Clean up platform options
| | * | | | | | | | | | nixpkgs module: Clean up platform optionsJohn Ericson2018-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `localSystem` is added, it strictly supercedes system - `crossSystem`'s description mentions `localSystem` (and vice versa). - No more weird special casing I don't even understand TEMP
| * | | | | | | | | | | Merge pull request #36864 from peterhoeg/f/ddclientPeter Hoeg2018-04-19
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | nixos ddclient: support multiple domains and run via systemd timer [WIP]
| | * | | | | | | | | | | nixos ddclient: support multiple domains and run via systemd timerPeter Hoeg2018-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) Some providers can update multiple domains - support that. b) Make "zone" and "script" configurable. Some providers require these. c) Instead of leaving the ddclient daemon running all the time, use a systemd timer to kick it off. d) Don't use a predefined user - run everything via DynamicUser e) Add documentation
| * | | | | | | | | | | | Merge pull request #38705 from tokudan/murmur_tmpfixMatthew Justin Bauer2018-04-18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | murmur: fix /tmp usage
| | * | | | | | | | | | | | murmur: fix /tmp usageDaniel Frank2018-04-10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | prometheus-exporters: add dovecot exporter moduleWilliButz2018-04-19
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | nixos/tor: use RuntimeDirectory, StateDirectory (#39083)Robert Schütz2018-04-18
| | | | | | | | | | | | |
| * | | | | | | | | | | | elasticsearch6: fix startup due to missing jvm.optionsBas van Dijk2018-04-18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #39072 from jbgi/azure-agent-mount-resource-optionJörg Thalheim2018-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Azure agent mount resource option + bash to path
| | * | | | | | | | | | | | azure-agent: add bash to service path.Jean-Baptiste Giraudeau2018-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as is often required by linux extensions.
| | * | | | | | | | | | | | azure-agent: add option to control auto mountJean-Baptiste Giraudeau2018-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of resource disk.
| * | | | | | | | | | | | | Merge pull request #39074 from jbgi/jira-updatesJörg Thalheim2018-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | atlassian-jira: 7.7.0 -> 7.9 and add bash to service path
| | * | | | | | | | | | | | | Add bash to jira PATH: required by health checks.Jean-Baptiste Giraudeau2018-04-17
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #36406 from alesguzik/bluez-midiMatthew Justin Bauer2018-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth MIDI support
| | * | | | | | | | | | | | | nixos/bluetooth: allow to specify custom bluez packageAles Huzik2018-03-08
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #36440 from dywedir/iwdMatthew Justin Bauer2018-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iwd: 2017-12-14 -> 0.1
| | * | | | | | | | | | | | | iwd: 2017-12-14 -> 0.1Vladyslav M2018-03-07
| | | | | | | | | | | | | | |