Florian Friesdorf
0bb20084b5
xorg: alphabetical extra.list
...
svn path=/nixpkgs/trunk/; revision=31179
2011-12-31 06:07:21 +00:00
Florian Friesdorf
c9b2b8a182
xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list
...
svn path=/nixpkgs/trunk/; revision=31178
2011-12-31 06:07:18 +00:00
Florian Friesdorf
e1556e64d7
xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6
...
svn path=/nixpkgs/trunk/; revision=31177
2011-12-31 06:07:15 +00:00
Florian Friesdorf
44ef26c896
xlsclients-1.1.2
...
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf
a38ca160ec
EMACSLOADPATH in /etc/profile
...
svn path=/nixos/trunk/; revision=31175
2011-12-31 04:14:36 +00:00
Florian Friesdorf
b0fefb876f
unset MOZ_PLUGIN_PATH and TERMINFO_DIRS before setting them
...
svn path=/nixos/trunk/; revision=31174
2011-12-31 04:14:31 +00:00
Florian Friesdorf
8dd443c8df
awesome-3.4.11 - ru manpages disabled because of build failure
...
svn path=/nixpkgs/trunk/; revision=31173
2011-12-31 04:06:02 +00:00
Florian Friesdorf
096d86bfb1
startup-notification-0.12 (works with xcb-util-0.3.8)
...
svn path=/nixpkgs/trunk/; revision=31172
2011-12-31 04:05:57 +00:00
Florian Friesdorf
251d42d03f
xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
...
this might break things but makes awesome-3.4.11 happy
svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Florian Friesdorf
19246750bf
libev-4.04 (frees awesome build from many warnings)
...
svn path=/nixpkgs/trunk/; revision=31170
2011-12-31 04:05:44 +00:00
Florian Friesdorf
aefc550ae0
asciidoc-8.6.6
...
svn path=/nixpkgs/trunk/; revision=31169
2011-12-31 04:05:33 +00:00
Florian Friesdorf
221c637356
fix MOZ_PLUGIN_PATH
...
svn path=/nixos/trunk/; revision=31168
2011-12-31 02:57:45 +00:00
Florian Friesdorf
97ce0b1386
MOZ_PLUGIN_PATH based on NIX_PROFILES
...
svn path=/nixos/trunk/; revision=31167
2011-12-31 02:05:51 +00:00
Florian Friesdorf
76986a24f9
enable noX11 on kernel cmdline to suppress start of X
...
xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.
Thanks to viric for the general idea.
svn path=/nixos/trunk/; revision=31166
2011-12-31 00:24:48 +00:00
Florian Friesdorf
5b7e7bb429
services.xserver.xkbVariant
...
svn path=/nixos/trunk/; revision=31165
2011-12-30 23:26:11 +00:00
Florian Friesdorf
da90f06ff8
4965agn was wrongly detected as a 3945abg
...
svn path=/nixos/trunk/; revision=31164
2011-12-30 23:26:06 +00:00
Peter Simons
6dfd7b1446
haskell-yaml: updated to version 0.5.1.1
...
svn path=/nixpkgs/trunk/; revision=31159
2011-12-30 17:05:20 +00:00
Peter Simons
573455fd44
haskell-data-object-yaml: updated to version 0.3.4
...
svn path=/nixpkgs/trunk/; revision=31158
2011-12-30 17:05:17 +00:00
Peter Simons
e91c6ea1ce
modules/system/upstart-events/shutdown.nix: refer to bash binary with full path
...
Upstart won't find a "bash" binary in $PATH when those commands are run, so we
refer to it using an absolute path.
svn path=/nixos/trunk/; revision=31157
2011-12-30 16:57:39 +00:00
Lluís Batlle i Rossell
3e9953290a
THe stable task warrior has a licence GPLv2+, not MIT.
...
svn path=/nixpkgs/trunk/; revision=31152
2011-12-29 22:28:22 +00:00
Lluís Batlle i Rossell
7d4e6bbec9
Adding task warrior unstable.
...
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell
99e6a23f03
Adding task warrior, stable.
...
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Florian Friesdorf
89c3120b20
zsh profile load tweaking only on nixos
...
svn path=/nixpkgs/trunk/; revision=31149
2011-12-29 20:09:30 +00:00
Florian Friesdorf
0009c1f650
zshprofile to load /etc/profile while emulating bash
...
svn path=/nixpkgs/trunk/; revision=31148
2011-12-29 19:46:47 +00:00
Florian Friesdorf
ecba799e78
zsh meta
...
svn path=/nixpkgs/trunk/; revision=31147
2011-12-29 19:46:43 +00:00
Florian Friesdorf
c6ad751a8c
zsh-4.3.15
...
svn path=/nixpkgs/trunk/; revision=31146
2011-12-29 19:46:37 +00:00
Florian Friesdorf
b2eb54ae5a
set TERMINFO_DIRS according to NIX_PROFILES
...
this finally makes rxvt-unicode work without manually linking it's terminfo
svn path=/nixos/trunk/; revision=31145
2011-12-29 19:38:03 +00:00
Florian Friesdorf
05a49f663e
include /share/terminfo into default pathsToLink
...
svn path=/nixos/trunk/; revision=31144
2011-12-29 19:38:00 +00:00
Florian Friesdorf
8ed89125b5
linewrap pathsToLink
...
svn path=/nixos/trunk/; revision=31143
2011-12-29 19:37:54 +00:00
Eelco Dolstra
633a194994
* PIL updated to 1.1.7.
...
svn path=/nixpkgs/trunk/; revision=31142
2011-12-29 16:53:14 +00:00
Peter Simons
de1a6e09d7
haskell-path-pieces: added version 0.1.0
...
haskell-attoparsec-conduit: added version 0.0.0
haskell-blaze-builder-conduit: added version 0.0.0
haskell-conduit: added version 0.0.0.1
haskell-http-conduit: added version 1.0.0
haskell-lifted-base: added version 0.1.0.2
haskell-xml-conduit: added version 0.5.0
haskell-zlib-conduit: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31141
2011-12-29 16:42:08 +00:00
Eelco Dolstra
bf55fb9192
* Fixed Calibre (it was referring to "python2", which doesn't exist)
...
and updated it to 0.8.32.
svn path=/nixpkgs/trunk/; revision=31140
2011-12-29 16:22:46 +00:00
Nicolas Pierron
338bc7b9f8
Fix nixos-option without argument.
...
svn path=/nixos/trunk/; revision=31139
2011-12-29 06:33:34 +00:00
Florian Friesdorf
eb755d4692
switched all mergeOptionString to pkgs.lib.types.string
...
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.
For my system the change evaluated to the exactly same.
svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Florian Friesdorf
3ebc7727f7
Revert "test we have cryptsetup-1.4.1 in initrd"
...
This reverts commit 025f8c40b40fad50086e8761eee61098d8fb2651.
The check was intened for building the initrd of the installer.
svn path=/nixos/trunk/; revision=31137
2011-12-28 22:37:38 +00:00
Florian Friesdorf
0544a008db
Revert "added an "error" to luksroot that should be caught"
...
This reverts commit c7967af35a13f68a8785c142582b639dc8c8e92c.
svn path=/nixos/trunk/; revision=31136
2011-12-28 22:36:26 +00:00
Florian Friesdorf
829bd9a727
added an "error" to luksroot that should be caught
...
svn path=/nixos/trunk/; revision=31135
2011-12-28 22:21:31 +00:00
Florian Friesdorf
d5709cfb64
cryptsetup-1.4.1
...
Thanks to Mathijs Kwik and Peter Simons for preparing this.
Make sure you have nixos r31132.
svn path=/nixpkgs/trunk/; revision=31134
2011-12-28 21:48:58 +00:00
Florian Friesdorf
daa459cc8a
popt-0.16
...
Thanks to Peter Simons for preparing this. Make sure you have nixos 31132.
svn path=/nixpkgs/trunk/; revision=31133
2011-12-28 21:48:55 +00:00
Florian Friesdorf
c7fd05a650
test we have cryptsetup-1.4.1 in initrd
...
svn path=/nixos/trunk/; revision=31132
2011-12-28 21:46:50 +00:00
Florian Friesdorf
c15aa7aea3
luksroot uses preLVMCommands instead of postDeviceCommands
...
svn path=/nixos/trunk/; revision=31131
2011-12-28 21:46:48 +00:00
Florian Friesdorf
90756a787c
add preLVMCommands hook
...
svn path=/nixos/trunk/; revision=31130
2011-12-28 21:46:45 +00:00
Florian Friesdorf
0a9f3a36ec
luksroot waits for usb drive
...
svn path=/nixos/trunk/; revision=31129
2011-12-28 21:46:42 +00:00
Florian Friesdorf
dd8e725d7d
copy only cryptsetup deps to stage-1 and test cryptsetup
...
popt-0.16 and cryptsetup-1.4.1 both generated pkgconfig (in contrast
to older versions). The pkgconfig files (popt.pc and cryptsetup.pc)
contain references into the store that are not removed by patchelf and
stage-1 fails with errors like: "output is not allowed to refer to
path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'".
Now, only the cryptsetup binaries and its dependencies are copied,
determined by ldd. In addition the cryptsetup binary and lvm are
tested after patchelf has adjusted the library paths.
Thanks to Peter Simons and Eelco Dolstra for giving the rights hints.
svn path=/nixos/trunk/; revision=31128
2011-12-28 21:46:40 +00:00
Florian Friesdorf
d98ecd1d9e
enable testing of extraUtilsCommands after patchelf
...
svn path=/nixos/trunk/; revision=31127
2011-12-28 21:46:35 +00:00
Marco Maggesi
fd64bc5289
Oops!
...
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00
Marco Maggesi
ff3b0ed420
Update HOL Light to r116
...
svn path=/nixpkgs/trunk/; revision=31125
2011-12-28 12:45:59 +00:00
Peter Simons
2afb111ad5
haskell-wai-logger: updated to version 0.1.2
...
svn path=/nixpkgs/trunk/; revision=31124
2011-12-28 10:31:37 +00:00
Peter Simons
4528363ead
haskell-persistent: updated to version 0.6.4.4
...
svn path=/nixpkgs/trunk/; revision=31123
2011-12-28 10:31:34 +00:00
Peter Simons
2cc6165e7e
haskell-gloss: updated to version 1.6.0.1
...
svn path=/nixpkgs/trunk/; revision=31122
2011-12-28 10:31:30 +00:00