alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
47624 commits 217 branches 121 tags 4.5 GiB
Commit graph

47624 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 def75f0282 stdenv: add first iteration of the multiout hook 
Now it should contain *all* information from stdenv/setup.sh of
the original mutiple-output branch.
However, the configurability of the output paths is much greater.
 2014-08-24 19:07:47 +02:00
Vladimír Čunát 4e72b61de9 stdenv/setup.sh: add $propagateIntoInput 
This is needed for multiple-output derivations,
where it is desirable to propagate deps and setup-hooks into $dev instead of $out.

Also drop an unused simple function which will not even make sense.
 2014-08-24 18:37:23 +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 86a372683a xorg: stop using the new nix syntax 
Partial revert of 5ea8497933.

Conflicts:
	pkgs/servers/x11/xorg/default.nix
 2014-08-24 10:47:14 +02:00
Vladimír Čunát a835b282fe another fixup: stripFlags 2014-08-23 18:42:33 +02:00
Vladimír Čunát 6eb7e42b5b merge fixup 2014-08-23 17:02:39 +02:00
Vladimír Čunát 8c8197dfb3 xorg: stop using the new nix syntax 
Partial revert of 5ea8497933.
 2014-08-23 16:15:28 +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
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 59e3e06076 xorg: update probably unused modules 2014-08-21 15:13:22 +02:00
Vladimír Čunát acf8919844 xorg.xrandr: minor bugfix update 2014-08-21 15:13:21 +02:00
Vladimír Čunát c31c79f0dd xorg.xcb (lib+proto): update (seems mainly bug fixes) 2014-08-21 15:13:21 +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 50b65a7f8e readline: use 6.3 by default 
I found no build regressions with the most common dependents.

It's possible that older readline branches may be vulnerable,
although the last one announced seemed not to affect regular packages.
 2014-08-21 15:13:19 +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 91db3f6b45 kde4: security patch for CVE-2014-5033 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
Vladimír Čunát 2d03fbf752 twinkle eval: fix the typo 2014-08-20 23:38:43 +02:00
Vladimír Čunát 25351012b2 nvidia: fix problems with -glsi and glx 
..by generalizing the build script.
Obsoletes #3699, and it should finally fix problems around 816d971a.
 2014-08-20 23:37:41 +02:00
Luca Bruno facb810bcc rhash: new package 
Console utility for computing and verifying hash sums of files

http://rhash.anz.ru
 2014-08-21 00:46:35 +02:00
Peter Simons 460885dfa5 Merge pull request #3696 from matejc/root_default_shell 
use mkDefault on root's shell
 2014-08-20 22:44:01 +02:00
Vladimír Čunát c198a36898 twinkle: fix build (fixes #3673) 
Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.

CC: maintainer @MarcWeber.
 2014-08-20 21:32:19 +02:00
Matej Cotman f4b5cd9f3f use mkDefault on root's shell 2014-08-20 21:17:48 +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 30d05ba082 haskell-timeparsers: build this package with a recent version of 'convertible' 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
Peter Simons 17d3aee3eb Merge pull request #3693 from ruediger/add/colord-kde 
Add colord-kde.
 2014-08-20 19:59:15 +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 16bbf00851 munge: Update from 0.5.10 to 0.5.11 2014-08-20 17:07:54 +02:00
Moritz Ulrich 77437983a2 Slic3r: Bump to 1.1.7. 2014-08-20 16:27:47 +02:00
Rickard Nilsson bf0e265a61 diod: Update from 1.0.21 to 1.0.22 2014-08-20 16:10:20 +02:00
Rickard Nilsson 5c9157b329 riemann-c-client: Update from 1.2.0 to 1.2.1 2014-08-20 16:04:10 +02:00