Commit graph

12457 commits

Author SHA1 Message Date
Daiderd Jordan
980346592c
Merge branch 'staging' into master 2017-07-08 22:22:17 +02:00
Jörg Thalheim
006ac6b224 exa: 0.6.0 -> 0.7.0 2017-07-07 16:23:39 +01:00
Jörg Thalheim
99069268e6 Merge pull request #27147 from jfrankenau/update-mergerfs
mergerfs: 2.22.1 -> 2.23.0
2017-07-07 13:54:28 +01:00
Eelco Dolstra
942422a646
Merge branch 'glibc' of https://github.com/rnhmjoj/nixpkgs into staging 2017-07-06 15:14:57 +02:00
Rob Vermaas
74f55017d2
Update nixops to 1.5.1
(cherry picked from commit 1b57bf274a)
2017-07-06 11:14:20 +00:00
Eelco Dolstra
bcfd8e7810 Merge pull request #27124 from robx/tmpdir
nix: short TMPDIR for tests on Darwin (fixes #27121)
2017-07-06 12:54:17 +02:00
Michael Raskin
c089080fc0 Merge pull request #26121 from womfoo/init/zabbix-cli-1.6.1
zabbix-cli: init at 1.6.1
2017-07-05 23:15:36 +02:00
Michael Raskin
d38d3d1096 Merge pull request #25724 from michalpalka/pvgrub-new
pvgrub_image: add package
2017-07-05 22:48:49 +02:00
Michael Raskin
958a757f1d Merge pull request #27152 from phile314-fh/szip-optional
PostGIS/GDAL/hdf4: Make unfree szip dependency optional.
2017-07-05 18:08:32 +02:00
Philipp Hausmann
a1ec03a223 hdf4: Make szip dependency optional. 2017-07-05 16:12:50 +02:00
Eelco Dolstra
c23dcd72a0
Enable some more debug info 2017-07-05 16:04:54 +02:00
Johannes Frankenau
ad627ae3e8 mergerfs: 2.22.1 -> 2.23.0 2017-07-05 16:01:05 +02:00
Michał Pałka
55208cc2e1 pvgrub_image: add package
Add a package containing a pvgrub image for xen generated from grub2
2017-07-05 12:23:30 +00:00
Rob Vermaas
730a394e75
Fix hologram server with go versions > 1.4, no fix yet upstream.
(cherry picked from commit cbfb35a145)
2017-07-05 10:22:10 +00:00
Vladimír Čunát
9e1c7ddaae
Merge branch 'master' into staging 2017-07-05 09:53:53 +02:00
Vladimír Čunát
7205dfadec
Merge #26877: fetchFromGitHub: fix fetchSubmodules
... when revision is not hexadecimal. (omitting the last commit in PR)
2017-07-05 09:48:12 +02:00
Vladimír Čunát
1db1ba9048
groff: (nitpick) quote shell variables 2017-07-05 09:33:39 +02:00
Vladimír Čunát
7b7eb577a2
Merge #27061: groff: fix man page coloring 2017-07-05 09:30:47 +02:00
Vladimír Čunát
5328aac7be
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
Gabriel Ebner
f203b32bb8 Merge pull request #27122 from dtzWill/fix/jd-gui
jd-gui: Fix interpreter, add many missing deps, un-upx.
2017-07-05 08:26:25 +02:00
Tim Steinbach
c22bf27fa0 Merge pull request #27123 from dywedir/tlp
tlp: 0.9 -> 1.0
2017-07-04 21:09:16 -04:00
Volth
b935b21ffd fix regressions where "${repo}-${rev}-scr" pattern was hardcoded 2017-07-04 20:22:13 +00:00
Robert Vollmert
57a0224a42 nix: short TMPDIR for tests on Darwin
This fixes test failures due to overly long nix-daemon socket paths.
2017-07-04 21:48:59 +02:00
dywedir
da7f680bca tlp: 0.9 -> 1.0 2017-07-04 22:35:05 +03:00
Will Dietz
ad29479457 jd-gui: Fix interpreter, add many missing deps, un-upx. 2017-07-04 13:13:50 -05:00
Vladimír Čunát
0ec4394ee7 ntfs3g: change package name
It was being parsed incorrectly, as noted on
https://github.com/NixOS/nix/issues/1440
nix-repl> builtins.parseDrvName ntfs3g.name
{ name = "ntfs"; version = "3g-2017.3.23"; }
2017-07-04 19:42:54 +03:00
Jörg Thalheim
92df3cc98e Merge pull request #27066 from Lassulus/ucspi-tcp-fix
ucspi-tcp: remove setuid from install script
2017-07-04 17:24:09 +01:00
Tuomas Tynkkynen
ed9bb167d5 iperf: 3.1.7 -> 3.2 2017-07-04 17:30:02 +03:00
Tuomas Tynkkynen
d453e8baad afl: 2.43b -> 2.44b 2017-07-04 17:30:02 +03:00
AnotherBugworm
430cc39f54 partition-manager: fix build
see #27112
2017-07-04 12:18:06 +02:00
Pascal Wittmann
336a6ebe89 cpuminer: 2.4.5 -> 2.5.0 2017-07-04 11:42:51 +02:00
lassulus
d461e64b63 ucspi-tcp: remove setuid from install script 2017-07-04 11:02:36 +02:00
Maarten Hoogendoorn
caf44a5dd3 google-cloud-sdk: enable alpha and beta features
google-cloud-sdk: enable alpha and beta features
2017-07-03 13:40:33 -04:00
Benno Fünfstück
6685b7a3d8 burpsuite: 1.7.06 -> 1.7.23 2017-07-03 17:20:45 +02:00
Frederik Rietdijk
680298ef85 Merge pull request #27039 from jokogr/f/kdiff3-kcrash
kdiff3: add dependency to kcrash
2017-07-03 09:51:20 +02:00
Vladimír Čunát
d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Jörg Thalheim
40c6f7e108 Merge pull request #27058 from Nadrieril/fzf-shell-scripts
fzf: Include fzf shell scripts in output
2017-07-03 08:01:04 +01:00
Samuel W. Flint
fa2c22ea97 x11idle: init at unstable-2017-07-01 (#27062)
* Add myself to the maintainers list

* Define the derivation for x11idle
2017-07-03 07:46:26 +01:00
Vladimír Čunát
6cad339a0e
p7zip: add commit ID to the patch
We still do mirror the patch (I think), as `nix-build -Q -A p7zip.patches`
downloaded it on my machine.  I verified that only the diff headers differ;
it's still better to have another working download and Fedora's URLs are
less likely to disappear than Debian's.
/cc #27075.
2017-07-03 08:19:20 +02:00
es_github
674e46d643 p7zip: Update CVE-2016-9296 patch URL.
The debian source for this patch file has gone away, rendering this derivation
unbuildable from scratch.
This change updates the URL to a src.fedoraproject.org location that is still
serving a p7zip patch. This file is not the same bytewise, so I'm also updating
the hash; I didn't manage to find a location still serving a file with the
original hash, and my best guess is that this one is functionally equivalent.
2017-07-03 02:58:38 +01:00
romildo
6cd8de8ba6 offlineimap: 7.1.0 -> 7.1.1 2017-07-02 21:29:30 +02:00
Nadrieril
a0f9386d53 fzf: Include fzf shell scripts in output 2017-07-02 19:33:07 +01:00
Joachim F
79df6e8068 Merge pull request #27037 from dywedir/xsv
xsv: 0.11.0 -> 0.12.1
2017-07-02 17:31:28 +01:00
Pascal Wittmann
2dc599083c
fsql: 0.2.1 -> 0.3.1 2017-07-02 12:58:11 +02:00
Ioannis Koutras
bf9e5d2111 kdiff3: add dependency to kcrash 2017-07-02 13:47:10 +03:00
dywedir
8197e4dffa xsv: 0.11.0 -> 0.12.1 2017-07-02 12:05:00 +03:00
Frederik Rietdijk
fb1ed9d17b Merge pull request #27032 from aij/fix-megacli
megacli: Fix missing libncurses.so.5
2017-07-02 10:35:18 +02:00
Aneesh Agrawal
111b5eb637 groff: Add site.tmac to fix man page coloring
This enables groff to correctly respond to the LESS_TERMCAP_*
environment variables, allowing colorized man pages.

Patch is taken from Arch Linux;
see https://bugs.archlinux.org/task/33760.
2017-07-01 18:58:34 -07:00
Jörg Thalheim
b1ae313111 Merge pull request #26998 from volth/collectd-configure-flags
collectd: fix configureFlags and jar location
2017-07-01 19:01:13 +01:00
Jörg Thalheim
712d26d437 runit: disable uid check during install 2017-07-01 19:00:07 +01:00