summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2018-12-08
|\
| * Merge pull request #51314 from Izorkin/mariadb-my.cnfGraham Christensen2018-12-07
| |\
| | * mariadb: change location configuration file to /etc/my.cnfIzorkin2018-12-02
* | | Merge master into staging-nextFrederik Rietdijk2018-12-07
|\| |
| * | Merge pull request #50809 from sorki/wireguard_containers_wont_modprobeRenaud2018-12-07
| |\ \
| | * | wireguard: don't modprobe if boot.isContainer is setRichard Marko2018-11-20
| * | | Merge pull request #51528 from grahamc/buildImage-on-layered-imagelewo2018-12-07
| |\ \ \
| | * | | dockerTools.buildImage: support using a layered image in fromImageGraham Christensen2018-12-05
| * | | | nixos/tests: Fix wrong arch in runInMachine testaszlig2018-12-07
| * | | | Merge pull request #51622 from dotlambda/home-assistant-0.83Peter Hoeg2018-12-07
| |\ \ \ \
| | * | | | home-assistant: 0.82.1 -> 0.83.3Robert Schütz2018-12-06
| * | | | | Merge pull request #51207 from samueldr/fix/sd-image-slimmingSamuel Dionne-Riel2018-12-06
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | sd-image: Slims the ext4 filesystem even more.Samuel Dionne-Riel2018-11-30
| * | | | | prometheus/exporters: fix regression in DynamicUser behaviorPierre Bourdon2018-12-05
| * | | | | prometheus/exporters/tor: make CPython happy by defining $HOMEPierre Bourdon2018-12-05
| * | | | | pkgsi686Linux.nixosTests.gitlab: fix 32 bit testsFlorian Klink2018-12-05
| * | | | | nixos/cockroachdb: simplify dataDir management, tweaksAustin Seipp2018-12-04
| * | | | | Merge pull request #51393 from arianvp/container-namesFlorian Klink2018-12-05
| |\ \ \ \ \
| | * | | | | nixos/containers: Add assertion for container name lengthArian van Putten2018-12-02
| * | | | | | kafka: Add 2.1Tim Steinbach2018-12-05
| * | | | | | kafka: Add test for 2.0Tim Steinbach2018-12-05
| | |_|/ / / | |/| | | |
| * | | | | Merge pull request #51493 from marsam/feature/docs-remove-nix-repl-referencesJörg Thalheim2018-12-04
| |\ \ \ \ \
| | * | | | | docs: Remove nix-repl referencesMario Rodas2018-12-03
| * | | | | | Merge pull request #51475 from redvers/update/mediawikiRenaud2018-12-04
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | mediawiki: 1.29.1 -> 1.31.1Red Davies2018-12-03
| * | | | | | Merge pull request #49392 from uvNikita/nixos/containers/vethsJörg Thalheim2018-12-03
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | nixos/containers: don't create veths if not configuredNikita Uvarov2018-10-29
| * | | | | | nixos/jenkins-job-builder: add accessTokenFile optionBjørn Forsman2018-12-03
| * | | | | | nixos/jenkins-job-builder: stop reloadScript on errorBjørn Forsman2018-12-03
* | | | | | | Merge master into staging-nextFrederik Rietdijk2018-12-03
|\| | | | | |
| * | | | | | nixos/cockroachdb: supply defaultText for the package optionPiotr Bogdan2018-12-02
| * | | | | | nixos/chrony: fix misplaced ConditionCapability= directiveAustin Seipp2018-12-02
| * | | | | | Merge pull request #51316 from primeos/swayMichael Weiss2018-12-02
| |\ \ \ \ \ \
| | * | | | | | nixos/sway-beta: Improve the wrapperMichael Weiss2018-12-01
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #48423 from charles-dyfis-net/beesSilvan Mosberger2018-12-02
| |\ \ \ \ \ \
| | * | | | | | nixos.tests.bees: initCharles Duffy2018-11-29
| | * | | | | | nixos/modules: services.bees initCharles Duffy2018-11-29
| * | | | | | | Revert "nixos/luksroot: Check whether the device already exists"Jörg Thalheim2018-12-02
| * | | | | | | Merge pull request #51329 from c0bw3b/cleanup/gnu-httpsmarkuskowa2018-12-02
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Treewide: use HTTPS on GNU domainsc0bw3b2018-12-02
| * | | | | | | Merge pull request #51225 from LumiGuide/elk-6.5.1Bas van Dijk2018-12-02
| |\ \ \ \ \ \ \
| | * | | | | | | elk: 6.3.2 -> 6.5.1Bas van Dijk2018-12-01
| * | | | | | | | Merge pull request #51379 from Gerschtli/add/programs-nm-appletJörg Thalheim2018-12-02
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/nm-applet: make the module smallerJörg Thalheim2018-12-02
| | * | | | | | | | nixos/nm-applet: add nm-applet programTobias Happ2018-12-02
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | nixos/cockroachdb: create new serviceJohn Boehr2018-12-01
| * | | | | | | | nixos/luksroot: Check whether the device already existsJanne Heß2018-12-01
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #51199 from samueldr/fix/iso-image-fat32Renaud2018-12-01
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | iso-image: Do not use batch operations for `mcopy`.Samuel Dionne-Riel2018-11-28
| | * | | | | | iso-image: Verifies the FAT partition at build.Samuel Dionne-Riel2018-11-28