Commit Graph

7302 Commits

Author SHA1 Message Date
Frederik Rietdijk
3209775495 Merge master into staging 2018-07-22 11:14:41 +02:00
Frederik Rietdijk
6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Frederik Rietdijk
5c72c7f055
Merge pull request #43922 from r-ryantm/auto-update/owncloud-client
owncloud-client: 2.4.1 -> 2.4.2
2018-07-22 08:40:00 +02:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
volth
983abe10e2 "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook 2018-07-21 21:47:26 +00:00
R. RyanTM
0e0f49438e owncloud-client: 2.4.1 -> 2.4.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/owncloud-client/versions.
2018-07-21 13:44:41 -07:00
Frederik Rietdijk
ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02: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
Jörg Thalheim
7d8fb852c5
Merge pull request #43896 from r-ryantm/auto-update/znc
znc: 1.7.0 -> 1.7.1
2018-07-21 16:16:13 +01:00
R. RyanTM
932d2e4f94 znc: 1.7.0 -> 1.7.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/znc/versions.
2018-07-21 08:09:01 -07:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Michael Weiss
c89bdf9704 signal-desktop: 1.14.3 -> 1.14.4 2018-07-21 11:30:46 +02:00
Frederik Rietdijk
8424ac61a9
Merge pull request #43862 from volth/unused3
[bot] treewide: remove unused 'args@' in lambdas
2018-07-21 11:14:44 +02:00
Frederik Rietdijk
251a0a9a86
Merge pull request #43860 from volth/unused2
treewide: remove unused 'inherit' in let blocks
2018-07-21 11:13:36 +02:00
Frederik Rietdijk
321f395f67
Merge pull request #43747 from r-ryantm/auto-update/neomutt
neomutt: 20180622 -> 20180716
2018-07-21 10:49:25 +02:00
Frederik Rietdijk
4431adc889
Merge pull request #43751 from r-ryantm/auto-update/mutt
mutt: 1.10.0 -> 1.10.1
2018-07-21 10:48:40 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Frederik Rietdijk
1a6af9f88e
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
2018-07-20 21:06:32 +02:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Tim Steinbach
b77a32f6cf
minikube: 0.28.0 -> 0.28.1 2018-07-20 08:18:01 -04:00
Sarah Brofeldt
31d1d3d166
Merge pull request #43831 from eliasp/terraform-name-whitespace
terraform: remove whitespace from name
2018-07-20 09:08:11 +02:00
Graham Christensen
7fdba7c74e
Merge pull request #43834 from ryantm/https2
treewide: http -> https
2018-07-19 21:31:36 -04:00
Ryan Mulligan
df8062c45b treewide: http -> https 2018-07-19 18:12:04 -07:00
Elias Probst
48a1dafdbe
terraform: remove whitespace from name
A `nix-env -iA unstable.terraform-full` gave me
`installing 'terraform-with-plugins -0.11.7'`
This removes the whitespace which sneaked into its name.
2018-07-20 00:06:11 +02:00
Michael Weiss
b68770c1a2 signal-desktop: 1.14.2 -> 1.14.3 2018-07-19 22:14:25 +02:00
Pascal Wittmann
aa10b3127f
weechat: set name to include version
see issue #43717
2018-07-19 21:43:11 +02:00
Frederik Rietdijk
8213ff161c Merge master into staging-next 2018-07-19 18:24:24 +02:00
Michael Weiss
4fd9ca3a51 signal-desktop: 1.14.1 -> 1.14.2 2018-07-19 12:56:05 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
R. RyanTM
7847ae02d8 mutt: 1.10.0 -> 1.10.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mutt/versions.
2018-07-18 10:38:17 -07:00
R. RyanTM
2ee1499325 neomutt: 20180622 -> 20180716
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neomutt/versions.
2018-07-18 09:50:59 -07:00
Michael Weiss
bf2a009380 tdesktop: 1.3.7 -> 1.3.10
tdesktopPackages.preview: 1.3.7 -> 1.3.10

Without the patch the build will fail with the following error:

[ 15%] Building CXX object CMakeFiles/lib_export.dir/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.o
/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.cpp: In lambda function:
/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.cpp:712:56: internal compiler error: Segmentation fault
   if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
                                                        ^
Please submit a full bug report,
with preprocessed source if appropriate.
See <https://gcc.gnu.org/bugs/> for instructions.
make[2]: *** [CMakeFiles/lib_export.dir/build.make:77: CMakeFiles/lib_export.dir/build/tdesktop/Telegram/SourceFiles/export/export_api_wrap.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:1101: CMakeFiles/lib_export.dir/all] Error 2
make: *** [Makefile:84: all] Error 2
2018-07-17 21:17:21 +02:00
lewo
a7d17e287a
Merge pull request #43644 from flokli/ksonnet
ksonnet: init at 0.11.0
2018-07-17 15:08:42 +02:00
Florian Klink
cf00b9aff4 ksonnet: init at 0.11.0
closes #42596
2018-07-17 14:37:43 +02:00
Frederik Rietdijk
6d339e5863 Merge staging-next into staging 2018-07-16 17:14:44 +02:00
Frederik Rietdijk
3c09808160 Merge master into staging-next 2018-07-16 07:43:37 +02:00
Franz Pletz
6d3dd01cb7
Merge pull request #43410 from taku0/thunderbird-bin-52.9.1
thunderbird, thunderbird-bin: 52.9.0 -> 52.9.1
2018-07-16 04:06:00 +00:00
Franz Pletz
c673643d31
Merge pull request #43539 from YorikSar/update-chromium
chromium: 67.0.3396.87 -> 67.0.3396.99
2018-07-15 20:52:23 +00:00
sjau
26bd3e994b flexget: 2.13.5 -> 2.14.5 (#43570) 2018-07-15 18:32:47 +02:00
Robert Schütz
18774d4173 Merge branch 'master' into staging 2018-07-15 12:31:18 +02:00
Joachim F
bc48770871
Merge pull request #43426 from tadfisher/zoom-us
zoom-us: fix runtime qt environment
2018-07-14 20:31:23 +00:00
Yuriy Taraday
06ec2a9f19 chromium: fix 68 (beta) build
Also replace openh264 patch with one landed in upstream.
2018-07-14 23:07:46 +04:00
Jens Binkert
0f55c40186 terraform-provider-ibm: 0.11.0 -> 0.11.1 (#43516) 2018-07-14 20:59:42 +02:00
Michael Weiss
c4fca64980 signal-desktop: 1.14.0 -> 1.14.1 2018-07-14 20:36:31 +02:00
Vladimír Čunát
0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
adisbladis
e8ec91bb59
Merge pull request #43502 from kalbasit/add-charles
charles: init at 4.2.6
2018-07-14 17:51:09 +08:00
Wael M. Nasreddine
d212160762 remove useless flags 2018-07-13 23:19:52 -07:00