mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Code Issues Wiki Activity
15182 commits 224 branches 124 tags 7.2 GiB
Commit graph

564 commits

Author SHA1 Message Date
Peter Simons 01d9831f4b pkgs/misc/misc.nix: removed the warning I added earlier 
What I did was to add two versions of the same package into the same
collection, i.e. ghc-7.0.4 and ghc-7.2.1. I was surprised to see the
build succeed, because there are file collisions between these two. So I
(wrongly) assumed that the collection function was to blame, but in fact
this is a "feature" of nix-env. Apparently, file collision detection
doesn't take place when the user installs two versions of the same
package simultaneously. File collisions are detected only between
different packages!

For example, the command

  nix-env -i ghc-7.0.4 ghc-7.2.1-wrapper

is going to fail, but

  nix-env -i ghc-7.0.4-wrapper ghc-7.2.1-wrapper

is going to succeed. Maybe I just didn't read the documentation
thoroughly enough, but this behavior sure is unexpected to me.

svn path=/nixpkgs/trunk/; revision=28638
 2011-08-16 23:42:29 +00:00
Peter Simons 1e7f572683 pkgs/misc/misc.nix: document the fact that 'collection' does not detect file collisions 
svn path=/nixpkgs/trunk/; revision=28610
 2011-08-16 13:03:46 +00:00
Shea Levy 3afb3eba27 busybox: Bump to 1.19.0 
svn path=/nixpkgs/trunk/; revision=28548
 2011-08-13 20:41:49 +00:00
Shea Levy 03b53d595d busybox: Move $out/usr/{s,}bin to $out/{s,}bin 
svn path=/nixpkgs/trunk/; revision=28547
 2011-08-13 20:41:40 +00:00
Eelco Dolstra ae6fa8071f * Wine updated to 1.3.26. 
svn path=/nixpkgs/trunk/; revision=28209
 2011-08-06 23:26:38 +00:00
Cillian de Roiste a751ada1ce Updating oxygen-gtk to 1.1.1 
svn path=/nixpkgs/trunk/; revision=28191
 2011-08-06 10:33:52 +00:00
Eelco Dolstra fcce78c0f4 * Sync with the trunk. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
 2011-08-03 22:00:49 +00:00
Michael Raskin 6e2572440a Update Wine 
svn path=/nixpkgs/trunk/; revision=28126
 2011-08-02 18:58:42 +00:00
Eelco Dolstra 1b427fe052 * Sync with the trunc. 
* Fixed the hash in PulseAudio: I updated the name/version, but forgot
  to update the hash.  So secretly it was still building the old
  version.  Also, now that we've realised that the PulseAudio server
  and library don't need to be the same build, disable some
  dependencies by default (avahi and bluez).

svn path=/nixpkgs/branches/kde-4.7/; revision=28023
 2011-07-31 19:44:58 +00:00
Sander van der Burg 14be409d8f Removed hardcoded paths to /bin and /usr/bin 
svn path=/nixpkgs/trunk/; revision=27906
 2011-07-22 20:09:00 +00:00
Sander van der Burg f635aceb5b Updated some meta information for the emulators I've tried recently. They all seem to work fine :-) 
svn path=/nixpkgs/trunk/; revision=27905
 2011-07-22 19:25:31 +00:00
Sander van der Burg 6ac699ba97 Added VisualBoy advance; a gameboy/gameboy color/gameboy advance emulator 
svn path=/nixpkgs/trunk/; revision=27904
 2011-07-22 18:31:42 +00:00
Sander van der Burg cb8409612c Added Mupen64 Plus, a nintendo 64 emulator 
svn path=/nixpkgs/trunk/; revision=27902
 2011-07-22 14:03:23 +00:00
Eelco Dolstra f4ac1126ff * Sync with the trunk. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
 2011-07-15 10:02:22 +00:00
Peter Simons aa8cea3e4d moderncv: updated description 
svn path=/nixpkgs/trunk/; revision=27766
 2011-07-13 16:49:33 +00:00
Peter Simons db9fc16b70 moderncv: cleanup the build instructions 
Just add this package to texLiveAggregationFun to install it.

svn path=/nixpkgs/trunk/; revision=27765
 2011-07-13 16:23:48 +00:00
Peter Simons a16e01fe19 Added moderncv package to texlive. 
svn path=/nixpkgs/trunk/; revision=27762
 2011-07-13 15:00:59 +00:00
Peter Simons 758e85cfac texlive: fixed erroneous forwarder scripts 
- Generate a forwarder scripts only for executable files. This change
   removes the broken 'man' script, for example.

 - Run the real binaries with 'exec'.

 - Use $SHELL to interpret the forwarder scripts rather than /bin/sh.

 - Indent consistently with blanks.

 - Removed some debug output from the build expression.

svn path=/nixpkgs/trunk/; revision=27679
 2011-07-08 22:45:23 +00:00
Eelco Dolstra 5caed864e5 * CUPS updated to 1.4.7. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27620
 2011-07-07 13:11:51 +00:00
Sander van der Burg b2548922bf Added UAE: Ultimate Amiga Emulator 
svn path=/nixpkgs/trunk/; revision=27541
 2011-06-26 19:49:51 +00:00
Sander van der Burg e4126afa44 Added ZSNES emulator package 
svn path=/nixpkgs/trunk/; revision=27539
 2011-06-25 22:25:50 +00:00
Eelco Dolstra 614e5a525c * Clean up foomatic-filters. 
svn path=/nixpkgs/trunk/; revision=27470
 2011-06-15 12:40:58 +00:00
