Commit Graph

943 Commits

Author SHA1 Message Date
Peter Simons b7d0a9a614 ltrace: update from 0.5.3 to 0.7.3 2014-04-09 12:41:10 +02:00
Vladimír Čunát 10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
2014-04-04 21:33:55 +02:00
Evgeny Egorochkin bf8991175a global: update from 6.2.9 to 6.2.12 2014-04-03 10:22:59 +03:00
Vladimír Čunát 457fdb3842 texinfo: move ncurses support into texinfoInteractive
This, for example, drops the stdenv dependency on ncurses.
2014-04-02 19:05:56 +02:00
Vladimír Čunát 576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Peter Simons ae2cb475c9 haskell-cpphs: update to version 1.18.4 2014-03-27 13:12:54 +01:00
Vladimír Čunát 65155c20d5 automake: update from 1.12.4 to 1.12.6 2014-03-21 10:34:20 +01:00
Lluís Batlle i Rossell ae3a1519e4 gdb: adding a patch to handle well the edit cmd + SIGWINCH.
It's reported to upstream since two years ago, through
their patches mailing list.
2014-03-20 11:09:39 +01:00
Lluís Batlle i Rossell d4bf329dde Updating gdb to 7.7. 2014-03-20 10:47:36 +01:00
Domen Kozar 059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
Michael Raskin 6cfbc75bc1 Fix CL-Launch source link 2014-03-09 12:47:33 +04:00
Bjørn Forsman b9d7780ced saleae-logic: install udev rules
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.saleae-logic ];
2014-03-08 21:46:13 +01:00
Bjørn Forsman 12e00b5eeb openocd: install udev rules
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.openocd ];
2014-03-08 21:46:13 +01:00
Michael Raskin 4376d70c61 Update CL-Launch to 4.0.2.2 2014-03-08 21:13:00 +04:00
Michael Raskin dc4d698e22 Update LuaRocks 2014-03-08 21:13:00 +04:00
Peter Simons f521a47663 haskell-cpphs: update to version 1.18.3 2014-03-08 11:27:41 +01:00
Bjørn Forsman 34caf106da swig: add meta.platforms (set to linux)
So that Hydra will build swig. This provides binary packages to users
and build breakage detection.
2014-03-07 23:59:30 +01:00
Moritz Ulrich 29a906b2d8 dfu-programmer: New package. 2014-03-07 13:28:33 +01:00
Evgeny Egorochkin 399269e6e0 help2man: update from 1.43.3 to 1.44.1 2014-03-01 05:26:44 +02:00
Peter Simons ec09c7d34e haskell-cpphs: update to version 1.18.2 2014-02-25 00:25:28 +01:00
aszlig ba8b0e8af9
binutils-cross: Remove unreferenced package.
This package wasn't imported by anything in the package tree and also
isn't used for cross-builds. So in order to avoid confusion, it's better
to remove it as it is outdated as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:22 +01:00
Vladimír Čunát ae5d8f6768 Merge master into x-updates 2014-02-20 20:55:31 +01:00
Peter Simons 029967dca6 haskell-cpphs: update to version 1.18.1 2014-02-18 19:56:13 +01:00
Evgeny Egorochkin c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
Moritz Ulrich 53b6744646 teensy-loader: New package
Firmware uploader for the teensy microcontroller board family.
2014-02-18 01:02:47 +01:00
Vladimír Čunát 96f07fa74e Merge master into x-updates 2014-02-16 11:45:02 +01:00
Evgeny Egorochkin cf3d2e0a17 add repositories.git to several packages 2014-02-14 09:34:30 +02:00
Peter Simons f687687e7d haskell-cpphs: update to version 1.18 2014-02-10 20:54:55 +01:00
Vladimír Čunát be70104a3a Merge master into x-updates
Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
2014-02-04 22:00:09 +01:00
Bjørn Forsman 662039802a lttng-tools: use absolute path to modprobe
Instead of relying on it being available in $PATH.
2014-02-02 14:00:09 +01:00
Vladimír Čunát 6e2d3b9847 Merge master into x-updates 2014-02-02 10:05:25 +01:00
Vladimír Čunát 5888f27c56 automake-1.10: remove, probably vulnerable CVE-2012-3386
The only user was xorg ATM, which I would remove from anyway.
2014-01-30 13:49:22 +01:00
Petr Rockai 4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Petr Rockai 6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Eelco Dolstra d92dc9bb3e gdb: Build on Darwin
Note that it doesn't actually work unless you run it as root, because
the Darwin kernel disallows unsigned debuggers (you'll get an error
message "please check gdb is codesigned").
2014-01-28 11:03:01 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra 7a6255e4e1 patchelf: Update to 0.8
This fixes a segfault in building Eclipse and the Android SDK.
2014-01-14 14:21:27 +01:00
Nixpkgs Monitor 88953a5799 automake114x: update from 1.14 to 1.14.1 2014-01-13 17:05:44 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Domen Kožar 73252021bb icon-naming-utils: add librsvg dependency and meta.platforms 2014-01-10 01:45:32 +01:00
Eelco Dolstra ffd6557dc6 patchelf: Update to 0.7 2014-01-07 17:44:03 +01:00
Eelco Dolstra 1e986d8de3 binutils: Use dynamic instead of shared libraries
This reduces the size of binutils from 29 to 17 MiB.
2014-01-07 15:01:59 +01:00
Eelco Dolstra 4b31f920b6 binutils: Get rid of a redundant copy of gold 2014-01-07 14:55:55 +01:00
Eelco Dolstra 320209a618 Merge deterministicStdenv into the default stdenv
This means that (on Linux) strip uses
"--enable-deterministic-archives" and ld uses the
BFD_DETERMINISTIC_OUTPUT flag.
2014-01-07 13:57:42 +01:00
Tomasz Kontusz fc55c71fb8 Add platforms and maintainers to d-feet. 2014-01-06 00:48:23 +01:00
Tomasz Kontusz a504b97e3e Add d-feet, a DBus debugger 2014-01-05 23:57:59 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Nixpkgs Monitor 32b2973807 ccache: update from 3.1.7 to 3.1.9 2013-12-18 18:18:21 +02:00
Nixpkgs Monitor 37d39237ab avrdude: update from 5.11 to 6.0.1 2013-12-18 18:18:18 +02:00
Nixpkgs Monitor 8970fb09ab autogen: update from 5.17 to 5.18 2013-12-18 18:18:17 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 53754a0397 help2man: update from 1.40.8 to 1.43.3 2013-12-15 13:03:15 +02:00
Nixpkgs Monitor 202ea363c4 astyle: update from 2.02.1 to 2.04 2013-12-15 11:25:54 +02:00
Nixpkgs Monitor 537a5d4b70 gdb: update from 7.6.1 to 7.6.2 2013-12-14 04:36:56 +02:00
Nixpkgs Monitor 8cfaf0697c global: update from 6.2.2 to 6.2.9 2013-12-12 03:11:34 +02:00
Nixpkgs Monitor 57826becea gengetopt: update from 2.22.5 to 2.22.6 2013-12-12 03:11:34 +02:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Jason "Don" O'Conal 1d7108d5f5 drush: add expression 2013-12-05 04:38:35 +00:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Jason "Don" O'Conal b3504c7bf5 complexity: fix build 2013-11-28 23:52:49 +00:00
Michael Raskin 5c90e785b2 Updating LuaRocks to 2.1.1 2013-11-25 10:59:38 +04:00
Shea Levy 7ab7be0cc3 Add automake 1.14
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-23 21:18:37 -05:00
Song Wenwu 61b8ebc77f swig: bump 2.0.4 -> 2.0.11 2013-11-22 09:41:17 +08:00
Bjørn Forsman 04ce6241ac lttv: update 1.5-beta1 -> 1.5
This makes lttv build again with the new GTK+ version that was recently
updated in nixpkgs.
2013-11-15 00:19:15 +01:00
Bjørn Forsman fbfa569efd stlink: fix chroot build
Add sha256 attribute to fetchgit to make it a fixed-output derivation
(needed for chroot builds).
2013-11-13 23:30:47 +01:00
Bjørn Forsman a8d63681db stlink: fix package name
To stop nixpkgs-lint from saying "stlink: package has no version".
2013-11-13 23:25:48 +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
Bjørn Forsman e0b7eeb0ad uhd: new package
UHD is USRP Hardware Driver (for Software Defined Radio).
2013-11-09 22:15:52 +01:00
Lluís Batlle i Rossell 3e8e635be7 Updating gdb to 7.6.1 2013-11-08 17:27:57 +01:00
Eelco Dolstra 58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Domen Kožar 09fa7304ae ninka: update to 1.1 and refactor 2013-10-30 11:47:12 +01:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Bjørn Forsman a13ed71b43 xc3sprog: new package
xc3sprog is command-line tools for programming FPGAs, microcontrollers
and PROMs via JTAG.

