Commit Graph

153 Commits

Author SHA1 Message Date
squalus
59d06e4826 wireshark-cli: support cross compile 2022-04-06 19:15:34 +02:00
Bjørn Forsman
61afa3e16b wireshark: add wrapGAppsHook
This fixes using the file chooser on non-NixOS:

  (wireshark:28052): GLib-GIO-ERROR **: 12:10:03.798: Settings schema 'org.gtk.Settings.FileChooser' does not contain a key named 'show-type-column'
2022-04-05 12:00:24 +02:00
Maximilian Bosch
63f0c334f0 wireshark: 3.6.2 -> 3.6.3
ChangeLog: https://www.wireshark.org/docs/relnotes/wireshark-3.6.3.html
2022-04-01 22:10:17 +02:00
TredwellGit
b5929ce22a wireshark: 3.6.1 -> 3.6.2
https://www.wireshark.org/docs/relnotes/wireshark-3.6.2.html
2022-02-10 21:16:31 +00:00
Matthieu Coudron
edbf02ff4a wireshark: add manpages
need asciidoctors
2022-01-10 14:06:48 +01:00
Matthieu Coudron
3ad8f02c84 wireshark: 3.4.10 -> 3.6.1
- wmem headers have changed place from epan/ folder to wsutil/
- sharkd protocol has changed too
2021-12-30 16:31:22 +01:00
Thomas Gerbet
6cf2385f15 wireshark: 3.4.9 -> 3.4.10
https://www.wireshark.org/docs/relnotes/wireshark-3.4.10.html
This release fixes a bunch of security issues.
2021-12-04 19:56:58 +01:00
ckie
a537690d30
Revert "wireshark: add wrapGAppsHook fixing open/save GUI" 2021-11-28 11:45:40 +02:00
Maximilian Bosch
ebeeea1c76
Merge pull request #147592 from ckiee/wireshark-gsettings
wireshark: add wrapGAppsHook fixing open/save GUI
2021-11-28 09:59:21 +01:00
ckie
c249f14bf8
wireshark: add wrapGAppsHook fixing open/save GUI 2021-11-27 15:18:05 +02:00
github-actions[bot]
b4569f7a81
Merge staging-next into staging 2021-10-08 00:02:10 +00:00
Sandro
628dbc979f
Merge pull request #136719 from r-burns/libgpg-error 2021-10-07 22:24:04 +02:00
TredwellGit
b757764b66 wireshark: 3.4.8 -> 3.4.9
https://www.wireshark.org/docs/relnotes/wireshark-3.4.9.html
2021-10-07 08:29:03 +00:00
Ryan Burns
41574158a0 libgpg-error: rename from libgpgerror
Matches pname and upstream project name
2021-10-06 18:23:43 -07:00
Dmitry Kalinkin
e0532475bc
treewide: remove darwin-only manual wrapQtApp invocations 2021-09-28 10:29:46 -04:00
TredwellGit
af5ec6d616 wireshark: 3.4.7 -> 3.4.8
https://www.wireshark.org/docs/relnotes/wireshark-3.4.8.html
2021-08-27 14:33:33 +00:00
TredwellGit
7ab66456ca wireshark: 3.4.6 -> 3.4.7
https://www.wireshark.org/docs/relnotes/wireshark-3.4.7.html
2021-07-17 09:16:47 +02:00
TredwellGit
15974f58b8 wireshark: 3.4.5 -> 3.4.6
https://www.wireshark.org/docs/relnotes/wireshark-3.4.6.html
2021-06-04 09:52:11 +00:00
Atemu
cc73a46e9a wireshark: set mainProgram
It'd try to run wireshark-qt or wireshark-cli otherwise.
2021-05-25 03:12:11 +02:00
TredwellGit
83452cfd71 wireshark: 3.4.4 -> 3.4.5
https://www.wireshark.org/docs/relnotes/wireshark-3.4.5.html
2021-04-25 12:00:45 +00:00
Sandro
ba3e930e5c
Merge pull request #115538 from jollheef/wireshark-fix
wireshark: place config.h to the right place
2021-04-05 21:15:09 +02:00
TredwellGit
f03cfcafbf
wireshark: 3.4.3 -> 3.4.4 (#116018)
https://www.wireshark.org/docs/relnotes/wireshark-3.4.4.html
2021-03-12 07:03:16 +01:00
Mikhail Klementev
3576e0d4b0
wireshark: place config.h to $dev/include/wireshark/ 2021-03-09 13:49:07 +00:00
TredwellGit
22663dfe53 wireshark: 3.4.2 -> 3.4.3
https://www.wireshark.org/docs/relnotes/wireshark-3.4.3.html
2021-02-04 13:29:44 +00:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot]
581059aed4
Merge staging-next into staging 2021-01-04 00:57:38 +00:00
Izorkin
131e617f77 wireshark-*: pass in overridden libpcap in all-packages.nix
This allows building wireshark-* with a explicitly disabled bluezSupport
in an overlay.
2021-01-03 21:55:01 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
TredwellGit
58c52f0b45 wireshark: 3.4.0 -> 3.4.2
https://www.wireshark.org/docs/relnotes/wireshark-3.4.1.html
https://www.wireshark.org/docs/relnotes/wireshark-3.4.2.html
2020-12-21 22:12:10 +00:00
Klemens Nanni
251349dac3 wireshark: Do $PATH lookup in wireshark.desktop instead of hardcoding derivation
See db236e588d "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

