3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

56798 commits

Author SHA1 Message Date
Sebastián Bernardo Galkin 390c838c7f Fixup zfs python scripts
zfs ships with a couple of python scripts that needed shebang rewriting. Adding
python as a build dependency enables fixup to do the rewrite.
2015-01-20 23:54:51 -08:00
Austin Seipp 4b76c1f897 Merge pull request #5880 from puffnfresh/feature/fix-upgrade-docker
Fix and upgrade Docker
2015-01-21 01:35:41 -06:00
Austin Seipp 978954b2e7 Merge pull request #5831 from mcox/unbound-fix-5728
nixpkgs: patch unbound 1.5.1 for linux < 3.15
2015-01-21 01:34:43 -06:00
Austin Seipp 1d60f8efb9 Merge pull request #5877 from benley/riemann-0.2.8
Riemann: update to 0.2.8
2015-01-21 01:32:41 -06:00
宋文武 b202dcb606 tiled: Update to 0.11.0, renamed from tiled-qt. 2015-01-21 13:14:12 +08:00
Charles Strahan 5f1622e95f ruby: allow for passing build arguments 2015-01-20 23:33:57 -05:00
Sou Bunnbu 0e8187b89f Merge pull request #5881 from puffnfresh/feature/upgrade-jansson
Upgrade Jansson to 2.7
2015-01-21 11:59:17 +08:00
Charles Strahan 7d8b2f0d60 ruby: make buildInputs work 2015-01-20 22:20:28 -05:00
Brian McKenna ca2143ee29 Upgrade Jansson to 2.7 2015-01-20 19:52:38 -07:00
Brian McKenna a26b8bcb5d Upgrade to Docker 1.4 2015-01-20 19:49:10 -07:00
Brian McKenna 6e0c30afbf Fix Docker SQLite and setgid problems
Docker doesn't support Go 1.4 yet. It compiles but it causes multiple
bugs. We should use Go 1.3 to build until the next release.

This seems to fix the following two problems I've been having:

https://github.com/docker/docker/issues/9649

https://bugzilla.redhat.com/show_bug.cgi?id=1169151
2015-01-20 19:48:32 -07:00
Sou Bunnbu 524881e4a1 Merge pull request #5840 from puffnfresh/feature/gst-enable-experimental
Enable experimental for gst-plugins-good
2015-01-21 09:56:34 +08:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Charles Strahan bd53746646 ruby: patching gems works 2015-01-20 19:09:02 -05:00
Peter Simons c55b5eb245 haskell-ng: disable some test suites that run forever 2015-01-21 00:10:12 +01:00
Peter Simons e6b8f4de94 hakyll: fix build (by disabling the failing test suite) 2015-01-20 23:59:31 +01:00
Peter Simons 1d6d5932cd haskell-streaming-commons: fix build on older GHC versions some more 2015-01-20 23:56:56 +01:00
William A. Kennington III ba67ad3c88 python-ldap: 2.4.15 -> 2.4.19 2015-01-20 14:50:39 -08:00
Peter Simons c64088f0ec haskell-streaming-commons: fix build on older GHC versions by way of bytestring-builder 2015-01-20 23:43:29 +01:00
Peter Simons 0eb306c5f7 haskell-cookie: fix build with older compilers 2015-01-20 23:43:29 +01:00
Peter Simons 3617e3b4df haskell-ng: disable lots of failing test suites 2015-01-20 23:43:29 +01:00
Peter Simons 99b46b64df haskell-ncurses: this package requires a pre 0.21 version of c2hs
Otherwise, the build fails, saying:

    c2hs: Errors during expansion of binding hooks:

    /nix/store/d6m9m2wqaymfiwbx11frdsm1cz7qjkdm-ncurses-5.9/include/curses.h:405: (column 2) [ERROR]  >>> Illegal type!
      The type specifiers of this declaration do not form a legal ANSI C(89) type.

