1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Commit graph

31677 commits

Author SHA1 Message Date
Peter Simons c39dbf65cd Merge pull request #1422 from ocharles/lens-aeson
haskellPackages.lensAeson: New expression
2013-12-30 10:37:39 -08:00
Peter Simons ea47447a29 Merge pull request #1426 from wkennington/openssh
openssh: Update from 6.2p2 -> 6.4p1
2013-12-30 10:37:27 -08:00
Lluís Batlle i Rossell 34859e2a42 Adding wxWidgets 3.0.0 2013-12-30 17:35:31 +01:00
Shea Levy 4af1c79c06 Remove uses of __overrides feature
In addition to replacing use of a feature with IMO confusing semantics,
this will also let us cleanly separate out all-packages.nix into
category-specific files without changing the structure of the pkgs
attrset.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-30 11:04:45 -05:00
Lluís Batlle i Rossell f529e91501 Updating vxl from 1.13 to 1.17. 2013-12-30 15:32:51 +01:00
Moritz Heidkamp 29e16c62eb Add chunksync package 2013-12-30 15:04:25 +01:00
Rob Vermaas 1e36663229 Update node packages 2013-12-30 13:24:51 +01:00
Rob Vermaas 96a51da082 Oraclejdk7: Fix hash and extracted path for jce_policy.zip. Add extra rpath. 2013-12-30 12:39:48 +01:00
Jonas Hoersch 5125b98602 network-manager-applet: re-do schema generation
fixes #1355. partial revert of f4d4e12c (introduced by #1313).

meta.priority is set to 6 (lower priority than standard) to resolve the
conflict of an exported gschemas.compiled for evince as for nm-applet.
this linked file is NOT consulted, as both binaries are wrapped to look
for their schemas in their nix store path first.

a better fix would avoid already avoid linking those gschemas.compiled
files into the environment.
2013-12-30 12:26:51 +01:00
Michael Raskin 950b785993 Use CLisp 2.44.1 for SBCL build --- some releases like it better for bootstrapping... 2013-12-30 14:17:48 +04:00
William A. Kennington III 1c14b519ac pythonPackages.matplotlib: Update to use buildPythonPackage
Matplotlib is currently using hacked together build / install phases
which mimick this functionality of buildPythonPackage. This patch
changes the expression to remove the duplicated build scripting.
2013-12-30 02:42:12 -06:00
William A. Kennington III c4e03f0739 openssh: Update from 6.2p2 -> 6.4p1
This patch also bumps up the HPN version of openssh so that it compiles
on top of 6.4. Along with the bump, a package was added for the high
performance networking version.

