JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,821 Commits 2 Branches 0 Tags 13 GiB
241738bca6
Commit Graph

29982 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
fda66c9ff4 Updating tox to master 2013-11-13 09:21:44 +01:00
Aristid Breitkreuz
f923c32204 boost: fix hardcoded hash 
Closes #1209

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-12 23:02:39 +00:00
Lluís Batlle i Rossell
868fa84e3a Adding smartdeblur (gpl3 version, ~1.27) 2013-11-12 22:12:43 +01:00
Moritz Ulrich
844b053cce ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors 
ghostscript and freetype were enabled but the configure script
couldn't find them. It turns out it uses pkgconfig to search for them.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-12 21:53:37 +01:00
Lluís Batlle i Rossell
a5bc306985 Adding revisions to all fetch* of ngrok. 2013-11-12 21:44:16 +01:00
Bjørn Forsman
6c2ee56e4b samba: bump 3.6.18 -> 3.6.20 (security fixes) 
3.6.20 is a security release in order to address CVE-2013-4475 (ACLs are
not checked on opening an alternate data stream on a file or directory)
and CVE-2013-4476 (Private key in key.pem world readable).

And 3.6.19 had some bug fixes:
http://www.samba.org/samba/history/samba-3.6.19.html
 2013-11-12 20:29:45 +01:00
