1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
nixpkgs/nixos
Jan Tojnar 380c030740 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/aiohttp-socks/default.nix
;	pkgs/development/python-modules/emv/default.nix
;	pkgs/development/python-modules/mocket/default.nix
;	pkgs/development/python-modules/types-protobuf/default.nix
2021-12-31 07:26:03 +01:00
..
doc nixos/kubernetes: remove dashboard 2021-12-30 18:51:03 +10:00
lib Merge master into staging-next 2021-12-29 06:01:11 +00:00
maintainers create-amis.sh: possible deprecation 2021-11-11 09:04:29 -07:00
modules Revert "nixos/dhcpd: switch to DynamicUser" 2021-12-30 14:22:08 +01:00
tests Merge branch 'master' into staging-next 2021-12-31 07:26:03 +01:00
COPYING
default.nix
README
release-combined.nix
release-small.nix
release.nix lxdImage: split from docker profile, use generators.toYAML 2021-11-03 07:49:54 +01:00

*** NixOS ***

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