nixpkgs/nixos
Florian Klink 6303131eb9 nixos/redis: fix merging
https://github.com/NixOS/nixpkgs/pull/71584 did merging without mkMerge.

cc @jtojnar
2019-11-08 15:38:06 +01:00
..
doc Merge pull request #70886 from allgreed/add-vbox-docs-hint 2019-11-07 17:24:14 -05:00
lib nixos/tests: improve get_unit_info expressiveness on failure 2019-11-08 11:20:54 +01:00
maintainers ec2-amis.nix: add 19.09 amis 2019-10-28 14:04:20 -04:00
modules nixos/redis: fix merging 2019-11-08 15:38:06 +01:00
tests Merge pull request #72935 from marijanp/port-tests-python 2019-11-08 14:50:04 +01:00
COPYING
default.nix
README
release-combined.nix nixos.tests.fontconfig-default-fonts: init 2019-09-01 00:09:25 -04:00
release-small.nix release-small.nix: Don't depend on currentSystem 2019-06-19 14:07:37 +02:00
release.nix Merge pull request #68265 from tkerber/rpi4 2019-09-27 14:35:17 -04:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.