This patch fixes https://github.com/NixOS/nixpkgs/issues/5873.
2015-01-20 23:43:29 +01:00
Peter Simons 1d61ab7860 haskell-glade: fix build some more 2015-01-20 23:43:29 +01:00
Peter Simons b5fb80ffa3 haskell-aeson: fix build with ghc 7.6.x 2015-01-20 23:43:28 +01:00
Peter Simons 02016e9026 haskell-ng: disable lots of failing test suites 2015-01-20 23:43:28 +01:00
Bob van der Linden d4b80026df mjpg-streamer: renamed attribute mjpg_streamer to mjpg-streamer 2015-01-20 23:28:35 +01:00
Domen Kožar 5cd76cd85e gevent: fix ssl patch 2015-01-20 22:40:58 +01:00
Ricardo M. Correia a94c0d2b0f racerRust: Update from 2015-01-07 -> 2015-01-20 2015-01-20 22:19:17 +01:00
Ricardo M. Correia e7d72312c8 rustcMaster: Update from 0.13-dev-g6539cb4 -> 1.0.0-dev-ga833337 2015-01-20 22:19:17 +01:00
Ricardo M. Correia 9526284cfe rustc: Update from 0.12 -> 1.0.0-alpha 2015-01-20 22:19:16 +01:00
Ricardo M. Correia 550124c126 rustc: Rename 0.12.nix -> 1.0.0-alpha.nix 2015-01-20 22:19:16 +01:00
Bjørn Forsman 11aa06c574 gstreamer: wrap gst-{launch,inspect,typefind} with GST_PLUGIN_SYSTEM_PATH
So that the tools become useable. The cool thing about wrapping them
like this (looping over $NIX_PROFILES) is that they will work on
non-NixOS systems too, given that $NIX_PROFILES is set correctly.

If you want the old (pure?) behaviour, just run gst-launch etc. with
empty $NIX_PROFILES.
2015-01-20 21:48:09 +01:00
lethalman 4d435720ca Merge pull request #5875 from cocreature/openjdk8
Add cocreature as maintainer of openjdk8
2015-01-20 21:36:35 +01:00
Benjamin Staffin e1f2da5314 Riemann: update to 0.2.8
Change-Id: I42b8e5f1341df826e8424141e9f9623e60b63767
2015-01-20 14:37:28 -05:00
Ricardo M. Correia a11dc2f0a3 grsecurity: Add denyUSB option to grsec NixOS module
The option had been added to the grsec build-support code,
but it hadn't been added to the grsec module.

After this commit, grsec module users will be able to change
the default value. It also serves to document that this option
exists and that NixOS will disable it by default.
2015-01-20 19:18:06 +01:00
Moritz Kiefer 1af7967007 Add cocreature as maintainer of openjdk8 2015-01-20 19:07:54 +01:00
Vincent Laporte 1df8208839 Adds ocaml-jsonm
Jsonm is an OCaml non-blocking streaming codec to decode and encode the
JSON data format.

Homepage: http://erratique.ch/software/jsonm
2015-01-20 18:02:51 +01:00
Peter Simons 0484f9f4b6 Disable many test suites. 2015-01-20 17:43:49 +01:00
Peter Simons 3948b71e83 Fix HList, digit, and filestore. 2015-01-20 17:43:49 +01:00
Peter Simons 127d278775 tasty-kat: disable test suite to fix build 2015-01-20 17:43:49 +01:00
Peter Simons 0be78f7b64 haskell-assertions: disable failing test suite 2015-01-20 17:43:49 +01:00
Peter Simons fa7b936217 haskell-simple-sendfile: fix build some more 2015-01-20 17:43:49 +01:00
Peter Simons 5f2db0b0e5 cabal2nix: bump version 2015-01-20 17:43:49 +01:00
Peter Simons c1dde7669b haskell-simple-sendfile: fix build by disabling the test suite 2015-01-20 17:43:49 +01:00
Peter Simons 039493ee89 haskell-tabular: the library works without a jailbreak now 2015-01-20 17:43:48 +01:00
Peter Simons 2ab7e1d950 disable test suites for graceful and serialport. 2015-01-20 17:43:48 +01:00
Peter Simons d2c7b78cbf haskell-permutation: disable test suite
The build uses QuickCheck, but doesn't declare it as a dependency. I
tried adding QuickCheck to the list, but then it wouldn't compile with
the latest version. Duh. Seems unmaintained to me.
2015-01-20 17:43:48 +01:00
Peter Simons b671ab161f haskell-zip-archive: fix test suite 2015-01-20 17:43:48 +01:00
Peter Simons 5dac8b316c haskell-glade: fix build 2015-01-20 17:43:48 +01:00
Peter Simons a83e3ac32c Fix vector and parallel builds with ghc 6.12.x. 2015-01-20 17:43:48 +01:00