Homepage: http://xc3sprog.sourceforge.net/

I'm using the latest from subversion as xc3sprog doesn't seem to make
proper releases. There are only a few seemingly random snapshots at
sourceforge. And these snapshots are built binary packages, not source
archives.

NOTE: I haven't tested this on any hardware yet.
2013-10-26 12:43:12 +02:00
Michael Raskin 20e8f46022 Updating luarocks to 2.1.0 2013-10-20 21:08:09 +04:00
Michael Raskin 96585205d7 Updating CL-Launch to 3.22.1 2013-10-20 21:07:48 +04:00
Michael Raskin be5b32e798 Apparently fix texinfo5 with fresh TeXLive 2013-10-20 19:15:11 +04:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Peter Simons b15c3e49e5 texinfo: remove obsolete version 4.9 2013-09-28 10:37:05 +02:00
Peter Simons 8ff3855204 texinfo: update to version 5.2 2013-09-28 10:36:34 +02:00
Moritz Ulrich 36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Peter Simons e4f6e4b15d gnum4: drop obsolete patches 2013-09-22 16:35:54 +02:00
Peter Simons ee3dc2d0c9 gnum4: fix download URL 2013-09-22 16:32:26 +02:00
Peter Simons 8d6b23a60a gnum4: update to version 1.4.17 2013-09-22 16:27:44 +02:00
Vladimír Čunát 2c7c65595d Revert "binutils: minor update 2.23.1 -> .2"
This reverts commit 15f96c840f.
See #909.

