Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

nixos-build-vms

Remove some obsolete references to <nixos>

2015-08-05 17:37:08 +02:00

auto-upgrade.nix

Merge branch 'master' into closure-size

2015-12-31 09:53:02 +01:00

get-version-suffix

Mark builds from git explicitly

2014-05-01 15:05:14 +02:00

nixos-checkout.nix

Unify NixOS and Nixpkgs channel structure

2015-08-05 17:37:11 +02:00

nixos-generate-config.pl

nixos-generate-config: fix #12595: broadcom quoting

2016-01-25 07:57:53 +01:00

nixos-install.sh

nixos-install: Don't use NIX_BUILD_HOOK from caller's environment

2015-09-30 23:02:21 +03:00

nixos-option.sh

Merge pull request #5416 from nbp/nixos-option-include

2014-12-21 15:11:11 -08:00

nixos-rebuild.sh

nixos-rebuild: Build only the 'out' output of nix (not 'doc' and 'debug' too)

2016-01-20 10:01:59 +01:00

nixos-version.sh

Add option to display git revision to nixos-version

2014-12-27 21:43:04 +01:00

tools.nix

btrfsProgs -> canonical btrfs-progs

2016-01-03 20:38:44 +01:00