Commit Graph

18180 Commits

Author SHA1 Message Date
Vladimír Čunát
694fa543af Merge 'staging'
Conflicts:
	pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Vladimír Čunát
0df6ccb4b6 orc: disable tests on i686
The failing test doesn't even work in the commit that introduced it.
2014-08-23 15:17:06 +02:00
Eelco Dolstra
2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
Vladimír Čunát
084626deec glew: update, and tweak meta 2014-08-21 21:28:42 +02:00
Vladimír Čunát
315b8ec8f6 orc: bugfix updates 2014-08-21 15:13:21 +02:00
Vladimír Čunát
ead8f2ba0a mesa: bugfix update 2014-08-21 15:13:20 +02:00
Vladimír Čunát
30fef8a3cf readline: remove unused old versions 4 and 5
...including an unused patch.
2014-08-21 15:13:20 +02:00
Vladimír Čunát
2b75fe851b readline-6.3: update, including security fixes
Close #3706 CVE-2014-2524 (likely not affecting any our program anyway).
2014-08-21 15:13:19 +02:00
Vladimír Čunát
3775fa9ea2 subversion+serf: security update to fix CVE-2014-3504
Thanks to nixpkgs monitor again.
2014-08-21 15:13:19 +02:00
Vladimír Čunát
32f95153a1 ffmpeg (_1 and default _2): minor update, incl. security
CVE-2014-{5271,5272}
2014-08-21 15:13:18 +02:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Peter Simons
128039217e haskell-hdevtools: fix patch checksum one more time
It appears that upstream has re-based the pull request, thereby changing the hash.
2014-08-20 20:26:57 +02:00
Peter Simons
e910c8d6c9 Disable Hydra builds for broken Haskell packages.
The following packages are broken with GHC 7.8.3:

 - filesystem-conduit version 1.0.0.2
 - ghc-events-analyze version 0.2.0
 - haskelldb version 2.2.2
 - haskell-mpi version 1.2.1
 - haxr-th version 3000.5
 - hoauth version 0.3.5
 - holy-project version 0.1.1.0
 - hoogle version 4.2.32
 - hspread version 0.3.3
 - instant-generics version 0.4
 - ivor version 0.1.14.1
 - jmacro-rpc-happstack version 0.3
 - lambdacube-engine version 0.2.4
 - language-c-inline version 0.6.0.0
 - lockfree-queue version 0.2.3
 - monad-peel version 0.1.1
 - network-transport-tests version 0.1.0.1
 - poppler version 0.12.3
 - profiteur version 0.1.2.1
 - prolog-graph-lib version 0.2.0.1
 - semigroupoid-extras version 4.0
 - setlocale version 0.0.3
 - sized-types version 0.5.0
 - snaplet-postgresql-simple version 0.5
 - snap-loader-dynamic version 0.10.0.2
 - uhc git version 20120502
 - uniqueid version 0.1.1
 - unix-process-conduit version 0.2.2.3
 - vado version 0.0.1
 - vcsgui version 0.0.4
 - xml-html-conduit-lens version 0.3.2.0

The following packages depend on one of the broken ones above:

 - hoodle-builder version 0.3
 - hoodle-core version 0.14
 - hoodle-extra version 0.1
 - hoodle-parser version 0.3
 - hoodle-render version 0.4
 - hoodle-types version 0.3
 - hoodle version 0.3
 - kansas-lava version 0.2.4
 - liblastfm version 0.4.0.0
 - prolog-graph version 0.1.0.2
 - vacuum-cairo version 0.5
 - wcwidth version 0.0.2
