JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,141 Commits 2 Branches 0 Tags 13 GiB
d43b06a7c4
Commit Graph

13205 Commits

Author SHA1 Message Date
Joachim Fasting
fd3a9e6468
tor: enable parallel building 2017-09-22 22:37:15 +02:00
Tuomas Tynkkynen
4acb425c39 darwin: Disable yet another bunch of packages never having built successfully 
cjdns: https://hydra.nixos.org/build/61134279
jonprl: https://hydra.nixos.org/build/61123711
mate.libmatemixer: https://hydra.nixos.org/build/61126968
dirac: https://hydra.nixos.org/build/61132432
idnkit: https://hydra.nixos.org/build/61123544
trousers: https://hydra.nixos.org/build/61109766
packetdrill: https://hydra.nixos.org/build/61116190
osm2pgsql: https://hydra.nixos.org/build/61118017
nawk: https://hydra.nixos.org/build/61139000
 2017-09-22 21:16:39 +03:00
Tuomas Tynkkynen
a7440aa7c6 hdf5: Re-enable on darwin 
Oops, ab71280823 intended to only disable hdf5-fortran but also
disabled the others that are fine.
 2017-09-22 19:56:49 +03:00
Tuomas Tynkkynen
4b4bfbf3e5 darwin: Disable another bunch of packages never having built successfully 
tecoc: https://hydra.nixos.org/build/61141995
shallot: https://hydra.nixos.org/build/61145497
plink-ng: https://hydra.nixos.org/build/61130149
tshark: https://hydra.nixos.org/build/61479600
 2017-09-22 19:49:57 +03:00
Andreas Rammhold
e9a56e798a
ferm: 2.3.1 -> 2.4.1 2017-09-22 18:42:38 +02:00
Michael Weiss
6f02c3bf77 sshfs-fuse: Fix the build on i686-linux 
The last upgrade (137142a72c) broke the
build on i686. Thanks @globin for noticing this.
 2017-09-22 17:13:24 +02:00
Tuomas Tynkkynen
ab71280823 darwin: Disable some packages that have never built successfully 
mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724
 2017-09-22 17:25:38 +03:00
Daniel Ehlers
8bb57bce2a radsecproxy: init at 1.6.9 2017-09-22 15:08:19 +02:00
Robert Schütz
723042efa9 ttwatch: init at 2017-04-20 2017-09-22 10:45:31 +02:00
Daiderd Jordan
570c0b3a72
transfig: cleanup and fix darwin clang 2017-09-22 00:25:22 +02:00
Jörg Thalheim
7833062986 Merge pull request #29648 from zzamboni/assh-2.6.0 
assh: init at 2.6.0
 2017-09-21 23:05:22 +01:00
Jörg Thalheim
81569ecd72 assh: add openssh to PATH 2017-09-21 23:03:55 +01:00
Michael Weiss
137142a72c sshfs-fuse: 2.10 -> 3.2.0 2017-09-21 23:59:46 +02:00
Diego Zamboni
334dfc3086 assh: init at 2.6.0 
Powerful wrapper around ssh.
 2017-09-21 22:23:16 +02:00
Vladimír Čunát
e15123092c
Merge #29612: unbound: 1.6.5 -> 1.6.6 2017-09-21 21:10:06 +02:00
Vladimír Čunát
4683c374fa
Merge branch 'master' into staging 
A couple thousand rebuilds again.
 2017-09-21 21:09:32 +02:00
Michael Weiss
a127f91f28 fim: Add X11 support and "USE flags" 2017-09-21 18:00:48 +02:00
Michael Weiss
e0ef28c12d fim: init at 0.5rc3 2017-09-21 16:08:32 +02:00
Robert Helgesson
25a2b4b3ec
svtplay-dl: 1.9.4 -> 1.9.6 2017-09-21 15:40:51 +02:00
Joachim Fasting
6bf56656f0
snapper: 0.3.3 -> 0.5.0 2017-09-21 00:56:24 +02:00
Joachim F
29c1888a57 Merge pull request #29560 from LumiGuide/elk-5.6.1 
elk: 5.5.2 -> 5.6.1
 2017-09-20 21:56:26 +00:00