Moritz Ulrich
96552b683e Erlang: Update to R16B02. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-12 20:06:46 +01:00
Moritz Ulrich
6937e0a99b yaws: Update to 1.98. 
This fixes the build when compiled with Erlang 16B01 (default).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-12 20:04:26 +01:00
Eelco Dolstra
d207047afc sudo: Update to 1.8.8 2013-11-12 17:58:49 +01:00
Sergey Mironov
86038eaa1d xfce: remove icon caches (close #1207) 
vcunat deleted another one
 2013-11-12 14:40:07 +01:00
Vladimír Čunát
9220d5b002 libxml2 on FreeBSD: disable impure python detection 
This might be good for all platforms,
when we do some big rebuild again.
 2013-11-12 14:09:15 +01:00
Evgeny Egorochkin
39e9fabae0 ZNC modules: expose meta properly, fix typo in license 2013-11-12 14:43:29 +02:00
Rok Garbas
f685b08d0d emacs offlineimap mode added 2013-11-12 11:00:58 +01:00
Rok Garbas
508e8f5347 nodePackages."grunt-bower-task" added 2013-11-12 11:00:15 +01:00
Vladimír Čunát
91028bd151 upower: fix Xfce via --enable-deprecated 
Also drop older libusb1 version which is no longer needed with newer upower.
 2013-11-12 10:05:57 +01:00
Vladimír Čunát
85d21a6963 libxml2: bump 2.9.0 -> 2.9.1 (CVE-2013-1969) 
And drop patch that has been merged upstream.
Close #1199.
Hack around python install problems (the rest is from bjornfor).
 2013-11-11 22:32:46 +01:00
Bjørn Forsman
d4e210539b alsa: bump 1.0.26 -> 1.0.27 (close #1198) 
Basically, bump all alsa projects to their latest version as per
http://www.alsa-project.org/main/index.php/Main_Page
 2013-11-11 22:32:28 +01:00
Peter Simons
a6d30242a1 Merge pull request #1201 from errge/master 
Add direct-sqlite haskell library
 2013-11-11 13:16:20 -08:00
Peter Simons
393689dcea Merge pull request #1202 from Zoomulator/master 
gtest: New package, the google c++ testing framework.
 2013-11-11 13:15:47 -08:00
Peter Simons
2192ddec0e boost: say hello to version 1.55.0 2013-11-11 22:08:47 +01:00
Evgeny Egorochkin
6f6d611a06 upower: update to 0.9.23 2013-11-11 22:16:34 +02:00
Evgeny Egorochkin
d3435e62b2 perlPackages.Switch: add missing version number 2013-11-11 22:05:03 +02:00
Kim Simmons
530a8dc7dc gtest: New package, the google c++ testing framework. 
BSD licensed testing framework from google:
https://code.google.com/p/googletest/
 2013-11-11 16:51:23 +01:00
Gergely Risko
d9ed78cbd9 Add direct-sqlite haskell library 2013-11-11 16:36:14 +01:00
Peter Simons
7aefd575b5 haskell-yesod-static: disable the yesod-static test suite 
It produces a strange error:

  Running 1 test suites...
  Test suite tests: RUNNING...

  /nix/store/gwm3821513h0jwcgxr73r3ay90shaq7r-haskell-base64-bytestring-ghc7.6.3-1.0.0.1/bin/../lib/ghc-7.6.3/package.conf.d/base64-bytestring-1.0.0.1.installedconf:1:19272:
      Not in scope: `main'
      Perhaps you meant `min' (imported from Prelude)
  ...

I'm not sure what this means.
 2013-11-11 14:39:59 +01:00
Peter Simons
716318c54d haskell-process-conduit: add version 1.0.0.1 2013-11-11 14:39:59 +01:00
Peter Simons
4159147663 haskell-control-monad-loop: add version 0.1 2013-11-11 14:39:59 +01:00
Peter Simons
c9afccda1d haskell-yesod: update to version 1.2.3 2013-11-11 14:39:59 +01:00
Peter Simons
bdbda93222 haskell-yesod-static: update to version 1.2.1 2013-11-11 14:39:59 +01:00
Peter Simons
07fa9cec40 haskell-yesod-form: update to version 1.3.4 2013-11-11 14:39:59 +01:00
Peter Simons
e3f874c0f7 haskell-yesod-core: update to version 1.2.5 2013-11-11 14:39:59 +01:00
Peter Simons
59d4efda21 haskell-yesod-bin: update to version 1.2.4 2013-11-11 14:39:59 +01:00
Peter Simons
f4775459ac haskell-threads: update to version 0.5.0.3 2013-11-11 14:39:59 +01:00
Peter Simons
598541fc15 haskell-html-conduit: update to version 1.1.0.1 2013-11-11 14:39:59 +01:00
Peter Simons
95fdcdb200 haskell-conduit: update to version 1.0.9 2013-11-11 14:39:58 +01:00
Peter Simons
876e2278c9 haskell-bifunctors: update to version 4.1.1 2013-11-11 14:39:58 +01:00
Peter Simons
20b512de7c haskell-keter: update to version 1.0.1.2 2013-11-11 14:39:58 +01:00
Peter Simons
6509447e81 haskell-thyme: update to version 0.3.0.3 2013-11-11 14:39:58 +01:00
Peter Simons
57d39d5083 haskell-tasty: update to version 0.4.0.1 2013-11-11 14:39:58 +01:00
Peter Simons
11c930d02a haskell-language-c-quote: update to version 0.7.5 2013-11-11 14:39:58 +01:00
Peter Simons
2f466ae9a0 haskell-cereal: update to version 0.4.0.1 2013-11-11 14:39:58 +01:00
Peter Simons
cbaf113858 haskell-HsSyck: update to version 0.51 2013-11-11 14:39:58 +01:00
Peter Simons
9537b2c8d2 haskell-HList: update to version 0.2.3 2013-11-11 14:39:58 +01:00
Peter Simons
ad2d8fdfb9 Don't override deepseq globally in Cabal 1.18.x. 
Deepseq is a core package, and building Cabal with a version that differs from
the one shipped with GHC is probably not a good idea.

For GHC 7.0.x, however, we must override deepseq, because the library just
won't build otherwise.
 2013-11-11 14:39:58 +01:00
Peter Simons
0cd6b6e896 haskell-thyme: update to version 0.3.0.2 2013-11-11 14:39:58 +01:00
Peter Simons
7d97e8c982 haskell-texmath: update to version 0.6.5.2 2013-11-11 14:39:58 +01:00
Peter Simons
f25b2c1be6 haskell-HsOpenSSL: update to version 0.10.3.5 2013-11-11 14:39:58 +01:00
Peter Simons
75ec0b31f8 haskell-git-annex: update to version 4.20131106 2013-11-11 14:39:57 +01:00
Peter Simons
62fd4cebe1 haskell-parallel: update to version 3.2.0.4 2013-11-11 14:39:57 +01:00
Peter Simons
9e036f4560 haskell-deepseq: update to 1.3.0.1 2013-11-11 14:39:57 +01:00
Peter Simons
2a98488609 haskell-snap-core: update to version 0.9.5.0 2013-11-11 14:39:54 +01:00
Peter Simons
dbffabdee6 haskell-parseargs: update to version 0.1.5.2 2013-11-11 14:39:54 +01:00
Peter Simons
2176c172ca haskell-hxt: update to version 9.3.1.2 2013-11-11 14:39:54 +01:00
Peter Simons
fb621b1724 haskell-cuda: update to version 0.5.1.0 2013-11-11 14:39:54 +01:00
Peter Simons
ccd4ca7c41 haskell-abstract-par: update to version 0.3.3 2013-11-11 14:39:54 +01:00
Peter Simons
e127d7a0a6 haskell-dual-tree: update to version 0.2 2013-11-11 14:39:54 +01:00
Peter Simons
fb89b4fb0a haskell-wai-extra: update to version 1.3.4.6 2013-11-11 14:39:54 +01:00
Peter Simons
67a59ade44 haskell-texmath: update to version 0.6.5.1 2013-11-11 14:39:54 +01:00
Peter Simons
c00944712d haskell-tasty: update to version 0.4 2013-11-11 14:39:54 +01:00
Peter Simons
9a904615a9 haskell-pipes-parse: update to version 2.0.2 2013-11-11 14:39:54 +01:00
Peter Simons
de03376a13 haskell-lifted-base: update to version 0.2.1.1 2013-11-11 14:39:53 +01:00
Peter Simons
c01cb9d67c haskell-dbus: update to version 0.10.5 2013-11-11 14:39:52 +01:00
Peter Simons
def8a6801c haskell-cufft: update to version 0.1.0.1 2013-11-11 14:39:52 +01:00
Peter Simons
9a615b6d9c haskell-cuda: update to version 0.5.0.2 2013-11-11 14:39:52 +01:00
Peter Simons
096e81f5a0 haskell-crypto-numbers: update to version 0.2.2 2013-11-11 14:39:51 +01:00
Peter Simons
8b863aab40 haskell-active: update to version 0.1.0.9 2013-11-11 14:39:51 +01:00
Peter Simons
226f773457 haskell-accelerate-fft: update to version 0.13.0.0 2013-11-11 14:39:51 +01:00
Peter Simons
c99c70dd8e haskell-accelerate-examples: update to version 0.13.0.0 2013-11-11 14:39:51 +01:00
Peter Simons
3a922b76f7 haskell-accelerate-cuda: update to version 0.13.0.4 2013-11-11 14:39:51 +01:00
Peter Simons
0f09271562 haskell-Chart: update to version 1.1 2013-11-11 14:39:51 +01:00
Peter Simons
6af70de21a haskell-Chart-gtk: update to version 1.1 2013-11-11 14:39:51 +01:00
Peter Simons
c1d17c070f haskell-Chart-cairo: update to version 1.1 2013-11-11 14:39:51 +01:00
Peter Simons
d72afe2f1b haskell-github-backup: update to version 1.20131101 2013-11-11 14:39:51 +01:00
Peter Simons
53cc2aa312 haskell-parsers: update to version 0.10.1.1 2013-11-11 14:39:48 +01:00
Peter Simons
b1f7180d6c Merge pull request #1188 from peti/reimplement-ghcWithPackagesOld-by-wrapping-ghcWithPackages 
Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
 2013-11-11 05:00:11 -08:00
Karn Kallio
1e80c57274 scala: add expression for scala 2.10.x branch. 2013-11-11 12:11:00 +01:00
Lluís Batlle i Rossell
cec700aab0 Updating ts to 0.7.4. 2013-11-11 09:53:17 +01:00
Jason "Don" O'Conal
d680003157 awesome: add which to build inputs (for awesome-client) 2013-11-11 01:40:17 +00:00
Jason "Don" O'Conal
311a25648b mpd: update to latest version 2013-11-11 01:08:21 +00:00
Cillian de Róiste
01266013a5 gimpPlugins.gmic: upgrade from 1.3.2.0 to 1.5.7.4, fix compilation with gimp 2.8 
Only the gimp plugin is built now, as the rest of the suite is quite
large and probably deserves its own package.
 2013-11-10 23:35:03 +01:00
Cillian de Róiste
b8bbc87ab1 gimpPlugins.fourier: upgrade from 0.3.3 to 0.4.1 and fix compilation 2013-11-10 23:35:03 +01:00
Cillian de Róiste
f5e92ce8f2 gimpPlugins.texturize: fix compilation with gimp 2.8 2013-11-10 23:35:03 +01:00
Cillian de Róiste
f9520337d0 gimpPlugins.ufraw: update plugin from 0.15 to 0.19.2 to build with gimp 2.8 2013-11-10 23:35:03 +01:00
Cillian de Róiste
bc368053ea gimp: change default from 2.6 to 2.8 2013-11-10 23:35:03 +01:00
Vladimír Čunát
d9f1ed063b pciutils: minor update to today's version 2013-11-10 21:02:48 +01:00
Bjørn Forsman
01fed132fc remmina: add meta.platforms 2013-11-10 18:25:12 +01:00
Domen Kožar
2099a81487 xawtv: 3.95 -> 3.103 
- package now builds on linux
- added linux platforms
- removed patches
 2013-11-10 17:57:58 +01:00
Cillian de Róiste
72aae985ae gutenprint: wrap sbin/cups-genppd.5.2 
This is used to generate ppd files for cups:

  $ cups-genppd.5.2 -M | grep p50
  canon-cp500
  escp2-p50
  $ cups-genppd.5.2 -p . escp2-p50

This will create the relevant ppd file in the current directory. This
can then be used by cups after setting services.drivers.drivers =
[pkgs.gutenprint]; and configuring the printer to use this ppd e.g.
via the web interface on http://localhost:631
 2013-11-10 16:32:05 +01:00
Bjørn Forsman
f4f18c11b6 uhd: bump 3.5.2 -> 3.5.4 
It seems upstream changed the hash of the 3.5.2 archive so it doesn't
build anymore. Bump it instead of just updating the hash.
 2013-11-10 16:22:38 +01:00
Moritz Ulrich
7fded05cbe New package: LDM - Lightweight device mounter 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-10 15:08:44 +01:00
Bjørn Forsman
edfd4cbb03 libvirtd: add missing dependency on dnsmasq 
Fixes this:

Nov 09 16:13:27 nixos-laptop systemd[1]: Starting Libvirt Virtual Machine Management Daemon...
Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: libvirt version: 1.1.4
Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: Cannot check dnsmasq binary dnsmasq: No such file or directory
Nov 09 16:13:28 nixos-laptop .libvirtd-wrapp[17183]: Cannot check dnsmasq binary dnsmasq: No such file or directory
Nov 09 16:13:28 nixos-laptop systemd[1]: Started Libvirt Virtual Machine Management Daemon.
 2013-11-10 14:00:04 +01:00
Cillian de Róiste
80e2706e51 gutenprint: fix the cupsd driver 2013-11-10 00:38:42 +01:00
Cillian de Róiste
78c76daf16 gutenprint: upgrade to 5.2.9 2013-11-10 00:38:42 +01:00
Bjørn Forsman
25b822db37 gnuradio: new package 
Add GNU Radio, the free & open-source software development toolkit that
provides signal processing blocks to implement software radios.
 2013-11-09 22:16:55 +01:00
Bjørn Forsman
57071b2213 Add fftwFloat => fftw composition with floating point 
Needed for Gnuradio (coming in next commit).
 2013-11-09 22:16:27 +01:00
Bjørn Forsman
e0b7eeb0ad uhd: new package 
UHD is USRP Hardware Driver (for Software Defined Radio).
 2013-11-09 22:15:52 +01:00
Peter Simons
e4d841eef4 Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions. 
This change is intended to fix <https://github.com/NixOS/nixpkgs/issues/1161>
and to address some of the concerns that come up during the discussion of
<d64917ad17>.
 2013-11-09 20:41:52 +01:00
Peter Simons
981c287355 ghc: several enhancements to the new "with-packages" wrapper 
1) The wrapper erroneously used the ghc-pkg flag "--package-db" instead of
    "--global-package-db". The result was that packages installed locally in
    ~/.ghc and ~/.cabal were invisible to GHC. This has been fixed.

 2) The wrapper now deals gracefully with an empty package set: if no package
    is requested to be included in the wrapped environment, the wrapper just
    installs a pristine GHC.

 3) Correctly configure the "docdir" path returned by ghc-paths.

 4) Added some comments that describe the idea behind our ghc-paths patches and
    gives users same sample shell code that can be used to import our special
    environment variables into the currently running shell, so that programs
    outside of the wrapped environment can use them, too.
 2013-11-09 20:36:25 +01:00
