Rickard Nilsson
0dbb2fdcfe
sbt: Remove duplicate package
2013-06-25 12:32:28 +02:00
Rickard Nilsson
8496b31e34
sbt: Use recommended java options
2013-06-25 12:31:44 +02:00
Evgeny Egorochkin
0889bbe88f
Patch binutils to produce more deterministic output
2013-06-25 11:15:45 +03:00
Bjørn Forsman
860161dcb7
remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
...
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
2013-06-22 21:09:43 +02:00
aszlig
1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency.
...
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).
The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02: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
Shea Levy
97b95d60d8
Chromedriver: update to 2.0
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-20 09:21:25 -04:00
Evgeny Egorochkin
f5f76e6446
ocamlPackages.deriving: fix version
2013-06-19 03:20:00 +03:00
Marc Weber
d25d1e4d24
ocaml adding deriving
2013-06-19 03:07:27 +03:00
Marc Weber
ccb2e9a832
Adding multiple versions of sbt. Probably you want to use the latest(default).
2013-06-19 02:45:40 +03:00
Vladimír Čunát
6bcf790d05
Merge branch 'master' into x-updates
2013-06-17 22:08:16 +02:00
Peter Simons
b08e12b37a
Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
...
This reverts commit abc7591aaf
, reversing changes
made to 6b1ebeccf2
, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
2013-06-17 10:19:15 +02:00
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14:45 +02:00
Gergely Risko
7a602e5f86
Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk
2013-06-17 09:53:28 +02:00
Michael Raskin
81b7f5fe63
Merge remote-tracking branch 'upstream/master' into x-updates
2013-06-15 17:15:32 +04:00
Peter Simons
43822c1a36
haskell-cabal2nix: update to version 1.52
2013-06-15 13:40:59 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin
abc7591aaf
Merge pull request #567 from MarcWeber/submit/cmake-improvement
...
experimental/cmake-improvement
2013-06-13 05:47:20 -07:00
Michael Raskin
27bbff463f
Merge pull request #601 from craff/ocaml/upgrade_and_new
...
Ocaml/upgrade and new
2013-06-13 05:41:59 -07:00
Peter Simons
7b3ebfe8c5
haskell-haddock: add version 2.13.2.1
2013-06-13 10:43:35 +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
Michael Raskin
8271de6727
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Peter Simons
504ae3f3a8
haskell-hlint: update to version 1.8.46
2013-06-09 10:47:15 +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
Christophe Raffalli
356983074e
Forgotten to add wanr.patch for omake.
2013-06-07 21:58:19 +02:00
Christophe Raffalli
87e1089498
Upgraded omake to 0.9.8.6_rc1. kept the previous version as default because this is a rc1.
...
This is necessary to compile the latest camlimages
2013-06-07 21:40:37 +02: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
Evgeny Egorochkin
9c6f7cc9c1
Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.
2013-06-07 03:15:45 +03:00
Evgeny Egorochkin
bc409a6e00
Merge pull request #593 from bjornfor/saleae-logic
...
saleae-logic: new package
2013-06-06 04:44:44 -07:00
Peter Simons
f37e7a92cf
gnulib: update to version v0.0-7952-g439b0e9
2013-06-05 22:16:24 +02: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
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons
97935a981e
haskell-cabal2nix: update to version 1.51
2013-06-05 12:17:36 +02:00
Peter Simons
f165b58b7b
cabal2nix: add myself as a maintainer
2013-06-05 12:17:35 +02:00
Mathijs Kwik
079ea60624
neoload: upgrade to 4.1.3
2013-06-04 07:50:59 +02:00
Peter Simons
e8b8efa471
haskell-cabal2nix: update to version 1.50
2013-06-01 14:53:44 +02:00
Peter Simons
5718931dd3
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-01 11:48:21 +02:00
Peter Simons
36aaa263d3
cabal2ghci: jailbreak to fix build with Haskell Platform 2013.2.0.0
2013-05-30 12:33:44 +02:00
Rickard Nilsson
a7dbbd2e25
New package: sbt 0.12.3, a Scala build tool
2013-05-30 12:12:19 +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
Marc Weber
f7ef08e5cd
experimental/cmake-improvement
...
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper
This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`
Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch
Also cmake builds in parallel perfectly fine
update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
2013-05-28 16:22:45 +02:00
Peter Simons
2bd7aa7a65
haskell-timeplot: update to version 1.0.20
2013-05-25 11:31:00 +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
Michael Raskin
f75d60fd90
Adding jq JSON processor
2013-05-20 11:17:20 +04:00
Bjørn Forsman
40d35e4bd5
ninja: include package name in source archive path
...
So that the nix store path becomes this:
/nix/store/HASH-ninja-1.2.0.zip.drv
instead of this anonymous path:
/nix/store/HASH-v1.2.0.zip.drv
2013-05-19 14:39:48 +02:00
Peter Simons
25b7c65b34
haskell-hlint: update to version 1.8.45
2013-05-13 13:43:44 +02:00
Peter Simons
057ec53542
haskell-haskdogs: update to version 0.3.2
2013-05-13 13:43:44 +02:00
Mathijs Kwik
81022e4b0a
neoload: upgrade to 4.1.2
2013-05-12 22:46:41 +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
Bjørn Forsman
7f1509aba6
ninja: use version attribute
...
...to avoid the risk of downloading a different version than the package
name suggests (i.e. on the next version bump).
2013-05-11 12:01:33 +02:00
Bjørn Forsman
beb2a7a579
ninja: add description and license
2013-05-11 12:01:31 +02:00
Bjørn Forsman
5ab346a327
ninja: move out of pythonPackages
...
ninja is a build system written in C++ that just happens to use python
to build/install *itself*. It is not a "python package".
After this commit, ninja will be at pkgs.ninja instead of
pkgs.pythonPackages.ninja.
2013-05-11 12:01:00 +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
Peter Simons
60195e10ba
haskell-haskdogs: update to version 0.3.1
2013-05-10 21:55:38 +02:00
Evgeny Egorochkin
9a2685af9b
Merge pull request #515 from bjornfor/openocd
...
OpenOCD: bump from 0.6.1 to 0.7.0
2013-05-10 08:18:52 -07:00
Bjørn Forsman
263b411639
openocd: update homepage
...
The old one still works, but it redirects to the new one:
http://openocd.sourceforge.net/
2013-05-10 15:30:25 +02:00
Bjørn Forsman
6ad413668e
openocd: bump to version 0.7.0
...
OpenOCD 0.7.0 has grown a dependency on libusb1.
2013-05-10 15:30:25 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Phreedom
7a4b06e0e8
Merge pull request #511 from bjornfor/buildbot
...
Buildbot version bump and add buildbot-slave
2013-05-08 15:45:20 -07:00
Bjørn Forsman
9fa9afe71e
buildbot-slave: new package
...
Tested with buildbot (master).
2013-05-08 22:26:43 +02:00
Bjørn Forsman
a36577367e
buildbot: bump to version 0.8.7p1 (latest stable)
...
* 0.8.7p1 doesn't contain *.info documentation; use manpage
instead
* Update meta.description to not contain the package name (redundant)
* 0.8.7p1 only builds with python dateutil==1.5, so that has to be added
as well
Runtime tested with the buildbot slave that is added in the next commit.
2013-05-08 22:09:05 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Shea Levy
6b78544add
binutils: enable gold by default
...
This doesn't change the default but makes gold available to packages
that might want to use it.
Required switching to the gzipped tarball for bison, as xz isn't
available in the early bootstrap.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 19:38:46 -04:00
Shea Levy
fde3526e7d
Merge branch 'master' into stdenv-updates
...
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Shea Levy
f8f9f3b1cc
binutils_gold: Don't require unneded dependencies.
...
Based on my scan of the logs they weren't even used when enabled
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 18:05:45 -04:00
Peter Simons
0b946a6374
haddock: update to version 2.13.2
2013-05-03 11:38:57 +02:00
Peter Simons
318b7e2eeb
Merge pull request #495 from bjornfor/stlink
...
stlink: new package
2013-05-02 06:21:37 -07:00
Bjørn Forsman
8df1afa9c9
stlink: new package
...
stlink is an in-circuit debugging and programming tool for ST-Link v1
and v2 devices. It is similar to OpenOCD but just for ST-Link devices.
https://github.com/texane/stlink
IMPORTANT: You need permissions to access the stlink usb devices. Here
are example udev rules for stlink v1 and v2 so you don't need to have
root permissions (copied from <stlink>/49-stlink*.rules):
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
2013-05-01 23:29:59 +02:00
Vladimír Čunát
8fc5fb6ecc
Merge branch 'master' into x-updates
2013-05-01 08:14:15 +02:00
Lluís Batlle i Rossell
b4fd5fdd83
gdb: update to 7.6
2013-04-29 13:44:23 +04:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Peter Simons
acd879f36f
xxdiff: update to current HEAD of the source repository
2013-04-23 12:11:58 +02:00
Peter Simons
afd37640e7
haskell-hlint: update to version 1.8.44
2013-04-22 14:14:39 +02:00
Peter Simons
2ffd0b6dac
Merge changes from branch 'origin/master' into stdenv-updates.
2013-04-20 22:19:39 +02:00
Peter Simons
2b56b020c7
alex, happy: fix build for gcc 4.8.0
...
Alex and happy use CPP to generate some internal template files, but the code
is unprepared for the output from CPP 4.8.0, which generates LINE pragmas that
contain more information than they thought it would.
2013-04-20 18:15:57 +02:00
Vladimír Čunát
1b349b06d8
itstool: update
2013-04-20 10:25:24 +02:00
Peter Simons
4914e63a89
Merge changes from branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/icu/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Vladimír Čunát
ec736312d4
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/development/compilers/vala/default.nix (it's different version)
pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
viric
d2d69902e8
Merge pull request #456 from bjornfor/premake
...
premake: bump to version 4.3
2013-04-15 14:35:46 -07:00
Michael Raskin
0d9d2a65ba
Adding libffi to autogen dependencies to fix the build
2013-04-15 09:46:42 +04:00
Vladimír Čunát
17ae1617dc
Merge branch 'master' into x-updates
...
Conflicts (systemd version is split on x-updates):
pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Peter Simons
1bec0e5a34
haskell-cabal-dev: update to version 0.9.2
2013-04-13 00:13:22 +02:00
Eelco Dolstra
4adad458e7
Remove the "proprietary" license
...
We already had "unfree".
2013-04-12 14:37:50 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Bjørn Forsman
38c7d196ac
premake: bump to version 4.3
...
aacskeys depends on premake3, so keep that version around.
2013-04-08 21:06:54 +02:00
Peter Simons
022f120a2c
Merge branch 'master' into stdenv-updates.
2013-04-07 23:37:12 +02:00
Peter Simons
c976480a01
elfutils: disable -Werror to fix the build
...
nm.c: In function 'show_symbols_sysv':
nm.c:773:27: error: argument to 'sizeof' in 'snprintf' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess]
snprintf (name, sizeof name, "[invalid sh_name %#" PRIx32 "]",
^
cc1: all warnings being treated as errors
2013-04-07 23:33:20 +02:00
Peter Simons
1ebb925939
haskell-cabal2nix: update to version 1.49
2013-04-06 15:56:27 +02:00
Peter Simons
d81e8a9cc3
gnulib: update to version 0.0-7901-g076ac82
2013-04-06 15:09:25 +02:00
Peter Simons
9f4d510b6b
Merge branch 'master' into stdenv-updates.
2013-04-05 11:23:38 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Peter Simons
e1b932689f
haskell-cabal2nix: update to version 1.48
2013-04-04 16:27:57 +02:00
Peter Simons
e71abf64c8
haskell-keter: update to version 0.3.6.1
2013-04-04 16:22:47 +02:00
Peter Simons
3c66736304
haskell-uuagc: update to version 0.9.42.3
2013-04-04 16:18:08 +02:00
Pascal Wittmann
310b1221e1
New: keter, Yesod deployment manager.
...
Including the dependencies: unix-process-conduit and networkConduitTls.
2013-04-03 23:50:40 +02:00
Peter Simons
64f600a010
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-01 13:39:57 +02:00
Moritz Ulrich
05f2ea2d12
Add myself (the-kenny) to the maintainer list.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 21:05:15 +01:00