Michael Raskin
3f30914672
Update wine dependency on flex and add myself as maintainer
...
svn path=/nixpkgs/trunk/; revision=19433
2010-01-14 13:17:40 +00:00
Michael Raskin
98bf3aef49
Update Wine
...
svn path=/nixpkgs/trunk/; revision=19428
2010-01-14 10:09:08 +00:00
Lluís Batlle i Rossell
d864771e26
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel
305c1b8ae5
update to 2.13.9
...
svn path=/nixpkgs/trunk/; revision=19103
2009-12-25 00:01:31 +00:00
Armijn Hemel
866856b77f
update to 1.0.20
...
svn path=/nixpkgs/trunk/; revision=19102
2009-12-24 23:27:05 +00:00
Armijn Hemel
e07c69c924
update to 0.996
...
svn path=/nixpkgs/trunk/; revision=19101
2009-12-24 23:19:53 +00:00
Lluís Batlle i Rossell
bed103ef53
Updating myEnv for the new crossCompiling stdenv, so it puts in the environment buildNativeInputs
...
and not builtInputs.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19078
2009-12-22 11:49:20 +00:00
Lluís Batlle i Rossell
5bae851b1e
Merging from trunk. I had to give away some structure to build the native
...
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Michael Raskin
67ed6bf75b
Update wine
...
svn path=/nixpkgs/trunk/; revision=18988
2009-12-16 09:26:55 +00:00
Lluís Batlle i Rossell
dae3eb2383
Merging from trunk.
...
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)
svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Marc Weber
5319704f80
removing old bleeding edge cruft replacing it by a niftier version using
...
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README .
sourceByName is called sourceFromHead now.
updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update
svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Marc Weber
f2ec65a538
fix source-and-tags
...
svn path=/nixpkgs/trunk/; revision=18892
2009-12-11 13:58:15 +00:00
Lluís Batlle i Rossell
89fe676bb3
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Eelco Dolstra
c726012afe
* Refactoring: move most filesystem utilities / FUSE filesystems to
...
tools/filesystems. Previously they were all over the place.
svn path=/nixpkgs/trunk/; revision=18809
2009-12-04 15:39:49 +00:00
Marc Weber
4a999a3811
adding neko
...
adding repository locations for haxe* and neko repositories
svn path=/nixpkgs/trunk/; revision=18709
2009-11-30 01:05:07 +00:00
Marc Weber
c5b2c2c40a
adding haxe
...
svn path=/nixpkgs/trunk/; revision=18708
2009-11-30 01:05:04 +00:00
Lluís Batlle i Rossell
a3403e6828
Finishing the update from trunk, having resolved the eclipse related directory
...
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Rob Vermaas
2ffa48af25
update maven2
...
svn path=/nixpkgs/trunk/; revision=18609
2009-11-25 07:51:06 +00:00
Ludovic Courtès
87a62e5409
gutenprint: Fix name, improve style.
...
svn path=/nixpkgs/trunk/; revision=18532
2009-11-22 19:11:27 +00:00
Lluís Batlle i Rossell
4dfc635cbb
Fixing the uboot cross-build.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18473
2009-11-19 21:43:03 +00:00
Lluís Batlle i Rossell
7ade207f6b
- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
...
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
keep this branch properly updated from trunk. We agreed with Nicolas Pierron
doing a massive renaming, so all current buildInputs become hostInputs (input
as build for the host machine, in autotools terminology) , and
then buildInputs would mean "input as for the build machine".
By now, the specific "input as for the build machine" is specified through
buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
we start changing nixpkgs expressions so they distinguish the current
buildInputs into buildInputs and buildNativeInputs, we could break even more
nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
to be run in the build machine. This allows, without any special rewriting,
"fetchurl" derivations to be always results for the build machine to use
them.
- The change above implies that, for anyone wanting to cross-compile, has to
build the hostDrv of the wanted derivation. For example, after this commit,
the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
the contents of this arm.nix in r18398.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
Lluís Batlle i Rossell
d82c7e0a69
Adding uboot cross compilation. I had to adapt the package a bit, because it
...
does not use autotools.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18362
2009-11-15 22:56:06 +00:00
Lluís Batlle i Rossell
4b27d28701
Porting changes from stdenv-updates into this branch.
...
This comes from:
svn diff ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.
trunk@18255 comes from the last time I updated stdenv-updates from trunk.
svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Michael Raskin
490ca07c68
Update Linux Wacom
...
svn path=/nixpkgs/trunk/; revision=18246
2009-11-07 09:25:06 +00:00
Peter Simons
1981322cc5
pkgs/misc/cups/default.nix: don't install files to /etc or /usr
...
The cups build tries to install files into global system directories.
This patch changes those paths to locations underneath of $out.
svn path=/nixpkgs/trunk/; revision=18134
2009-11-05 13:33:36 +00:00
Eelco Dolstra
404007aab3
* Build CUPS with dbus support, plus some purity fixes.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18051
2009-10-30 12:33:34 +00:00
Eelco Dolstra
78648561c5
* Updated CUPS to 1.4.1.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
2009-10-30 09:46:51 +00:00
Michael Raskin
658b350235
Remove duplicate declaration
...
svn path=/nixpkgs/trunk/; revision=17982
2009-10-28 05:25:52 +00:00
Marc Weber
a7261348d8
Netsurf update
...
svn path=/nixpkgs/trunk/; revision=17978
2009-10-27 17:46:45 +00:00
Michael Raskin
742dcbc12e
Update Wine
...
svn path=/nixpkgs/trunk/; revision=17947
2009-10-23 23:27:59 +00:00
Michael Raskin
5e1c057878
If this url then this hash
...
svn path=/nixpkgs/trunk/; revision=17637
2009-10-04 22:01:26 +00:00
Michael Raskin
dc14fc06da
Updating linuxwacom
...
svn path=/nixpkgs/trunk/; revision=17488
2009-09-29 06:48:37 +00:00
Marc Weber
afbb4d0b59
update topgit - using official release now
...
svn path=/nixpkgs/trunk/; revision=17457
2009-09-26 23:33:08 +00:00
Peter Simons
d874ec17a4
xlock: fixed typo in default.nix
...
svn path=/nixpkgs/trunk/; revision=17360
2009-09-23 11:01:14 +00:00
Peter Simons
04558d8496
xlock: fixed build and updated to version 5.24
...
svn path=/nixpkgs/trunk/; revision=17356
2009-09-22 20:16:38 +00:00
Marc Weber
d816babb74
jackaudio: symlink pkg-config description to lib
...
svn path=/nixpkgs/trunk/; revision=17321
2009-09-21 09:58:24 +00:00
Eelco Dolstra
a54fc7e7f7
svn path=/nixpkgs/trunk/; revision=17083
2009-09-13 10:54:47 +00:00
Marc Weber
5478df996a
adding netsurf browser. No JavaScript yet
...
svn path=/nixpkgs/trunk/; revision=17077
2009-09-13 08:54:47 +00:00
Sander van der Burg
3a5645269d
Claimed maintainership of VICE package and added VICE to the releases.nix
...
svn path=/nixpkgs/trunk/; revision=17049
2009-09-11 13:16:00 +00:00
Marc Weber
09920037c0
adding mplayer trunk cause the stable source distribution is said to be
...
outdated
svn path=/nixpkgs/trunk/; revision=17030
2009-09-10 16:58:02 +00:00
Marc Weber
3201717bdb
adding lilypond
...
svn path=/nixpkgs/trunk/; revision=17028
2009-09-10 16:57:56 +00:00
Eelco Dolstra
580096378b
* Fixed the Wacom package (version 0.8.4 has disappeared).
...
svn path=/nixpkgs/trunk/; revision=17003
2009-09-10 12:21:25 +00:00
Eelco Dolstra
f560f49faa
* Fix nix-env evaluation.
...
svn path=/nixpkgs/trunk/; revision=16931
2009-09-02 13:22:34 +00:00
Marc Weber
8ff2647169
adding gutenprint (former gimp-print) and gutenprintBin. I still haven't
...
found the source of the binary package containing the .ppd files
Still impure but works. See comment.
svn path=/nixpkgs/trunk/; revision=16881
2009-08-27 23:32:13 +00:00
Marc Weber
bc8a85288d
cups-bjnp driver
...
svn path=/nixpkgs/trunk/; revision=16880
2009-08-27 23:32:10 +00:00
Michael Raskin
f0a3ff997f
Update wine (use new updater script in the process)
...
svn path=/nixpkgs/trunk/; revision=16817
2009-08-23 22:24:17 +00:00
Eelco Dolstra
c8886f7215
* dblatex 0.2.12.
...
svn path=/nixpkgs/trunk/; revision=16815
2009-08-22 23:11:12 +00:00
Marc Weber
075f9712f2
fix soappy by using trunk version
...
svn path=/nixpkgs/trunk/; revision=16790
2009-08-20 20:19:04 +00:00
Eelco Dolstra
0fa5cdc251
* Remove some trace calls.
...
svn path=/nixpkgs/trunk/; revision=16705
2009-08-13 08:37:00 +00:00
Michael Raskin
caede3beb5
Update LinuxWacom driver
...
svn path=/nixpkgs/trunk/; revision=16565
2009-08-03 14:15:22 +00:00
Marc Weber
c3ddc9df62
cdtenv: also store PATH and PKG_CONFIG_PATH
...
svn path=/nixpkgs/trunk/; revision=16478
2009-07-27 16:05:36 +00:00
Andres Löh
5164d2ec62
Added lhs2TeX support to LaTeX builder.
...
svn path=/nixpkgs/trunk/; revision=16439
2009-07-23 14:13:09 +00:00
Eelco Dolstra
04cc6b721a
* Made findLaTeXIncludes pure. Previously find-includes.pl looked
...
outside of the Nix store for the dependencies of the root source
file, which is impure. That's why it needed the
`builtins.currentTime' hack to force a rebuild. It also didn't work
in a chroot. Now find-includes.pl only scans the source file at
hand, and we use builtins.genericClosure to find all includes
recursively.
svn path=/nixpkgs/trunk/; revision=16414
2009-07-17 15:10:01 +00:00
Marc Weber
62eccd21d4
updating bleeding edge source file info for nix-repository-manager
...
svn path=/nixpkgs/trunk/; revision=16349
2009-07-14 12:31:37 +00:00
Eelco Dolstra
46db02a5e3
* Fix xrefs and callouts that refer to xml:ids (rather than ids).
...
Will send upstream.
svn path=/nixpkgs/trunk/; revision=16312
2009-07-10 12:09:58 +00:00
Marc Weber
25a1533d9a
removing old haskell stuff. I was using my own branch for a long time.
...
It will be replaced by something else anyway.
Some of those patches may still be of interest (?)
svn path=/nixpkgs/trunk/; revision=16298
2009-07-09 22:24:08 +00:00
Marc Weber
676f4c4e2d
haskellPackages: adding bytestring, networkBytestring, getOptions, ghcSyb, hslogger, tar
...
svn path=/nixpkgs/trunk/; revision=16296
2009-07-09 22:24:02 +00:00
Marc Weber
6abf8471fb
fix sourceWithTagsDerivation, myhasktags now based on current haskell derivations
...
svn path=/nixpkgs/trunk/; revision=16263
2009-07-09 03:50:47 +00:00
Rob Vermaas
5c13747775
dblatex 0.2.11
...
svn path=/nixpkgs/trunk/; revision=16246
2009-07-08 13:12:27 +00:00
Marc Weber
5ef46894e0
adding cdtEnv symlinking deps into one $out/cdt-env/{lib,include} directory
...
and collection which let's you install and update a set of derivations at once
svn path=/nixpkgs/trunk/; revision=16224
2009-07-07 20:53:16 +00:00
Eelco Dolstra
d3f5d94ac7
* Fix some attributes that now make nix-env -q --meta barf.
...
svn path=/nixpkgs/trunk/; revision=16134
2009-07-02 09:08:01 +00:00
Marc Weber
ffb53a0e6f
adding sqlalchemy which is a nice orm mapper for python
...
svn path=/nixpkgs/trunk/; revision=16059
2009-06-26 16:52:54 +00:00
Eelco Dolstra
83c3123617
* Wine 1.1.23.
...
svn path=/nixpkgs/trunk/; revision=15886
2009-06-07 19:48:49 +00:00
Sander van der Burg
ec871e6400
Upgraded DOSBox to 0.73 and removed glibc fixes which are obsolete now
...
svn path=/nixpkgs/trunk/; revision=15786
2009-05-29 12:14:56 +00:00
Ludovic Courtès
f3706471e8
GNU Ghostscript: Add pointers to the URW++ font files in the fontmap.
...
svn path=/nixpkgs/trunk/; revision=15780
2009-05-28 22:11:02 +00:00
Sander van der Burg
5990b0d95f
Added VICE emulator package
...
svn path=/nixpkgs/trunk/; revision=15776
2009-05-28 19:22:00 +00:00
Marc Weber
3157bb1098
removed all __primops from nixpkgs
...
svn path=/nixpkgs/trunk/; revision=15693
2009-05-24 10:57:46 +00:00
Marc Weber
52647ea3b0
FullDepEntry -> fullDepEntry, PackEntry -> packEntry
...
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +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
Eelco Dolstra
d78a404063
* Removed some assertions that rely on pointer equality. (It's kind
...
of unfortunate that consitency checks like "httpd.apr == apr" don't
really work. Perhaps equality tests on derivations should just
compare the drvPath or outPath attributes.)
svn path=/nixpkgs/trunk/; revision=15569
2009-05-12 12:50:07 +00:00
Michael Raskin
d8e3181425
Update URLs for TeXLive
...
svn path=/nixpkgs/trunk/; revision=15544
2009-05-10 23:26:19 +00:00
Marc Weber
90344f9e1e
use svn sources for ctgas.
...
The last release has a bug. I got "no end of file expected" while tagging
svn path=/nixpkgs/trunk/; revision=15501
2009-05-07 18:28:19 +00:00
Eelco Dolstra
f0e8c6aaef
* Updated dblatex.
...
svn path=/nixpkgs/trunk/; revision=15495
2009-05-07 13:18:35 +00:00
Eelco Dolstra
b5e67e699b
* CUPS 1.3.10.
...
svn path=/nixpkgs/trunk/; revision=15472
2009-05-06 14:05:32 +00:00
Marc Weber
94a01668a1
cleaned up and fixed autofs v5
...
svn path=/nixpkgs/trunk/; revision=15419
2009-05-01 05:42:32 +00:00
Eelco Dolstra
2d1bcbeacf
* Electric Sheep, a screensaver.
...
svn path=/nixpkgs/trunk/; revision=15415
2009-04-30 17:41:19 +00:00
Marc Weber
cd9c9a2431
fix broken myEnv
...
svn path=/nixpkgs/trunk/; revision=15382
2009-04-28 16:52:36 +00:00
Ludovic Courtès
2dc368f084
GNU Ghostscript 8.64.0.
...
svn path=/nixpkgs/trunk/; revision=15334
2009-04-27 10:19:59 +00:00
Marc Weber
829e0da0e5
topgit update
...
there is now a tg push command pushing branch and its base optionally
including all dependency
svn path=/nixpkgs/trunk/; revision=15328
2009-04-27 01:18:07 +00:00
Eelco Dolstra
5a2284ac61
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Lluís Batlle i Rossell
1e8fff0915
Updating Wine.
...
svn path=/nixpkgs/trunk/; revision=15308
2009-04-25 16:22:08 +00:00
Eelco Dolstra
7689a348c4
* Got rid of a lot of "postInstall=postInstall" and similar lines in
...
builders. These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations. This is done
automatically now if setupHook is set.
* Deleted the initscripts package. NixOS doesn't use it anymore.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
6e32a4cea8
svn path=/nixpkgs/branches/stdenv-updates/; revision=15273
2009-04-23 12:46:14 +00:00
Eelco Dolstra
f762b50991
* Another sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra
94d7d1fdbb
* Got rid of all --disable-static flags; they're redundant now.
...
* Also a bunch of style cleanups (tabs, with args, ...).
svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Sander van der Burg
883eb4371c
Fixed dosbox expression
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=15220
2009-04-21 18:30:54 +00:00
Lluís Batlle i Rossell
98f6f77709
Adding a folding-at-home client.
...
svn path=/nixpkgs/trunk/; revision=15122
2009-04-17 20:36:54 +00:00
Eelco Dolstra
2eb05cf933
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Eelco Dolstra
7ae8544b4c
* ntfs-3g updated to 2009.4.4. The old version has disappeared
...
anyway.
svn path=/nixpkgs/trunk/; revision=14915
2009-04-07 16:03:30 +00:00
Eelco Dolstra
d27514cb28
* Sync with the trunk once more.
...
* Turn on everything in Hydra.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Marc Weber
5af6ba01fd
doh (forgotten to update name)
...
svn path=/nixpkgs/trunk/; revision=14782
2009-03-30 14:21:18 +00:00
Marc Weber
0be7534b0f
maven-2 version bump to 2.1.0
...
svn path=/nixpkgs/trunk/; revision=14781
2009-03-30 14:20:05 +00:00
Marc Weber
27db9f1dfd
updated synergy cvs source
...
svn path=/nixpkgs/trunk/; revision=14772
2009-03-30 10:32:44 +00:00
Eelco Dolstra
58ae185001
* Latest ntfs-3g, FUSE.
...
svn path=/nixpkgs/trunk/; revision=14696
2009-03-25 10:55:40 +00:00
Eelco Dolstra
f3815e7ad5
* Fixed ntfsprogs.
...
svn path=/nixpkgs/trunk/; revision=14695
2009-03-25 10:55:28 +00:00
Eelco Dolstra
3593b97d63
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra
808f12e369
* Dosbox 0.72.
...
svn path=/nixpkgs/trunk/; revision=14556
2009-03-16 12:22:47 +00:00
Eelco Dolstra
2ae9a1c947
* Doh.
...
svn path=/nixpkgs/trunk/; revision=14498
2009-03-10 20:04:08 +00:00
Marc Weber
b56ed35851
replacing applyAndFun by lib.defaultOverridableDelayableArgs
...
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.
I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.
important refactoring:
applyAndFun had .fun and .funMerge only when passing the merge
function lib.mergeOrApply
composableDerivation {
initial = {
...
};
}
to
overridableDelayableArgs has always .replace and .merge
composableDerivation {} {
...
}
svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Eelco Dolstra
0175270bf9
* Wine 1.1.15.
...
svn path=/nixpkgs/trunk/; revision=14273
2009-02-27 12:52:55 +00:00