Peter Simons
46581c6918 subversion: install bash completion 2013-11-09 19:19:22 +01:00
Bjørn Forsman
b8e890539e tig: small expression cleanup 
* Add a bit of whitespace to make it easier on the eyes
* Shorten the description (and remove package name)
 2013-11-09 19:13:35 +01:00
Bjørn Forsman
9b6fb1ebd5 tig: bump 1.1 -> 1.2.1 
XML_CATALOG_FILES is needed to be able to build the asciidoc
documentation/manpages in this new version.
 2013-11-09 19:06:09 +01:00
Ricardo M. Correia
e8361c3523 linux: Update to 3.11.7 2013-11-09 18:46:29 +01:00
Vladimír Čunát
619a1f5614 changes proposed for 13-10 update 
One feature change: polkit update 8d14c7ba
 2013-11-09 18:41:42 +01:00
Jonas Hoersch
a131ce533d fbreader: add meta.platforms attribute 2013-11-09 18:16:17 +01:00
Jonas Hoersch
2923631287 libunibreak: meta.platforms attribute 2013-11-09 18:16:16 +01:00
Jason "Don" O'Conal
f1a537bee6 pythonPackages.mpmath: add expression 2013-11-09 17:59:53 +01:00
Jason "Don" O'Conal
62ebdd7a6a rubyLibs.resque_web: add expression 2013-11-09 17:44:28 +01:00
Vladimír Čunát
8d14c7baa6 polkit: major update 0.105 -> 0.112 
- It now uses JavaScript for configuration (only),
  so I had to "convert" config for NetworkManager.