Conflicts (trivial, auto-resolved):
	pkgs/development/tools/misc/binutils/default.nix
2013-09-16 15:53:40 +02:00
Peter Simons 24366adf19 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-14 15:28:40 +02:00
Krofek 51f63b1d03 Merge branch 'master' of https://github.com/Krofek/nixpkgs 2013-09-14 00:28:27 +02:00
Krofek da21a852c3 gtkdialog: update to 0.8.3 2013-09-14 00:10:17 +02:00
Rickard Nilsson 45b8a1b1ff avrdude: Update to version 5.11 2013-09-13 00:28:02 +02:00
Mathijs Kwik 2f428bbb46 Merge remote-tracking branch 'official/master' into stdenv-updates 2013-09-11 10:56:47 +02:00
Peter Simons 701937b085 binutils: remove unused flex2535, bc, and dejagnu arguments 2013-09-09 10:34:37 +02:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Vladimír Čunát 9766dbb1df dejagnu: minor update 2013-09-07 16:20:39 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Bjørn Forsman 86c7583ab4 lttng: 2.2.x -> 2.3.0 2013-09-05 22:46:07 +02:00
Vladimír Čunát c074433fc6 binutils: add support for x86_64 in i686 builds (close #857)
Also some style refactoring around repeating "stdenv.lib.optional*".
The author of the idea is @errge.
2013-09-02 22:03:43 +02:00
Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Bjørn Forsman 36564b72fe uncrustify: new package
Uncrustify is a source code beautifier for C, C++, C#, ObjectiveC, D,
Java, Pawn and VALA.

Homepage: http://uncrustify.sourceforge.net/
2013-08-31 09:42:20 +02:00
Peter Simons 9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Vladimír Čunát c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Peter Simons 2badada2be haskell-cpphs: update to version 1.17.1 2013-08-19 20:54:51 +02:00
Petr Rockai 374a27fe8e binutils: Also enable plugins when building with gold. 2013-08-18 21:14:16 +02:00
Peter Simons e6e33e3d08 haskell-cpphs: update to version 1.17 2013-08-18 18:49:12 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Peter Simons e2baa14add xxdiff: update to version 4.0 2013-08-15 12:25:07 +02:00
Bjørn Forsman 5a3a82d81c lttv: new package
Linux Trace Toolkit Viewer is a GUI program to visualize LTTng trace
files. (An alternative to this program is the LTTng plugin for the
Eclipse IDE.)
2013-08-10 14:32:57 +02:00
Bjørn Forsman 1eb38f2ccb babeltrace: new package
Babeltrace is a command-line tool and library to read and convert LTTng
tracefiles. Give it a (binary) trace file/dir path and it will print a
human readable event log to standard out.
2013-08-10 14:32:57 +02:00
Bjørn Forsman 6a4f068b9e lttng-tools: new package
This is the Linux Trace Toolkit. Included in this package:

Command-line client:
  lttng
Tracing daemons:
  lttng-sessiond (automatically started by lttng)
  lttng-relayd   (remote trace collection daemon)

Userspace tracing can be done by using liblttng-ust. To do kernel
tracing we also need the LTTng kernel modules.

I've added a patch that changes "/sbin/modprobe" to just "modprobe".
2013-08-10 14:32:57 +02:00
Bjørn Forsman 33d78777a3 lttng-ust: new package
This is the user space library for LTTng. It is needed to do user space
tracing, as opposed to kernel space tracing.
2013-08-10 14:32:56 +02:00
Bjørn Forsman 61a1867c5d strace: 4.7 -> 4.8
Also, update meta.license and add meta.platforms.
2013-08-06 23:43:51 +02:00
Vladimír Čunát 661a1a68a6 automake113x: minor update to .4
I can't make glib build without it.
2013-08-03 09:39:31 +02:00
Michael Raskin bfbbb12e35 Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations 2013-08-02 09:39:20 +04:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Bjørn Forsman 67ce7f863a srecord: new package
The SRecord package is a collection of powerful tools for manipulating
EPROM load files.

http://srecord.sourceforge.net/
2013-07-19 00:29:50 +02:00
Moritz Ulrich 30f54585d5 Add stm32flash, flash program for stm32 bootloader.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-07-18 01:50:41 +02:00
Bjørn Forsman 2c702a1d81 avarice: set meta.platforms (make hydra build it) 2013-07-16 19:40:45 +02:00
Sergey Mironov 62bbba8173 AVaRICE: translates between GDB's remote debug protocol and the AVR JTAG ICE protocol 2013-07-16 14:19:32 +04:00
Evgeny Egorochkin da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin 8a2da95255 luarocks: fix version to match tarball 2013-07-14 02:08:49 +03:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Jason "Don" O'Conal 525a6856f2 otool and setfile: cleanup 2013-07-07 18:58:29 +10:00
Jason "Don" O'Conal 2a21046f24 otool & setFile: only allow on darwin 2013-07-04 19:01:47 +10:00
Jason "Don" O'Conal c2901da1b8 setFile: add expression 2013-07-04 08:50:37 +10:00
Jason "Don" O'Conal 216d47be0c gobject-introspection: fix build on darwin
* add otool expression (add otool to build inputs)
* add libintlOrEmpty to build inputs
2013-07-03 22:03:48 +10:00
Vladimír Čunát c1ef3d2854 texinfo5: add missing xz, use version 5.* by default 2013-06-30 09:00:11 +02:00
Vladimír Čunát 15f96c840f binutils: minor update 2.23.1 -> .2 2013-06-30 09:00:11 +02:00
Moritz Ulrich 978fa98933 avrdude: Add libusb to enable USB support 2013-06-25 22:19:31 +02:00
Evgeny Egorochkin 0889bbe88f Patch binutils to produce more deterministic output 2013-06-25 11:15:45 +03:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates.
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Michael Raskin eb946b4795 Luarocks: new package 2013-06-07 14:05:13 +04:00
Michael Raskin 2baaaebf57 Luarocks: new package 2013-06-07 14:04:15 +04:00
Bjørn Forsman f425048875 saleae-logic: new package
Add Saleae Logic - analyzer software for Saleae logic analyzators.

Also, add a small LD_PRELOAD library that is needed to make it work from
a read-only installation directory.
2013-06-05 21:56:50 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Bjørn Forsman df09b7fb5f tcptrack: new package
tcptrack is a small libpcap based program (with ncurses UI) for live TCP
connection monitoring.

It seems upstream homepage is down, so download the source code from a
fedora server instead.
2013-05-12 14:03:24 +02:00
Peter Simons 3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00