The gcmrekey patch was removed as this vulnerability is fixed in
version 6.4 onward. http://www.openssh.org/txt/gcmrekey.adv
2013-12-30 02:42:12 -06:00
William A. Kennington III 0270be1eb6 subversion: Update from 1.7.14 -> 1.8.5 2013-12-30 00:08:59 +00:00
Marius Rejdak 2da33b4ecf tint2 nixpkg 2013-12-29 23:35:46 +01:00
Michael Raskin 26b3d0ab50 Update unstable Wine to 1.7.9 2013-12-30 02:32:19 +04:00
Michael Raskin d22106ab2d Update SBCL to 1.1.14 2013-12-30 02:30:55 +04:00
William A. Kennington III b05d8d8310 vlc: Update from 2.1.1 -> 2.1.2 2013-12-29 21:35:01 +01:00
Domen Kožar 5e641b3ffc pythonPackages.py: 1.4.13 -> 1.4.19 2013-12-29 20:04:26 +01:00
Domen Kožar 8a920ad306 pyramid_jinja: 1.6 -> 1.9 2013-12-29 19:57:34 +01:00
Domen Kožar 43ede75535 python3Packages: update some to fix py3k support 2013-12-29 19:52:26 +01:00
Domen Kožar c73f118af6 setuptools: 0.9.8 -> 2.0.2 2013-12-29 19:15:36 +01:00
Michael Raskin 952a0a3797 Fix btrfs source link 2013-12-29 21:34:30 +04:00
Michael Raskin e0b529d088 Fix btrfs source link 2013-12-29 21:33:37 +04:00
Domen Kožar 5603e611a7 xbmc: 12.2 -> 12.3 2013-12-29 17:53:40 +01:00
Michael Raskin e9ec56a596 Update vim_configurable to the same source tag as default vim 2013-12-29 19:38:43 +04:00
Michael Raskin c5bbad405d Merge pull request #1423 from wkennington/vim
Update vim from 7.4.23 -> 7.4.131
2013-12-29 07:05:17 -08:00
Michael Raskin 5adf60b46e Merge pull request #1418 from wkennington/linux
Update kernels 3.10 and 3.11
2013-12-29 07:03:37 -08:00
Michael Raskin c356b67ce7 Merge pull request #1414 from coroa/gammu
Add gammu version 1.33.0 - a library and command line utility for interfacing phones
2013-12-29 07:02:35 -08:00
Michael Raskin 6177a4f556 Merge pull request #1410 from ktosiek/pr/compton
Bump compton to v0.1_beta2
2013-12-29 07:01:53 -08:00
Michael Raskin e4f659c201 Merge pull request #1409 from urv/master
calibre: upgrade from 1.15.0 to 1.17.0
2013-12-29 07:01:31 -08:00
Michael Raskin f1daf24bea Less aggressive LD_LIBRARY_PATH seems to avoid segfault 2013-12-29 18:52:43 +04:00
Jonas Hoersch 4418c1e1d7 Add gammu version 1.33.0 - a library and command line utility for interfacing phones 2013-12-29 15:13:23 +01:00
William A. Kennington III 211b9a5016 linux: Update 3.10.18 -> 3.10.25 2013-12-29 07:53:23 -06:00
William A. Kennington III 811d88e94d linux: Update 3.11.8 -> 3.11.10 2013-12-29 07:53:19 -06:00
William A. Kennington III a2ff906257 vim: Update from 7.4.23 -> 7.4.131
Instead of applying all of the patches, this build pulls an archive from
the source code repo with all of the patches already applied. This is the
preferred way from http://www.vim.org/sources.php
2013-12-29 07:51:58 -06:00
Domen Kožar e860eef8f3 pythonPackages.webtest: typo 2013-12-29 14:26:25 +01:00
Domen Kožar 8f14618e45 pythonPackages.webob: 2.0.3 -> 2.0.11 2013-12-29 14:22:40 +01:00
Peter Simons 8da218c34e haskell-defaults.nix: fix quickcheck-io build with GHC 7.2.2 2013-12-29 14:12:57 +01:00
Mathijs Kwik bcd5d154a6 Merge pull request #1421 from wkennington/btrfs
Fix btrfsprogs so nix detects the version
2013-12-29 05:00:27 -08:00
William A. Kennington III 88e4596ffd Fix btrfsprogs so nix detects the version
Currently, btrfsprogs is misdetected by nix such that it requires
specifying btrfs-progs-v3.12 for install instead of just btrfs-progs.
This patch removes the v so that it now reads btrfs-progs-3.12 and is
properly detected by nix.
2013-12-29 06:55:47 -06:00
Oliver Charles eb4618d288 haskellPackages.lensAeson: New expression 2013-12-29 12:32:43 +00:00
Domen Kožar 4cc859c6be pythonPackages.unittest2: use correct name under py3k 2013-12-29 13:21:47 +01:00
Peter Simons da71287281 haskell-defaults.nix: use the old version of pretty-show with ghc 7.2.2
The old compiler cannot build Happy 1.19.2.
2013-12-29 13:18:22 +01:00
Peter Simons b06f53900d haskell-defaults.nix: ensure that hspec-expectations uses the same version of HUnit as quickcheck-io 2013-12-29 13:18:22 +01:00
Domen Kožar bffd5c23b2 pythonPackages.nose-selecttests: fix url 2013-12-29 13:06:42 +01:00
Domen Kožar 7324936915 salut_a_toi: use setuptools 2013-12-29 13:06:42 +01:00
Peter Simons cdfd953ffa apache-httpd-2.4: enable building the 'event'-based mpm worker
Adding "LoadModule mpm_event_module modules/mod_mpm_event.so" to httpd.conf
enables that worker instead of the default choice.
2013-12-29 12:52:54 +01:00
Peter Simons ac692ddb50 haskell-cabal2nix: update to version 1.57 2013-12-29 12:26:07 +01:00
Peter Simons a5d046d007 cabal2nix: the test suite compiles only on GHC 7.6.x or later
See <https://github.com/sol/doctest-haskell/issues/69> for further details.
2013-12-29 12:26:07 +01:00
Peter Simons 7e51f66bea Fix GHC 7.2.2 build of Haskell Platform 2012.2.0.0. 2013-12-29 12:26:07 +01:00
Peter Simons d1b97eea02 haskell-opengl: fix version conflicts with OpenGL 2.9.x build 2013-12-29 12:26:07 +01:00
Peter Simons 132965e66a haskell-trifecta: re-generate expressions with cabal2nix 2013-12-29 12:26:07 +01:00
Peter Simons 446a93b375 haskell-graphviz: jailbreak some more 2013-12-29 12:26:07 +01:00
Peter Simons 8cca7e4603 haskell-statistics: fix version mismatch of binary package some more 2013-12-29 12:26:07 +01:00
Peter Simons 0652273194 haskell-yesod-bin: update to version 1.2.5.3 2013-12-29 12:26:07 +01:00
Peter Simons 3b397273d9 haskell-asn1-types: update to version 0.2.3 2013-12-29 12:26:07 +01:00
Peter Simons b6e7a650f0 haskell-graphviz: jailbreak some more 2013-12-29 12:26:07 +01:00
Peter Simons d7eae3f86b haskell-statistics: fix version mismatch of binary package 2013-12-29 12:26:07 +01:00
Peter Simons 293a7f00bf haskell-xss-sanitize: update to version 0.3.4.1 2013-12-29 12:26:07 +01:00
Peter Simons ec33405820 haskell-wai-logger: update to version 2.1.0 2013-12-29 12:26:07 +01:00
Peter Simons 38b9c60dda haskell-tasty-ant-xml: update to version 1.0.0.5 2013-12-29 12:26:07 +01:00
Peter Simons 987025b911 haskell-shakespeare: update to version 1.2.0.4 2013-12-29 12:26:07 +01:00
Peter Simons 2b140cc909 haskell-rethinkdb: re-generate expression with cabal2nix 2013-12-29 12:26:07 +01:00
Peter Simons eac8e44d09 haskell-profunctors: update to version 4.0.2 2013-12-29 12:26:06 +01:00
Peter Simons 453668d04e haskell-hamlet: update to version 1.1.7.6 2013-12-29 12:26:06 +01:00
Peter Simons e8e8e8b8fa haskell-fast-logger: update to version 2.1.0 2013-12-29 12:26:06 +01:00
Peter Simons 56e4f6285c haskell-graphviz: lift restrictions on temporary to fix the build 2013-12-29 12:26:06 +01:00
Peter Simons 67515e8e38 haskell-statistics: this package needs a more recent version of binary 2013-12-29 12:26:06 +01:00
Peter Simons 469735b45f haskell-wai-extra: jailbreak to fix build with recent version of fast-logger 2013-12-29 12:26:06 +01:00
Peter Simons c3fafc22b1 haskell-miniutter: this package needs a more recent version of binary 2013-12-29 12:26:06 +01:00
Peter Simons 9f37ace519 haskell-bmp: don't use the latest version because it requires binary >= 0.6; a version that no released compiler has yet 2013-12-29 12:26:06 +01:00
Peter Simons 634e636792 haskell-defaults.nix: fix evaluation of the ghc 7.2.2 package set 2013-12-29 12:26:06 +01:00
Peter Simons 08884ea8e5 haskell-yesod-routes: update to version 1.2.0.5 2013-12-29 12:26:06 +01:00
Peter Simons c6653e4564 haskell-yesod-persistent: update to version 1.2.2.1 2013-12-29 12:26:06 +01:00
Peter Simons b7450e7085 haskell-yesod-form: update to version 1.3.4.2 2013-12-29 12:26:06 +01:00
Peter Simons 1f22a2b93d haskell-yesod-core: update to version 1.2.6.4 2013-12-29 12:26:06 +01:00
Peter Simons 80cadd1f00 haskell-yesod-auth: update to version 1.2.5.2 2013-12-29 12:26:06 +01:00
Peter Simons 6bc07e5a36 haskell-wai-extra: update to version 2.0.1.2 2013-12-29 12:26:06 +01:00
Peter Simons 513fd95f6c haskell-temporary: update to version 1.2.0.1 2013-12-29 12:26:06 +01:00
Peter Simons f777fd99dc haskell-tasty: update to version 0.7 2013-12-29 12:26:06 +01:00
Peter Simons 96c27d4a16 haskell-tasty-golden: update to version 2.2.0.2 2013-12-29 12:26:06 +01:00
Peter Simons fba98ed1f4 haskell-statistics: update to version 0.10.5.2 2013-12-29 12:26:06 +01:00
Peter Simons 2f4d7e22c3 haskell-persistent: update to version 1.3.0 2013-12-29 12:26:06 +01:00
Peter Simons 5f481cef8e haskell-persistent-template: update to version 1.3.0 2013-12-29 12:26:05 +01:00
Peter Simons 7f84c7394b haskell-persistent-sqlite: update to version 1.3.0 2013-12-29 12:26:05 +01:00
Peter Simons 2f6ccb037c haskell-persistent-postgresql: update to version 1.3.0 2013-12-29 12:26:05 +01:00
Peter Simons d4a5eb8e1f haskell-mono-traversable: update to version 0.2.0.0 2013-12-29 12:26:05 +01:00
Peter Simons 86eb9b78b5 haskell-monad-logger: update to version 0.3.4.0 2013-12-29 12:26:05 +01:00
Peter Simons 36b02e9431 haskell-either: update to version 4.1 2013-12-29 12:26:05 +01:00
Peter Simons e698851cc1 haskell-classy-prelude: update to version 0.7.0 2013-12-29 12:26:05 +01:00
Peter Simons e097ad80b5 haskell-classy-prelude-conduit: update to version 0.7.0 2013-12-29 12:26:05 +01:00
Peter Simons ce829e2c6b haskell-ansi-wl-pprint: update to version 0.6.7.1 2013-12-29 12:26:05 +01:00
Peter Simons 0e1c29e0ad haskell-HsOpenSSL: update to version 0.10.4 2013-12-29 12:26:05 +01:00
Peter Simons 7e94212b0d haskell: don't provide 'binary' default, instead we override that
attribute in the compiler-specific package set