Michael Raskin db4fdfec67 Update Wine 
svn path=/nixpkgs/trunk/; revision=27416
 2011-06-11 07:26:37 +00:00
Lluís Batlle i Rossell c6d377eadf Adding mainline ghostscript as an option. 
svn path=/nixpkgs/trunk/; revision=27297
 2011-05-24 15:35:38 +00:00
Rob Vermaas 77db753065 update maven3 
svn path=/nixpkgs/trunk/; revision=27233
 2011-05-12 08:39:09 +00:00
Cillian de Roiste 3fb9e2214b Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much better for me 
svn path=/nixpkgs/trunk/; revision=27205
 2011-05-09 20:49:51 +00:00
Shea Levy 5acb2cbb1e Fix typo in pkgs/misc/misc.nix 
svn path=/nixpkgs/trunk/; revision=27152
 2011-05-04 18:55:22 +00:00
Michael Raskin 9926941bf2 Fixing forgotten hash for Wine update 
svn path=/nixpkgs/trunk/; revision=27065
 2011-04-30 19:42:48 +00:00
Michael Raskin bb809bb2c3 Update Wine 
svn path=/nixpkgs/trunk/; revision=27063
 2011-04-30 16:32:53 +00:00
Cillian de Roiste 59f16bc779 Fixing the url for jack 
svn path=/nixpkgs/trunk/; revision=26934
 2011-04-23 13:16:33 +00:00
Cillian de Roiste 55bbbbaf84 Updating jack to version 0.120.1 (some newer applications e.g. Yoshimi require a more recent version) 
svn path=/nixpkgs/trunk/; revision=26932
 2011-04-23 12:50:03 +00:00
Nicolas Pierron f40afa1ade tex4ht: Fix package location. 
svn path=/nixpkgs/trunk/; revision=26863
 2011-04-17 08:27:16 +00:00
Nicolas Pierron 0069aa0637 texlive Aggregate: 
- Add bouncer to binaries stored in /bin directory.
- Avoid manipulation of patterns as a match.

svn path=/nixpkgs/trunk/; revision=26862
 2011-04-17 08:27:09 +00:00
Lluís Batlle i Rossell a602209a6b Fixing the name of darcnes. 
svn path=/nixpkgs/trunk/; revision=26552
 2011-03-27 20:14:42 +00:00
Lluís Batlle i Rossell bd3f5e7340 Adding a key 'exit 0' to myenv. Otherwise it fails to build if pkgconfig is one of the build inputs. 
svn path=/nixpkgs/trunk/; revision=26547
 2011-03-27 14:08:13 +00:00
Eelco Dolstra 20912b654b * runLaTeX: detect the existence of a pre-generated .bbl file and use 
it.  Useful if you're supposed to stick a \balancecolumns in the
  middle of the file.

svn path=/nixpkgs/trunk/; revision=26522
 2011-03-26 00:14:28 +00:00
Lluís Batlle i Rossell ef57b57b92 Adding two NES emulators. 
Because of them, I made allegro build the allegrogl library.
I also added the HawkNL library.


svn path=/nixpkgs/trunk/; revision=26517
 2011-03-25 22:15:48 +00:00
Yury G. Kudryashov ba3c547f6d Fixing hardcoded paths in foo2zjs. Still no firmware 
svn path=/nixpkgs/trunk/; revision=26332
 2011-03-15 23:08:59 +00:00
Eelco Dolstra 37a95e0084 * Fix the gens-gs build (http://hydra.nixos.org/build/955354). 
svn path=/nixpkgs/branches/x-updates/; revision=26297
 2011-03-14 10:54:10 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already 
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
 2011-03-07 12:17:12 +00:00
Yury G. Kudryashov da4447afd7 foo2zjs: less hardcoded paths 
svn path=/nixpkgs/trunk/; revision=26179
 2011-03-06 16:07:53 +00:00
Yury G. Kudryashov 513ee9fc4f hplip-3.11.1, enable polkit support 
svn path=/nixpkgs/trunk/; revision=26178
 2011-03-06 16:07:47 +00:00
Yury G. Kudryashov d1d9da2ff3 Trying to fix foo2zjs 
There are still some hardcoded paths

svn path=/nixpkgs/trunk/; revision=26177
 2011-03-06 16:07:43 +00:00
Eelco Dolstra d6c6f9f0e0 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26018
 2011-02-17 16:33:39 +00:00
Cillian de Roiste da00930257 Adding version, fixing the mirror path and the license and adding myself as maintainer 
svn path=/nixpkgs/trunk/; revision=26005
 2011-02-16 23:52:14 +00:00
Cillian de Roiste e80dc8eb7f Applying a patch for pstoraster, without this the cups test page was printing solid black, as described in the bug report: http://bugs.ghostscript.com/show_bug.cgi?id=691108 The patch was kindly taken from https://bugs.archlinux.org/task/18339 
svn path=/nixpkgs/trunk/; revision=26003
 2011-02-16 23:34:19 +00:00
Eelco Dolstra a08d99715d * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=25900
 2011-02-11 13:08:45 +00:00
Cillian de Roiste 42f818969d Bumping to version 5.2.6 and fixing the url 
svn path=/nixpkgs/trunk/; revision=25858
 2011-02-09 20:34:52 +00:00
Eelco Dolstra b8e7238254 * CUPS updated to 1.4.6. 
svn path=/nixpkgs/branches/x-updates/; revision=25823
 2011-02-09 10:45:45 +00:00
Michael Raskin c6ee103fc3 Update paths - does not fix all the problems, apparently 
svn path=/nixpkgs/trunk/; revision=25714
 2011-01-28 10:22:30 +00:00