public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
166,990 Commits 1 Branch 0 Tags
6851b8f3da17034c422a36229cf2962f497d2d1e
Commit Graph
166990 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Peter Simons d74fd84210 haskell-blaze-html: updated to version 0.4.3.1 
svn path=/nixpkgs/trunk/; revision=31121
 2011-12-28 10:31:27 +00:00
Lluís Batlle i Rossell 5cf6543e6e Removing unused lines of the nfs-kernel script, and fixing some indentation. 
svn path=/nixos/trunk/; revision=31120
 2011-12-28 09:05:52 +00:00
Lluís Batlle i Rossell 99cca93398 Fixing the race condition on loading nfsd. It was not a modprobe thing like I 
said on 31113, but again, upstart order.

I restore the usual modprobe procedure.


svn path=/nixos/trunk/; revision=31119
 2011-12-28 08:44:24 +00:00
Lluís Batlle i Rossell 58af7eb6bf Adding smbldap-tools. And some CPAN packages as bonus. 
svn path=/nixpkgs/trunk/; revision=31118
 2011-12-27 21:35:50 +00:00
Lluís Batlle i Rossell 9c87cccee9 Adding cgroups to the sheevaplug kernel. 
svn path=/nixpkgs/trunk/; revision=31114
 2011-12-27 19:33:36 +00:00
Lluís Batlle i Rossell ef1755f3c0 I had a bug in my nfs server... just after boot, all clients were receiving 
"Permission denied" until I run "restart nfs-kernel-exports". "exportfs -ra" did not help.

I tracked that down to some race condition between loading the module nfsd and
starting the daemons. Therefore, I decided to add nfsd to the boot.kernelModules instead
of using modprove with it.

Now it works for my server. No more Permission denied after reboot.


svn path=/nixos/trunk/; revision=31113
 2011-12-27 18:08:05 +00:00
Peter Simons c6814a8951 haskell-zipper: updated to version 0.4.1 
svn path=/nixpkgs/trunk/; revision=31112
 2011-12-27 17:49:40 +00:00
Peter Simons 577b55a0de haskell-yesod: updated to version 0.9.4.1 
svn path=/nixpkgs/trunk/; revision=31111
 2011-12-27 17:49:35 +00:00
Peter Simons d0543a8af1 Added missing meta.maintainers section. 
svn path=/nixpkgs/trunk/; revision=31110
 2011-12-27 17:49:31 +00:00
Lluís Batlle i Rossell 8bc381c4cd Fixing the boot sequence in case of only having nfsKernel.client.enable = true, and not server. 
svn path=/nixos/trunk/; revision=31109
 2011-12-27 16:33:10 +00:00
Rob Vermaas a8785e7b72 use simple version compare in stead of timestamps to determine newer package 
svn path=/nixpkgs/trunk/; revision=31108
 2011-12-27 12:56:07 +00:00
Karn Kallio 2ae07a853f Clean version 2.4 
svn path=/nixpkgs/trunk/; revision=31107
 2011-12-27 01:48:57 +00:00
Peter Simons 1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0 
svn path=/nixpkgs/trunk/; revision=31106
 2011-12-26 20:24:59 +00:00
Lluís Batlle i Rossell 0def824532 Updating webalizer. 
svn path=/nixpkgs/trunk/; revision=31105
 2011-12-26 17:27:30 +00:00
Lluís Batlle i Rossell 0de75cde39 Asking for an interactive shell in case of error umounting filesystems. I've 
not tested it; sometimes I hit the trouble, but not always.


svn path=/nixos/trunk/; revision=31104
 2011-12-26 16:40:13 +00:00
Lluís Batlle i Rossell 2c77b292a6 I reworked the nfs upstart jobs, so they work better on the events of interest of nixos. 
Related to http://yellowgrass.org/issue/NixOS/109 .


svn path=/nixos/trunk/; revision=31103
 2011-12-26 16:06:20 +00:00
Peter Simons 42a4cda59d haskell-yesod: updated to version 0.9.4 
svn path=/nixpkgs/trunk/; revision=31102
 2011-12-26 15:37:02 +00:00
Peter Simons 3553c0f867 haskell-yesod-static: updated to version 0.3.2.1 
svn path=/nixpkgs/trunk/; revision=31101
 2011-12-26 15:36:58 +00:00
Peter Simons 1592e39ced haskell-yesod-json: updated to version 0.2.3 
svn path=/nixpkgs/trunk/; revision=31100
 2011-12-26 15:36:52 +00:00
Peter Simons aa1be5c36f haskell-yesod-form: updated to version 0.3.4.2 
svn path=/nixpkgs/trunk/; revision=31099
 2011-12-26 15:36:46 +00:00
Peter Simons 8923112c1d haskell-yesod-core: updated to version 0.9.4 
svn path=/nixpkgs/trunk/; revision=31098
 2011-12-26 15:36:42 +00:00
Peter Simons d0dc6f0ba8 haskell-warp: updated to version 0.4.6.3 
svn path=/nixpkgs/trunk/; revision=31097
 2011-12-26 15:36:37 +00:00
Peter Simons 51254f668a haskell-wai-extra: updated to version 0.4.6 
svn path=/nixpkgs/trunk/; revision=31096
 2011-12-26 15:36:32 +00:00
Peter Simons d9c27a4387 haskell-simple-sendfile: updated to version 0.2.0 
svn path=/nixpkgs/trunk/; revision=31095
 2011-12-26 15:36:27 +00:00
Peter Simons 381ebfe994 haskell-shakespeare-js: updated to version 0.10.4 
svn path=/nixpkgs/trunk/; revision=31094
 2011-12-26 15:36:23 +00:00
Peter Simons ba991ec100 haskell-shakespeare-css: updated to version 0.10.5 
svn path=/nixpkgs/trunk/; revision=31093
 2011-12-26 15:36:18 +00:00
Peter Simons 9ccf9b3674 haskell-regular: updated to version 0.3.4 
svn path=/nixpkgs/trunk/; revision=31092
 2011-12-26 15:36:12 +00:00