- I tested suspend/restart/(un)mount on KDE/Xfce,
  Phreedom tested NetworkManager config conversion.
 2013-11-09 16:29:18 +01:00
Cillian de Róiste
0c555809d1 gimp: upgrade to 2.8.8 
This also fixes color management support (lcms2)
 2013-11-09 16:27:11 +01:00
Vladimír Čunát
35a3d07c4f Merge #1082: Update QtCreator to 2.8.1, add Qt 5.1.1 and QtSDK 2013-11-09 16:26:59 +01:00
Vladimír Čunát
61528849e3 mesa: bugfix update 9.1.6 -> .7 
Thist is just for master before the official release,
x-updates has 9.2.* already.
 2013-11-09 16:26:54 +01:00
Vladimír Čunát
2a9bdac39a gtk2: minor update .20 -> .22 2013-11-09 16:26:53 +01:00
Cillian de Róiste
1ff90228b2 xsane: add optional gimp plugin support 2013-11-09 15:03:12 +01:00
Cillian de Róiste
b5bac4c7a4 sane: tidy-up, wrap expression arguments 2013-11-09 15:03:12 +01:00
Cillian de Róiste
46646feb17 sane: add support for Epson snapscan scanners 
The firmware file needs to be downloaded or extracted from the windows
driver file and configured in nixpkgs.config e.g.:

