Commit graph

13077 commits

Author SHA1 Message Date
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
Gabriel Adomnicai 7c08e86be9 mmake: init at 1.2.0 (#28904)
* Package for mmake

* Package for mmake - build from sources

* Package name update

* Added maintainers
2017-09-05 15:00:22 +01:00
Franz Pletz 00a9902297
at: 3.1.16 -> 3.1.20 2017-09-05 14:24:57 +02:00
Franz Pletz a46f206271
tcpdump: fix multiple CVEs
Fixes CVE-2017-11541, CVE-2017-11542, CVE-2017-11543.

Also fixes a segfault if built with openssl 1.1.
2017-09-05 13:10:13 +02:00
Franz Pletz f8ff9a783f
aptly: 1.0.1 -> 1.1.1 2017-09-05 13:10:13 +02:00
Franz Pletz a5e9a31fb5
advancecomp: 1.23 -> 2.0 2017-09-05 13:10:13 +02:00
Franz Pletz 7753daa204
connman: 1.34 -> 1.35
Fixes CVE-2017-12865, see http://connmando.nri-secure.co.jp/index.html.

Fixes #28967.
2017-09-05 11:58:58 +02:00
Frederik Rietdijk c7be7c54e8 Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
2017-09-05 11:16:41 +02:00
Jörg Thalheim f91b4de9c2 Merge pull request #28993 from catern/patch-1
offlineimap: add Kerberos support
2017-09-05 09:31:30 +01:00
Frederik Rietdijk d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Peter Hoeg 62ff6cb69c netalyzr: init at 57861 2017-09-05 08:12:40 +08:00
Jörg Thalheim 73c6284c2e mitmproxy: unicode locales, skip network test 2017-09-04 22:47:42 +01:00
catern b5eb923bc7 offlineimap: add Kerberos support 2017-09-04 15:55:24 -04:00
Tuomas Tynkkynen 5f8e6a4fe1 tpm-tools: 1.3.8 -> 1.3.9.1, fixes build 2017-09-04 19:15:27 +03:00
Dan Peebles 550c5c9b3f coreutils: fix on Darwin
This patch doesn't apply because it's already applied upstream
2017-09-04 12:04:12 -04:00
John Ericson 0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Vladimír Čunát 37242d98de
Merge branch 'master' into staging 2017-09-03 10:51:11 +02:00
Vladimír Čunát 828bc3812c
texlive: add ghostscript when containing pdfcrop
Potential disadvantage: ghostscript will become visible to user,
so there may e.g. be (new) collisions in nix-env due to this.
Fixes #28411.
2017-09-03 10:17:37 +02:00
Joachim F 829a2e81d3 Merge pull request #28890 from disassembler/irods-icommands
irods-icommands: 4.2.0 -> 4.2.1
2017-09-03 07:45:56 +00:00
Michael Raskin 491f5be49b Trying a less disruptive patch for Cuneiform 2017-09-02 18:53:06 +02:00
Tim Steinbach 1c45fd01aa
coreutils: 8.27 -> 8.28 2017-09-02 11:11:19 -04:00
Samuel Leathers 5fb93524b3 irods-icommands: 4.2.0 -> 4.2.1 2017-09-02 10:52:02 -04:00
Frederik Rietdijk 72cc6ba17f ansible_2_1, ansible_2_2: use overridePythonAttrs 2017-09-02 13:55:59 +02:00
Jörg Thalheim 8d015553d5 ansible_2_2/ansible_2_1: switch to overrideDerivation for jinja2 2017-09-02 13:55:59 +02:00
Frederik Rietdijk d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
Jörg Thalheim 7b20952c04 Merge pull request #28726 from vyp/interception-tools
interception-tools: init at 0.1.1
2017-09-02 08:24:57 +01:00
xd1le e0b44a09b8 interception-tools: init at 0.1.1
The latest release of libyamlcpp in nixpkgs does not build because it
uses an older version of boost than the one in nixpkgs and therefore
expects a particular header file which does not exist in the latest
boost anymore. For this reason, a later (git) version of libyamlcpp is
used here (which actually doesn't even require boost).

The substituteInPlace in the prePatch phase is needed because libevdev
places its headers in non-standard places, meaning Nix cannot normally
find them. The `cut` command removes the first two "-I" characters from
the output of `pkg-config`. This needs to be in the prePatch phase
because otherwise Nix will patch these lines to `/var/empty`, meaning
you would have less specific replacement (in case other lines are also
patched to `/var/empty`).

I wrote the patch. (I believe it is NixOS specific.)
2017-09-02 16:17:53 +10:00
Samuel Leathers 917a0e3e77 glmark2: 2016-05-11 -> 2017-09-01 2017-09-01 22:01:24 -04:00