binary has become a core package in ghc 7.4.2, so we cannot easily build
stuff with our own version of it. (Least not without Cabal warning about
version conflicts in the build log.)
2013-12-29 12:26:05 +01:00
Peter Simons ad80939299 pkgs/top-level/release.nix: build the ghc 7.2.2 binary 2013-12-29 12:26:05 +01:00
Peter Simons 631ad32b5d pkgs/build-support/cabal: the configure-phase warning check can be
disabled by setting 'strictConfigurePhase' to 'false'

This is necessary for some packages, like dns, because cabal warns about
multiple versions of the same dependency being used, but the usage is fine,
actually, so we want the build to succeed. Packages that depend on 'doctest'
also have this issue <https://github.com/sol/doctest-haskell/issues/69>.
2013-12-29 12:26:05 +01:00
Peter Simons 6ea52bf49a haskell-defaults.nix: cabal2nix now requires Cabal 1.16.x or later 2013-12-29 12:26:05 +01:00
Peter Simons 63e37a4f1f haskell-DRBG: add version 0.5.1 2013-12-29 12:26:05 +01:00
Peter Simons 6646b80027 haskell-cipher-aes128: add version 0.5 2013-12-29 12:26:05 +01:00
Peter Simons 5b37e9b543 haskell-prettyclass: add version 1.0.0.0 2013-12-29 12:26:05 +01:00
Peter Simons 6209bb8556 pkgs/build-support/cabal: add 'buildTarget' attribute to allow passing flags to "./Setup build" 2013-12-29 12:26:05 +01:00
Peter Simons 63c60638fc pkgs/build-support/cabal: clean up the code that sets rpath for shared executables 2013-12-29 12:26:05 +01:00
Peter Simons 7d577eb822 build-support/cabal: recognize the "this package indirectly depends on
multiple versions of the same package" warning from Cabal and abort the
build if it occurs.
2013-12-29 12:26:05 +01:00
Peter Simons 074fee59c5 haskell-yesod-static: update to version 1.2.2.1 2013-12-29 12:26:05 +01:00
Peter Simons 8d18c2cfbc haskell-wai-logger: update to version 2.0.2 2013-12-29 12:26:04 +01:00
Peter Simons 0e2c35b89c haskell-wai-extra: update to version 2.0.1.1 2013-12-29 12:26:04 +01:00
Peter Simons 0e87adf3f2 haskell-lens: update to version 3.10.1 2013-12-29 12:26:04 +01:00
Peter Simons 87d05fcea5 haskell-fclabels: update to version 2.0.1 2013-12-29 12:26:04 +01:00
Peter Simons 6ee7b328d1 haskell-fast-logger: update to version 2.0.3 2013-12-29 12:26:04 +01:00
Peter Simons 053120f28f haskell-digestive-functors-heist: update to version 0.8.4.0 2013-12-29 12:26:04 +01:00
Peter Simons 1f71eab618 haskell-crypto-pubkey: update to version 0.2.4 2013-12-29 12:26:04 +01:00
Peter Simons fa7e494b25 haskell-RSA: update to version 2.0 2013-12-29 12:26:04 +01:00
Domen Kožar 5ac2d969f2 salut-a-toi: remove distribute dependency (not needed) 2013-12-29 10:24:37 +01:00
Domen Kožar 8993655f4c pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests 2013-12-29 10:09:30 +01:00
Mathijs Kwik 5f9d99926a Merge pull request #1419 from wkennington/btrfs
Updated btrfsprogs from 0.20-git -> 3.12
2013-12-28 17:27:07 -08:00
William A. Kennington III 0276de4d1b Updated btrfsprogs from 0.20-git -> 3.12
Additionally, removed an unmaintained utility for setting the uuid of
sent volumes.
2013-12-28 19:23:10 -06:00
Shea Levy 1cc5942845 Update node packages
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-28 17:54:52 -05:00
Shea Levy d59d4dd9a5 Add haskellPackages.robotsTxt
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-28 17:34:47 -05:00
Shea Levy e5898a4f95 Add haskellPackages.heredoc
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-28 17:33:52 -05:00
Domen Kožar 86ecd31111 Python: get rid of distribute
Distribute is deprecated in favor of setuptools (again), please
see http://pythonhosted.org/setuptools/merge-faq.html
2013-12-28 21:15:49 +01:00
Domen Kožar dcbf69915d matplotlib: get rid of distribute 2013-12-28 21:04:51 +01:00
William A. Kennington III c00b1ba8f3 Update matplotlib from 1.2.1 -> 1.3.1
Additionally, fix the build and install phases so that they build under
python3
2013-12-28 21:04:50 +01:00
William A. Kennington III 7f4f6bdbfb Update tornado from 2.4 -> 3.1.1 2013-12-28 21:04:50 +01:00
William A. Kennington III e5c6fb8fa1 Update pyparsing from 1.5.6 -> 2.0.1 2013-12-28 21:04:50 +01:00
William A. Kennington III e4b4df6f43 Update python3 from 3.3.2 -> 3.3.3 2013-12-28 21:04:50 +01:00
William A. Kennington III 587d03ec4e Update python-dateutil from 2.1 -> 2.2 2013-12-28 21:04:50 +01:00
Vladimír Čunát 9f735bdf57 gnumeric: add platforms, maintainer 2013-12-28 15:49:19 +01:00
Vladimír Čunát a126ce011a gnumeric: add schemas and icons, refactor
Also move goffice under gnome3,
as it's released in the same way.
2013-12-28 15:45:20 +01:00
Vladimír Čunát 9bcacfb142 hicolor_icon_theme: minor update 0.12 -> 0.13 2013-12-28 15:08:47 +01:00
Moritz Ulrich 5890215501 windowManager.xmonad: Make it configurable and extensible.
PR #1366
The previous windowManager.xmonad option only starts xmonad and
doesn't make ghc available. This assumes that the user has GHC with
access to the xmonad package in his PATH when using xmonad.

Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE}
environment variables which define the path to either ghc or xmessage.
These are set automatically when using xmonad through
windowManager.xmonad.

