Commit Graph

4584 Commits

Author SHA1 Message Date
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Peter Simons
ff85b53c5f highlight: update to version 3.18 to fix build errors with Lua 5.2 2014-09-08 10:22:50 +02:00
Aristid Breitkreuz
0d35711412 atd: use /var/setuid-wrappers/sendmail by default instead of ssmtp 2014-09-06 20:10:19 +02:00
Nixpkgs Monitor
d54fd845bc at: update from 3.1.14 to 3.1.15 2014-09-06 19:04:08 +02:00
Nixpkgs Monitor
2415c6cbb2 memtest86: update from 4.3.3 to 4.3.6 2014-09-06 18:17:14 +02:00
Nixpkgs Monitor
9d73922ed7 blueman: update from 1.21 to 1.23 2014-09-06 18:12:35 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Domen Kožar
ed706113a8 sproxy-web: mark as broken 2014-09-06 15:23:22 +02:00
Nathaniel Baxter
4a1a77a432 unrar: Fixed license typo 2014-09-06 20:53:45 +10:00
Michael Raskin
ebfeed0b04 Merge pull request #3978 from ehmry/unrar
unrar: update from 5.1.5 to 5.1.7, change license to 'unfree-redistributable'
2014-09-06 13:34:58 +04:00
Domen Kožar
b420eeba44 remove bittorrent package since it's obsolete 2014-09-05 22:49:31 +02:00
Emery Hemingway
1124d8a9b9 unrar: update from 5.1.5 to 5.1.7, change license to 'unfree-redistributable' 2014-09-05 11:38:44 -04:00
Eelco Dolstra
364bdc2a95 nixUnstable: Update to 1.8pre3782_d2d5543 2014-09-05 16:05:50 +02:00
Mateusz Kowalczyk
eac5176529 Fix license on unRAR to unfree.
This license is BAD and it needs to be caught. You need to agree to the
use conditions or you have to remove the software from your machine
which makes it not redistributable.

cc @ehmry
2014-09-05 01:47:16 +01:00
Moritz Ulrich
8c2384a7cf gparted: update from 0.18.0 to 0.19.1 2014-09-04 19:31:33 +02:00
Moritz Ulrich
f2779233db ethtool: update from 3.14 to 3.15 2014-09-04 19:31:33 +02:00
Moritz Ulrich
2bfd7ae15c dos2unix: update from 6.0.5 to 6.0.6 2014-09-04 19:31:33 +02:00
Moritz Ulrich
14fd86307f diffstat: update from 1.58 to 1.59 2014-09-04 19:31:32 +02:00
Moritz Ulrich
f54f5539aa dhcpcd: update from 6.4.2 to 6.4.3 2014-09-04 19:31:32 +02:00
Jaka Hudoklin
4d104542e9 Add keylogs, a GNU/Linux keylogger that works 2014-09-04 19:10:56 +02:00
Moritz Ulrich
332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
d788060cc7 httrack: update from 3.48.17 to 3.48.19 2014-09-04 17:05:20 +02:00
Moritz Ulrich
ff3ba48294 fping: update from 3.8 to 3.10 2014-09-04 17:05:20 +02:00
Moritz Ulrich
484dc89a21 pngcrush: update from 1.7.76 to 1.7.77 2014-09-04 16:06:41 +02:00
Bjørn Forsman
c3436c0c4a sudo: change password prompt
The current sudo password prompt is "Password: ", while distros like
e.g. Ubuntu and Arch Linux use "[sudo] password for %p: ", where "%p"
expands to the username of the user running sudo.

Adopt the prompt from other distros because it makes it less confusing
when running commands with sudo that themselves ask for a password.
2014-09-04 15:39:11 +02:00
Bjørn Forsman
89eccb7fb0 sudo: add sendmailPath option (defaults to /var/setuid-wrappers/sendmail)
It currently seems impossible to make sudo send emails. No matter how much
debugging I enable, sudo continues to be silent about sendmail. I tried setting
"Defaults mailerpath=/var/setuid-wrappers/sendmail" but that too was completely
ignored (except for logging that the variable mailerpath exists with the value
I assigned to it...).

This enables sendmail support and sets a default value that works on NixOS.
2014-09-04 13:38:03 +02:00
Jaka Hudoklin
3ccd8af29d Add curl-unix-socket, Run HTTP requests over UNIX socket 2014-09-04 12:08:59 +02:00
Jaka Hudoklin
98778c4c27 Add JohnTheRipper, a fast password cracker 2014-09-04 01:30:04 +02:00
Michael Raskin
50cf685019 Merge pull request #3841 from monocell/wkhtml-update
updated wkhtmltopdf and use patched qt
2014-09-04 01:43:02 +04:00
Michael Raskin
113037967d Merge pull request #3931 from CodeBlock/screenfetch-bump
[screenfetch] Bump to the stable release
2014-09-03 21:55:55 +04:00
Michael Raskin
b37af08c3d Update mdbtools-git to latest 2014-09-03 21:54:25 +04:00
Eelco Dolstra
65ef435d7b Merge pull request #3949 from wkennington/master.grub
grub2: Add localizations
2014-09-03 19:06:26 +02:00
Sergey Mironov
2b72edad9b yandex-disk: fix the url; introduce systemd.service #2228 2014-09-03 12:36:29 +04:00
William A. Kennington III
88d270f62e grub2: Add localizations 2014-09-03 01:06:07 -07:00
Michael Raskin
4fa0a59753 Merge pull request #3807 from iyzsong/fcitx
fcitx: update and add anthy addon
2014-09-03 11:45:58 +04:00
Michael Raskin
7a47d21aec Merge pull request #3943 from wkennington/master.grub
Fix grub zfs build and typo
2014-09-03 11:39:35 +04:00
Michael Raskin
2b7e30b674 Merge pull request #3741 from wkennington/master.tinc
tinc_pre: Add derivation
2014-09-03 11:18:25 +04:00
Michael Raskin
74343ca3ab Fix handling of paths with multuple mounts — for example rootfs first mount for / 2014-09-03 10:11:41 +04:00
William A. Kennington III
c369c4afbd grub2: Fix zfs support 2014-09-02 19:38:52 -07:00
Aristid Breitkreuz
3a33731e54 Merge pull request #3903 from wkennington/master.grub
Bring back grub update with fixes
2014-09-02 20:59:27 +02:00
Michael Raskin
0ede64bfcb Override postFixup for urlwatch so it works somehwo 2014-09-02 21:17:52 +04:00
William A. Kennington III
d13423c74f tinc_pre: Experimental Patches 2014-09-02 09:16:15 -07:00
William A. Kennington III
ac502d28ff tinc_pre: Add derivation
The tinc developer has made significant developments to the next version
of tinc including many protocol security fixes. This patch adds the
prerelease of the next major tinc release.
2014-09-02 09:16:15 -07:00
William A. Kennington III
36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
2014-09-02 09:16:13 -07:00
Sander van der Burg
ef8220d1bf Expose Android NDK in the top level expression 2014-09-02 14:11:09 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Michael Raskin
10b4bc3c43 Update XDaliClock 2014-09-02 14:25:17 +04:00
Michael Raskin
85caa0942d Update SleuthKit 2014-09-02 14:25:17 +04:00