Commit graph

25018 commits

Author SHA1 Message Date
William A. Kennington III
91e87c5f58 Merge branch 'master.upstream' into staging.upstream 2015-06-18 23:33:44 -07:00
William A. Kennington III
dbed487998 rabbitmq-c: 0.6.0 -> 0.7.0 2015-06-18 22:55:12 -07:00
William A. Kennington III
a41a8cee03 tevent: 0.9.24 -> 0.9.25 2015-06-18 22:48:43 -07:00
William A. Kennington III
66c6b8543a tdb: 1.3.4 -> 1.3.6 2015-06-18 22:46:11 -07:00
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
a8d04d9d1b libraw: 0.16.0 -> 0.16.1 2015-06-18 22:20:22 -07:00
William A. Kennington III
549eb64bc3 libinput: 0.15.0 -> 0.17.0 2015-06-18 22:19:59 -07:00
William A. Kennington III
99dea2b61a libssh2: 1.5.0 -> 1.6.0 2015-06-18 22:13:56 -07:00
William A. Kennington III
0967c0fcdb wayland: 1.7.0 -> 1.8.1 2015-06-18 21:58:45 -07:00
William A. Kennington III
d5e841765e mbedtls: 1.3.10 -> 1.3.11 2015-06-18 21:50:29 -07:00
William A. Kennington III
6c4dad1692 wiredtiger: 2.6.0 -> 2.6.1 2015-06-18 21:34:46 -07:00
William A. Kennington III
4468d52cbb libndp: 1.4 -> 1.5 2015-06-18 21:19:33 -07:00
William A. Kennington III
c0b553c12c zeromq: 4.1.1 -> 4.1.2 2015-06-18 21:17:51 -07:00
William A. Kennington III
d8c746601e libjpeg-turbo: 1.4.0 -> 1.4.1 2015-06-18 21:17:36 -07:00
William A. Kennington III
663b6f2eaa nghttp2: 0.7.14 -> 1.0.2 2015-06-18 20:50:30 -07:00
William A. Kennington III
5191f5be2e ncurses: Fix up library linking 2015-06-18 20:04:46 -07:00
Jude Taylor
10d06f4252 darwin purity: gmp-4.3.2 2015-06-18 17:54:12 -07:00
Jude Taylor
9fd1920d8f fix ncurses renames on darwin 2015-06-18 17:04:09 -07:00
Jude Taylor
e26b421b71 fix conditionals for bootstrap sed calls 2015-06-18 13:41:34 -07:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Andrew Kelley
8925d17034 add myself as maintainer 2015-06-18 11:52:39 -07:00
Thomas Tuegel
5c7fb3a9b5 haskell-bindings-levmar: build with openblasCompat 2015-06-18 12:58:16 -05:00
Vincent Laporte
710b3e6d79 proj: add myself as maintainer 2015-06-18 18:41:52 +02:00
Austin Seipp
c3fcd5ecb7 nixpkgs: Remove bunk 'infer' expression
This was accidentally committed because I'm a goof - see
1ee742b0ef.

Thanks to ftrvxmtrx on IRC for spotting.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-06-18 11:37:51 -05:00
Vincent Laporte
d691bf0d4f proj: update from 4.8.0 to 4.9.1 (close #8235) 2015-06-18 17:05:27 +02:00
Vincent Laporte
2583b22573 frama-c: fix hash, closes #8308 2015-06-18 11:47:34 +02:00
Vincent Laporte
2205847614 ocaml-menhir: update from 20130116 to 20140422 2015-06-18 11:47:28 +02:00
Daiderd Jordan
8dba95502d wxmac: fixed impure libiconv, closes #8367 2015-06-18 11:34:18 +02:00
Daiderd Jordan
b66942702b erlang: use wxmac on darwin 2015-06-18 11:34:05 +02:00
Daiderd Jordan
8a07499620 wxmac: new package
- based on the current homebrew package
2015-06-18 11:34:05 +02:00
lassulus
24dc9d7160 add pkgs: fmod42416 2015-06-18 11:28:52 +02:00
lassulus
03f0f41db5 add pkgs: sqlite-amalgamation 2015-06-18 11:28:52 +02:00
Benjamin Saunders
cec71a01d9 libuv: 1.5.0 -> 1.6.1, closes #8365 2015-06-18 11:23:04 +02:00
William A. Kennington III
2ae75f3a85 gnutls: 3.4.1 -> 3.4.2 2015-06-17 18:33:10 -07:00
William A. Kennington III
ebb2e41611 openldap: Add gcc5 compat patch 2015-06-17 17:51:12 -07:00
Peter Simons
bb42c215e2 R: improve support for CRAN and Bioconductor package sets
- Update the instructions for re-generating each of the package set files.
 - Provide test-evaluation.nix expression to verify that the package sets evaluates.
 - Update list of known broken packages.
2015-06-17 23:19:56 +02:00
Jeffrey David Johnson
93a742fd28 R: add support for Bioconductor packages 2015-06-17 23:19:56 +02:00
Peter Simons
84235ff763 haskell-xkbcommon test suite has unspecified dependencies. 2015-06-17 23:17:54 +02:00
Peter Simons
b8446a4d85 haskell: update configuration for Cabal 1.22.4.0 2015-06-17 23:17:54 +02:00
Peter Simons
ef421d6f9b hackage-packages.nix: update to 0a97083894 with hackage2nix revision 1663fb81050a8be440e74263f022c7b04d3ccd6b 2015-06-17 23:17:48 +02:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
Peter Simons
75f82f50e6 Merge pull request #5908 from cstrahan/hoogle-local-ng
haskell-ng: hoogleLocal support

I believe this code ought to be used as follows:

    {
        packageOverrides = pkgs : let self = pkgs.pkgs; in rec {

        hsEnv = pkgs.haskell-ng.packages.ghc784.ghcWithPackages (p: with p;
                (haskellDev p) 
                ++(myPackages p) 
                # add more packages here
                );
        hsEnvHoogle = withHoogle hsEnv;

        withHoogle = haskellEnv: with pkgs.haskellngPackages;
         import <nixpkgs/pkgs/development/libraries/haskell/hoogle/local.nix> {
          stdenv = pkgs.stdenv;
          inherit hoogle rehoo ghc;
          packages = haskellEnv.paths;
        };
      };
    }
2015-06-17 15:07:07 +02:00
Charles Strahan
af21595eca ghcjs: fix/bump git refs 2015-06-16 21:26:11 -04:00
Pascal Wittmann
b73a9a0b68 add libgringotts, a library to encapsulate data in an encrypted structure 2015-06-16 20:13:20 +02:00
Vladimír Čunát
f2c84ffeb2 libarchive: fix CVE-2015-1197 by upstream patch
Fixes #6799.
2015-06-16 18:35:13 +02:00
Peter Simons
b333a2cb19 openssl: remove some cruft 2015-06-16 14:19:25 +02:00
Eelco Dolstra
a4178b1b8a openssl: Update to 1.0.1o
From https://www.openssl.org/news/openssl-1.0.1-notes.html:

"Fix HMAC ABI incompatibility"
2015-06-16 14:16:08 +02:00
Peter Simons
8a8ed5fa1b ghcjs: unbreak syntax highlighting in Emacs 2015-06-16 13:02:28 +02:00