Joachim Fasting
c41af35c04
unbound: 1.6.5 -> 1.6.6 2017-09-20 22:23:05 +02:00
Tuomas Tynkkynen
2c2cd34b54 esptool: Fix tests in sandbox 
It actually requires flake8-future-import but manages to download it
from the Internet when run outside the sandbox.
 2017-09-20 17:55:31 +03:00
Peter Simons
56207cdbd1 rtorrent: update to current git HEAD to avoid build errors with recent cppunit 
Fixes https://github.com/NixOS/nixpkgs/issues/29601.
 2017-09-20 16:53:03 +02:00
Peter Simons
6b0e6e2e97 libtorrent: update to current git HEAD to avoid build errors with recent cppunit 2017-09-20 16:53:03 +02:00
Jörg Thalheim
daf833316a Merge pull request #29578 from jfroche/upgrade-openfortivpn 
openfortivpn: 1.2.0 -> 1.5.0
 2017-09-20 09:35:59 +01:00
Jean-Francois Roche
0b39118494 openfortivpn: 1.2.0 -> 1.5.0 
fixes #29578
 2017-09-20 09:21:42 +01:00
Lancelot SIX
4935d5f376 gnupg: 2.2.0 -> 2.2.1 
See http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00010.html
for release information
 2017-09-20 10:01:28 +02:00
John Ericson
e9c1f64048 Merge branch 'master' into staging 2017-09-20 01:39:59 -04:00
Jörg Thalheim
87435a95f8 Merge pull request #29562 from LumiGuide/journalbeat-5.6.0 
journalbeat: 5.5.0 -> 5.6.0
 2017-09-20 02:44:40 +01:00
Vladimír Čunát
d4c33d5e4e
Merge branch 'master' into staging 2017-09-19 18:03:09 +02:00
Jörg Thalheim
d63b59adf9 Merge pull request #29561 from dywedir/fd 
fd: 3.0.0 -> 3.1.0
 2017-09-19 12:28:38 +01:00
Rickard Nilsson
005a672139 Merge pull request #29501 from moaxcp/obnam 
obnam: 1.21 -> 1.22
 2017-09-19 13:17:39 +02:00
Bas van Dijk
8d07b99b96 journalbeat: 5.5.0 -> 5.6.0 2017-09-19 11:03:38 +02:00
dywedir
72129c2cb4 fd: 3.0.0 -> 3.1.0 2017-09-19 12:02:33 +03:00
Dmitry Kalinkin
5ae7445530
coreutils: remove conflicting _FORTIFY_SOURCE definition 
Originally this was introduced in 055e646b ('coreutils: Guard against compiler not supporting __builtin_stpncpy_chk') four years ago. Right now this doesn't seem to serve any purpose and it conflicts with the hardening flags:

    <command line>:2:9: warning: '_FORTIFY_SOURCE' macro redefined [-Wmacro-redefined]
    #define _FORTIFY_SOURCE 2
            ^
    <command line>:1:9: note: previous definition is here
    #define _FORTIFY_SOURCE 0
            ^
    1 warning generated.
 2017-09-19 04:59:40 -04:00
Bas van Dijk
ea8e7ed1e3 elk: 5.5.2 -> 5.6.1 
Release notes:

* https://www.elastic.co/guide/en/elasticsearch/reference/5.6/release-notes-5.6.1.html
* https://www.elastic.co/guide/en/logstash/5.6/logstash-5-6-1.html
* https://www.elastic.co/guide/en/kibana/current/release-notes-5.6.1.html
 2017-09-19 10:52:08 +02:00
Rob Vermaas
ef3cb5cc47
keybase: update to 1.0.30 
(cherry picked from commit 06896f26489d71fee5460556eaea86fb123a8245)
 2017-09-19 07:34:56 +00:00
Joachim Fasting
1ee60e98e2
tor: 0.3.0.10 -> 0.3.1.7 2017-09-19 02:36:38 +02:00
Robert Schütz
7f89abd820 esptool: 1.3 -> 2.1 2017-09-19 00:22:29 +03:00
Daiderd Jordan
6b7e103870
nmap: patch vendored libz for darwin 2017-09-18 22:02:58 +02:00
Peter Hoeg
971eb19dbc ifstat-legacy: init at 1.1 2017-09-18 18:25:54 +08:00
Robert Schütz
107b181523 abcm2ps: init at 8.13.15 2017-09-18 07:26:34 +02:00
Franz Pletz
672ff7112e Merge pull request #29498 from yesbox/netdata_1.7.0 
netdata: 1.5.0 -> 1.7.0
 2017-09-17 18:47:36 +02:00