sane.snapscanFirmware = /firmware/esfw41.bin;
 2013-11-09 15:03:12 +01:00
Moritz Ulrich
698065715a Leiningen: Update to 2.3.3 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-08 21:30:34 +01:00
Lluís Batlle i Rossell
3e8e635be7 Updating gdb to 7.6.1 2013-11-08 17:27:57 +01:00
Domen Kožar
9b35dac0c0 iperf: 2.0.4 -> 2.0.5 2013-11-08 16:53:19 +01:00
Eelco Dolstra
52ad0eaca5 openssh: Security fix 
CVE-2013-4548
 2013-11-08 16:42:59 +01:00
Eelco Dolstra
065493284f Update the X11 terminal server module for systemd 
Yay, we no longer need inetd!
 2013-11-08 16:39:22 +01:00
Michael Raskin
29d981d1bd Oops, merged a double-fix 2013-11-08 13:55:20 +04:00
Michael Raskin
d569958894 Merge pull request #1189 from grwlf/qvim 
qvim: fix stdenvAdapters issue, disable Darwin builds
 2013-11-08 01:30:23 -08:00
Lluís Batlle i Rossell
0aedd883e8 Adding qbittorrent 2013-11-08 09:59:52 +01:00
Sergey Mironov
2b1b4f3d3a qvim: chage platforms from 'unix' to 'linux' 
I have no Darwin machine available so lets test qvim on Linux for now
 2013-11-08 12:24:51 +04:00
Sergey Mironov
139b10eb93 qvim: fix stdenvAdapters issue 2013-11-08 12:19:28 +04:00
Michael Raskin
73847ca936 Add missing arguments to qvim --- needed to preserve the partial Darwin compatibility fixes inherited from main vim expression 2013-11-08 09:01:28 +04:00
Sander van der Burg
5bc317409f Bump disnixos to latest development version 2013-11-07 17:45:52 +01:00
Eelco Dolstra
10e31f6de7 Clean up the vsftpd module a bit 2013-11-07 16:38:57 +01:00
Peter Simons
29588edfe1 python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step 
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.

After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.

Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:

  pkgs.python27Full.override {
    extraLibs = [pkgs.pylint];
    postBuild = ''
      cd ${pkgs.pylint}/bin
      for i in *; do
        rm $out/bin/$i
        sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
        chmod +x $out/bin/$i
      done;
    '';
  };
 2013-11-07 15:13:02 +01:00
