Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Eelco Dolstra
ddd480ac30
Revert "Remove which -> type -P alias."
...
This reverts commit e8e8164f348a0e8655e1d50a7a404bdc62055f4e. I
misread the original commit as adding the "which" package, but it only
adds it to base.nix. So then the original motivation (making it work
in subshells) doesn't hold. Note that we already have some convenience
aliases that don't work in subshells either (such as "ll").
2016-03-25 17:17:07 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Domen Kožar
73ba0ae2de
Remove which -> type -P alias.
...
Aliases are not the same as programs. They won't work in subshells.
It's better to just use which as it's only 88K.
2016-03-03 16:15:25 +00:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Roger Qiu
1ddbc20dac
Change the preset networking.hostId to use mkDefault so it can be easily changed by the user later
2015-11-22 01:03:16 +11:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Jan Malakhovski
dddcec21fe
nixos: add xfs support to profiles/minimal
2015-09-18 18:58:18 +00:00
Eelco Dolstra
6bf1853387
Don't include 4 editors in the minimal installation CD
...
Emphasis on "minimal".
2015-06-04 11:06:44 +02:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
Ricardo M. Correia
f5e7190572
nixos.system_tarball_pc: Fix evaluation
...
It was broken due to 57b05765c9
2015-04-28 17:15:02 +02:00
Vladimír Čunát
e81e2785c7
xfsprogs: fix outputs and references
2015-04-21 09:02:40 +02:00
Eelco Dolstra
3d2b24d161
Remove pciutils and usbutils from the default system path
...
Issue #7117 .
2015-04-20 11:21:20 +02:00
Eelco Dolstra
2b6d011bec
Include cifs-utils only when needed
...
Issue #7117 .
2015-04-19 22:06:45 +02:00
Eelco Dolstra
57b05765c9
Don't include ntfs-3g by default
...
Issue #7117 .
2015-04-19 22:06:45 +02:00
William A. Kennington III
20d2092ff8
nixos/base: Add efi management utilities
2015-01-07 01:52:47 -08:00
William A. Kennington III
5ae216558f
jfsrec: Remove derivation
2014-11-02 17:22:27 -08:00
Eelco Dolstra
1f7c775910
Remove unrar from the installation CD since it's unfree
2014-09-05 14:25:17 +02:00
Eelco Dolstra
5e96158234
Remove Subversion from the installation CD
2014-07-30 16:04:15 +02:00
Emery Hemingway
c96d5fe170
nixos: f2fs filesystem module support ( close #2085 )
2014-05-11 13:53:26 +02:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00