k0ral
579a190cfd youtube-dl: 2017.08.27 -> 2017.09.15 2017-09-17 18:44:04 +02:00
John Mercier
90e572f40a obnam: 1.21 -> 1.22 2017-09-17 11:52:48 -04:00
Daiderd Jordan
64bf283104
opensc: add darwin frameworks 2017-09-17 16:25:27 +02:00
Frederik Rietdijk
8a09e51dc2 niff: init at 0.1 2017-09-17 15:37:35 +02:00
yesbox
6b3d9144b0 netdata: 1.5.0 -> 1.7.0 2017-09-17 15:22:24 +02:00
Bjørn Forsman
983d01421e fpart: init at 0.9.3 2017-09-17 13:04:09 +02:00
Bjørn Forsman
a2a9b53e77 cdrkit: fix 'dirsplit' tool by depending on perl 
Or else dirsplit uses "/usr/bin/perl" shebang.
 2017-09-17 10:06:53 +02:00
Matt McHenry
a80ef5b88a djbdns: init at 1.05 2017-09-16 21:14:36 -04:00
Georges Dubus
94400c0cd2 nox: 0.0.5 -> 0.0.6 2017-09-16 21:29:40 +01:00
Jaka Hudoklin
4dc3551397 Merge pull request #29315 from xtruder/pkgs/telepresence/init 
pkgs/telepresence: init at 0.65
 2017-09-16 15:51:15 +02:00
Frederik Rietdijk
03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00
Ruben Maher
6c9a1b7aa3 network-manager-applet: 1.4.6 -> 1.8.2 
Make `network-manager-applet` version match `network-manager` version.

Ref: https://github.com/NixOS/nixpkgs/pull/29375#issuecomment-329923662
 2017-09-16 11:32:22 +02:00
lassulus
f4dfa30d24 tinc_pre: 1.1pre14 -> 1.1pre15 
Remove an obsolete patch
Add lassulus to maintainers
Supply the build with the correct version number and changelog
 2017-09-15 17:54:20 +02:00
Eelco Dolstra
6dad1f70ce
nix: 1.11.14 -> 1.11.15 2017-09-15 16:38:33 +02:00
Eelco Dolstra
b86fd340f0
nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1 2017-09-15 11:27:32 +02:00
Robert Schütz
608045aed5
abcMIDI: init at 2017.06.10 2017-09-15 11:25:43 +02:00
Muhammad Herdiansyah
25944370e1
neofetch: 3.2.0 -> 3.3.0 2017-09-15 10:17:12 +02:00
Lancelot SIX
259d61b34a
xorriso: 1.4.6 -> 1.4.8 
See http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00009.html
for release information
 2017-09-15 10:09:20 +02:00
Bastian Köcher
adec41e573 network-manager: 1.6.2 -> 1.8.2 2017-09-15 08:49:38 +02:00
John Ericson
d2f4084eb9 Merge pull request #29380 from obsidiansystems/eval-fix 
bcachefs-tools: Make eval more robust
 2017-09-14 12:54:18 -04:00
John Ericson
f96f3f7a5c bcachefs-tools: Make eval more robust 
No hash was changed
 2017-09-14 12:32:23 -04:00
Jaka Hudoklin
18245fd222 pkgs/telepresence: init at 0.65 2017-09-14 17:32:32 +02:00
Tuomas Tynkkynen
c8c82a67f0 swfmill: Fix build on GCC 6 
https://hydra.nixos.org/build/60900173
 2017-09-14 18:20:27 +03:00
John Ericson
e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap 
Bootstrap tools has since been bumped
 2017-09-14 10:27:13 -04:00
Jörg Thalheim
610eac1773 Merge pull request #29370 from mguentner/urltypofixes 
fix src.url typos
 2017-09-14 13:34:55 +01:00
