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

178 Commits

Author SHA1 Message Date
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
R. RyanTM
db0da7c11d sngrep: 1.4.7 -> 1.4.8 2020-11-12 04:00:13 +00: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
Olli Helenius
4463f819b6 kismet: 2020-04-R2 -> 2020-09-R2 2020-09-22 23:19:50 -07:00
R. RyanTM
88e07c9e70 ettercap: 0.8.3 -> 0.8.3.1 2020-08-01 23:23:39 +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
R. RyanTM
ba6a893218 sngrep: 1.4.6 -> 1.4.7 2020-05-25 03:39:15 +00:00
Mario Rodas
3932bc412c
Merge pull request #88496 from zowoq/wireshark 
wireshark: 3.2.3 -> 3.2.4
 2020-05-22 01:07:14 -05: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
R. RyanTM
dad8374ca3 etherape: 0.9.18 -> 0.9.19 2020-05-21 06:43:23 +00:00
snicket2100
e91183d98d whsniff: init at 1.3 2020-05-03 13:22:22 -07:00
snicket2100
af62dc5355 kismet: 2016-07-R1 -> 2020-04-R2 2020-05-03 12:04:02 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01: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
Michael Weiss
ee8935d635
ettercap: Switch to OpenSSL 1.1.1 
I noticed that Ettercap was listed in #80746.
 2020-02-24 18:46:29 +01:00
Maciej Krüger
b9f7819bd3
ettercap: fix pango not finding hb.h from harfbuzz (#75789) 2020-02-24 18:31:23 +01: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
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +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
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00
Robin Gloster
93b46241a8
ettercap: 0.8.2 -> 0.8.3 
fixes openssl 1.1 compat
 2019-08-21 00:29:22 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01: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
Vladimír Čunát
3686036e02
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1530372
 2019-07-15 09:39:03 +02:00
Joris Engbers
4d75d04d52 sngrep: init at 1.4.6 
Sngrep is used to inspect SIP traffic.
 2019-07-13 18:15:49 +00: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