3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

65018 commits

Author SHA1 Message Date
William A. Kennington III f93d565c28 Merge branch 'master.upstream' into staging.upstream 2015-06-27 10:44:00 -07:00
William A. Kennington III e080827fdb Fix heimdal reference 2015-06-27 10:43:45 -07:00
William A. Kennington III 8b844dce2d ffado -> ffadoFull 2015-06-27 10:42:13 -07:00
William A. Kennington III 0efcb4032e Merge pull request #8528 from dudebout/patch-1
One more change for jack2 to libjack2
2015-06-27 10:35:55 -07:00
Nicolas Dudebout 430c8520b2 One more change for jack2 to libjack2
7297255019 did break things and this change seems to fix them.
2015-06-27 13:20:56 -04:00
vbgl 742824bd78 Merge pull request #8291 from maurer/misc-ocaml
Add miscellaneous OCaml Packages
2015-06-27 18:52:03 +02:00
Matthew Maurer 9c0f1eefc6 piqi-ocaml: init at 0.7.4 2015-06-27 16:54:20 +00:00
Matthew Maurer 8c875e76f0 uuidm: init at 0.9.5 2015-06-27 16:54:20 +00:00
Matthew Maurer 289e2a10db ocaml-faillib: init at 111.17.00 2015-06-27 16:54:20 +00:00
Matthew Maurer 1d79d840b1 piqi: init at 0.6.12 2015-06-27 16:54:20 +00:00
Matthew Maurer 90a4de0f1b ocaml-bitstring: init at 2.0.4 and f1673f8 2015-06-27 16:54:10 +00:00
Vincent Laporte e4d16dcc72 ocaml-io-page: 1.4.0 -> 1.5.1 2015-06-27 14:48:12 +02:00
Vladimír Čunát e6ca18e9bf xwayland: fix build
Maybe it was just covered by #7524 until now.
/cc #5061 and @echo-oddly.
2015-06-27 11:40:04 +02:00
Vladimír Čunát 58f7bf5b68 gsl: fix i686 tests by upstream patch 2015-06-27 11:28:50 +02:00
Vladimír Čunát 9c5f76bc0f gnome-menus: fix build by dropping wrong patchShebangs
Strange error, probably hidden by #7524 until recently.
/cc @lethalman.
2015-06-27 10:57:03 +02:00
Vladimír Čunát 637873d8fb crypto++: fix tests by not using -O3, refactor
Tests were segfaulting due to compilation with -O3,
most likely since building with gcc-4.9.
AFAIK it isn't generally safe/advisable to use -O3 anyway.

Also do some cleanup and expression refactoring, mostly.
2015-06-27 10:57:03 +02:00
Michael Raskin 9bf2c6a8ab Fix wrong condition related to enableKerberos 2015-06-27 11:40:38 +03:00
William A. Kennington III 12102562f7 Merge branch 'master.upstream' into staging.upstream 2015-06-27 00:18:18 -07:00
William A. Kennington III 7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
William A. Kennington III 559cbdaab7 heimdal: Rename to heimdalFull 2015-06-26 23:07:10 -07:00
William A. Kennington III 9c5ef0469c krb5: 1.13.1 -> 1.13.2 2015-06-26 23:02:20 -07:00
William A. Kennington III 943b282800 heimdal: Always install hcrypto 2015-06-26 22:45:20 -07:00
William A. Kennington III a13fe2db47 Fix redundancy 2015-06-26 22:41:58 -07:00
William A. Kennington III 769ea09360 heimdal: Use the git version and breakout into a library 2015-06-26 22:41:25 -07:00
William A. Kennington III ccc47a6a42 kerberos: Use mit by default as it is has more upstream support / bugfixes 2015-06-26 22:06:16 -07:00
William A. Kennington III b6322e1215 krb5: Break out into a lib and not lib version 2015-06-26 22:05:47 -07:00
William A. Kennington III ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
William A. Kennington III 8ce4cb4de8 Also fix the default reference for kerberos 2015-06-26 17:24:11 -07:00
William A. Kennington III adeab5e815 Migrate all heimdal -> libheimdal
Also disable heimdal references in samba as it uses internal api
features not guaranteed to be stable
2015-06-26 17:23:00 -07:00
William A. Kennington III fa1bdb8cbd Migrate all krb5 -> libkrb5 2015-06-26 17:21:49 -07:00
William A. Kennington III eb8a411a18 Add kerberos library references for later use 2015-06-26 17:16:27 -07:00
William A. Kennington III fee9ef8659 nixos: Replace pkgs.openssh with config.programs.ssh.package 2015-06-26 17:09:58 -07:00
Arseniy Seroka da4266afb6 vimPlugins: update 2015-06-27 2015-06-27 02:05:15 +03:00
Arseniy Seroka 43636bc83c Merge pull request #8506 from hrdinka/add/qtpass
qtpass: init at 0.8.4
2015-06-26 20:19:06 +03:00
Jude Taylor e130e9d3a3 fix bundler hash 2015-06-26 09:54:49 -07:00
Jude Taylor 05fe0da059 remove obsolete part of gyp patch 2015-06-26 09:54:49 -07:00
Jude Taylor 363d1bf07a darwin purity: vim 2015-06-26 09:54:44 -07:00
Jude Taylor 20268f6382 darwin purity: libusb1 (depend on udev on linux only) 2015-06-26 09:53:28 -07:00
Jude Taylor 616ed6ee15 darwin purity: libev 2015-06-26 09:53:10 -07:00
Eelco Dolstra 1f3f31b2a8 Add options nix.{trustedUsers,allowedUsers}
These are just trusted-users and allowed-users in nix.conf. It's
useful to have options for them so that different modules can specify
trusted/allowed users.
2015-06-26 18:45:27 +02:00
Eelco Dolstra fb203a34c0 nix.buildMachines: Don't require sshUser 2015-06-26 18:44:44 +02:00
Russell O'Connor 946a6823b2 cassandra: add procps depencency, closes #8512
${cassandra}/conf/cassandra-env.sh calls free program on Linux systems in
calculate_heap_sizes().

Adding procps to the path makes the free program available.
2015-06-26 18:03:54 +02:00
Profpatsch 62921384e0 stow: patch that removes warning for 2.2.0, closes #8513 2015-06-26 18:02:59 +02:00
Pascal Wittmann 8c4fcc87f8 autobuild: 3.5 -> 5.3 2015-06-26 17:40:09 +02:00
lethalman 5754fd9e02 Merge pull request #8490 from lethalman/overridepkgs
Add pkgs.overridePackages
2015-06-26 17:14:22 +02:00
Pascal Wittmann dd73d2af87 Merge pull request #8505 from joachifm/delete-codeville
codeville: delete expression
2015-06-26 17:09:42 +02:00
Damien Cassou 8b86e245bc stumpwm: use full-path of xdpyinfo, closes #8518 2015-06-26 16:23:48 +02:00
Andrey Pavlov 5506632473 erlang: add Erlang R18, closes #8515 2015-06-26 16:15:14 +02:00
Luca Bruno 7f5f9072ad all-packages.nix: Add pkgs.overridePackages 2015-06-26 15:08:11 +02:00
Peter Simons 449c14d20b Merge pull request #8520 from hrdinka/fix/postfix-recipient_delimiter
postfix: fix recipient_delimiter option
2015-06-26 14:18:58 +02:00