Tuomas Tynkkynen
0dc4672d36 diffoscope: Move cbfstool and poppler_utils to bloat category 2017-09-14 15:26:19 +03:00
Tuomas Tynkkynen
2581865717 diffoscope: Add even more tools 2017-09-14 15:25:08 +03:00
Maximilian Güntner
ec7b09ecd0
fix src.url typos 2017-09-14 13:54:14 +02:00
Peter Hoeg
d29a8f25c3 pdf2odt: 20141217 -> 20170207 2017-09-14 19:09:26 +08:00
Peter Hoeg
68764d50b3 mtr: 0.87 -> 0.92 2017-09-14 18:14:19 +08:00
Robert Helgesson
a3a8887b7f
cloc: add myself as maintainer 2017-09-14 11:47:24 +02:00
Robert Helgesson
d35e4439dd
cloc: 1.72 -> 1.74 2017-09-14 11:46:39 +02:00
Sarah Brofeldt
fc2566e966 s3fs: 1.80 -> 1.82 2017-09-14 08:25:29 +02:00
Joachim Fasting
aff74b6af7
socklog: fixup implicit function declarations 2017-09-13 18:27:15 +02:00
Joachim Fasting
705f47f50e
socklog: properly disable the chkshsgr test 
My previous attempt d438cbb0b6 was
bogus ...
 2017-09-13 18:27:09 +02:00
Frederik Rietdijk
4871946c63 Merge pull request #29310 from Infinisil/s-tui 
s-tui: init at 0.6.0
 2017-09-13 17:51:52 +02:00
Silvan Mosberger
753d114b34
s-tui: init at 0.6.0 2017-09-13 17:48:56 +02:00
John Ericson
8fccaa284d Merge pull request #29282 from obsidiansystems/soext 
lib, treewide: Add `*Platform.extensions` and use it where possible
 2017-09-13 11:20:06 -04:00
John Ericson
5aec3f96a2 treewide: Use *Platform.extensions 2017-09-13 11:16:10 -04:00
Tuomas Tynkkynen
98d84b1375 diffoscope: Update tool list 2017-09-13 17:56:07 +03:00
Tuomas Tynkkynen
ab5bd5e596 diffoscope: Remove obsolete and unreferenced patch 2017-09-13 17:56:07 +03:00
Tuomas Tynkkynen
890d4a2853 diffoscope: Revive hard links patch 2017-09-13 17:56:07 +03:00
Tuomas Tynkkynen
4b28da6fd8 diffoscope: 85 -> 86 2017-09-13 17:56:07 +03:00
Tuomas Tynkkynen
42a3be191d afl: 2.48b -> 2.51b 2017-09-13 16:28:48 +03:00
Winnie Quinn
abeb6af482 aspcud: add darwin platform support 
This works because `gringo` now builds on Darwin.
 2017-09-13 00:40:14 +02:00
Joachim F
9b31035ea4 Merge pull request #29268 from rnhmjoj/pirate-get 
pirate-get: 0.2.10 -> 0.2.12
 2017-09-12 22:34:47 +00:00
Joachim F
5488e42641 Merge pull request #29211 from fadenb/graylog_plugins 
graylogPlugins: update existing and add new plugins
 2017-09-12 22:23:10 +00:00
Vladimír Čunát
422adc3063
Merge branch 'staging' 
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
 2017-09-12 19:17:52 +02:00
Jörg Thalheim
7786aab173 openssh: update gssapi patch 2017-09-12 14:28:33 +01:00
rnhmjoj
375ff71380
pirate-get: 0.2.10 -> 0.2.12 2017-09-12 13:59:36 +02:00
Edward Tjörnhammar
90e78aafad
i2pd: 2.14.0 -> 2.15.0 2017-09-12 10:13:49 +02:00
Winnie Quinn
a1013287f3 gringo: add darwin platform support 2017-09-12 09:22:25 +02:00
Daiderd Jordan
7b00a6ef15
html2text: fix clang build 2017-09-11 23:40:46 +02:00
Frederik Rietdijk
628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
Daiderd Jordan
77294205ac
go-mtpfs: fix darwin build 2017-09-11 22:49:01 +02:00
Michael Weiss
9f4fa7339b lf: 2017-05-15 -> 2017-09-06 2017-09-11 20:32:13 +02:00
Michael Weiss
89ae07b05b iouyap: init at 0.97 2017-09-11 19:21:49 +02:00
Bjørn Forsman
835b2ccfa8 t1utils: 1.39 -> 1.41 2017-09-11 17:24:33 +02:00
Bjørn Forsman
0a7d124eb0 basex: 8.6.4 -> 8.6.6 2017-09-11 17:24:33 +02:00
Bjørn Forsman
0177902337 ascii: 3.15 -> 3.18 2017-09-11 17:24:33 +02:00
Tristan Helmich
ea5e03085a graylogPlugins: update and add plugins 2017-09-10 17:53:01 +02:00
Franz Pletz
4a810fb31d
borgbackup: fix build with python36 
cffi fails to build with python34.
 2017-09-10 16:27:12 +02:00
