Commit Graph

17142 Commits

Author SHA1 Message Date
Yury G. Kudryashov
08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Yury G. Kudryashov
7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +00:00
Yury G. Kudryashov
15ab248bca Revert "Use qt-4.8 by default"
This reverts r31196. Will re-apply after fixing most packages broken by this
change.

svn path=/nixpkgs/trunk/; revision=31203
2012-01-02 12:54:22 +00:00
Yury G. Kudryashov
b8a3e5fbc9 kdelibs: depend on libjpeg
svn path=/nixpkgs/trunk/; revision=31202
2012-01-02 12:52:43 +00:00
Yury G. Kudryashov
a6c6878f5b libdbusmenu-qt-0.9.0, disable apidocs
svn path=/nixpkgs/trunk/; revision=31201
2012-01-02 11:35:13 +00:00
Peter Simons
2a0453e43e haskell-enumerator: updated to version 0.4.17
svn path=/nixpkgs/trunk/; revision=31200
2012-01-02 11:22:58 +00:00
Yury G. Kudryashov
0c824aa456 Pass pkgconfig to strigi
svn path=/nixpkgs/trunk/; revision=31199
2012-01-02 11:16:48 +00:00
Yury G. Kudryashov
78c300f015 soprano-2.7.4, pass pkgconfig explicitly
svn path=/nixpkgs/trunk/; revision=31198
2012-01-02 11:12:27 +00:00
Yury G. Kudryashov
097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Yury G. Kudryashov
6639c58398 Use qt-4.8 by default
Some packages may break because pkgconfig is no longer propagated.

svn path=/nixpkgs/trunk/; revision=31196
2012-01-02 10:42:25 +00:00
Peter Simons
a0e7016709 haskell-texmath: updated to version 0.5.0.4
svn path=/nixpkgs/trunk/; revision=31195
2012-01-01 21:24:20 +00:00
Peter Simons
ff5e4c4f4b haskell-syb-with-class: updated to version 0.6.1.3
svn path=/nixpkgs/trunk/; revision=31194
2012-01-01 21:24:17 +00:00
Peter Simons
e2c7b54f8c haskell-derive: updated to version 2.5.5
svn path=/nixpkgs/trunk/; revision=31193
2012-01-01 21:24:14 +00:00
Peter Simons
25db17f1b3 haskell-data-accessor: updated to version 0.2.2.1
svn path=/nixpkgs/trunk/; revision=31192
2012-01-01 21:24:11 +00:00
Lluís Batlle i Rossell
be12dae1ec Fixing the busybox installation. All symlinks were pointing wrong.
svn path=/nixpkgs/trunk/; revision=31191
2012-01-01 20:14:50 +00:00
Lluís Batlle i Rossell
076977b462 Making procps crossbuild.
svn path=/nixpkgs/trunk/; revision=31190
2012-01-01 20:01:02 +00:00
Florian Friesdorf
2e31e7293a moved parts of extra.list back to tarballs-7.6.list
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
2011-12-31 15:37:51 +00:00
Florian Friesdorf
90dda8a07f adjusted awesome to generated names of xcbutil-*
svn path=/nixpkgs/trunk/; revision=31186
2011-12-31 06:14:31 +00:00
Florian Friesdorf
d2e8c37e41 default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf
1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list
svn path=/nixpkgs/trunk/; revision=31184
2011-12-31 06:07:34 +00:00
Florian Friesdorf
2a2ceace7f generate-expr-from-tarballs.pl support multiple versions
svn path=/nixpkgs/trunk/; revision=31183
2011-12-31 06:07:32 +00:00
Florian Friesdorf
f6090f6bba reproduced my previous manual changes through generation of default.nix
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00
Florian Friesdorf
cebb40f533 adjusted oder of *.list in generate-expr-from-tarballs.pl example
svn path=/nixpkgs/trunk/; revision=31181
2011-12-31 06:07:26 +00:00
Florian Friesdorf
e45921800c adjusted example generate-expr-from-tarballs.pl call to 7.6
svn path=/nixpkgs/trunk/; revision=31180
2011-12-31 06:07:23 +00:00
Florian Friesdorf
0bb20084b5 xorg: alphabetical extra.list
svn path=/nixpkgs/trunk/; revision=31179
2011-12-31 06:07:21 +00:00
Florian Friesdorf
c9b2b8a182 xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list
svn path=/nixpkgs/trunk/; revision=31178
2011-12-31 06:07:18 +00:00
Florian Friesdorf
e1556e64d7 xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6
svn path=/nixpkgs/trunk/; revision=31177
2011-12-31 06:07:15 +00:00
Florian Friesdorf
44ef26c896 xlsclients-1.1.2
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf
8dd443c8df awesome-3.4.11 - ru manpages disabled because of build failure
svn path=/nixpkgs/trunk/; revision=31173
2011-12-31 04:06:02 +00:00
Florian Friesdorf
096d86bfb1 startup-notification-0.12 (works with xcb-util-0.3.8)
svn path=/nixpkgs/trunk/; revision=31172
2011-12-31 04:05:57 +00:00
Florian Friesdorf
251d42d03f xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Florian Friesdorf
19246750bf libev-4.04 (frees awesome build from many warnings)
svn path=/nixpkgs/trunk/; revision=31170
2011-12-31 04:05:44 +00:00
Florian Friesdorf
aefc550ae0 asciidoc-8.6.6
svn path=/nixpkgs/trunk/; revision=31169
2011-12-31 04:05:33 +00:00
Peter Simons
6dfd7b1446 haskell-yaml: updated to version 0.5.1.1
svn path=/nixpkgs/trunk/; revision=31159
2011-12-30 17:05:20 +00:00
Peter Simons
573455fd44 haskell-data-object-yaml: updated to version 0.3.4
svn path=/nixpkgs/trunk/; revision=31158
2011-12-30 17:05:17 +00:00
Lluís Batlle i Rossell
3e9953290a THe stable task warrior has a licence GPLv2+, not MIT.
svn path=/nixpkgs/trunk/; revision=31152
2011-12-29 22:28:22 +00:00
Lluís Batlle i Rossell
7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell
99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Florian Friesdorf
89c3120b20 zsh profile load tweaking only on nixos
svn path=/nixpkgs/trunk/; revision=31149
2011-12-29 20:09:30 +00:00
Florian Friesdorf
0009c1f650 zshprofile to load /etc/profile while emulating bash
svn path=/nixpkgs/trunk/; revision=31148
2011-12-29 19:46:47 +00:00
Florian Friesdorf
ecba799e78 zsh meta
svn path=/nixpkgs/trunk/; revision=31147
2011-12-29 19:46:43 +00:00
Florian Friesdorf
c6ad751a8c zsh-4.3.15
svn path=/nixpkgs/trunk/; revision=31146
2011-12-29 19:46:37 +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
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
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