2014-08-20 20:26:57 +02:00
Peter Simons
3b096e601a haskell-time-1.4.2: disable test suite to fix build error because the version of test-framework doesn't match 2014-08-20 20:26:57 +02:00
Peter Simons
07451adc93 haskell-yesod-form: update to version 1.3.15.2 2014-08-20 20:26:57 +02:00
Peter Simons
ce14313c69 haskell-yesod-bin: update to version 1.2.12.4 2014-08-20 20:26:56 +02:00
Peter Simons
020027d84e haskell-yesod-auth: update to version 1.3.4.2 2014-08-20 20:26:56 +02:00
Peter Simons
701af305d3 haskell-xss-sanitize: update to version 0.3.5.4 2014-08-20 20:26:56 +02:00
Peter Simons
b48153160e haskell-wai-logger: update to version 2.2.3 2014-08-20 20:26:56 +02:00
Peter Simons
a2cd9ceab1 haskell-language-glsl: update to version 0.1.1 2014-08-20 20:26:56 +02:00
Peter Simons
c3565da080 haskell-force-layout: update to version 0.3.0.6 2014-08-20 20:26:56 +02:00
Shea Levy
908bd66407 Merge branch 'master' of git://github.com/ip1981/nixpkgs
jq: make sure libjq is in library search path
2014-08-20 11:33:25 -04:00
Peter Simons
b4175c94e9 Merge pull request #3689 from Fuuzetsu/ghc-mod
haskell-ghc-mod: add 5.0.1
2014-08-20 17:17:00 +02:00
Rickard Nilsson
7c06bb13be re2c: Fix license reference 2014-08-20 15:30:18 +02:00
Peter Simons
5cac6895da haskell-language-glsl: disable test suit to fix the build
https://github.com/noteed/language-glsl/issues/8
2014-08-20 14:03:03 +02:00
Peter Simons
18e3aa4672 haskell-double-conversion: update to version 2.0.1.0 2014-08-20 14:03:03 +02:00
Peter Simons
c6a7af6782 haskell-yesod-form: update to version 1.3.15.1 2014-08-20 14:03:03 +02:00
Peter Simons
d404e1120e haskell-yesod-auth: update to version 1.3.4.1 2014-08-20 14:03:02 +02:00
Peter Simons
7360bbd179 haskell-xss-sanitize: update to version 0.3.5.3 2014-08-20 14:03:02 +02:00
Peter Simons
b2569a0417 haskell-warp: update to version 3.0.1.1 2014-08-20 14:03:02 +02:00
Peter Simons
d92b08b0ba haskell-wai-extra: update to version 3.0.2 2014-08-20 14:03:02 +02:00
Peter Simons
68af6b805a haskell-text-icu: update to version 0.7.0.0 2014-08-20 14:03:02 +02:00
Peter Simons
75e56df256 haskell-language-glsl: update to version 0.1.0 2014-08-20 14:03:02 +02:00
Peter Simons
341831d6a7 haskell-hxt: update to version 9.3.1.6 2014-08-20 14:03:02 +02:00
Peter Simons
59d4db445d haskell-hxt-http: update to version 9.1.5 2014-08-20 14:03:02 +02:00
Peter Simons
580e18c5ea haskell-http-client: update to version 0.3.7.1 2014-08-20 14:03:02 +02:00
Peter Simons
ec4102e7d9 haskell-hspec-wai: update to version 0.3.0 2014-08-20 14:03:02 +02:00
Peter Simons
784c87772d haskell-happstack-server: update to version 7.3.8 2014-08-20 14:03:02 +02:00
Shaun Sharples
e3e4f26b1d Don't try make first argument the command, the vim plugin mixes up commands with options 2014-08-20 13:21:31 +02:00
Mateusz Kowalczyk
c9dd66fde6 haskell-ghc-mod: add 5.0.1
Separate expression for now due to big API chanages.
2014-08-20 12:09:54 +01:00
Peter Simons
4bbe6a39bb Merge pull request #3686 from ts468/hdevtool
Fix: hdevtools: correct sha256 hash of patch
2014-08-20 12:40:37 +02:00
Eelco Dolstra
5c53f22492 Revert "binutils: Enable sysroot support"
This reverts commit 773595540b. It
breaks stuff and we don't need it anymore.

http://hydra.nixos.org/build/13517591
2014-08-20 11:13:46 +02:00
Austin Seipp
d95ae1cc89 fsharp: 3.1.0 -> 3.1.1.25
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 02:03:18 -05:00
Austin Seipp
e2bc49d3f3 mps: 1.113.0 -> 1.114.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:53:45 -05:00
Austin Seipp
f1bc7b229d jhc: 0.8.1 -> 0.8.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:43:31 -05:00
Austin Seipp
87f54f1961 fmodex: 4.44.34 -> 4.44.41
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:41:47 -05:00
Austin Seipp
618e220f67 concurrencykit: 0.4.1 -> 0.4.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:37:17 -05:00
Austin Seipp
8b96a44460 nixpkgs: boringssl 20140820-a7d1363f
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:23:40 -05:00
Austin Seipp
528a1c0f56 ninja: 1.4.0 -> 1.5.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:13:33 -05:00
Austin Seipp
9f5eba94d8 re2c: 0.13.6 -> 0.13.7.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:12:21 -05:00