Peter Simons
b53f71e715 all-packages.nix: strip trailing whitespace 2013-11-07 14:57:34 +01:00
Peter Simons
46419ae454 python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment 
This patch means that adding 'matplotlib' to extraLibs will automatically
include 'numpy', too, because matplotlib depends on it.
 2013-11-07 14:00:08 +01:00
Peter Simons
b66a59bf41 haskell-uu-parsinglib: update to version 2.8.1.1 2013-11-07 14:00:08 +01:00
Sander van der Burg
97ecf74181 disnix: add dysnomia as dependency 2013-11-07 13:58:47 +01:00
Peter Simons
dc9efcd02d milkytracker: fix evaluation 2013-11-07 12:59:45 +01:00
Peter Simons
4a8712328d Merge pull request #1186 from wizeman/flashplayer 
flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabi...
 2013-11-07 03:31:31 -08:00
Peter Simons
f92a5cbfc6 pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter 
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:

  (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };

See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
 2013-11-07 12:14:19 +01:00
Peter Simons
89c566fcfd pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages 
Haskell packages -- i.e. packages built by our Cabal builder -- invariably have
the attributes 'pname' and 'version'. We use the absence of these attributes to
recognize non-Haskell packages and filter them from the closed package set
generated by closePropagation. We do this so that the generated Haskell
environment won't contain paths like "/lib/libz.a", which are part of the
closure but have nothing to do with Haskell.

The previous scheme used the attribute 'ghc' to accomplish the same thing, but
unfortunately other packages to contain a 'ghc' attribute, too, like the
old-style ghc-wrapper. Including the ghc-wrapper in this environment is
pointless, obviously. The new approach filters the ghc-wrapper successfully.
 2013-11-07 12:14:19 +01:00
cillianderoiste
ed67672aac Merge pull request #1181 from Zoomulator/master 
New application: Milkytracker v0.90.85
 2013-11-07 02:54:32 -08:00
Michael Raskin
2b8cdc8434 Merge pull request #686 from ocharles/postgres92 
Disable exec symlink resolution for PostgreSQL 9.2
 2013-11-07 02:53:37 -08:00
Michael Raskin
b541b702ae Merge pull request #1159 from bjornfor/fetchsvn 
fetchsvn: handle redirect(s)
 2013-11-07 02:50:15 -08:00
Michael Raskin
2d1121c454 Merge pull request #1170 from grwlf/qvim 
Add qvim - an experimental Qt gui for Vim
 2013-11-07 02:48:22 -08:00
Ricardo M. Correia
38f85ac5ae flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabilities) 
Fixes CVE-2013-3361, CVE-2013-3362, CVE-2013-3363 and CVE-2013-5324.
 2013-11-07 11:44:18 +01:00
Sander van der Burg
890b706df5 Fix sha256 hash of disnix 2013-11-07 11:33:23 +01:00
Peter Simons
9c1982cd68 Merge pull request #1179 from cpages/sdl2 
SDL2: some improvements to the expression.
 2013-11-07 02:16:00 -08:00
Kim Simmons
db2075b6d8 Added milkytracker: Compiles and runs. 2013-11-07 11:05:13 +01:00
Sander van der Burg
775b1bd4df Bump version of development Disnix 2013-11-07 10:42:13 +01:00
Eric Kow
1be6aae4b4 darwin x11/opengl: only copy subset of files (close #1165) 
Copy only the pc files related to X11 and OpenGL.

This should allow us to build our own version of libraries like
cairo without having the native ones be accidentally dynamically
linked in to things that depend on them.

Before this patch if we `dyldinfo -dylibs libpangocairo` we can
see that it was dynamically linked against the OS X (but seemingly
built against include files from the nix one, as we would get a
runtime complaint about missing symbols)
 2013-11-07 10:39:28 +01:00
Vladimír Čunát
0eeee298ef perl: avoid --no-cpp-precomp on darwin, (close #1160) 
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch

Conflicts (trivial):
	pkgs/development/interpreters/perl/5.16/default.nix
 2013-11-07 10:39:28 +01:00
Carles Pagès
b81caba5fb SDL2: some improvements to the expression. 
Based on comments in the pull request from @edolstra and @peti. I also added
missing metadata, setting myself as maintainer.
 2013-11-06 23:17:46 +01:00
Sergey Mironov
82dedd9cad Fix remmina: add Desktop file and icons 2013-11-06 22:57:55 +01:00