3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
..
doc Merge pull request #31064 from disassembler/release-manager-docs 2019-08-24 09:42:02 -04:00
lib Merge branch 'master' into flip-map-foreach 2019-08-18 18:00:25 +03:00
maintainers mass replace "flip map -> forEach" 2019-08-05 14:03:38 +03:00
modules Merge branch 'master' into staging-next 2019-08-25 14:57:11 +02:00
tests Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
COPYING
default.nix
README
release-combined.nix nixosTests.pantheon: enable for all platforms 2019-08-07 15:55:39 -04:00
release-small.nix release-small.nix: Don't depend on currentSystem 2019-06-19 14:07:37 +02:00
release.nix nixos/sd-image-aarch64-new-kernel: Added to release 2018-12-26 11:03:32 +00: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.