nixpkgs

History

Domen Kožar bb4d658f64 Merge branch 'master' into staging

Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix

2015-05-11 10:05:23 +02:00

doc/manual

Revert "cups: Rename "browsing" config option to "advertise""

2015-05-10 20:47:50 +02:00

lib

VM tests: Don't produce output on failure

2015-04-10 11:18:30 +02:00

maintainers

nixos/initrd: Generic library copying

2015-03-28 18:37:29 -07:00

modules

Merge branch 'master' into staging

2015-05-11 10:05:23 +02:00

tests

cups: Add defaultShared, browsing and webInterace config option

2015-05-10 13:46:32 +02:00

COPYING

…

default.nix

…

README

…

release-combined.nix

nixos: Re-add swraid installer tests to releases.

2015-04-01 08:50:38 +02:00

release-small.nix

Rename scrubDrv -> hydraJob and make it more effective

2015-03-20 19:46:18 +01:00

release.nix

nixos/release: Test vbox on x86_64-linux only.

2015-04-04 17:16:57 +02:00

README

*** 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.