Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372f0fec244ca
2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next'
2019-09-21 13:14:09 +02:00
Will Dietz
855d3e7eaf
tor: 0.4.1.5 -> 0.4.1.6
...
https://blog.torproject.org/new-release-tor-0416
2019-09-19 09:48:50 -05:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next
2019-09-18 21:15:35 +02:00
Matthew Bauer
1bc7fae62d
Merge pull request #68889 from nspin/pr/various-cross-2
...
Various cross-compilation fixes
2019-09-17 19:35:44 -04:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next
2019-09-16 19:24:52 +02:00
Nick Spinale
e39d627a12
gnupg: fix cross-compilation
2019-09-16 10:48:24 +00:00
Nick Spinale
a6635fbc19
pinentry: fix cross-compilation
2019-09-16 10:48:24 +00:00
Arian van Putten
35e9b2915a
vault: 1.2.2 -> 1.2.3
...
Fixes the build because https://git.apache.org has been taken offline
and now has been replaced with another mirror
2019-09-16 10:49:59 +02:00
Mario Rodas
18eeec914b
Merge pull request #68645 from marsam/update-sops
...
sops: 3.3.1 -> 3.4.0
2019-09-15 17:49:22 -05:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next
2019-09-15 13:18:54 +02:00
Daniel Schaefer
f25e86411c
chipsec: 1.4.0 -> 1.4.1
2019-09-13 14:30:58 +02:00
Robin Gloster
63b645f3d8
Merge pull request #67414 from JohnAZoidberg/chipsec-140
...
chipsec: 1.3.7 -> 1.4.0
2019-09-13 13:20:02 +02:00
Mario Rodas
304aa6f6b6
sops: 3.3.1 -> 3.4.0
...
Changelog: https://github.com/mozilla/sops/releases/tag/3.4.0
2019-09-13 04:20:00 -05:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging
2019-09-12 22:49:43 +02:00
Peter Hoeg
6759d15465
Merge pull request #68512 from nspin/pr/stdenv-spelling
...
stdenv: fix misspellings of dontPatchELF
2019-09-12 17:04:49 +08:00
Jason Carr
7644e88334
lesspass: fix src
2019-09-11 23:16:36 -04:00
Nick Spinale
d2333beb86
stdenv: fix misspellings of dontPatchELF
2019-09-11 13:10:09 +00:00
Jan Tojnar
1716d62f63
Merge branch 'staging-next' into staging
2019-09-10 07:06:45 +02:00
Jan Tojnar
8752ff2254
zbar: clean up ( #68389 )
...
zbar: clean up
2019-09-10 06:57:40 +02:00
Jan Tojnar
e1cb839d17
zbar: Split to multiple outputs
...
Also fix D-Bus config dir path: The configure script is appending `/dbus-1/system.d`
so when we added passed in `$out/etc/dbus-1/system.d`, it ended up with extra nesting.
2019-09-10 01:34:50 +02:00
Izorkin
329a88efa7
treewide: replace mysql.connector-c to libmysqlclient
2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c
treewide: remove redundant quotes
2019-09-08 23:38:31 +00:00
Frederik Rietdijk
5f4734b1dd
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
...
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Maximilian Bosch
4f67ff34d5
Merge pull request #68281 from doronbehar/update-sequoia
...
sequoia: 0.9.0 -> 0.10.0
2019-09-08 12:38:56 +02:00
Jan Tojnar
98d9589819
gnome-keysign: init at 1.0.1 ( #57000 )
...
gnome-keysign: init at 1.0.1
2019-09-08 03:44:11 +02:00
Doron Behar
176395f0f4
sequoia: 0.9.0 -> 0.10.0
2019-09-07 20:36:02 +03:00
Frederik Rietdijk
66bc7fc1b3
Merge master into staging-next
2019-09-06 22:46:05 +02:00
Frederik Rietdijk
9b92496429
Merge pull request #68194 from adisbladis/drop-go-1_10
...
Drop unsupported go version 1.10
2019-09-06 19:14:02 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
...
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar
ed54a5b51d
Merge branch 'gtk-no-plus'
2019-09-06 02:57:51 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g
...
GTK was renamed.
2019-09-06 02:54:53 +02:00
adisbladis
4bca8b48fb
notary: Build with go 1.12
2019-09-05 22:33:40 +01:00
Sean Buckley
7d7d9e57f8
metasploit: 4.16.1 -> 5.0.45
2019-09-04 20:44:50 -04:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next
2019-09-04 11:00:56 +02:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8
2019-09-03 22:15:07 +02:00
worldofpeace
59e68d3b74
treewide: don't use single quotes with placeholder
2019-09-03 13:01:42 -04:00
Jan Tojnar
ad72ce9c2b
gnome-keysign: init at 1.0.1
2019-09-03 18:49:05 +02:00
Frederik Rietdijk
ad1d58c622
Merge staging-next into staging
2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291
Merge master into staging-next
2019-08-31 09:50:38 +02:00
zimbatm
3d0af7848c
Merge pull request #67607 from zimbatm/verifpal-0.2
...
verifpal: init at 0.2
2019-08-30 21:56:52 +02:00
zimbatm
792bb4f7f6
verifpal: init at 0.2
2019-08-30 21:56:12 +02:00
Jaka Hudoklin
8d1510abfb
Merge pull request #67606 from endocrimes/r-vault-1.2.2
...
vault: 1.0.2 -> 1.2.2
2019-08-29 07:07:09 +00:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Stig Palmquist
2d36aa63fd
ripasso-cursive: init unstable at 2019-08-27
2019-08-28 11:56:04 +02:00
Danielle Lancashire
d95dca26ab
vault: 1.0.2 -> 1.2.2
...
This upgrades Vault to version 1.2.2. To accomplish this, we migrate to
using the `buildGoModule` helper, as since 1.0.2 the Vault build process
migrated to modules, and does not vendor its dependencies.
We also stop using the vault build script, and gox, as it only really
provides value for local development, where it configures GOOS/GOARCH
and installs into some convenient dev locations.
2019-08-28 09:47:03 +02:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8
2019-08-25 18:55:46 +02:00
Vladimír Čunát
985d1ac425
Merge branch 'master' into staging-next
...
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.
Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
