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
Peter Simons
df12e039e3
haskell-keter: update to version 0.4.0
2013-07-01 12:11:05 +02:00
Peter Simons
6b58b32ad8
haskell-hlint: update to version 1.8.47
2013-07-01 12:11:05 +02: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
Vladimír Čunát
3314be6b73
cmake: consistent names, to satisfy comments on #567
2013-06-27 16:33:24 +02:00
Vladimír Čunát
4251b70c7e
Merge master into stdenv-updates (contains new X stuff)
2013-06-27 16:24:57 +02:00
Vladimír Čunát
7f1e09c35d
Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
...
This reverts commit b08e12b37ae9470c9d8eb8438c21adb8ddbae19e.
2013-06-27 15:14:32 +02:00
Moritz Ulrich
978fa98933
avrdude: Add libusb to enable USB support
2013-06-25 22:19:31 +02:00
Eelco Dolstra
552fd3d599
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/gmime/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Eelco Dolstra
acba9240cd
nixos.org/tarballs -> tarballs.nixos.org
...
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
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 abc7591aaf3912d819401241d7d2339fb96441f3, reversing changes
made to 6b1ebeccf2c9d9e8f68d7e21a1e55b5d91577683, 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
Eelco Dolstra
c3cbe0452a
patchelf: Enable "make check"
2013-06-12 14:59:39 +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
Eelco Dolstra
99b88cfb53
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +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
