Commit Graph

129 Commits

Author SHA1 Message Date
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
Daiderd Jordan
a97e16e4ec wireshark: fix Wireshark.app on darwin
Generalize install_name_tool fixup calls for Wireshark.app to avoid breaking
when version numbers change.
2019-04-09 11:09:07 +09:00
Daiderd Jordan
064bcdb22f wireshark: fix darwin build
Fixing the cycle in the cmake files is also needed on darwin.
2019-04-09 11:09:06 +09:00
Matthieu Coudron
5e19cec491 wireshark: 2.6.6 -> 3.0.1
See https://www.wireshark.org/docs/relnotes/wireshark-3.0.0.html.
Drops gtk build.
2019-04-09 11:09:06 +09:00
Jan Malakhovski
56ee5bca69 wireshark: move defaults to package file 2019-02-03 15:30:43 +00:00
R. RyanTM
699b94165b wireshark: 2.6.5 -> 2.6.6
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-01-16 01:13:00 -08:00
R. RyanTM
3fba6d8175 wireshark: 2.6.4 -> 2.6.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
2018-12-14 07:38:20 -05:00
Michael Bishop
1795ca14c3 wireshark: include headers in wireshark.dev, to support building wireshark plugins 2018-10-27 08:15:31 -03:00
R. RyanTM
77d29e5f06 wireshark: 2.6.3 -> 2.6.4
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
2018-10-14 09:02:12 +02:00
R. RyanTM
2d04c3f476 wireshark: 2.6.2 -> 2.6.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
wireshark-qt
2018-08-30 09:39:51 -07:00
Matthew Bauer
2d63877fa4 wireshark: fix on darwin
Need CMP0025 to be set. No way to do it from the command
line (overrode by the cmake_minimimum_version policy).

Fixes #44878
2018-08-16 22:44:07 -05:00
Frederik Rietdijk
e97e174726
Merge pull request #43904 from r-ryantm/auto-update/wireshark-gtk
wireshark-gtk: 2.6.1 -> 2.6.2
2018-07-21 19:41:16 +02:00
R. RyanTM
564e733a52 wireshark-gtk: 2.6.1 -> 2.6.2
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-gtk/versions.
2018-07-21 09:12:39 -07:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Michael Raskin
5fce881f60 wireshark: 2.4.7 -> 2.6.1 2018-06-19 21:21:19 +02:00
Lancelot SIX
a7e0fb6ffc wireshark: 2.4.6 -> 2.4.7 (#41175)
See https://www.wireshark.org/docs/relnotes/wireshark-2.4.7.html for
release information
2018-05-29 00:21:33 +02:00
Matthieu Coudron
ab613b9336 wireshark: run binary from nix-shell
when in a shell, export variable WIRESHARK_RUN_FROM_BUILD_DIRECTORY to be able to run the newly built wireshark
else one get:
./build/run/wireshark: error while loading shared libraries: libwscodecs.so.0: cannot open shared object file: No such file or directory

see https://github.com/NixOS/nixpkgs/issues/29638
2018-05-09 14:39:08 +09:00
R. RyanTM
b97550f400 wireshark-gtk: 2.4.5 -> 2.4.6
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-gtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/wireshark-gtk -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/wireshark-gtk --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/rawshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/rawshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/text2pcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/text2pcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/mergecap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/mergecap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/reordercap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/reordercap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/dumpcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/dumpcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.wireshark-gtk-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.wireshark-gtk-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.rawshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.rawshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.text2pcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.text2pcap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.mergecap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.mergecap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.reordercap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.reordercap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.dumpcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.dumpcap-wrapped --help’ got 0 exit code
- found 2.4.6 with grep in /nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6
- directory tree listing: https://gist.github.com/ca5179603a5aebfd1a1ba1b1e3945de9
2018-04-05 19:17:27 -07:00
Franz Pletz
1a0f84d0b8
wireshark: 2.4.4 -> 2.4.5 2018-03-05 18:06:29 +01:00
Väinö Järvelä
023d584433 wireshark: Add Darwin support 2018-03-01 15:31:30 +02:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Will Dietz
3c750912e1 wireshark: fix build w/musl using upstream commit 2018-02-13 09:44:56 -06:00
Will Dietz
fecfd3b7ae wireshark: 2.4.3 -> 2.4.4
https://www.wireshark.org/docs/relnotes/wireshark-2.4.4.html
2018-01-14 15:43:42 -06:00
Andreas Rammhold
969d61dd42
wireshark: en- & disable Gtk/Qt separately
This should also fix the wireshark-cli variant
2018-01-06 06:25:43 +01:00