about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #83618 from NixOS/staging-nextFrederik Rietdijk2020-04-05
|\
| * Merge master into staging-nextFrederik Rietdijk2020-04-05
| |\
| * | nixos/ibus: fix evaluationTor Hedin Brønner2020-04-05
| * | Merge master into staging-nextFrederik Rietdijk2020-04-03
| |\ \
| * | | Revert "make-options-doc: fix string context issues"Jan Tojnar2020-04-02
| * | | Merge branch 'master' into staging-nextJan Tojnar2020-03-31
| |\ \ \
| * \ \ \ Merge branch 'master' into staging-nextJan Tojnar2020-03-29
| |\ \ \ \
| * \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2020-03-28
| |\ \ \ \ \
| * | | | | | rl-2009: note gnome desktop upgradeTor Hedin Brønner2020-03-24
| * | | | | | gnome3.vino: removeJan Tojnar2020-03-24
| * | | | | | gnome3.gnome-flashback: 3.34.2 -> 3.36.0Tor Hedin Brønner2020-03-24
| * | | | | | nixos/gnome-keyring: add portalsTor Hedin Brønner2020-03-24
| * | | | | | Merge branch 'staging-next' into stagingJan Tojnar2020-03-24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into stagingOrivej Desh2020-03-23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #81277 from markuskowa/upd-rdma-coremarkuskowa2020-03-22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/rxe: use iproute instead of rdma-coreMarkus Kowalewski2020-03-12
| * | | | | | | | | Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020Matthew Bauer2020-03-16
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | gtk-icon-cache: get native gtk3 for icon cacheMatthew Bauer2020-03-06
* | | | | | | | | | | ssh validationPackage is a single value, not a listFrederik Rietdijk2020-04-05
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | nixos/matrix-synapse: remove web_client optionMartin Milata2020-04-04
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #73763 from kmcopper/hardening-profileJoachim F2020-04-03
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nixos/hardened: scudo default allocator. zero by default allow override.Kyle Copperfield2019-11-26
| * | | | | | | | | nixos/hardened: build sandbox incompatible with namespacesKyle Copperfield2019-11-19
* | | | | | | | | | Merge pull request #84074 from Infinisil/fix-literal-option-examplesSilvan Mosberger2020-04-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | nixos/treewide: Fix incorrectly rendered examplesSilvan Mosberger2020-04-02
* | | | | | | | | | | nixos/wg-quick: Fix after wireguard got upstreamedBastian Köcher2020-04-03
* | | | | | | | | | | Merge pull request #83258 from mmilata/sympa-6.2.54Silvan Mosberger2020-04-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | nixos/sympa: fix outgoing messagingMartin Milata2020-03-24
| * | | | | | | | | | | sympa: build with --enable-fhsMartin Milata2020-03-24
* | | | | | | | | | | | Merge pull request #84087 from Izorkin/mariadb-tokudbFlorian Klink2020-04-02
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | mariadb: add option to build server without tokudb storageIzorkin2020-04-02
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | nix-daemon.nix: Add option nix.registryEelco Dolstra2020-04-02
* | | | | | | | | | | | Merge pull request #84103 from mmilata/moinmoin-b42Silvan Mosberger2020-04-02
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | nixos/moinmoin: fix maintainer referenceMartin Milata2020-04-02
* | | | | | | | | | | | | Merge pull request #79828 from Mic92/zedJörg Thalheim2020-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | nixos/zfs: populate PATH with needed programs for zedJörg Thalheim2020-02-11
* | | | | | | | | | | | | | Merge pull request #81298 from Mic92/buildkiteJörg Thalheim2020-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixos/buildkite-agents: don't run as nogroupJörg Thalheim2020-02-28
* | | | | | | | | | | | | | | nixos/pixiecore: init (#83406)Bruno Bigras2020-04-02
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | nixos/borgbackup: fix evaluationJörg Thalheim2020-04-02
* | | | | | | | | | | | | | Merge pull request #83529 from ngiger/83525Jörg Thalheim2020-04-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | borgbackup: Moved documentation to NixOS manual and added examples forNiklaus Giger2020-04-01
* | | | | | | | | | | | | | | Revert "nixos/none: remove"worldofpeace2020-04-02
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #84037 from worldofpeace/remove-none.nixworldofpeace2020-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixos/none: removeworldofpeace2020-04-01
* | | | | | | | | | | | | | | nixos: add freedesktop/gnome/myself maintainersworldofpeace2020-04-01
* | | | | | | | | | | | | | | Revert "make-options-doc: fix string context issues"Jan Tojnar2020-04-02
* | | | | | | | | | | | | | | nixos/iio: adjust formatting of option description.Dave Anderson2020-04-01
* | | | | | | | | | | | | | | nixos/iio: explain why you might want IIO sensor support.David Anderson2020-04-01
* | | | | | | | | | | | | | | Merge pull request #70762 from xfix/nixos-mullvad-vpnMario Rodas2020-04-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \