3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

15975 commits

Author SHA1 Message Date
Pascal Wittmann f393521630 libasr: fixed description 2015-02-13 14:29:11 +01:00
Pascal Wittmann d7b01c8526 Merge pull request #6325 from k0ral/opensmtpd
opensmtpd: 5.4.2p1 -> 5.4.4p1
2015-02-13 13:28:04 +00:00
koral 3bc7dfdf22 opensmtpd: 5.4.2p1 -> 5.4.4p1 2015-02-13 12:38:21 +01:00
Domen Kožar b2d17156bb Merge pull request #6324 from codyopel/x265br
X265br
2015-02-13 01:22:16 +01:00
codyopel 3f22fdf7b0 x265: refactor & add optionals 2015-02-12 17:55:23 -05:00
codyopel b60f5a004a x265-hg: bump commit 2015-02-12 17:53:48 -05:00
codyopel 90ea935252 x265: 1.4 -> 1.5 2015-02-12 17:53:07 -05:00
codyopel 3269e202b1 libvpx-git: bump commit & disable high bitdepth builds on i686 2015-02-12 16:08:33 -05:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Eric Seidel a86fd94ecc only link libsodium against libssp when building with gcc 2015-02-11 14:37:30 -08:00
Domen Kožar 2024e08564 partially fix pythonPackages.protobuf 2015-02-11 10:21:51 +01:00
codyopel 0f18322026 libvpx: refactor & add git (close #6213) 2015-02-10 19:52:58 +01:00
Luca Bruno fd6e830aa3 gsm: compile with -fPIC to fix build in mediastreamer for ZHF 2015-02-10 18:52:02 +01:00
codyopel 80dd1aa437 faac: revert licensing change 2015-02-10 09:32:51 -05:00
William A. Kennington III 376dd19a79 Merge pull request #6270 from codyopel/fdkaac
fdk-aac: disable example encoder by default
2015-02-09 17:09:34 -08:00
William A. Kennington III 973b736c17 ldb: 1.1.19 -> 1.1.20 2015-02-09 17:05:57 -08:00
codyopel 9e60224efb fdk-aac: disable example encoder by default 2015-02-09 15:18:20 -05:00
William A. Kennington III 88d508ae40 Merge pull request #6262 from codyopel/gsm
gsm: fix include directory
2015-02-09 11:14:53 -08:00
Ben Moseley 926e5aa70a Remove old PostGis versions. 2015-02-09 15:57:19 +00:00
Peter Simons 7b99c149a4 Merge branch 'master' into staging. 2015-02-09 16:51:10 +01:00
codyopel 700f04b8da gsm: fix include directory 2015-02-09 10:30:10 -05:00
codyopel ac726eb2dd libass: refactor & 0.11.1 -> 0.12.1 2015-02-09 10:27:10 -05:00
Daniel Peebles f864b95dca Merge pull request #6232 from maun/sdl2
Modified SDL2 derivation to work on Mac OSX darwin
2015-02-09 02:01:09 -05:00
Dan Peebles b0e1db1159 Fix boost 1.55 on clang (1.56 onwards already have the fix)
See https://trac.macports.org/ticket/42282 for more.
2015-02-08 22:19:04 -05:00
William A. Kennington III c165f24208 Merge pull request #6253 from codyopel/gsm
gsm: refactor
2015-02-08 17:21:04 -08:00
codyopel c951d7d449 gsm: refactor 2015-02-08 20:16:54 -05:00
William A. Kennington III bbefc61f71 Merge pull request #6241 from codyopel/faad2
faad2: refactor and add drm optional
2015-02-08 14:34:52 -08:00
William A. Kennington III 76f9f2b8ac Merge pull request #6246 from codyopel/fdkaac
fdk-aac: refactor and add example optional
2015-02-08 14:34:32 -08:00
codyopel 51e995f006 fdk-aac: refactor and add example optional 2015-02-08 17:12:58 -05:00
codyopel 18fbca33bb faad2: refactor and add drm optional 2015-02-08 17:02:17 -05:00
William A. Kennington III ac99fefae1 Formatting fixes 2015-02-08 13:42:12 -08:00
William A. Kennington III 2a0ad62c56 Merge pull request #6239 from codyopel/faac
faac: refactor and add drm optional
2015-02-08 13:39:38 -08:00
William A. Kennington III 2828ad37e0 Merge pull request #6233 from codyopel/celt
celt: refactor to generic
2015-02-08 13:38:57 -08:00
William A. Kennington III 5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar 33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
codyopel 58edd9431c faac: refactor and add drm optional 2015-02-08 15:04:40 -05:00
codyopel cd21ff1311 celt: refactor to generic 2015-02-08 12:30:37 -05:00
Manuel Adameit c7a74ca5c6 Modified SDL2 derivation to work on Mac OSX darwin
default to no alsa on darwin
default to no x11 support on darwin
changed asserts to check for darwin
2015-02-08 18:08:14 +01:00
Peter Simons 8515b5ca7a Merge pull request #6220 from joachifm/haskell-updates
Fix several haskellPackages build failures
2015-02-08 12:43:45 +01:00
Itai Zukerman 25e9475b19 Added Haskell package vector-fftw. 2015-02-07 22:29:40 -08:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Joachim Fasting 9cc3a7771c haskell-fb: bump version
Fixes build
2015-02-07 19:09:23 +00:00
Joachim Fasting 4b2433f156 haskell-hsc3-server: mark as broken
Latest version fails to build.
2015-02-07 19:01:09 +00:00
Joachim Fasting 90e1ba68be haskell-iteratee: mark as broken
Latest version fails to build.
2015-02-07 18:57:10 +00:00
Joachim Fasting 677dee38db haskell-simple-conduit: jailbreak required 2015-02-07 18:55:49 +00:00
Joachim Fasting c336769408 haskell-shell-conduit: mark as broken
Latest version fails to build.
2015-02-07 18:52:39 +00:00
Thomas Tuegel 042e4ad633 qt5split: add split submodule build of Qt 5.3 2015-02-07 12:52:20 -06:00
Joachim Fasting 32fd92e7dc haskell-hcltest: mark as broken
Latest version on hackage fails to build.
2015-02-07 18:49:02 +00:00
Joachim Fasting 09c6d80ac0 haskell-webdriver: bump version
Fixes build error, jailbreak no longer necessary
2015-02-07 18:46:38 +00:00
Joachim Fasting a2c87d374f haskell-stm-conduit: version bump
Fixes build failure
2015-02-07 18:25:57 +00:00
Joachim Fasting 71f8367b28 haskell-rest-client: version bump
Fixes build failure
2015-02-07 18:25:57 +00:00
Joachim Fasting a964403dae haskell-higher-leveldb: version bump
Fixes build failure
2015-02-07 18:25:57 +00:00
Joachim Fasting 51606074cd haskell-list-t: version bump 2015-02-07 18:25:57 +00:00
Joachim Fasting ca7c4c2b5c haskell-distributed-process-monad-control: version bump
Fixes build failure
2015-02-07 18:25:56 +00:00
Joachim Fasting 082469bc81 haskell-jwt: declare missing deps 2015-02-07 18:25:56 +00:00
Joachim Fasting f63f6d5a3a haskell-happstack-server: bump version to 7.4.0
Fixes build error. Also doCheck and jailbreak no longer necessary.
2015-02-07 18:25:56 +00:00
Joachim Fasting 3d7cda6b23 haskell-EitherT: mark as broken
Fails to build, deprecated.
2015-02-07 18:25:56 +00:00
Joachim Fasting 7c715dd746 haskell-yesod: bump to version 1.4.1.4
Fixes build failure
2015-02-07 18:25:55 +00:00
Joachim Fasting 8fcba36796 haskell-yesod-core: bump to version 1.4.7.2
Fixes build failure. Also, jailbreak appears to no longer be necessary.
2015-02-07 18:25:55 +00:00
Joachim Fasting 94b179362a haskell-persistent: bump to 2.1.1.4
Fix build error
2015-02-07 18:25:55 +00:00
Thomas Tuegel fa56e5ffa7 qt5: move monolithic build 2015-02-07 07:30:18 -06:00
William A. Kennington III 1570cb501c v8: Properly update to 4.1.0.15 2015-02-06 22:52:39 -08:00
William A. Kennington III 098ed10f39 v8: 3.26.31.15 -> 3.31.1 2015-02-06 22:25:45 -08:00
Vladimír Čunát da3105d538 exiv2: fix CVE-2014-9449 by upstream patch
It's just a crash fix, not a "real" vulnerability.
2015-02-07 06:48:21 +01:00
William A. Kennington III a1f6084fc8 libu2f-host: 0.0.2 -> 0.0.4 2015-02-06 12:53:10 -08:00
William A. Kennington III 170775a834 libinput: 0.7.0 -> 0.10.0 2015-02-06 12:53:09 -08:00
William A. Kennington III 9f0a6d6d7f protobufc: Add version 1.1.0 as the default 2015-02-06 12:53:09 -08:00
William A. Kennington III 673b18fdd7 protobuf: Support both 2.5 and 2.6 and make 2.6 the default 2015-02-06 12:53:09 -08:00
William A. Kennington III f9dcf13b6e gtest: Modularize out the source files into a derivation 2015-02-06 12:53:09 -08:00
Joachim Fasting f1951f932d haskell-resource-pool: bump to 0.2.3.2
Fixes build error.
2015-02-06 09:08:24 +00:00
Thor A. Hopland 28b8c50c2d Added Touchegg and 3 depdenencies. Touchegg is a daemon for X that adds gesture based navigation for touch based surfaces. 2015-02-06 06:53:32 +01:00
Peter Simons 37a39e9cb4 gmp: drop obsolete and unused version 5.0.5 2015-02-06 00:32:00 +01:00
Ambroz Bizjak 349a25fb2c libelf: Fix cross-compile by adding glibc as a native build input.
TBD: This can probably be unconditional but I put it into crossAttrs to avoid a rebuild of native stuff.
2015-02-05 21:26:02 +01:00
Ambroz Bizjak e191e227d2 glibc: Disable copying libgcc when cross compiling.
It seems this is only needed for native bootstrapping.
2015-02-05 21:25:40 +01:00
Russell O'Connor 3feac4fd86 Merge branch 'master' of github.com:NixOS/nixpkgs 2015-02-05 15:21:54 -05:00
Russell O'Connor af3c4a2744 Bitcoin 0.9.3 won't work with OpenSSL 1.0.1k.
This patch restores OpenSSL 1.0.1j and builds Bitcoin against it.
2015-02-05 11:40:57 -05:00
Emil Rangden 654d1f21b2 despotify source moved 2015-02-05 17:37:19 +01:00
Mike Sperber daa1941d27 Unbreak ADNS on Darwin.
Make the version number in postInstall match that of the package.
2015-02-05 15:02:23 +01:00
Vladimír Čunát 474aeb0b3d ffmpeg-2.2: update (still used by vlc) 2015-02-05 11:19:18 +01:00
Sou Bunnbu dcc543f8fe Merge pull request #6125 from ktosiek/dynamic-glfw2
Build and install the .so for glfw 2.x
2015-02-05 10:02:11 +08:00
Shea Levy e14d39b97b Merge branch 'osx-i3-urxvt' of git://github.com/cresh/nixpkgs 2015-02-04 22:14:52 +00:00
Vladimír Čunát 4495d06a7f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
2015-02-04 22:00:07 +01:00
Marcus Crestani 92ca614934 i3: Use xcb-util-cursor-HEAD on OS X. 2015-02-04 20:44:19 +01:00
Marcus Crestani 455d9600e1 libev: Enable on all platforms. 2015-02-04 20:44:00 +01:00
Rickard Nilsson 57d71cf8d2 More download mirrors for samba URLs 2015-02-04 17:38:39 +01:00
Rickard Nilsson 52cb8db899 libldb: Add mirror url 2015-02-04 17:05:16 +01:00
Peter Simons 955001a55b Merge pull request #6134 from joachifm/haskell-monad-logger
haskell-monad-logger: version bump
2015-02-04 12:07:14 +01:00
Domen Kožar eaeef0377f jasper: CVE-2014-8157, CVE-2014-8158, fixes #6114 2015-02-04 11:37:49 +01:00
John Wiegley ad60eaedf1 clucene-core: make darwin-related patch conditional
This relates to pull request #6137, and was made at request of the
submitter.
2015-02-04 01:40:17 -06:00
Eric Seidel 58a891afb2 fix clucene on darwin 2015-02-03 23:34:03 -08:00
Eric Seidel a600443bb3 fix obscure bug in apr on darwin 2015-02-03 23:11:44 -08:00
Joachim Fasting 40b4b1490d haskell-monad-logger: version bump
The previous version fails to build.
2015-02-04 04:03:10 +01:00
Eric Seidel cbd446d465 fix gmp on darwin 2015-02-03 15:18:28 -08:00
Eric Seidel 4a467ec02b move libcxx[abi] into llvm tree 2015-02-03 14:58:10 -08:00
Eric Seidel dbf3d31727 make llvm-3.5 the default and remove references to gccApple
make perl be less dumb

revert change to release.nix
2015-02-03 14:31:04 -08:00
Eric Seidel 6f7632a7bd update libcxx[abi] to 3.5 2015-02-03 14:02:59 -08:00
Tomasz Kontusz 9d8defa06a Build and install the .so for glfw 2.x 2015-02-03 21:33:26 +01:00
Peter Simons d034aa11ee Merge pull request #6121 from boothead/kafka
Kafka and c libraries for kafka and zookeeper
2015-02-03 20:17:22 +01:00
Eelco Dolstra 007feb911d libsodium: Update to 1.0.2 2015-02-03 16:59:28 +01:00
Eelco Dolstra 86db6789ef libsodium: Fix typo 2015-02-03 16:28:20 +01:00