summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* * Bravely delete the mergeinfo.•••svn path=/nixpkgs/branches/stdenv-updates/; revision=34050 backups/stdenv-updates@34093Eelco Dolstra2012-05-100-0/+0
* * Third attempt.•••svn path=/nixpkgs/branches/stdenv-updates/; revision=34048 Eelco Dolstra2012-05-100-0/+0
* * Second attempt.•••svn path=/nixpkgs/branches/stdenv-updates/; revision=34047 Eelco Dolstra2012-05-100-0/+0
* * Hack svn:mergeinfo to hopefully allow "svn merge --reintegrate" ••• to succeed. The error is: $ svn merge --reintegrate ^/nixpkgs/branches/stdenv-updates svn: E195016: Reintegrate can only be used if revisions 33530 through 34045 were previously merged from https://nixos.org/repos/nix/nixpkgs/trunk to the reintegrate source, but this is not the case: nixpkgs/branches/stdenv-updates/pkgs/misc/screensavers/xscreensaver/default.nix Missing ranges: /nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix:33655-33656 svn path=/nixpkgs/branches/stdenv-updates/; revision=34046 Eelco Dolstra2012-05-100-0/+0
* * Final sync with the trunk.•••svn path=/nixpkgs/branches/stdenv-updates/; revision=34045 Eelco Dolstra2012-05-1017-81/+220
|\
| * Reverting some more Haskell changes, to make things complete again.•••svn path=/nixpkgs/trunk/; revision=34044 Andres Löh2012-05-103-0/+34
| * Reverted changes to the Haskell package defaults.•••The current versions are the ones being proposed for the new Haskell Platform. If they cause problems with other packages, those packages should be fixed, not the defaults. svn path=/nixpkgs/trunk/; revision=34043 Andres Löh2012-05-101-4/+4
| * Updated Haskell packages.••• - DSH: updated to version 0.7.8.1 - alex: updated to versino 3.0.2 - certificate: updated to version 1.2.2 - language-c: updated to version 0.4.2 - xhtml: updated to version 3000.2.1 Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to avoid lots of build errors, i.e. with monad-par. svn path=/nixpkgs/trunk/; revision=34042 Peter Simons2012-05-106-18/+18
| * * Linux 3.0.31.•••svn path=/nixpkgs/trunk/; revision=34036 Eelco Dolstra2012-05-091-2/+2
| * * Disable some failing builds on specific platforms.•••svn path=/nixpkgs/trunk/; revision=34033 Eelco Dolstra2012-05-094-22/+12
| * Adapted the ghc-7.4.1 package version defaults to upcoming Platform release.•••svn path=/nixpkgs/trunk/; revision=34032 Andres Löh2012-05-093-5/+25
| * Changing the way haskellPackagesFun is invoked.•••This is supposed to make it easier to create locally modified version preferences in Haskell package sets, by using override on the extraPrefs attribute. svn path=/nixpkgs/trunk/; revision=34031 Andres Löh2012-05-091-45/+71
| * Added haskell-mpi and dependencies.•••svn path=/nixpkgs/trunk/; revision=34030 Andres Löh2012-05-094-0/+60
| * GNU Guile 2.0: Fix cross-GNU builds.•••svn path=/nixpkgs/trunk/; revision=34029 Ludovic Courtès2012-05-091-1/+10
* | * Sync with the trunk.•••svn path=/nixpkgs/branches/stdenv-updates/; revision=34028 Eelco Dolstra2012-05-0959-451/+632
|\|
| * Updated Haskell packages.••• - attoparsec-conduit: updated to version 0.4.0.1 - conduit: updated to version 0.4.2 - network-conduit: updated to version 0.4.0.1 - persistent-sqlite: updated to version 0.9.0.2 - persistent: updated to version 0.9.0.4 - semigroups: updated to version 0.8.3.1 - wai-app-static: updated to version 1.2.0.3 - wai-extra: updated to version 1.2.0.4 - wai: updated to version 1.2.0.2 - warp: updated to version 1.2.0.2 - xml-conduit: updated to version 0.7.0.2 svn path=/nixpkgs/trunk/; revision=34027 Peter Simons2012-05-0911-34/+31
| * upgraded uhc•••svn path=/nixpkgs/trunk/; revision=34026 Mathijs Kwik2012-05-091-3/+3
| * bbswitch: upgraded to 0.4.2•••svn path=/nixpkgs/trunk/; revision=34025 Mathijs Kwik2012-05-091-2/+2
| * mplayer: enabled speex support•••I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by default too, so it's probably on most systems already svn path=/nixpkgs/trunk/; revision=34024 Mathijs Kwik2012-05-091-1/+5
| * numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen•••The patch broke the build of matplotlib. svn path=/nixpkgs/trunk/; revision=34023 Peter Simons2012-05-092-31/+2
| * The jujuutils are meant for a recent kernel, more recent than our linuxHeaders.•••Therefore I add recent linuxHeaders for it. It's quite a hack to build it mixed with 2.6.35 headers and 3.3.5, but it builds at least. svn path=/nixpkgs/trunk/; revision=34021 Lluís Batlle i Rossell2012-05-083-2/+70
| * Adding jujuutils.•••svn path=/nixpkgs/trunk/; revision=34020 Lluís Batlle i Rossell2012-05-082-0/+18
| * Updating cssutils.•••svn path=/nixpkgs/trunk/; revision=34017 Russell O'Connor2012-05-081-3/+3
| * haskell-file-embed: updated to version 0.0.4.3•••svn path=/nixpkgs/trunk/; revision=34016 Peter Simons2012-05-081-3/+3
| * haskell-abstract-par: updated to version 0.3.1•••svn path=/nixpkgs/trunk/; revision=34015 Peter Simons2012-05-081-2/+2
| * Updating libraw1394 to 2.0.8.•••svn path=/nixpkgs/trunk/; revision=34014 Lluís Batlle i Rossell2012-05-081-2/+2
| * Adding the Allied Technologies libdc1394 variant and the cc1394 viewer.•••svn path=/nixpkgs/trunk/; revision=34013 Lluís Batlle i Rossell2012-05-083-0/+69
| * Adding support in VLC for 1394 cameras.•••svn path=/nixpkgs/trunk/; revision=34012 Lluís Batlle i Rossell2012-05-081-1/+3
| * Linux 3.3.5•••svn path=/nixpkgs/trunk/; revision=34011 Shea Levy2012-05-071-2/+2
| * Fixing webserver path..•••svn path=/nixpkgs/trunk/; revision=34005 Michael Raskin2012-05-071-1/+1
| * Added missing meta.maintainers tags.•••svn path=/nixpkgs/trunk/; revision=34004 Peter Simons2012-05-074-0/+4
| * Updated Haskell packages.••• - abstract-deque: added version 0.1.5 - abstract-par: added version 0.3 - bits-atomic: added version 0.1.3 - blaze-builder-conduit: updated to version 0.4.0.2 - IORefCAS: added version 0.2 - MemoTrie: updated to version 0.4.12 - monad-par: added version 0.3 - monad-par-extras: added version 0.3 - repa: updated to version 3.1.4.2 - texmath: updated to version 0.6.0.6 svn path=/nixpkgs/trunk/; revision=34003 Peter Simons2012-05-0712-10/+120
| * * Cygwin: provide a Perl setup hook so that Perl dependencies work••• properly. svn path=/nixpkgs/trunk/; revision=34002 Eelco Dolstra2012-05-075-11/+21
| * virtinst•••svn path=/nixpkgs/trunk/; revision=34000 Joachim Schiele2012-05-071-0/+1
| * virtinst is still missing, but i will finish this tomorrow•••svn path=/nixpkgs/trunk/; revision=33999 Joachim Schiele2012-05-061-1/+8
| * nearly there, please someone check: libvirt/default.nix and see this post: ht...•••svn path=/nixpkgs/trunk/; revision=33998 Joachim Schiele2012-05-062-13/+8
| * virt-manager is not working yet, but as we are not using git yet, i use this ...•••svn path=/nixpkgs/trunk/; revision=33997 Joachim Schiele2012-05-062-0/+70
| * Apply patch from Michel Alexandre Salim advancing mysql workbench version to ...•••svn path=/nixpkgs/trunk/; revision=33996 Karn Kallio2012-05-061-2/+2
| * gem nix missed a lot of hashes, strange...•••svn path=/nixpkgs/trunk/; revision=33995 Shea Levy2012-05-051-6/+6
| * gem nix failed to fill in the hash for bundler•••svn path=/nixpkgs/trunk/; revision=33994 Shea Levy2012-05-051-1/+1
| * Update rubygems•••svn path=/nixpkgs/trunk/; revision=33993 Shea Levy2012-05-051-96/+124
| * Update HOL Light to r134•••svn path=/nixpkgs/trunk/; revision=33992 Marco Maggesi2012-05-051-3/+3
| * Updating lrzip to 0.612.•••svn path=/nixpkgs/trunk/; revision=33991 Lluís Batlle i Rossell2012-05-051-2/+2
| * * OpenSSH 6.0.•••svn path=/nixpkgs/trunk/; revision=33988 Eelco Dolstra2012-05-051-2/+2
| * We no longer need the bootstub config patch•••svn path=/nixpkgs/trunk/; revision=33987 Shea Levy2012-05-053-232/+0
| * Updating calibre, and adding sourceforge as a backup url, suggested by roconnor.•••svn path=/nixpkgs/trunk/; revision=33983 Lluís Batlle i Rossell2012-05-041-3/+6
| * update tomcat-connectors url•••svn path=/nixpkgs/trunk/; revision=33982 Rob Vermaas2012-05-031-1/+1
| * Fixing a typo, semicolon, in the coriander expression.•••svn path=/nixpkgs/trunk/; revision=33980 Lluís Batlle i Rossell2012-05-031-1/+1
| * Adding the license meta for two packages I added today.•••svn path=/nixpkgs/trunk/; revision=33977 Lluís Batlle i Rossell2012-05-032-0/+2
| * Adding coriander. I don't know how to make its gconf thing work, so it shows a•••warning at gui start. svn path=/nixpkgs/trunk/; revision=33976 Lluís Batlle i Rossell2012-05-032-0/+28
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 05:15:05 +0000