3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Dmitry Kalinkin c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
..
doc Merge pull request #67232 from ck3d/container-useHostResolvConf 2019-09-25 09:34:17 +00:00
lib nixos/lib/utils: Make the set recursive again, unbreak eval 2019-09-08 13:31:18 +02:00
maintainers amazon-image.nix: upload prebuilt images 2019-09-05 00:52:21 +09:00
modules Merge branch 'master' into staging-next 2019-09-25 19:21:46 -04:00
tests Merge pull request #67232 from ck3d/container-useHostResolvConf 2019-09-25 09:34:17 +00: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.nix nixos/release: add gnome3 closure 2019-09-17 17:48:40 -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.