JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,625 Commits 2 Branches 0 Tags 13 GiB
4dccb224c5
Commit Graph

13224 Commits

Author SHA1 Message Date
Vladimír Čunát
4dccb224c5 WIP2 2014-08-26 01:10:56 +02:00
Vladimír Čunát
3ec413cece WIP 2014-08-25 15:30:46 +02:00
Vladimír Čunát
77da5efc78 merge the rest of multiple-outputs 
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
 2014-08-25 10:41:49 +02:00
Vladimír Čunát
c96f4d7949 gcc, glibc: merge changes from original multiple-output 
Can't be done automatically because of file copies/moves.
 2014-08-25 10:29:54 +02:00
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
6eb7e42b5b merge fixup 2014-08-23 17:02:39 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +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
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
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
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
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
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
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
0aa8cdcef9 nixpkgs: libressl 2.0.5 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 00:51:15 -05:00
Peter Simons
229eb441a3 haskell-aws: disable test suite to fix the build 
https://github.com/aristidb/aws/issues/125
 2014-08-19 23:47:59 +02:00
Peter Simons
42c7a11d4b haskell-pandoc: update to version 1.13.0.1 2014-08-19 23:47:59 +02:00
Peter Simons
afd1ed90c9 haskell-uri-encode: update to version 1.5.0.3 2014-08-19 23:47:59 +02:00
Peter Simons
80d5fb1d18 haskell-pcre-light: update to version 0.4.0.3 2014-08-19 23:47:59 +02:00