1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

4448 commits

Author SHA1 Message Date
Vladimír Čunát a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
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 694fa543af Merge 'staging'
Conflicts:
	pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +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 d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +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 17d3aee3eb Merge pull request #3693 from ruediger/add/colord-kde
Add colord-kde.
2014-08-20 19:59:15 +02:00
Rickard Nilsson 16bbf00851 munge: Update from 0.5.10 to 0.5.11 2014-08-20 17:07:54 +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
Peter Simons f8da7d5d18 Merge pull request #3684 from bodil/master
Update to ponysay version 3.0.2.
2014-08-20 12:41:27 +02:00
Peter Simons 390f7b1870 Merge pull request #3687 from ruediger/up/colord
colord: Update to 1.1.7 and copy bash completions.
2014-08-20 12:40:15 +02:00
Austin Seipp 32183417fa stunnel: 5.01 -> 5.03
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:56:23 -05:00
Rüdiger Sonderfeld fd5084bc8f Add colord-kde.
A KDE front-end for colord.
2014-08-20 01:54:45 +02:00
Rüdiger Sonderfeld 0741150b97 colord: Update to 1.1.7 and copy bash completions. 2014-08-20 01:53:46 +02:00
Bodil Stokke c38a27df77 Update to ponysay version 3.0.2. 2014-08-19 19:43:48 +01:00
Pascal Wittmann 464ec2a8e5 silver-searcher: update from 0.21.0 to 0.24.1 2014-08-19 19:27:16 +02:00
Rüdiger Sonderfeld 775b4a39e6 tmux: Install bash completion script. 2014-08-19 17:03:49 +02:00
Rickard Nilsson c5c1a243fa nixUnstable: Update to nix-1.8pre3748_02843ba 2014-08-18 16:44:51 +02:00
Eelco Dolstra b8866772d8 nixUnstable: Update to 1.8pre3746_c160ead 2014-08-17 21:50:22 +02:00
William A. Kennington III 5f64a6ffe0 speedtest-cli: 0.2.7 -> 0.3.1 2014-08-17 11:19:41 -07:00
Domen Kožar f0fb53b051 Merge pull request #3607 from bosu/tigervnc-upgrade
tigervnc: upgrade to 1.3.1 security release
2014-08-16 20:17:14 +02:00
Domen Kožar acc1195c41 Merge pull request #3619 from nathan-gs/mailutils-sendmail-path
mailutils: fix for sendmail path
2014-08-16 20:16:45 +02:00
Vladimír Čunát 44a0db4f0f ntfs3g: update to latest stable (2-year bump) 2014-08-16 18:47:20 +02:00
John Wiegley 28d898ed07 texlive: Fix build for users of Mavericks 2014-08-16 00:13:15 -05:00
Nathan Bijnens 23da6f9ca4 mailutils: fix for sendmail path 2014-08-15 21:16:33 +02:00
Boris Sukholitko 91293785e8 tigervnc: upgrade to 1.3.1 security release
The source is on github archive now. Therefore switch to fetchurl.
2014-08-15 14:37:22 +03:00
Peter Simons 4329812ec7 Merge pull request #3597 from Fuuzetsu/rtorrent-xmlrpc
rtorrent: compile with xmlrpc-c for 3rd party UIs
2014-08-15 12:07:44 +02:00
Eelco Dolstra df7bc53606 Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
Vladimír Čunát e5a701eaa2 plan9port: fix eval (license typo) 2014-08-15 02:06:45 +02:00
Sergey Mironov 37d5b54f59 plowshare: version bump
From #3301.
2014-08-15 00:25:45 +02:00
Vladimír Čunát a149b1f31f plan9port: enableParallelBuilding, improve meta 2014-08-15 00:11:28 +02:00
Vladimír Čunát 4a93a5f8f4 merge #3416: plan9port: update 2014-08-15 00:00:28 +02:00
Luca Bruno b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Petar Bogdanovic 133fb0c6e0 rtorrent: compile with xmlrpc-c for 3rd party UIs 2014-08-14 22:06:59 +01:00
Vladimír Čunát ae7153b9b0 sl: fix license (close #3072)
From https://github.com/fistonbettens/nixpkgs/commit/7b6591b551afc6a17b
but it failed to apply for me, so I hand-added and corrected the change.
2014-08-14 21:28:33 +02:00
Vladimír Čunát 7fdd16cb54 merge #3074: dhcp: update to the latest version 2014-08-14 21:01:27 +02:00
Vladimír Čunát 8a4827a881 kdiff3: minor update 2014-08-14 19:43:27 +02:00
Sander van der Burg ba54614773 kzipmix: create package 2014-08-14 16:10:30 +02:00
Sander van der Burg 34d8190e30 pngout: Create new package 2014-08-14 15:59:50 +02:00
Alexander Kjeldaas 29a79bb0d5 tboot: security update to 1.8.2 (close #3562)
This includes a vulnerability fix for:
TBOOT Argument Measurement Vulnerability for GRUB2 + ELF Kernels

@vcunat: enable i686 again.
2014-08-14 14:23:44 +02:00
Gergely Risko 59291fdbf4 Get rid of bootstrap-tools dependency from xz (and therefore stdenv)
0769fc5b77 broke this by setting CONFIG_SHELL.
2014-08-14 02:06:44 +02:00
William A. Kennington III 5337b16435 dhcp: Update meta information and add maintainership 2014-08-13 15:10:04 -05:00
William A. Kennington III 05976a2b5a dhcpd: Update 4.1-ESV-R6 -> 4.3.0
Additionally add the ability to run as a non-root user / group by including
paranoia patches in the build.
2014-08-13 15:08:08 -05:00
Joachim Schiele 6c2763c3bf Merge pull request #3568 from qknight/pdfgrep
pdfgrep: added a nice util to search in pdf files
2014-08-13 20:03:53 +02:00
Joachim Schiele 79617c03eb pdfgrep: added a nice util to search in pdf files 2014-08-13 20:03:04 +02:00
Vladimír Čunát f5d6c9f252 tboot: restrict to one platform 2014-08-13 09:52:34 +02:00