Commit Graph
43498 Commits
Author SHA1 Message Date
Eelco Dolstra 8ff00dd4c5 svn path=/nixos/branches/modular-nixos/; revision=15653 2009-05-19 14:55:17 +00:00
Eelco Dolstra b9d560d30e * Get rid of __primop.
* newMergeOptionSets -> mergeOptionSets.

svn path=/nixpkgs/trunk/; revision=15652
2009-05-19 14:54:41 +00:00
Peter Simons 4b7fc6f5d6 all-packages.nix: commented out package 'vice'
error: getting status of `/usr/local/src/nix-pkgs-current/pkgs/misc/emulators/vice': No such file or directory

svn path=/nixpkgs/trunk/; revision=15646
2009-05-18 13:53:01 +00:00
Marc Weber cb411d1a3d Synced with trunk @ 15580
svn path=/nixos/branches/modular-nixos/; revision=15645
2009-05-18 12:59:01 +00:00
Marc Weber 908e8fe2d4 Synced with trunk @ 15577
svn path=/nixos/branches/modular-nixos/; revision=15644
2009-05-18 12:57:01 +00:00
Marc Weber 7dc33353c4 Synced with trunk @ 15548
svn path=/nixos/branches/modular-nixos/; revision=15643
2009-05-18 12:54:54 +00:00
Marc Weber 5cff1db403 Synced with trunk @ 15509
svn path=/nixos/branches/modular-nixos/; revision=15642
2009-05-18 12:03:11 +00:00
Marc Weber f51620cdff Synced with trunk @ 15508
svn path=/nixos/branches/modular-nixos/; revision=15641
2009-05-18 12:02:27 +00:00
Marc Weber 81d6032c43 Synced with trunk @ 15505
svn path=/nixos/branches/modular-nixos/; revision=15640
2009-05-18 12:01:31 +00:00
Marc Weber 1d0c0a4291 Synced with trunk @ 15480
svn path=/nixos/branches/modular-nixos/; revision=15639
2009-05-18 11:59:40 +00:00
Marc Weber c14ccdae91 Synced with trunk @ 15469
svn path=/nixos/branches/modular-nixos/; revision=15638
2009-05-18 11:58:45 +00:00
Marc Weber bbeb12b77d Synced with trunk @ 15468
svn path=/nixos/branches/modular-nixos/; revision=15637
2009-05-18 11:58:02 +00:00
Marc Weber 56e78c810a Synced with trunk @ 15430
svn path=/nixos/branches/modular-nixos/; revision=15636
2009-05-18 11:55:32 +00:00
Eelco Dolstra 551c80db47 * Sync.
svn path=/nixos/branches/modular-nixos/; revision=15635
2009-05-18 11:36:01 +00:00
Marc Weber 65908cccd1 Synced with trunk @ 15428, 15620
svn path=/nixos/branches/modular-nixos/; revision=15634
2009-05-18 11:30:33 +00:00
Eelco Dolstra 168268ba28 svn path=/nixos/trunk/; revision=15633 2009-05-18 11:27:20 +00:00
Eelco Dolstra 85e16ee19e * Removed seccureUser because -DNOMEMLOCK no longer seems to have any
effect in version 0.4.

svn path=/nixpkgs/trunk/; revision=15632
2009-05-18 11:24:16 +00:00
Eelco Dolstra 4dc9b6d378 * Function renamed.
svn path=/nixos/branches/modular-nixos/; revision=15631
2009-05-18 10:49:28 +00:00
Marc Weber 9dc4edbd4d Synced with trunk @ 15427
svn path=/nixos/branches/modular-nixos/; revision=15630
2009-05-18 10:25:36 +00:00
Lluís Batlle i Rossell 5d72346338 Adding pkgconfig to MPlayer, as now it uses it for finding some libs as theora.
svn path=/nixpkgs/trunk/; revision=15629
2009-05-17 20:34:12 +00:00
Lluís Batlle i Rossell 291260a325 Updating mldonkey to 3.0.0.
svn path=/nixpkgs/trunk/; revision=15628
2009-05-17 20:34:04 +00:00
Lluís Batlle i Rossell 226d5cf608 Changing the xscreensaver expression, so nix-env operations with '*' work.
svn path=/nixpkgs/trunk/; revision=15627
2009-05-17 20:33:58 +00:00
Sander van der Burg 1b7f187af2 Added VICE, a Commodore 64 emulator
svn path=/nixpkgs/trunk/; revision=15626
2009-05-17 14:00:20 +00:00
Lluís Batlle i Rossell 24b76784e1 Adding trackballs
svn path=/nixpkgs/trunk/; revision=15625
2009-05-16 23:14:37 +00:00
Lluís Batlle i Rossell 9f34ef8cf5 Making tightvnc use given fonts, instead of depending of an X Font Server started
at the usual unix socket.

svn path=/nixpkgs/trunk/; revision=15624
2009-05-16 23:04:06 +00:00
Lluís Batlle i Rossell c4c6c2a224 Fixing wxGTK build in x86_64 (mesa related)
svn path=/nixpkgs/trunk/; revision=15623
2009-05-16 13:53:26 +00:00
Andres Löh ffcdec785b Added a number of Haskell packages.
svn path=/nixpkgs/trunk/; revision=15622
2009-05-15 18:53:00 +00:00
Andres Löh cd7dba4f0b Some Haskell library updates.
svn path=/nixpkgs/trunk/; revision=15621
2009-05-15 18:52:55 +00:00
Marc Weber fa32ac7fb6 follow -r15428 and move the comment as well
svn path=/nixos/trunk/; revision=15620
2009-05-15 16:07:27 +00:00
Marc Weber 3148755063 * Synced with trunk @ 15424
svn path=/nixos/branches/modular-nixos/; revision=15619
2009-05-15 15:21:33 +00:00
Marc Weber aacdff7ad9 * Synced with trunk @ 15413
svn path=/nixos/branches/modular-nixos/; revision=15618
2009-05-15 15:19:59 +00:00
Marc Weber 7ef8db8aad * Synced with trunk @ 15408
svn path=/nixos/branches/modular-nixos/; revision=15617
2009-05-15 15:16:58 +00:00
Marc Weber d26f944b98 * Synced with trunk @ 15406
svn path=/nixos/branches/modular-nixos/; revision=15616
2009-05-15 15:15:59 +00:00
Marc Weber d29eaa100e * Synced with trunk @ 15396, 15397 (-> configurations repo)
svn path=/nixos/branches/modular-nixos/; revision=15615
2009-05-15 15:12:46 +00:00
Marc Weber d44206d2c4 * Synced with trunk @ 15391
svn path=/nixos/branches/modular-nixos/; revision=15612
2009-05-15 08:00:20 +00:00
Marc Weber 48e4b8f573 * Synced with trunk @ 15370
svn path=/nixos/branches/modular-nixos/; revision=15611
2009-05-15 07:55:47 +00:00
Marc Weber 1e16e6dee4 * Synced with trunk @ 15369
also adding missing assertion fixed in 15609

svn path=/nixos/branches/modular-nixos/; revision=15610
2009-05-15 07:51:51 +00:00
Marc Weber 3f79e158ba add missing assertion catching enabled xserver but disabled hal service
svn path=/nixos/trunk/; revision=15609
2009-05-15 07:39:36 +00:00
Marc Weber ecff4f580c * Synced with trunk @ 15368
svn path=/nixos/branches/modular-nixos/; revision=15608
2009-05-15 06:43:02 +00:00
Sander van der Burg 2c0ef01583 The CON file is not mandatory for running Duke
svn path=/nixpkgs/trunk/; revision=15607
2009-05-14 19:52:19 +00:00
Lluís Batlle i Rossell c1d2a2e2d1 Fixing the version in the name of freeimage.
svn path=/nixpkgs/trunk/; revision=15606
2009-05-14 15:03:31 +00:00
Eelco Dolstra 6b611bc0f1 svn path=/nixpkgs/trunk/; revision=15605 2009-05-14 14:43:50 +00:00
Eelco Dolstra 120a82d7b9 * NASM: updated to the latest version.
* eduke: needs NASM on i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
2009-05-14 14:42:20 +00:00
Sander van der Burg 1cfc364e98 Fixed wrapper script to use environment variables from the user profile
svn path=/nixpkgs/trunk/; revision=15602
2009-05-14 14:05:38 +00:00
Sander van der Burg 16ffeaead6 Added EDuke32 package to celebrate the moment that 3DRealms is dead and Duke Nukem Forever is never going to be released
svn path=/nixpkgs/trunk/; revision=15601
2009-05-14 13:48:45 +00:00
Eelco Dolstra d15fc44b23 * Firefox 3.0.9.
svn path=/nixpkgs/trunk/; revision=15600
2009-05-14 12:34:13 +00:00
Sander van der Burg c0605f9d3c Added desktop item to DOSBox
svn path=/nixpkgs/trunk/; revision=15599
2009-05-14 11:17:41 +00:00
Lluís Batlle i Rossell 5ee7338cd2 Adding povray
svn path=/nixpkgs/trunk/; revision=15598
2009-05-14 08:49:46 +00:00
Andres Löh f8a30d60d0 Updated multirec and zipper Haskell packages.
svn path=/nixpkgs/trunk/; revision=15597
2009-05-13 20:34:22 +00:00
Sander van der Burg 271c960f67 Added GTK-Qt engine package for KDE 4.2 to make GTK+ applications look better in KDE
svn path=/nixpkgs/trunk/; revision=15596
2009-05-13 20:10:48 +00:00