My (or specific: @aristidb and my) changes make it possible to use
Xmonad without adding GHC to any profile. This is useful if you want
to add a different GHC to your profile.

This commit introduces some options:

- xmonad.haskellPackages: Controls which Haskell package set & GHC set
  is used to (re)build Xmonad

- xmonad.extraPackages: Function returning a list of additional
  packages to make available to GHC when rebuilding Xmonad

- xmonad.enableContribExtras: Boolean option to build xmonadContrib
  and xmonadExtras.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-28 09:29:53 +01:00
Moritz Ulrich 5331088ba1 ledger3: Update to latest git (8d38060968) 2013-12-28 00:57:17 +00:00
Vladimír Čunát 9020582fea xfce4-terminal: bugfix update 0.6.2 -> .3 2013-12-27 08:48:39 +01:00
Rob Vermaas 8cb70b0b93 Upgrade cppunit to 1.13.2 2013-12-27 08:25:39 +01:00
Shea Levy 44c97e02f6 Move GEM_PATH part of rubygems' setup hook to ruby
Fixes #1413

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 18:38:10 -05:00
Song Wenwu 88b9e1f191 retroarch: update to 0.9.9.7 2013-12-26 18:55:17 +01:00
Song Wenwu 9b273eb971 midori: build with webkit2 to support GTK+2 plugins (close #1412) 2013-12-26 18:14:45 +01:00
Song Wenwu 55a49a3f93 midori: fix file chooser dialog (Ctrl+o)
vcunat: change to double-prefix of the variable, instead of clearing it.
2013-12-26 18:14:45 +01:00
Domen Kožar f6a8fe34b2 speedtest-cli: dev -> 0.2.4 2013-12-26 16:51:08 +01:00
Eelco Dolstra 9f75797d0b Merge remote-tracking branch 'origin/glibc-2.18' 2013-12-26 14:49:19 +01:00
Shea Levy 73e78c24fb Update node packages to npm2nix-5.4.2 to fix tarball
Thanks @vcunat for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 06:43:21 -05:00
William A. Kennington III f5374c123c Add targetcli-fb as well as necessary dependencies 2013-12-26 10:58:15 +01:00
Vladimir Still b345bdf5d2 tmpwatch: Add platforms to meta (unix).
According to web pages of tmpwatch it seems that it can be build on
unixes (Mac OS X, solaris). Not much information is here though.
2013-12-26 10:56:00 +01:00
Song Wenwu 0889c86b86 midori: update from 0.4.4 to 0.5.6 (close #1411) 2013-12-26 09:19:19 +01:00
Evgeny Egorochkin 46c1216fd0 kde411: expose it to nix-env with a lower priority. 2013-12-26 04:23:53 +02:00
Tomasz Kontusz 37a3f21799 Bump compton to v0.1_beta2 2013-12-26 01:22:24 +01:00
Florian Friesdorf 7a988c62af git-repo-1.20, update and pin python 2013-12-26 01:01:01 +01:00
Florian Friesdorf 46f627e8f7 git-repo-1.19 2013-12-26 00:45:21 +01:00
Edward Tjörnhammar 01c39bdefc Adding IntelliJ IDEA13 Community and Ultimate 2013-12-26 00:12:19 +01:00
Vladimír Čunát b80d1c5923 Merge x-updates 2013-12-25 23:56:41 +01:00
AndersonTorres 378f962c0e Aegisub: New Package
Adding Aegisub: an advanced movie subtitle editor
2013-12-25 22:24:19 +01:00