1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Commit graph

16003 commits

Author SHA1 Message Date
Domen Kožar b7c3afa674 Merge pull request #5926 from benmos/postgis
Postgis 2.1.4 support
2015-02-18 12:08:59 +01:00
Joachim Fasting baba36ce27 haskell-rest-happstack
Fixes build
2015-02-18 06:53:13 +00:00
Joachim Fasting c2f216b8e1 haskell-rest-types: version bump 2015-02-18 06:53:13 +00:00
Joachim Fasting 233cc55dc4 haskell-rest-core: version bump 2015-02-18 06:53:08 +00:00
Joachim Fasting b3bacd4d0c haskell-pool-conduit: mark as broken
Fails to build, deprecated.
2015-02-18 06:41:09 +00:00
Joachim Fasting 45b9432f82 haskell-happstack-lite: version bump
Fixes build
2015-02-18 06:39:02 +00:00
Joachim Fasting fbe66014ab haskell-happstack-hamlet: mark as broken
No upstream version supports happstack-server >= 7.4
2015-02-18 06:37:52 +00:00
William A. Kennington III ad0277fbdc Merge pull request #6386 from codyopel/xvidcore
xvidcore: refactor & 1.3.2 -> 1.3.3
2015-02-17 22:29:40 -08:00
Arseniy Seroka 0e63ac0acf Merge pull request #6402 from codyopel/xavs
xavs: add package
2015-02-17 23:42:01 +03:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
codyopel be0b4050aa xavs: add package 2015-02-17 13:29:48 -05:00
lethalman 6be3ffb0d4 Merge pull request #6394 from codyopel/libwebp
libwebp: refactor & 0.4.1 -> 0.4.2
2015-02-17 15:28:35 +01:00
codyopel 1435e69758 wavpack: add package 2015-02-17 07:29:04 -05:00
codyopel 67f82fe49c libwebp: refactor & 0.4.1 -> 0.4.2 2015-02-17 06:05:40 -05:00
Nathaniel Baxter b19da5ba23 gecode: update from 4.3.0 to 4.3.3 2015-02-17 18:50:48 +11:00
codyopel 1b26e25845 xvidcore: refactor & 1.3.2 -> 1.3.3 2015-02-17 02:01:10 -05:00
codyopel 534332eaf7 vid-stab: add package 2015-02-17 00:54:23 -05:00
Aristid Breitkreuz 6aa43976a7 update http-types 2015-02-16 21:06:29 +01:00
AndersonTorres f19ed980a2 Sawfish (git): New Package
Sawfish is a versatile, Lisp-based window manager

In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
2015-02-15 19:42:53 +03:00
William A. Kennington III b1fef78b8f Merge pull request #6347 from codyopel/lamebr
lame: move to libraries & fix license
2015-02-14 16:08:34 -08:00
codyopel b03ded550f lame: move to libraries & fix license 2015-02-14 19:06:38 -05:00
William A. Kennington III c6642675b9 Merge pull request #6336 from codyopel/gsm
gsm: seperate phases & fix shared library
2015-02-14 13:55:52 -08:00
codyopel fc27383909 gsm: seperate phases & fix shared library 2015-02-13 21:04:03 -05:00
Peter Simons f2a376f52a Enable static libraries in "gmp" to allow static linking of Haskell programs.
Haskell programs depend on gmp to implement the unbounded Integer type. Without
static variants of gmp we cannot build statically linked Haskell programs, what
some users have found desirable in the past. So far, we've used an override to
derive our own copy of gmp in the Haskell ecosystem, but this patch ends the
dichotomy between Haskell and the rest of Nixpkgs by enabling static gmp
libraries in the default build default.
2015-02-13 22:18:27 +01:00
Peter Simons 600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons 54ce1a1810 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Peter Simons c6ed2aa203 Merge pull request #5968 from jkarni/jkarni/servant-server-0.2.3
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:39:32 +01:00
Peter Simons afaa01c957 Merge pull request #6009 from nkaretnikov/yesod-1.4.1.4
I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.
2015-02-13 15:38:41 +01:00
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