3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

12481 commits

Author SHA1 Message Date
Tuomas Tynkkynen 43ff1c8262 Merge remote-tracking branch 'upstream/master' into staging 2017-07-11 14:16:21 +03:00
Sander van der Burg 42e6b754fb disnix: 0.7 -> 0.7.1 2017-07-11 00:26:16 +02:00
Will Dietz 07f27eddae jnettop: add patch for 64bit counters (#27283)
Add patch (from Debian) to use 64bit counters for transfer totals. Otherwise counters overflow at 4GB.
2017-07-10 20:02:07 +02:00
Franz Pletz e4dd6377a5
mitmproxy: add patch to bump pyopenssl dependency 2017-07-10 19:47:54 +02:00
Tuomas Tynkkynen 745dadf139 socklog: Move docs to the correct location 2017-07-10 14:47:52 +03:00
Tuomas Tynkkynen 95d73068de awstats: Fix doc path 2017-07-10 14:42:39 +03:00
Franz Pletz c3b566bb87
pinentry: 0.9.7 -> 1.0.0 2017-07-10 09:36:04 +02:00
Franz Pletz 33acb13fcd
lldpd: remove references to gcc-wrapper 2017-07-10 09:36:04 +02:00
Orivej Desh d2ff74f9dd unionfs-fuse: 1.0 -> 2.0 2017-07-10 02:56:25 +02:00
Eelco Dolstra 7b52b0c067 youtube-dl: 2017.06.18 -> 2017.07.09 2017-07-09 21:23:13 +02:00
Vladimír Čunát bfb7ef86f3
Merge branch 'master' into staging
Mass rebuilds incoming.  The mass-rebuild situation got really messy
this weekend.
2017-07-09 18:07:52 +02:00
Michael Walker 4aad6d800d ezstream: init at 0.6.0 (#27259)
* ezstream: init at 0.6.0

* ezstream: pkgconfig belongs to nativeBuildInput
2017-07-09 16:46:16 +01:00
Jörg Thalheim aacb816eb6 Merge pull request #27213 from sigma/pr/gx
gx: 20160601-f84ddf7 -> 0.12.0
2017-07-09 13:19:15 +01:00
Jörg Thalheim 2841f7e5ea Merge pull request #27235 from wizzup/fix-25793
btrfs-progs : fix bash-completion
2017-07-09 13:15:43 +01:00
Aristid Breitkreuz 01557ee8b9 sshuttle: clean up expression a little bit 2017-07-09 12:17:14 +02:00
Karn Kallio bd129c2b3e unzipNLS : Fix build by removing patch fuzz. 2017-07-09 10:44:48 +02:00
Aristid Breitkreuz 19dfb63036 sshuttle: 0.78.0 -> 0.78.3, use py3 for tests to succeed 2017-07-09 09:59:20 +02:00
wisut hantanong 25028cb750 add btrfs-progs bash-completion, fix #25793 2017-07-09 14:29:34 +07:00
Peter Hoeg 6e2579c465 partition-manager: add missing dependencies 2017-07-09 04:44:32 +02:00
Peter Hoeg e9c803f09f peruse: one last missing dependency 2017-07-09 04:25:37 +02:00
Peter Hoeg a8c1419d53 peruse: add missing dependencies 2017-07-09 09:39:06 +08:00
Peter Hoeg 73c21aad92 kronometer: fix build 2017-07-09 08:47:18 +08:00
Daiderd Jordan 980346592c
Merge branch 'staging' into master 2017-07-08 22:22:17 +02:00
montag451 21ef8d5c89 network-manager: fix hard-coded path for modprobe 2017-07-07 18:12:46 +02:00
Jörg Thalheim 006ac6b224 exa: 0.6.0 -> 0.7.0 2017-07-07 16:23:39 +01:00
Yann Hodique c4ecdfd39e gx: 20160601-f84ddf7 -> 0.12.0 2017-07-07 08:17:21 -07: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