As upstream's .desktop file does not contain any executable paths,
simply avoid substitution.

Message-Id: <97c3e797-d844-4d0a-9ccf-397745f83aeb@siticom.de>
2020-12-16 03:42:19 +01:00
TredwellGit
286a201786 wireshark: 3.2.7 -> 3.4.0
https://www.wireshark.org/docs/relnotes/wireshark-3.2.8.html
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
2020-11-09 12:00:43 +00:00
TredwellGit
5a1c55f911 wireshark: 3.2.5 -> 3.2.7
https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html
https://www.wireshark.org/docs/relnotes/wireshark-3.2.6.html
2020-09-25 13:53:44 +00:00
zowoq
fa18e11f42 wireshark: 3.2.4 -> 3.2.5 2020-07-16 08:49:22 +02:00
Pierre Bourdon
7198d973c1 wireshark: compile with QT_NO_DEBUG to avoid depending on qt*-dev 2020-06-17 18:53:56 +02:00
Justin Gerhardt
9930b8fd3d wireshark: Add Bluetooth
Only applies to Linux
2020-06-10 19:53:29 +02:00
zowoq
294da17a9e wireshark: 3.2.3 -> 3.2.4
https://www.wireshark.org/docs/relnotes/wireshark-3.2.4.html
2020-05-21 18:54:33 +10:00
zowoq
7145a692b1 wireshark: 3.2.2 -> 3.2.3
https://www.wireshark.org/docs/relnotes/wireshark-3.2.3.html
2020-04-09 15:20:14 +02:00
Fabian Möller
e7f2ad0db9 wireshark: use relative cmake LIBDIR
`wireshark` expects `CMAKE_INSTALL_LIBDIR` to be relative and prefixes
it with `CMAKE_INSTALL_PREFIX` in some places to make it absolute.
This results in duplicate absolute paths being accessed, which don't exist.

Making `CMAKE_INSTALL_LIBDIR` relative fixes this issue.
2020-03-15 17:16:11 +01:00
zowoq
3f34c5388f wireshark: 3.2.1 -> 3.2.2
https://www.wireshark.org/docs/relnotes/wireshark-3.2.2.html
2020-02-27 10:54:11 +10:00
zowoq
8c7a5613f3 wireshark 3.2.0 -> 3.2.1
https://www.wireshark.org/docs/relnotes/wireshark-3.2.1.html
2020-01-16 08:09:22 +01:00
zowoq
da32ab4405 wireshark: 3.0.5 -> 3.2.0 2019-12-28 15:30:49 +01:00
R. RyanTM
887cf78b0e wireshark: 3.0.3 -> 3.0.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
2019-09-29 18:58:39 +02:00
Jan Tojnar
cce6e9e7a1
wireshark-cli: remove Qt from build closure
Not sure how it gets into extra-cmake-modules but I saw the following tree on my system:

+---/nix/store/s8abxisr8d5m6mgyqmas52msjzvdc0dn-wireshark-cli-3.0.3.drv
|   + [...]
|   +---/nix/store/izi9ma2lqz7kppswhqkrdh1b98a8a853-extra-cmake-modules-5.58.0.drv
|   |   +---[...]
|   |   +---/nix/store/scgsmlabpvm6r31kps8p7yflwh17q7ns-hook.drv
|   |       +---/nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25b-default-builder.sh [...]
|   |       +---/nix/store/0iwik51jw5r1a2ffk4q5fmlpbqziwkvi-bash-4.4-p23.drv [...]
|   |       +---/nix/store/8af1a7lnk062h46lfs762pkzbyam5sb3-wrap-qt-apps-hook.sh
|   |       +---/nix/store/lsd5v3xzsskl14fpi4n4a851d7h1g7i3-qtbase-5.12.0.drv
[...]
2019-08-26 16:25:48 +02:00
R. RyanTM
6323cf8a8c wireshark: 3.0.2 -> 3.0.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
2019-07-21 09:53:09 +02:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Will Dietz
1540c0e120 wireshark: 3.0.1 -> 3.0.2 2019-05-29 16:20:12 +09:00
edef
99ece30213 wireshark: include nghttp2 by default
Without nghttp2 included, Wireshark's HTTP/2 dissector is rather neutered,
and the UI gives no indication of why.
2019-05-25 08:13:14 +02:00
Matthieu Coudron
6e21976092 wireshark: cleanup
the call to fixCmakeFiles looks useless and just pollutes git status when developing
on wireshark.
I also removed an old variable that generated a warning.
2019-05-13 10:16:48 +09:00