Commit Graph

4236 Commits

Author SHA1 Message Date
github-actions[bot]
a4c3a2d732
Merge staging-next into staging 2021-05-03 12:26:48 +00:00
Fabian Affolter
212c4e8f73
Merge pull request #121460 from marsam/update-rage
rage: 0.5.1 -> 0.6.0
2021-05-03 12:09:17 +02:00
github-actions[bot]
0e4580d4d0
Merge staging-next into staging 2021-05-02 18:24:58 +00:00
Mario Rodas
a624e11323 rage: 0.5.1 -> 0.6.0
https://github.com/str4d/rage/releases/tag/v0.6.0
2021-05-01 20:22:00 -05:00
github-actions[bot]
49721bed32
Merge staging-next into staging 2021-05-01 18:26:21 +00:00
Luke Granger-Brown
48152d32cc
Merge pull request #120166 from r-ryantm/auto-update/clevis
clevis: 16 -> 18
2021-05-01 18:48:58 +01:00
Luke Granger-Brown
6aec5a24a4
Merge pull request #120176 from r-ryantm/auto-update/doppler
doppler: 3.23.2 -> 3.24.3
2021-05-01 18:41:29 +01:00
Luke Granger-Brown
291fd0ee7e doppler: 3.24.1 -> 3.24.3 2021-05-01 17:40:21 +00:00
github-actions[bot]
22035d0518
Merge staging-next into staging 2021-05-01 12:25:27 +00:00
Robert Schütz
ada3e19b7a
prs: 0.2.10 -> 0.2.11 (#121314)
https://gitlab.com/timvisee/prs/-/blob/v0.2.11/CHANGELOG.md#0211-2021-04-30
2021-05-01 11:01:38 +02:00
Mario Rodas
d4fc6ca4ff gopass: 1.12.5 -> 1.12.6
https://github.com/gopasspw/gopass/releases/tag/v1.12.6
2021-05-01 04:20:00 +00:00
github-actions[bot]
ef6416a6ba
Merge staging-next into staging 2021-05-01 00:54:32 +00:00
Maximilian Bosch
f476258fdf
Merge pull request #121287 from dotlambda/pass-import-fix
passExtensions.pass-import: fix tests
2021-04-30 22:18:06 +02:00
John Ericson
17305d2df0
Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
2021-04-30 11:28:08 -04:00
Robert Schütz
93507828b2 passExtensions.pass-import: fix tests 2021-04-30 17:16:28 +02:00
Fabian Affolter
7409f12164 metasploit: 6.0.41 -> 6.0.42 2021-04-30 12:12:41 +02:00
Andrew Childs
7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
Sandro
44b21b47c7
Merge pull request #121163 from dotlambda/prs-0.2.10
prs: 0.2.9 -> 0.2.10
2021-04-30 02:05:50 +02:00
Maximilian Bosch
d7e7fd74b1
Merge pull request #120770 from jb55/plasma-pass
plasma-pass: init at 1.2.0
2021-04-29 23:04:49 +02:00
Robert Schütz
12a07ce3d1 prs: 0.2.9 -> 0.2.10
https://gitlab.com/timvisee/prs/-/blob/v0.2.10/CHANGELOG.md#0210-2021-04-29
2021-04-29 16:08:57 +02:00
R. RyanTM
111ab7f7b6 ffuf: 1.3.0 -> 1.3.1 2021-04-28 21:33:09 +00:00
Sarah Brofeldt
7859f8a9d6
Merge pull request #120905 from stigtsp/bugfix/tpm2-tools-de-nest-wrappers
tpm2-tools: fix broken wrappers
2021-04-27 22:33:52 +02:00
Sandro
b2377b9515
Merge pull request #120486 from TredwellGit/tboot
tboot: 1.9.8 -> 1.10.1
2021-04-27 21:33:14 +02:00
schnusch
cf9bf19bf3
oathToolkit: 2.6.2 -> 2.6.6 (#120610) 2021-04-27 20:49:18 +02:00
Stig Palmquist
d7564b07c8 tpm2-tools: remove nested wrappers
symlinks like `tpm2_createprimary -> tpm2` were wrapped, causing argv0
issues due to double wrapping:

   $ tpm2_ptool init
   [..]
   RuntimeError: Could not execute tpm2_createprimary: b'ERROR:
   /nix/store/[..]/bin/.tpm2_createprimary-wrapped: unknown tool.

This patch only wraps the `tpm2` and `tss2` executables, and not the
symlinks to them `tpm2_*` and `tss2_*`
2021-04-27 19:38:29 +02:00
Matthias Beyer
0db1ac4ec2 plasma-pass: init at 1.2.0
Reviewed-by: William Casarin <jb55@jb55.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20210427123311.517-1-mail@beyermatthias.de%3E
2021-04-27 08:56:04 -07:00
Mario Rodas
4cce27d742
Merge pull request #120687 from marsam/update-rbw
rbw: 1.1.2 -> 1.2.0
2021-04-27 07:49:53 -05:00
Sandro
e280d68c34
Merge pull request #120703 from fabaff/kubei
kubei: init at 1.0.11
2021-04-27 14:42:54 +02:00
Sandro
22bb091546
Merge pull request #120717 from fabaff/kubesec
kubesec: init at 2.11.0
2021-04-27 14:40:05 +02:00
Sandro
7c137b57be
Merge pull request #120792 from fabaff/nbtscanner
nbtscanner: init at 0.0.1
2021-04-27 13:09:53 +02:00
Fabian Affolter
322ed1b535 nbtscanner: init at 0.0.1 2021-04-26 23:53:39 +02:00
davidak
c5a51a7859
Merge pull request #120462 from NinjaTrappeur/nin-fix-nsjail
nsjail: fix bison link error
2021-04-26 13:36:37 +02:00
Fabian Affolter
38568801d3 kubesec: init at 2.11.0 2021-04-26 12:20:51 +02:00
Fabian Affolter
47e5dcf33e kubei: init at 1.0.11 2021-04-26 10:56:22 +02:00
Fabian Affolter
55fafd9e23
Merge pull request #120678 from r-ryantm/auto-update/grype
grype: 0.10.2 -> 0.11.0
2021-04-26 09:09:30 +02:00
R. RyanTM
abc021b616 gitleaks: 7.4.0 -> 7.4.1 2021-04-26 00:50:38 -04:00
R. RyanTM
1f53e83fa0 grype: 0.10.2 -> 0.11.0 2021-04-26 00:51:58 +00:00
Mario Rodas
0b2034e36c rbw: 1.1.2 -> 1.2.0 2021-04-25 04:20:00 +00:00
Jan Tojnar
0f1c4558d3
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Luke Granger-Brown
9839cda8dc
Merge pull request #110897 from LeSuisse/trousers-0.3.15
trousers: 0.3.14 -> 0.3.15
2021-04-24 23:43:11 +01:00
Luke Granger-Brown
57fd99043e
Merge pull request #120155 from LeSuisse/vault-0.7.1
vault: 1.7.0 -> 1.7.1
2021-04-24 11:32:08 +01:00
Robert Schütz
5d41312d33
prs: 0.2.8 -> 0.2.9 (#120494)
https://gitlab.com/timvisee/prs/-/blob/v0.2.9/CHANGELOG.md
2021-04-24 11:50:58 +02:00
github-actions[bot]
d8d6ba0d2e
Merge master into staging-next 2021-04-24 06:05:30 +00:00
TredwellGit
688ed16f00 tboot: 1.9.8 -> 1.10.1
https://sourceforge.net/p/tboot/code/ci/v1.10.1/tree/CHANGELOG
2021-04-24 02:26:23 +00:00
Sandro
91e505eedc
Merge pull request #120353 from Mic92/ghidra
ghidra: 9.2.2 -> 9.2.3
2021-04-24 03:25:22 +02:00
Sandro
dcfb100bab
Merge pull request #120313 from fabaff/bump-metasploit
metasploit: 6.0.40 -> 6.0.41
2021-04-24 02:58:44 +02:00
github-actions[bot]
6e7c70d02d
Merge master into staging-next 2021-04-24 00:16:17 +00:00
Sandro
dd2bec2c3b
Merge pull request #120311 from dotlambda/prs-0.2.8
prs: 0.2.7 -> 0.2.8
2021-04-24 01:39:09 +02:00
Alyssa Ross
0d0e7ca769
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/top-level/python-packages.nix
2021-04-23 21:18:11 +00:00
Félix Baylac-Jacqué
a9a112e57f
nsjail: fix bison link error
The nsjail build has been broken since the 3.7.5 bison bump:

  /nix/store/(...)/bin/ld: kafel/libkafel.a(libkafel.o):
    in function `kafel_yyerror':
  arm_syscalls.c:(.text+0x6833): undefined reference to `YYUSE'

The issue is coming from kafel and has been fixed upstream. More infos
at: https://github.com/google/kafel/pull/28.

Kafel being distributed through a git submodule in the nsjail repo, we
can't directly fetchpatch the fix from Github. We had to manually
modify the said patch to add a /kafel prefix.

We'll need to remove this patch for the next nsjail version bump.
2021-04-23 23:06:13 +02:00