Commit graph

4385 commits

Author SHA1 Message Date
Vladimír Čunát 54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Vladimír Čunát 56f409a446 glmark2: style fixups 2014-08-12 20:58:36 +02:00
Vladimír Čunát a3d33de16a Merge #3248: add glmark2-2014.03 2014-08-12 20:53:11 +02:00
Vladimír Čunát abd361173a PR fixups: use mirror://, drop unused params, etc.
Note: hash of trousers tarball didn't match (anymore),
so I updated it to the one from sourceforge.
It's probably some safe and tiny retrospective update.
2014-08-12 19:42:23 +02:00
Vladimír Čunát 87c3c0e885 Merge master into #2129
Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Matt Miemiec 8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Moritz Ulrich 2486f89aed isync: Bump to 1.1.1 2014-08-12 13:34:37 +02:00
Rickard Nilsson bdea35d98b obnam: Update from 1.6.1 to 1.8 2014-08-12 13:32:24 +02:00
Florian Friesdorf 93593a09b6 muscleframework/tool remove platform as lib is marked broken 2014-08-12 13:02:11 +02:00
Domen Kožar 004c745c52 Merge pull request #3525 from wkennington/cache.ddrescue
ddrescue: 1.17 -> 1.18.1
2014-08-11 22:40:42 +02:00
Mateusz Kowalczyk 5258db2479 haskell-sizes: update to 2.3.2 2014-08-11 14:34:10 +02:00
Mateusz Kowalczyk 749cf663be youtube-dl: update to 2014.08.10 2014-08-11 08:57:38 +02:00
John Wiegley 326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Bjørn Forsman b9bd655b16 ucspi-tcp: new package
ucspi-tcp is command-line tools for building TCP client-server
applications.

http://cr.yp.to/ucspi-tcp.html
2014-08-10 23:00:42 +02:00
William A. Kennington III 5f23f0b177 ddrescue: 1.17 -> 1.18.1 2014-08-10 14:06:29 -05:00
Georges Dubus ca0b0a68e8 Fixed deterministicness of fetchgit with leaveDotGit
The shebang of .git/hooks depended the git's bash, which made the result
depend of that bash's path.
2014-08-10 16:25:29 +02:00
Luca Bruno 0b038724c5 chrony: fails to build on darwin 2014-08-10 11:50:43 +02:00
Eelco Dolstra 9f08904c8d gnuplot: Use default compiler on Darwin 2014-08-09 19:53:09 +02:00
Eelco Dolstra 6c5186cf9b gnuplot: Reduce dependency bloat a bit 2014-08-09 19:30:48 +02:00
Eelco Dolstra a1a96d8744 Merge pull request #3507 from jochu/nix-update-nzbget
Update nzbget (13.0) and libpar2 (0.4)
2014-08-09 19:19:52 +02:00
Jeff Chu 2a59e573b2 nzbget: Update to 13.0 2014-08-09 09:36:56 -07:00
Luca Bruno 7926b587c3 file: fails to build on darwin 2014-08-09 14:37:03 +02:00
Luca Bruno 64f2ab4fb7 barcode: unsupported on darwin 2014-08-09 14:30:13 +02:00
lethalman 05eb5bf913 Merge pull request #3503 from lethalman/platforms
Make platforms.allBut accept a list rather than a single platform
2014-08-09 14:22:09 +02:00
Michael Raskin fa907fce31 Use a still-available Debian patch... 2014-08-09 16:09:22 +04:00
Peter Simons 5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Peter Simons 18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
lethalman 7d246d569a Merge pull request #3497 from madjar/nox
Nox: added expression
2014-08-09 12:33:17 +02:00
Luca Bruno b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
Georges Dubus 8de8d5a639 nox: Added expression 2014-08-09 12:30:38 +02:00
Luca Bruno ba2da1fa6c cadaver: mark as unsupported on darwin 2014-08-09 12:29:26 +02:00
Mateusz Kowalczyk 44d65c6582 youtube-dl: update to 2014.08.05 2014-08-09 02:57:18 +02:00
Peter Simons 48fb5d73a6 cabal-install: don't build old versions of this package with a recent GHC 2014-08-09 00:39:53 +02:00
lethalman 86ed47efbf Merge pull request #3489 from frerich/dnsmasq
Update dnsmasq to new version and enable for OS X
2014-08-08 22:32:42 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Pascal Wittmann 7bd3921cf9 multitail: update from 5.2.13 to 6.2.1 2014-08-08 14:51:11 +02:00
Pascal Wittmann f3fd2bf9b2 xclip: fixed broken homepage link 2014-08-08 11:20:32 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Joel Taylor d8cca3d624 fail2ban: systemd support
- upgrade fail2ban to 0.9
- override systemd to enable python support and include sqlite3 module
- make fail2ban enablable
2014-08-08 00:10:19 +02:00
Frerich Raabe 965237a6ee Use .tar.xz instead of .tar.gz for dnsmasq
To save precious bandwidth.
2014-08-07 21:40:45 +02:00
Frerich Raabe dee49fa1b2 Update dnsmasq to version 2.71 2014-08-07 21:40:45 +02:00
Frerich Raabe 1ff81347ec Enable dnsmasq on OS X
It seems to work alright.
2014-08-07 21:40:45 +02:00
taku0 74ce1a016f add peco: Simplistic interactive filtering tool 2014-08-07 01:34:28 +02:00
Jason \"Don\" O'Conal 297599a299 bindfs: add expression 2014-08-07 01:07:34 +02:00
Rickard Nilsson c59a602465 chrony: Update from 1.29.1 to 1.30 2014-08-06 14:08:08 +02:00
Rickard Nilsson 0dd1551806 syslog-ng: Update from 3.5.4.1 to 3.5.6 2014-08-06 12:10:07 +02:00
Rickard Nilsson f4cd161e9b syslog-ng-incubator: Update from 0.3.1 to 0.3.3 2014-08-06 12:09:08 +02:00
Rickard Nilsson d958692420 riemann-c-client: Update from 1.1.1 to 1.2.0 2014-08-06 12:08:41 +02:00
Rickard Nilsson 55e6d092ca ec2-ami-tools: Update from 1.4.0.9 to 1.5.3 2014-08-05 01:25:16 +02:00