Jörg Thalheim
6d3ca5fce0 Merge pull request #29176 from hiberno/update-rofi-pass 
rofi-pass: 1.5.0 -> 1.5.1
 2017-09-10 12:56:51 +01:00
Rob Vermaas
5dcf5d6d05
gnupg: add gnupg2 alias/symlink for 2.2. Otherwise signing commits with git break. 
(cherry picked from commit c651a0ccbf5b17739390b56f91b656a7b920f643)
 2017-09-10 09:15:59 +00:00
Eelco Dolstra
79c9adce65
nifskope: Fix build 
https://hydra.nixos.org/build/60608938
 2017-09-10 10:56:35 +02:00
Jörg Thalheim
79c7d103bc Merge pull request #29174 from dywedir/fd 
fd: 2.0.0 -> 3.0.0
 2017-09-10 09:42:54 +01:00
hiberno (Christian Lask)
003833f1ce
rofi-pass: 1.5.0 -> 1.5.1 2017-09-10 10:28:15 +02:00
dywedir
bb0f86be43 fd: 2.0.0 -> 3.0.0 2017-09-10 10:43:11 +03:00
Frederik Rietdijk
dab3272f47 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-10 08:56:39 +02:00
Dan Peebles
15502421c7 yubikey-manager: 3.1 -> 4.0 
Also, support Darwin properly
 2017-09-09 23:07:14 -04:00
Daiderd Jordan
2317a07fbb
fontforge-fonttools: use $CC 2017-09-09 23:59:04 +02:00
Daiderd Jordan
479c15b08b
eggdrop: fix tcllib reference on darwin 2017-09-09 23:07:07 +02:00
Daiderd Jordan
6226fd05ba
dibbler: fix darwin build 2017-09-09 15:23:17 +02:00
Joachim F
b5163bc937 Merge pull request #29071 from nh2/glusterfs-glusterfind-dirs 
glusterfs service: Ensure dirs needed by `glusterfind` exist
 2017-09-09 13:07:39 +00:00
Joachim F
3df16e83f7 Merge pull request #29147 from fuzzy-id/master 
haproxy: 1.7.8 -> 1.7.9, download source via https
 2017-09-09 13:05:12 +00:00
Thomas Bach
d34386792d haproxy: 1.7.8 -> 1.7.9 2017-09-09 17:53:20 +08:00
Thomas Bach
fd84128595 haproxy: haproxy.org is now accessible via https 2017-09-09 17:52:37 +08:00
Frederik Rietdijk
6589ee83c2 Merge pull request #29134 from abbradar/protobuf 
Update protobuf and remove old versions
 2017-09-09 09:27:10 +02:00
dywedir
79770136ff minidlna: 1.1.5 -> 1.2.1 2017-09-09 09:17:36 +02:00
Nikolay Amiantov
1f2a18d916 protobuf: remove old versions 
This leaves only protobuf3_1 which is the last version with libprotobuf2.

Also fix several packages to build with the latest protobuf.
 2017-09-09 05:54:43 +03:00
