volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
worldofpeace
6402a044f3
Merge pull request #67488 from worldofpeace/glib/get-schema-path
...
glib: add getSchemaPath, makeSchemaPath
2019-08-27 15:19:11 -04:00
Frederik Rietdijk
98640fd482
Merge master into staging-next
2019-08-27 16:36:47 +02:00
Marek Mahut
6b978f9b67
Merge pull request #67495 from Alkeryn/ckb-next
...
ckb-next: fix #67371
2019-08-27 10:00:50 +02:00
worldofpeace
7bb8f05f12
treewide: use glib.{getSchemaPath, makeSchemaPath}
2019-08-26 21:28:17 -04:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Michael Weiss
ba9305c404
tcpflow: 1.4.6 -> 1.5.2
...
Changelog: https://github.com/simsong/tcpflow/blob/tcpflow-1.5.2/ChangeLog
Does now cross-compile and build with OpenSSL 1.1.1.
I've also restructured/simplified the expression and added additional
meta information.
2019-08-26 20:11:52 +02:00
Alkeryn
43ab91e6c4
ckb-next: fix #67371
2019-08-26 15:02:10 +02:00
Marek Mahut
d5a5718f2a
Merge pull request #67463 from lilyball/ffsend
...
ffsend: v0.2.49 -> v0.2.50
2019-08-26 10:45:36 +02:00
Peter Hoeg
de20ba7ede
Merge pull request #66248 from peterhoeg/f/grc
...
grc: leave /etc/grc.conf alone so we can override it
2019-08-26 14:35:48 +08:00
Peter Hoeg
6d43bc3a84
Merge pull request #67169 from peterhoeg/u/dyncol
...
dynamic-colors: 0.2.2.1 -> 0.2.2.2
2019-08-26 14:33:44 +08:00
Lily Ballard
f44bb0d0c3
ffsend: v0.2.49 -> v0.2.50
2019-08-25 14:41:50 -07:00
Marek Mahut
3f6d0a981a
Merge pull request #67460 from primeos/wev
...
wev: init at 2019-08-11
2019-08-25 23:27:07 +02:00
Marek Mahut
7192ca5fd3
Merge pull request #66682 from asymmetric/ix.io
...
ix: init at 20190815
2019-08-25 23:14:36 +02:00
Michael Weiss
aec95ecf0d
wev: init at 2019-08-11
2019-08-25 21:44:04 +02:00
worldofpeace
741163efdb
Merge pull request #65370 from Ma27/package-3llo
...
_3llo: init at 0.3.0
2019-08-25 15:42:13 -04:00
Matthew Bauer
c45a990a5d
Merge pull request #65844 from matthewbauer/man-alias
...
man: use man-db everywhere
2019-08-25 15:29:57 -04:00
Gabriel Ebner
73f67bc4ac
vdirsyncer: fix build with openssl 1.1
2019-08-25 16:38:42 +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
Marek Mahut
d212d864e4
Merge pull request #67202 from kisik21/uwimap-cross-compile-fix
...
uwimap: Fixed cross-compilation
2019-08-25 14:27:24 +02:00
Alkeryn
af9f401b9a
ckb-next: use qt5's mkDerivation
2019-08-25 13:51:50 +09:00
Matthew Bauer
5f770d4070
man-db: handle building on darwin
...
this needs some weird manual autoconf settings to work. Most likely
some test is giving false positives, but I cannot figure out how.
2019-08-24 20:14:16 -04:00
Jan Tojnar
edcecfee00
Merge pull request #67358 from jtojnar/ofono-progress
...
nixos/ofono: various improvements
2019-08-24 21:37:42 +02:00
Jan Tojnar
d90aa7dc62
Merge pull request #67389 from jtojnar/xdg-user-dirs
...
Allow changing xdg-user-dirs with environment.etc
2019-08-24 19:22:45 +02:00
Marek Mahut
3043f6d5d9
Merge pull request #65901 from r-ryantm/auto-update/calamares
...
calamares: 3.2.8 -> 3.2.11
2019-08-24 16:22:54 +02:00
adisbladis
83d179fc09
xpra: 2.5 -> 2.5.3
...
Also fix build by using opencv4
2019-08-24 14:15:17 +01:00
Jan Tojnar
865293c508
xdg-user-dirs: deprioritize shipped configs
...
XDG_CONFIG_DIRS should contain directories ordered by priority
so if we want users to be able to customize the defaults, we
need to move the shipped values to the end.
2019-08-24 14:39:02 +02:00
Samuel Leathers
17a5cb6cb5
Merge pull request #67373 from eadwu/bcachefs/update-6
...
bcachefs/update-6
2019-08-24 08:32:37 -04:00
zimbatm
b240871063
nixpkgs-fmt: 0.2.0 -> 0.3.1
2019-08-24 14:28:06 +02:00
Marek Mahut
1538b64280
Merge pull request #67017 from r-ryantm/auto-update/openconnect
...
openconnect: 8.03 -> 8.04
2019-08-24 14:01:35 +02:00
Marek Mahut
e567a5f7e4
Merge pull request #67296 from jonringer/bump-acpica-tools
...
acpica-tools: 20190703 -> 20190816
2019-08-24 12:46:32 +02:00
Marek Mahut
5f333459d7
Merge pull request #67374 from thefloweringash/nmap-darwin-patch-update
...
nmap: update clang specific patch
2019-08-24 12:27:11 +02:00
Michael Weiss
01551c2147
scdoc: 1.9.6 -> 1.9.7
2019-08-24 12:18:21 +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
Andrew Childs
de1e3c9aee
nmap: update clang specific patch
...
The upstream PR had two parts: adding a missing include and resolving
an ambiguous reference. The upstream project fixed the first but not
the second. We still need the second part, so extract it by filtering
the patch.
2019-08-24 13:57:35 +09:00
Edmund Wu
d8601dc4f9
bcachefs-tools: 2019-07-13 -> 2019-08-21
2019-08-23 22:38:00 -04:00
Vladyslav M
9a2b01ad8c
hcxtools: 5.1.6 -> 5.2.0
2019-08-23 23:14:23 +03:00
Jan Tojnar
5db762126c
nixos/ofono: allow adding 3rd party plug-ins
2019-08-23 19:50:53 +02:00
Jan Tojnar
f66613b3b6
nixos/ofono: add module
2019-08-23 19:50:53 +02:00
Linus Heckemann
d1d602f559
Merge remote-tracking branch 'origin/master' into openssl-1.1
2019-08-23 17:27:39 +02:00
Maximilian Bosch
a35b734f28
Merge pull request #67354 from mayflower/scrot-1.2
...
scrot: 0.8-18 -> 1.2
2019-08-23 16:59:59 +02:00
Robin Gloster
39f9042e65
Merge pull request #67346 from mayflower/clamav-0.101.4
...
clamav: 0.101.3 -> 0.101.4
2019-08-23 16:29:41 +02:00
Robin Gloster
c55d90b81c
scrot: 0.8-18 -> 1.2
2019-08-23 16:28:51 +02:00
zimbatm
79c2ed6b60
nixpkgs-fmt: init at 0.2.0
2019-08-23 16:12:50 +02:00
Robin Gloster
47a219d8e7
clamav: 0.101.3 -> 0.101.4
2019-08-23 15:53:07 +02:00
xrelkd
2a26c699d2
eksctl: 0.4.1 -> 0.4.2
2019-08-23 15:11:23 +08:00
Marek Mahut
29ca909e00
Merge pull request #67147 from jonringer/bump-osinfo
...
Bump libosinfo packages
2019-08-23 08:26:25 +02:00
Marek Mahut
bd67156e12
Merge pull request #67005 from bbigras/httplz
...
httplz: 1.5.1 -> 1.5.2
2019-08-23 08:19:28 +02:00
Marek Mahut
9a7a18e817
Merge pull request #67012 from xrelkd/update/eksctl
...
eksctl: 0.3.1 -> 0.4.1
2019-08-23 08:18:53 +02:00