1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Commit graph

45981 commits

Author SHA1 Message Date
Eelco Dolstra 9edf4631ce emacs24Macport: Mark as lowPrio 2014-07-22 13:50:53 +02:00
Eelco Dolstra 3ef40e5004 emacs: Remove 23.x 2014-07-22 13:50:52 +02:00
Peter Simons 0d23cf835f Merge pull request #3318 from joelteon/master
Fix icu4c build on darwin
2014-07-22 12:27:11 +02:00
Pascal Wittmann 7491fccfe6 Merge pull request #3338 from svenkeidel/gpodder-metainfo
added metainformation for gpodder and mygpoclient
2014-07-22 10:20:27 +02:00
Sven Keidel 4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
lethalman 27a5a68e41 Merge pull request #3336 from DamienCassou/installing-on-efi
Adding a missing instruction for EFI installations
2014-07-22 09:36:26 +02:00
Sven Keidel ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
Pascal Wittmann 261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2
Logstash 1.4.2
2014-07-21 20:02:11 +02:00
Pascal Wittmann 5156b5d11d Merge pull request #3260 from linquize/gbdfed
gbdfed: add package 1.6
2014-07-21 19:49:26 +02:00
Bjørn Forsman f8778ed82c openopc: new package
"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
2014-07-21 18:43:33 +02:00
lethalman 5cde295b1d Merge pull request #3327 from svenkeidel/gpodder
added gpodder package
2014-07-21 18:37:28 +02:00
Sven Keidel 75b3c9eb95 Use make install instead of setup.py directly.
Using setup.py results in the following error message:

    Missing file: share/applications/gpodder.desktop

    If you want to install, use "make install" instead of using
    setup.py directly. See the README file for more information.
2014-07-21 18:05:08 +02:00
Sven Keidel 1a484c8ba2 moved wrapper declaration to preFixup 2014-07-21 17:58:27 +02:00
Damien Cassou 812da7cd2f Adding a missing instruction for EFI installations
This commit also adds a link to rEFInd which is a useful tool to manage
EFI systems. If this link is not desired, I can remove it.
2014-07-21 17:54:38 +02:00
William Roe 8f31b13938 Fix service to use logstash new directory layout 2014-07-21 16:24:18 +01:00
Shea Levy 430bf4719e Add plugins haskell package 2014-07-21 09:44:39 -04:00
Oliver Charles a80a701101 haskellPackages.engineIO/engineIOSnap/socketIO: Update to latest versions 2014-07-21 14:24:57 +01:00
Oliver Charles 977add9710 haskellPackages.engineIO: Update to 1.0.2 2014-07-21 13:58:41 +01:00
Bjørn Forsman cd3ba19ec0 asciidoc: add enableExtraPlugins expression argument
'enableExtraPlugins = true' enables all the extra plugins (filters and
backends) that are available in the expression. This simplifies the
configuration for users who want to have the fullest possible asciidoc
configuration (not needing to enable each individual plugin).
2014-07-20 23:03:27 +02:00
Bjørn Forsman 0ab24ad8c8 Revert "asciidoc: properly differentiate the "-full" variant in meta.description"
I changed my mind about this, I no longer think that meta.description
should differ depending on the package configuration. A package
configuration can be very fine grained, and I don't think it's
possible/preferable to describe this in meta.description.

This reverts commit 9033821c34.
2014-07-20 23:03:27 +02:00
Cillian de Róiste bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Sven Keidel eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Peter Simons 5c0659f2b4 Merge pull request #3324 from linquize/git-2.0.2
git: Update to 2.0.2
2014-07-20 21:12:19 +02:00
Peter Simons 6609493aa5 Merge pull request #3322 from bennofs/haskell-gtk-gio
haskell-gtk: re-generate after applying NixOS/cabal2nix#70
2014-07-20 21:11:49 +02:00
Linquize 4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
William Roe b6c2dc4e4f License, platforms and maintainer for Logstash 2014-07-20 16:09:19 +01:00
Benno Fünfstück e2046181b6 haskell-gtk: re-generate after applying NixOS/cabal2nix#70 2014-07-20 16:56:19 +02:00
Pascal Wittmann 52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Pascal Wittmann c7add6c270 Merge pull request #3317 from Mathnerd314/prelink
Add prelink package
2014-07-20 14:03:12 +02:00
Evgeny Egorochkin 2660e19b73 Google Compute config: add a unit to wait for the metadata server to become available 2014-07-20 14:07:46 +03:00
Austin Seipp f677e843d5 hhvm: remove bash input
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:46:32 -05:00
Austin Seipp 03fd95d248 hhvm: Fix path to /bin/bash
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:44:43 -05:00
Peter Simons 713379c658 Re-generate Haskell packages with cabal2nix. 2014-07-19 21:12:04 +02:00
Cillian de Róiste 2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
Aycan iRiCAN de155d13da Merge pull request #3227 from hrdinka/haskell-stm-containers
haskell-stm-containers: add package version 0.1.2 and its dependencies
2014-07-19 11:47:42 +03:00
Aycan iRiCAN bfe2e05925 Merge pull request #3319 from luke-clifton/master
Added cgrep utility.
2014-07-19 11:43:06 +03:00
Aycan iRiCAN 0cd98d7f60 Merge branch 'fluffynukeit-add-rest-framework' 2014-07-19 11:25:52 +03:00
Aycan iRiCAN f057f06136 resolved conflicts 2014-07-19 11:25:30 +03:00
Aycan iRiCAN 9489105aca Merge branch 'haskellPackages.rest' 2014-07-19 11:18:18 +03:00
Aycan iRiCAN 5a1167455e Merge remote-tracking branch 'upstream/master' 2014-07-19 11:01:54 +03:00
Aycan iRiCAN 139fdaa5ba Merge branch 'master' of github.com:aycanirican/nixpkgs 2014-07-19 10:59:39 +03:00
Luke Clifton 8fcd7bffb9 Merge remote-tracking branch 'upstream/master' 2014-07-19 15:45:31 +08:00
Austin Seipp 4b0178d2a4 hhvm: 3.1.0 -> 3.2.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 01:58:09 -05:00
Luke Clifton 2fbd9e07f2 Added cgrep utility. 2014-07-19 12:21:15 +08:00
Joel Taylor 48d9dfa890 fix icu4c build on darwin 2014-07-18 19:25:46 -07:00
Mathnerd314 dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
John Wiegley 73e0c50b30 haskell-git-annex: fix for darwin
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
2014-07-18 18:37:54 -05:00
John Wiegley ad31933ec4 haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically 2014-07-18 18:02:09 -05:00
John Wiegley 9b608c0e99 haskell-codex: jailbreak due to circular dependency
It seems the codex-0.1.0.2 build requires 0.1.0.1.
2014-07-18 18:00:27 -05:00
Eelco Dolstra 3282de17fd Revert "titanium: Bump to 3.3.0"
This reverts commit 4426b8a3a1. It
causes an infinite recursion during Nixpkgs evaluation:

http://hydra.nixos.org/build/12608698

(@svanderburg)
2014-07-18 23:49:33 +02:00