BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3723 commits 1 branch 0 tags 3.8 GiB
Commit graph

116 commits

Author SHA1 Message Date
Eelco Dolstra
d0786fd3e7 * Cache nix-pull calls in nixos-install. 
svn path=/nixos/trunk/; revision=34241
 2012-05-25 13:32:30 +00:00
Eelco Dolstra
a3e04ba0aa * Fix problems with repeated installations due to the immutable bit 
(http://hydra.nixos.org/build/2645533).

svn path=/nixos/trunk/; revision=34235
 2012-05-25 02:30:52 +00:00
Eelco Dolstra
b11770373a * Work properly if /root/.nix-defexpr/channels already exists. 
svn path=/nixos/trunk/; revision=34233
 2012-05-24 23:37:06 +00:00
Eelco Dolstra
801cd7402c * Don't use ‘chown user.group’ since that syntax is not officially 
supported (you're supposed to say ‘chown user:group’).

svn path=/nixos/trunk/; revision=34161
 2012-05-17 19:43:32 +00:00
Eelco Dolstra
560262dae0 * Fix "error: the group nixbld' specified in build-users-group' does 
not exist" during nixos-install.

svn path=/nixos/trunk/; revision=34103
 2012-05-15 13:50:36 +00:00
Eelco Dolstra
29b05fb62a * nixos-checkout: add an argument to specify the directory where the 
sources should be stored.  E.g. "nixos-checkout /home/eelco/srcs"
  will check out to /home/eelco/srcs/{nixos,nixpkgs}.  Probably the
  /etc/nixos default should be removed eventually because /etc is a
  pretty weird place to keep large source trees.

svn path=/nixos/trunk/; revision=34086
 2012-05-14 04:12:43 +00:00
Eelco Dolstra
8d568e5a71 * nixos-option: clean up the English and the generated file. 
svn path=/nixos/trunk/; revision=34082
 2012-05-14 01:56:42 +00:00
Sander van der Burg
4b650026bf The <> syntax has to be applied properly, in order to find build-vms.nix 
svn path=/nixos/trunk/; revision=33981
 2012-05-03 12:31:01 +00:00
Eelco Dolstra
4d07f159a1 * Create /nix/var/nix/profiles/per-user with the right permissions. 
Fixes NixOS/149.

svn path=/nixos/trunk/; revision=33929
 2012-04-26 13:16:58 +00:00
Eelco Dolstra
6c1bb54483 * In the installation CD, make the NixOS/Nixpkgs available as if they 
were obtained from the NixOS channel.  "nixos-install" copies this
  to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
  the benefit of memory-constrained environments.

svn path=/nixos/trunk/; revision=33887
 2012-04-23 00:41:37 +00:00
Eelco Dolstra
f8e36664a6 * Subtle: since nix-env processes flags in order, any ‘-I’ flag should 
come before ‘-f <nixos>’.

svn path=/nixos/trunk/; revision=33831
 2012-04-18 15:01:42 +00:00
Eelco Dolstra
b4afefcc40 * Typo. 
svn path=/nixos/trunk/; revision=33826
 2012-04-18 12:32:17 +00:00
Eelco Dolstra
395d73db70 * nixos-rebuild: don't do a pull of the manifest by default anymore. 
It's not necessary when using the NixOS channel.  "nixos-rebuild
  pull" now pulls from the NixOS channel.

svn path=/nixos/trunk/; revision=33825
 2012-04-18 11:46:16 +00:00
Eelco Dolstra
fb0a54b803 * In nixos-install, do a nix-pull from 
http://nixos.org/releases/nixos/nixos-<version> to ensure we're
  getting the right binaries.

svn path=/nixos/trunk/; revision=33738
 2012-04-10 22:17:37 +00:00
Eelco Dolstra
c02240082a * Add missing file. 
svn path=/nixos/trunk/; revision=33733
 2012-04-10 21:17:43 +00:00
Eelco Dolstra
dccd99b564 * Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's 
not documented, and it doesn't seem to be used anywhere.

svn path=/nixos/trunk/; revision=33732
 2012-04-10 21:11:11 +00:00
Eelco Dolstra
096b7723c8 * Add a command "nixos-version" that prints the version of the 
currently activated NixOS.  This is "0.1pre-svn" when built from a
  SVN tree, but contains the actual revision when installed from the
  NixOS channel or from the ISO.

svn path=/nixos/trunk/; revision=33730
 2012-04-10 20:56:38 +00:00
Eelco Dolstra
f9ac67c67f * Copying manifests is slightly tricky because 
download-using-manifests expects that the files in
  /nix/var/nix/manifests are symlinks into the store.

svn path=/nixos/trunk/; revision=33727
 2012-04-10 15:36:50 +00:00
Eelco Dolstra
f37b453b19 * nixos-install: Ensure that builds are done by the nixbld users 
rather than root.  Also copy all manifests into the chroot so that
  any nix-pull done outside the chroot is "inherited".

svn path=/nixos/trunk/; revision=33725
 2012-04-10 14:39:12 +00:00
Eelco Dolstra
f9e8e735bb * Remove debug line. 
svn path=/nixos/trunk/; revision=33723
 2012-04-10 13:28:48 +00:00
Eelco Dolstra
5c06c66b68 * Clear more locale-related variables in the installer. 
svn path=/nixos/trunk/; revision=33722
 2012-04-10 13:28:17 +00:00
Eelco Dolstra
b2025c4687 * Use "umount -l" to clean up. 
svn path=/nixos/trunk/; revision=33721
 2012-04-10 13:25:55 +00:00
Rob Vermaas
6b34bd8564 remove remaining reference to nixos-deploy-nwtork 
svn path=/nixos/trunk/; revision=33663
 2012-04-07 15:18:39 +00:00
Eelco Dolstra
301c4d96b1 * Remove nixos-deploy-network. It has been superceded by Charon. 
svn path=/nixos/trunk/; revision=33662
 2012-04-07 13:26:35 +00:00
Eelco Dolstra
1949a85987 * Do a sync before switching to a new configuration. 
svn path=/nixos/trunk/; revision=33381
 2012-03-23 12:29:11 +00:00
Eelco Dolstra
f4903be57e * nixos-hardware-scan: detect if we're in a VirtualBox guest and 
enable the guest additions in that case.

svn path=/nixos/trunk/; revision=33133
 2012-03-16 01:57:23 +00:00
Eelco Dolstra
b4d16ef07e * Fix nixos-option. 
svn path=/nixos/trunk/; revision=33031
 2012-03-13 09:36:41 +00:00
Eelco Dolstra
45fab492fc * nixos-hardware-scan: "acpi-cpufreq" is automatically loaded, so we 
don't need to detect it.
* nixos-hardware-scan: don't use modulesPath.

svn path=/nixos/trunk/; revision=32972
 2012-03-10 14:35:31 +00:00
Eelco Dolstra
4869175158 * Fix the installer. The nixos-config element in $NIX_PATH was not 
set (and neither was $NIXOS_CONFIG).
  (http://hydra.nixos.org/build/2230309).

svn path=/nixos/trunk/; revision=32857
 2012-03-07 21:17:46 +00:00
Eelco Dolstra
a2417fd92f * Another workaround for the bug in substitute. 
svn path=/nixos/trunk/; revision=32814
 2012-03-06 10:57:52 +00:00
Eelco Dolstra
974a74ad49 * enableWLAN -> wireless.enable. 
svn path=/nixos/trunk/; revision=32788
 2012-03-04 21:15:34 +00:00
Eelco Dolstra
65824d40e1 * nixos-rebuild: pass on the -I option to nix-build. 
svn path=/nixos/trunk/; revision=32741
 2012-03-02 13:31:12 +00:00
Eelco Dolstra
29d84af677 * Remove the use of the NIXPKGS and NIXOS environment variables. 
Instead use $NIX_PATH.  NIXOS_CONFIG is still supported.

svn path=/nixos/trunk/; revision=32739
 2012-03-02 12:38:22 +00:00
Nicolas Pierron
338bc7b9f8 Fix nixos-option without argument. 
svn path=/nixos/trunk/; revision=31139
 2011-12-29 06:33:34 +00:00
Shea Levy
7f7eb341c8 Update the comment in the nixos-option generated configuration.nix in light of r30325 
svn path=/nixos/trunk/; revision=30326
 2011-11-08 15:51:39 +00:00
Eelco Dolstra
a76fe106e7 * nixos-hardware-scan: don't emit an include of an "install profile". 
That's confusing and wrong: nixos-hardware-scan should just enable
  support for the detected hardware, not enable lots of software (let
  alone KDE).

svn path=/nixos/trunk/; revision=30325
 2011-11-08 15:39:13 +00:00
Peter Simons
20b364f4de Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc. 
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.

svn path=/nixos/trunk/; revision=30127
 2011-10-30 15:19:58 +00:00
Shea Levy
fe045dc949 sed -i -e 's|/nix/var|@stateDir@|g' -e 's|/nix/store|@storeDir@|g' modules/installer/tools/*.sh 
Use configurable storeDir and stateDir in the installer tools

svn path=/nixos/trunk/; revision=30106
 2011-10-29 22:14:27 +00:00
Shea Levy
a16d43a8ac Make the stateDir and storeDir available for substitution into the tools 
svn path=/nixos/trunk/; revision=30105
 2011-10-29 22:00:25 +00:00
Shea Levy
09cf6ce70c find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g' 
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
 2011-10-29 21:03:57 +00:00
Eelco Dolstra
00ce9aaf1a * svn.nixos.org -> nixos.org. 
svn path=/nixos/trunk/; revision=29690
 2011-10-06 11:29:44 +00:00
Peter Simons
eb6e1310b8 strip trailing whitespace; no functional change 
svn path=/nixos/trunk/; revision=29285
 2011-09-14 18:20:50 +00:00
Sander van der Burg
ab70d480ab The machines in the network should be accessed by the node function parameter 
svn path=/nixos/trunk/; revision=27538
 2011-06-24 12:35:58 +00:00
Sander van der Burg
deb6cce4bb Adapted deploy-network to accept multiple network configurations which are zipped together. With this you can run the tool like this: 
$ nixos-deploy-network network1.nix network2.nix


svn path=/nixos/trunk/; revision=27028
 2011-04-28 11:02:58 +00:00
Eelco Dolstra
3ae283e8c3 * Remove installer2 and nixos-bootstrap-archive for lack of 
documentation / maintenance / clear use cases.

svn path=/nixos/trunk/; revision=27008
 2011-04-27 16:16:47 +00:00
Eelco Dolstra
b8a1e98180 * nixos-checkout depends on subversion. (The original nixos-checkout 
did a "nix-env -i subversion", which may be preferable to a static
  dependency.)

svn path=/nixos/trunk/; revision=27006
 2011-04-27 15:42:14 +00:00
Eelco Dolstra
41a8f23189 * Revert to the old (r10556) version of the nixos-checkout script. It 
was never intended as a generic "check out anything" script; it's
  just a convenience script to obtain the NixOS trunk after
  installation.  So that's what it should do.

svn path=/nixos/trunk/; revision=27005
 2011-04-27 15:34:33 +00:00
Eelco Dolstra
650d14be8d * Remove most references to the "services" tree. 
svn path=/nixos/trunk/; revision=26990
 2011-04-27 13:16:33 +00:00
Eelco Dolstra
be7a7a5b78 * nixos-build-vms/build-vms.nix: drop the "nixos" function argument, 
since the path to the NixOS source tree is known.

svn path=/nixos/trunk/; revision=26989
 2011-04-27 13:01:42 +00:00
Nicolas Pierron
6839bddd1b modules/installer/tools: nixos-gui: Fix derivation. 
svn path=/nixos/trunk/; revision=26972
 2011-04-25 17:48:59 +00:00