3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos
Orivej Desh ab0d141f44 Merge branch 'master' into staging
* master: (23 commits)
  silver-searcher: patch bash completions location
  shairplay: init at 2016-01-01
  ocamlPackages.rope: 0.5 -> 0.6
  ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8
  mupdf: Patch openjpeg version
  nextcloud-client: fix build after qt updates
  gstreamer.gst-plugins-bad: Patch openjpeg version
  silver-searcher: move bash completion to etc/bash-completion.d/
  neomutt: use mime.types from dedicated mime-types derivation
  mime_types: rename to mime-types
  XMLLibXML: 2.0129 -> 2.0132 fixes failing tests & CVE-2017-10672
  nixos/matrix-synapse: remove unused log_file config
  nixos: run parted with --script option (3rd)
  nixos: run parted with --script option (2nd)
  nixos/release: add nixos/tests/switch-test.nix to tested job
  nixos/system: make switch-to-configuration script pure.
  nixos/release: include mutableUsers test to release tests.
  nixos/tests: Add a test for config.users.mutableUsers.
  corebird: 1.7.2 -> 1.7.3
  nixos/matrix-synapse: make home directory configurable
  ...
2017-11-20 09:21:51 +00:00
..
doc/manual Merge pull request #31268 from Ma27/x11-defaults 2017-11-15 16:41:52 +00:00
lib nixos/testing: fix after --set ceased to evaluate the value 2017-11-19 14:15:19 +00:00
maintainers amazon-image: make derivation name configurable 2017-10-23 16:22:24 -04:00
modules Merge pull request #31812 from eqyiel/matrix-synapse-configurable-home 2017-11-20 09:35:57 +01:00
tests nixos: run parted with --script option (3rd) 2017-11-19 22:55:12 +01:00
COPYING
default.nix
README
release-combined.nix Merge pull request #31805 from gleber/make-switch-to-configuration-pure 2017-11-19 19:03:52 +00:00
release-small.nix php: pcre test blocks -small channels as well 2017-11-12 11:03:54 +01:00
release.nix Merge pull request #31805 from gleber/make-switch-to-configuration-pure 2017-11-19 19:03:52 +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.