Daiderd Jordan
76437e5e5a
gsc: fix darwin build 2017-09-08 22:22:04 +02:00
Frederik Rietdijk
febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Jason Miller
e9183fd2d4 tigervnc: correct default ssh client path (#29084) 
* tigervnc: correct default ssh client path

The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh
upstream.  This patches it to use the nixpkgs openssh client.

* tigervnc: patch ssh path correctly
 2017-09-08 19:45:17 +01:00
Matthieu Coudron
4551099cb8 offlineimap: 7.1.1 -> 7.1.2 2017-09-08 18:27:03 +02:00
Niklas Hambüchen
abc96aae47 glusterfs: Fix glusterfind's crawlers dlopen() error. 
This fixes:

  Traceback (most recent call last):
    File "/nix/store/7f9arl3f9xyj8sm05mkanh2mlp217192-glusterfs-3.10.2/libexec/glusterfs/glusterfind/changelog.py", line 22, in <module>
      import libgfchangelog
    File "/nix/store/7f9arl3f9xyj8sm05mkanh2mlp217192-glusterfs-3.10.2/libexec/glusterfs/glusterfind/libgfchangelog.py", line 21, in <module>
      libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
    File "/nix/store/nlyr5ankhi7yvva8zndi718zj37js270-python-2.7.13-env/lib/python2.7/ctypes/__init__.py", line 362, in __init__
      self._handle = _dlopen(self._name, mode)
  OSError: libgfchangelog.so: cannot open shared object file: No such file or directory
  Connection to 10.0.0.2 closed.

when running `glusterfind pre`.

Done by setting PYTHONPATH/LD_LIBRARY_PATH as for the other
Python scripts.
 2017-09-08 04:29:20 +02:00
Niklas Hambüchen
e7325f82a3 glusterfs: Patch upstream bug preventing glusterfind from running. 
See: https://bugzilla.redhat.com/show_bug.cgi?id=1489610

Also add patch to correctly log stderr from remote nodes
when glusterfind fails.
This, too, should be removed when fixed upstream.
 2017-09-08 04:29:13 +02:00
Niklas Hambüchen
8e329da496 glusterfs: Fix wrong xattr package: xattr -> pyxattr. 
Fixes error

  File "/nix/store/lxpsl84km87xpk59nai6a33ihgpfs7qr-glusterfs-3.10.2/libexec/glusterfs/glusterfind/changelog.py", line 105, in populate_pgfid_and_inodegfid
      file_xattrs = xattr.list(p)
  AttributeError: 'module' object has no attribute 'list'

when using `glusterfind pre`.
 2017-09-08 04:29:08 +02:00
Nikolay Amiantov
6f7b62e038 protobuf: default to 3.4 2017-09-08 03:40:56 +03:00
Andraz Brodnik
4955943101 Add gosu 2017-09-07 22:57:43 +02:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper" 
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
 2017-09-07 12:51:21 +02:00
Frederik Rietdijk
d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Frederik Rietdijk
a3e524054f mitmproxy: fix build 
which was broken after the cryptography bump to 2.x.

cc maintainer @fpletz
 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
d45e554457 mycli: move out of python-packages.nix and fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
b00be43cdf gmvault: fix build 2017-09-07 09:28:03 +02:00
Peter Hoeg
90433ed831 diffoscope: 77 -> 85 2017-09-07 09:28:03 +02:00
Daiderd Jordan
3cb57304de Merge pull request #29045 from matthewbauer/pinentry-no-fill-plist 
pinentry-mac: no ‘fill plist’ stuff
 2017-09-06 21:11:18 +02:00
Frederik Rietdijk
9e27b88141 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 20:17:53 +02:00
Robin Gloster
993a83d395
tcpdump: 4.9.1 -> 4.9.2 
This is a security release theoretically under emgargo, but leaked by
Mageia and Fedora.

We have permission to deliver this prior to public release.
 2017-09-06 16:42:43 +02:00
Frederik Rietdijk
38dc9a870f Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 14:01:25 +02:00
Frederik Rietdijk
67651d80bc Merge pull request #28884 from FRidh/python-fixes 
Python: several fixes
 2017-09-06 13:54:10 +02:00
Matthew Bauer
7f860249e1
pinentry-mac: no ‘fill plist’ stuff 
fixes #26774
 2017-09-05 22:35:00 -05:00
John Ericson
40e917d35d Merge pull request #29023 from obsidiansystems/deps-reorg 
misc pkgs: Reorganize dependencies ahead of #26805
 2017-09-05 18:10:32 -04:00
Daiderd Jordan
8706664ff6
afl: use clangStdenv 
Fixes #28712
 2017-09-05 22:00:44 +02:00
Franz Pletz
84ec7ef6c3
file: 5.31 -> 5.32 for CVE-2017-1000249 2017-09-05 20:22:01 +02:00
Franz Pletz
bbeeee220a
Merge remote-tracking branch 'origin/master' into staging 2017-09-05 20:14:08 +02:00
John Ericson
252b36a28d misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04:00