Commit graph

22493 commits

Author SHA1 Message Date
Frederik Rietdijk 0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +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
Marek Mahut 88c68c53e2
Merge pull request #69049 from dtzWill/update/datamash-1.5
datamash: 1.4 -> 1.5
2019-09-19 13:50:06 +02:00
Georges Dubus 55bf3b482c httpie: add missing 'setuptools' to propagatedBuildInputs
As a side-effect of f7e28bf, the build no longer propagated 'setuptools', which
is a run-time dependency. See #68314 for further details.
2019-09-19 13:47:06 +02:00
talyz 43dc5c0e8f nomachine-client: 6.7.6 -> 6.8.1 2019-09-19 13:16:08 +02:00
Claudio Bley 3b437ebe59 ntopng: Remove broken = true 2019-09-19 12:18:20 +02:00
Claudio Bley c4486a084f ntopng: Add patch needed to build with newer libpcap
Fixes build errors for the third-party mongoose module:
```
In file included from
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
                 from /build/ntopng-2.0/include/ntop_includes.h:93,
                                  from src/HTTPserver.cpp:22:
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
   #define INVALID_SOCKET -1

src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
 typedef int SOCKET;
             ^~~~~~
```
2019-09-19 09:08:50 +02:00
Matthew Bauer ca99e4562a
Merge pull request #69039 from samueldr/cross/vboot_reference
vboot_reference: use the right ar when cross-compiling
2019-09-18 20:43:03 -04:00
Will Dietz d57dab74c6
datamash: 1.4 -> 1.5
https://lists.gnu.org/archive/html/info-gnu/2019-09/msg00005.html
2019-09-18 17:00:56 -05:00
Jan Tojnar 62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
Samuel Dionne-Riel 48859723ac vboot_reference: use the right ar when cross-compiling 2019-09-18 15:11:21 -04:00
Matthew Bauer 2c32f91bfc nix: mark unix only
Nix is only known to work on unix like platforms.

https://hydra.nixos.org/job/nixpkgs/cross-trunk/crossMingw32.nix.x86_64-linux
2019-09-18 12:51:00 -04:00
Mario Rodas bd56ba8096
mtm: 1.0.1 -> 1.1.0
Changelog: https://github.com/deadpixi/mtm/releases/tag/1.1.0
2019-09-17 19:50:42 -05:00
worldofpeace 7591343bf3
Merge pull request #68945 from rvolosatovs/update/tendermint
tendermint: 0.32.2 -> 0.32.3
2019-09-17 20:42:07 -04:00
Franz Pletz 48277d3f9d
Merge pull request #68992 from alyssais/tarsnap
tarsnap: fix license to mark as unfree
2019-09-18 00:15:19 +00: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
Alyssa Ross 39b5f5956e
tarsnap: fix license to mark as unfree
tarsnap has always been unfree, but this wasn't expressed properly, so
it wouldn't be caught by allowUnfree = false.
2019-09-17 23:12:56 +00:00
Matthew Bauer fc6c332677
Merge pull request #68960 from B4dM4n/boringtun-darwin
boringtun: fix darwin build
2019-09-17 17:57:14 -04:00
Vlad Artamonov 1897cf8ad8 pulumi: 0.17.27 -> 1.1.0 2019-09-17 14:29:57 -04:00
Bjørn Forsman 5667484b64 ntopng: mark as broken 2019-09-17 20:24:28 +02:00
worldofpeace fef262cd92
Merge pull request #68893 from sikmir/qt5ct
qt5ct: 0.39 -> 0.41
2019-09-17 13:04:33 -04:00
Fabian Möller f8860eb670
boringtun: fix darwin build 2019-09-17 14:24:04 +02:00
Jason Felice 1a5c68c7fe plan9port: do not use which in builder.sh
Removing the build time dependency on which broke builder.sh
2019-09-16 22:15:59 -04:00
Aaron Andersen d1ba913ddd
Merge pull request #68922 from davidtwco/starship-0.17.0
starship: 0.15.0 -> 0.17.0
2019-09-16 21:01:57 -04:00
volth 8276314608 treewide: fix string escapes 2019-09-16 22:15:38 +00:00
Roman Volosatovs 0f4f80173a
tendermint: 0.32.2 -> 0.32.3 2019-09-16 23:36:39 +02:00
Léo Gaspard ffaf2661fb
Merge branch 'master' into os-prober-test 2019-09-16 23:21:15 +02:00
Will Dietz 31be449657
stress-ng: workaround kernel header SNAFU re:sysinfo, fix w/musl 2019-09-16 12:37:43 -05:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
David Wood d857d1628f
starship: 0.15.0 -> 0.17.0 2019-09-16 16:27:13 +01:00
Will Dietz c6af7bf1ac
wireguard: 0.0.20190702 -> 0.0.20190913 2019-09-16 10:12:42 -05:00
Will Dietz 3eb894e55b
stress-ng: 0.10.02 -> 0.10.05 2019-09-16 10:10:03 -05:00
zimbatm 25fb1e59d6
nixpkgs-fmt: 0.5.0 -> 0.6.0 2019-09-16 16:28:46 +02:00
Nikolay Korotkiy 96b22bb697
qt5ct: 0.39 -> 0.41 2019-09-16 15:20:49 +03: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 41894f17e0
Merge pull request #68644 from marsam/update-netdata
netdata: 1.17.0 -> 1.17.1
2019-09-15 17:49:34 -05: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
Maximilian Bosch b7403db3cb
Merge pull request #68867 from mimame/update/fd-7.4.0
fd: 7.3.0 -> 7.4.0
2019-09-15 23:57:48 +02:00
Maximilian Bosch c4196cca9a
Merge pull request #68659 from JohnAZoidberg/chipsec-141
chipsec: 1.4.0 -> 1.4.1
2019-09-15 23:40:11 +02:00
Marek Mahut a6878ff0dd
Merge pull request #68757 from dtzWill/update/uhubctl-2.1.0
uhubctl: unstable-2019-07-31 -> 2.1.0
2019-09-15 23:36:11 +02:00
Mario Rodas 6091d14c58
Merge pull request #67641 from suhr/i2p
i2p: 0.9.41 -> 0.9.42
2019-09-15 16:33:15 -05:00
Miguel Madrid Mencía 956669e894
fd: 7.3.0 -> 7.4.0 2019-09-15 23:29:24 +02:00
Maximilian Bosch 3ddbe41f79
Merge pull request #68723 from jonringer/freeze-azure-storage
nixops_1_6_1: fix build
2019-09-15 20:03:13 +02:00
Maximilian Bosch e6b249ce21
Merge pull request #68685 from B4dM4n/mitmproxy-pytest5
mitmproxy: add pytest5 compatability
2019-09-15 19:23:30 +02:00
Maximilian Bosch 36cc0c6392
Merge pull request #68694 from danme/nix-du
nix-du: 0.3.0 -> master
2019-09-15 18:50:50 +02:00
Maximilian Bosch 050646af12
nix-du: update version to show actual rev's date rather than git-master 2019-09-15 18:14:11 +02:00
Aaron Andersen a6edca1aca
Merge pull request #68406 from leenaars/datefudged
datefudge: 1.22 -> 1.23
2019-09-15 10:17:51 -04:00
Aaron Andersen 6f24ec8827
Merge pull request #66600 from Pamplemousse/sasquatch
sasquatch: init
2019-09-15 10:16:38 -04:00
Nick Spinale f4951397ba lshw: fix cross-compilation 2019-09-15 15:36:31 +02:00
Vladimír Čunát b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Vladyslav M f18a6d5d8f
broot: 0.9.0 -> 0.9.4 (#68777)
broot: 0.9.0 -> 0.9.4
2019-09-15 09:13:52 +03:00
Will Dietz 706b243dad
Merge pull request #68742 from dtzWill/update/txr-225
txr: 224 -> 225
2019-09-14 13:14:43 -05:00
Robert Helgesson 77eef5529f
svtplay-dl: 2.2 -> 2.4 2019-09-14 17:08:51 +02:00
obadz 1a848ef93a
Merge pull request #68764 from dtzWill/update/networkmanager-openconnect-1.2.6
networkmanager-openconnect: 1.2.4 -> 1.2.6
2019-09-14 15:08:00 +01:00
Franz Pletz a0a3f5c86c
Merge pull request #67332 from uvNikita/nixos-container/run
nixos-container: use systemd-run instead of nsenter
2019-09-14 13:22:35 +00:00
Daniel Schaefer e416a39464 bareos: Mark as broken
Doesn't have a maintainer.
Doesn't work with our new glusterfs version.
bareos18 has changed from autotools to cmake so the derivation has to be
completely rewritten.
2019-09-14 15:04:02 +02:00
Will Dietz 447d625edc networkmanager,modemmanager: fix service symlinks for systemd v243
Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
2019-09-14 08:05:27 -04:00
worldofpeace 3cb0ae999f
Revert "networkmanager,modemmanager: fix service symlinks for systemd v243" 2019-09-14 08:04:28 -04:00
worldofpeace e8bc2a6ac0
Merge pull request #68731 from dtzWill/fix/networkmanager-dbus-service-aliases
networkmanager,modemmanager: fix service symlinks for systemd v243
2019-09-14 08:03:12 -04:00
Vladyslav M 2f4fffd9c9
broot: 0.9.0 -> 0.9.4 2019-09-14 13:01:48 +03:00
WilliButz 91bb6cf407
httplz: 1.5.2 -> 1.6.0, add openssl to PATH 2019-09-14 11:58:20 +02:00
Will Dietz c659b70e86 z-lua: 1.7.2 -> 1.7.3, lua-filesystem so _ZL_USE_LFS can be used
https://github.com/skywind3000/z.lua/releases/tag/v1.7.3
2019-09-14 18:49:22 +09:00
WilliButz a52c77fbea
Merge pull request #68660 from JohnAZoidberg/httplz-openssl102
httplz: Fix build with openssl_1_0_2
2019-09-14 11:26:14 +02:00
Will Dietz 6654b52c8b
networkmanager-openconnect: 1.2.4 -> 1.2.6 2019-09-13 23:11:26 -05:00
Will Dietz 108d019e59
uhubctl: unstable-2019-07-31 -> 2.1.0 2019-09-13 22:42:20 -05:00
worldofpeace 2b8712508d
Merge pull request #68697 from Kiwi/ocrmypdf-67497
ocrmypdf: 8.2.3 -> 9.0.3
2019-09-13 23:41:57 -04:00
Robert Djubek 82c4218fe9
ocrmypdf: 8.2.3 -> 9.0.3
Version bump and bug fix
Fixes runtime dependencies ( #67497 ) and the version bump fixed other issues
2019-09-14 03:40:11 +00:00
Will Dietz 9a63273267
txr: 224 -> 225
http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=txr-225
2019-09-13 21:56:37 -05:00
Will Dietz f99bdb2b61
networkmanager,modemmanager: fix service symlinks for systemd v243
Fixes problems such as:

systemd[1]: Failed to put bus name to hashmap: File exists
systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.

Problem is that systemd treats symlinks to files outside the service
path differently, causing our old workaround to look like two separate services.

These symlinks are intended to be a means for manually emulating
the behavior of the `Alias=` directive in these services.
Unfortunately even making these symlinks relative isn't enough,
since they don't make it to where it matters--
that only makes the links in /etc/static/systemd/system/*
relative, with systemd still being shown non-relative links
in /etc/systemd/system/*.

To fix this, drop all of this at the package level
and instead simply specify the aliases in the NixOS modules.

Also handle the same for modemmanager,
since the networkmanager NixOS module also handles that.
2019-09-13 21:02:39 -05:00
Jonathan Ringer a0440ad8b5 nixops_1_6_1: pin azure-storage 2019-09-13 16:59:45 -07:00
Robin Gloster c8cb4c743e
Merge pull request #68664 from danme/fix-csvkit
csvkit: fix failing test
2019-09-13 23:50:31 +02:00
Robin Gloster 761b3a0640
Merge pull request #68692 from mayflower/netatalk
netatalk: use system netatalk
2019-09-13 20:46:20 +02:00
Eelco Dolstra b9e81b2138 nixFlakes: 2.3pre20190830_04np4n6 -> 2.4pre20190913_a25c022 2019-09-13 20:13:14 +02:00
danme 586946829c nix-du: 0.3.0 -> master
recent master fixes the build problem.
2019-09-13 19:41:07 +02:00
Linus Heckemann 19ca6c62b0 netatalk: use system netatalk 2019-09-13 17:14:50 +00:00
Linus Heckemann 39ee74629c
Merge pull request #68388 from alyssais/appleseed
appleseed: fix build
2019-09-13 18:47:17 +02:00
Fabian Möller 5d0c384fc1
mitmproxy: add pytest5 compatability 2019-09-13 18:30:42 +02:00
Daniel Schaefer 08dab35cd4 xfstests: 2018-04-11 -> 2019-09-08 2019-09-13 17:40:16 +02:00
Robin Gloster b19be78a93
Merge pull request #68648 from JohnAZoidberg/fluxgui120
xflux-gui: 1.1.10 -> 1.2.0
2019-09-13 16:43:13 +02:00
danme 535117b136 csvkit: fix failing test
downgrading dependency agate-sql
2019-09-13 15:29:32 +02:00
Daniel Schaefer acf571eec4 httplz: Fix build with openssl_1_0_2
The rust crate dependency that wraps OpenSSL doesn't support the Openssl
1.1.
2019-09-13 15:02:37 +02:00
Daniel Schaefer f25e86411c chipsec: 1.4.0 -> 1.4.1 2019-09-13 14:30:58 +02:00
Daniel Schaefer eb5497c419 xflux-gui: 1.1.10 -> 1.2.0
Didn't build with the old version because they dropped Python2 and
changed some dependencies.
2019-09-13 14:04:07 +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 67425aa31e
netdata: 1.17.0 -> 1.17.1
Changelog: https://github.com/netdata/netdata/releases/tag/v1.17.1
2019-09-13 04:20:00 -05: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
Pamplemousse d25bf0495c sasquatch: init 2019-09-12 21:28:29 -07:00
Jan Tojnar a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
worldofpeace 2a10e8fef5
Merge pull request #68266 from pstn/dehydrated-modernisation
dehydrated: move to pname syntax, handle docs/manpage.
2019-09-12 14:16:39 -04:00
Philipp 274b8654f5 dehydrated: move to pname syntax, handle docs/manpage. 2019-09-12 19:54:44 +02:00
Austin Seipp f0ad5ebdfb nixos/{chrony,ntpd,openntpd}: add myself as maintainer
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-09-12 11:45:51 -05: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
Maximilian Bosch 99b291c73c
Merge pull request #68507 from peterhoeg/f/mtr
nixos/mtr: support for selecting the package
2019-09-12 09:34:22 +02:00
Jason Carr 7644e88334 lesspass: fix src 2019-09-11 23:16:36 -04:00
Peter Hoeg 2e47cb88ea
Merge pull request #68510 from peterhoeg/p/dupd
dupd: init at 1.7
2019-09-12 08:22:53 +08:00
worldofpeace 79ec84fb96
Merge pull request #68521 from averelld/youtube-dl-update
youtube-dl: 2019.09.12 -> 2019.09.12.1
2019-09-11 16:43:57 -04:00
Averell Dalton 99ec6416c5 youtube-dl: 2019.09.12 -> 2019.09.12.1 2019-09-11 22:14:33 +02:00
Michael Weiss bcaa3e702f
scdoc: 1.9.7 -> 1.10.0 2019-09-11 22:10:13 +02:00
Roosembert Palacios 264369254c
youtube-dl: 2019.09.01 -> 2019.09.12
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2019-09-11 21:24:32 +02:00
adisbladis a26a274a68
mongodb-tools: 3.7.2 -> 4.2.0
Fix build with latest Go
2019-09-11 14:33:13 +01:00
Nick Spinale d2333beb86 stdenv: fix misspellings of dontPatchELF 2019-09-11 13:10:09 +00:00
Roman Volosatovs 8d7f62083a
lazydocker: 0.7 -> 0.7.4 2019-09-11 10:39:25 +02:00
Gabriel Ebner 91754d5e8e
fctix-engines.mozc: fix build (#68457)
fctix-engines.mozc: fix build
2019-09-11 10:09:37 +02:00
worldofpeace 2bcd4fa96d
Merge pull request #68443 from ivan/mozc-gcc8-fix
ibus-engines.mozc: fix build
2019-09-10 18:43:57 -04:00
Ivan Kozik fdccd9cd9b fctix-engines.mozc: fix build
This fixes:

FAILED: obj/engine/engine.engine.o
clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -include base/namespace.h -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x  -c ../../engine/engine.cc -o obj/engine/engine.engine.o
In file included from ../../engine/engine.cc:30:
In file included from /build/source/src/engine/engine.h:33:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66:
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator'
        --__i;
        ^ ~~~
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance<mozc::ZeroQueryDict::iterator, long>' requested here
      std::__advance(__i, __d, std::__iterator_category(__i));
           ^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance<mozc::ZeroQueryDict::iterator, long>' requested here
          std::advance(__middle, __half);
               ^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range<mozc::ZeroQueryDict::iterator, unsigned long, __gnu_cxx::__ops::_Iter_less_val, __gnu_cxx::__ops::_Val_less_iter>' requested here
      return std::__equal_range(__first, __last, __val,
                  ^
/build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range<mozc::ZeroQueryDict::iterator, unsigned long>' requested here
    return std::equal_range(begin(), end(), iter.index());
                ^
1 error generated.
2019-09-10 21:59:31 +00:00
Gabriel Ebner 9c71e5f594
Merge pull request #67856 from averelld/fcitx-use-enchant2
fcitx: use enchant2
2019-09-10 22:50:45 +01:00
Ivan Kozik b4b332bcad ibus-engines.mozc: fix build
This fixes:

FAILED: obj/engine/engine.engine.o
clang++ -MMD -MF obj/engine/engine.engine.o.d -DOS_LINUX -DMOZC_BUILD -DCHANNEL_DEV -DENABLE_GTK_RENDERER -DNDEBUG -DQT_NO_DEBUG -DNO_LOGGING -DIGNORE_HELP_FLAG -DIGNORE_INVALID_FLAG -I/build/source/src -Igen -Igen/proto_out -Wall -Wno-char-subscripts -Wno-sign-compare -Wno-deprecated-declarations -Wwrite-strings -Wno-unknown-warning-option -Wno-inconsistent-missing-override -fPIC -fno-exceptions -fmessage-length=0 -fno-strict-aliasing -funsigned-char -pipe -pthread -fno-omit-frame-pointer -fstack-protector --param=ssp-buffer-size=4 -Wtype-limits -O2 -Wno-deprecated -Wno-covered-switch-default -Wno-unnamed-type-template-args -Wno-c++11-narrowing -std=gnu++0x -std=gnu++0x  -c ../../engine/engine.cc -o obj/engine/engine.engine.o
In file included from ../../engine/engine.cc:30:
In file included from /build/source/src/engine/engine.h:33:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/memory:62:
In file included from /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algobase.h:66:
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:183:2: error: cannot decrement value of type 'mozc::ZeroQueryDict::iterator'
        --__i;
        ^ ~~~
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_iterator_base_funcs.h:206:12: note: in instantiation of function template specialization 'std::__advance<mozc::ZeroQueryDict::iterator, long>' requested here
      std::__advance(__i, __d, std::__iterator_category(__i));
           ^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2137:9: note: in instantiation of function template specialization 'std::advance<mozc::ZeroQueryDict::iterator, long>' requested here
          std::advance(__middle, __half);
               ^
/nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_algo.h:2190:19: note: in instantiation of function template specialization 'std::__equal_range<mozc::ZeroQueryDict::iterator, unsigned long, __gnu_cxx::__ops::_Iter_less_val, __gnu_cxx::__ops::_Val_less_iter>' requested here
      return std::__equal_range(__first, __last, __val,
                  ^
/build/source/src/prediction/zero_query_dict.h:213:17: note: in instantiation of function template specialization 'std::equal_range<mozc::ZeroQueryDict::iterator, unsigned long>' requested here
    return std::equal_range(begin(), end(), iter.index());
                ^
1 error generated.
2019-09-10 19:09:49 +00:00
Ruud van Asseldonk f6e8ee7533 squashfsTools: use updated Darwin patch
This new patch is the patch between 4.4, and commit [1], a pull request
at [2] to upsteam Mac and BSD compatibility. That pull request is
itself a rebase of an older pull request for an earlier version of
squashfs-tools. I squashed all commits between 4.4 and [1], apart from
the BSD-specific ones, and exported the new patch from that. Attached
below is the git diff --ignore-space-change between squashfs-tools 4.4
with the previous patch applied, and with the new patch applied.

[1]: 7d31beec53e6245d3405d6ef2b96e9811ae07044
[2]: https://github.com/plougher/squashfs-tools/pull/69

---

diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
index 8efefe6..5c2f835 100644
--- a/squashfs-tools/info.c
+++ b/squashfs-tools/info.c
@@ -159,7 +159,7 @@ void *info_thrd(void *arg)
 			case EINTR:
 				continue;
 			default:
-				BAD_ERROR("sigwaitfailed "
+				BAD_ERROR("sigwait failed "
 					"because %s\n", strerror(errno));
 			}
 		}
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 67d86a5..3607448 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -35,7 +35,10 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef linux
+#ifndef linux
+#include <sys/sysctl.h>
+#else
+#include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #endif
 #include <fcntl.h>
@@ -52,7 +55,6 @@
 #include <sys/wait.h>
 #include <limits.h>
 #include <ctype.h>
-#include <sys/sysinfo.h>

 #ifndef FNM_EXTMATCH /* glibc extension */
 	#define FNM_EXTMATCH 0
@@ -5191,7 +5193,17 @@ int parse_mode(char *arg, mode_t *res)

 int get_physical_memory()
 {
+	/*
+	 * Long longs are used here because with PAE, a 32-bit
+	 * machine can have more than 4GB of physical memory
+	 *
+	 * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted.
+	 * If it fails use sysinfo, if that fails return 0
+	 */
+	long long num_pages = sysconf(_SC_PHYS_PAGES);
+	long long page_size = sysconf(_SC_PAGESIZE);
 	int phys_mem;
+
 #ifndef linux
 	#ifdef HW_MEMSIZE
 		#define SYSCTL_PHYSMEM HW_MEMSIZE
@@ -5221,16 +5233,6 @@ int get_physical_memory()
 	}
   #undef SYSCTL_PHYSMEM
 #else
-	/*
-	 * Long longs are used here because with PAE, a 32-bit
-	 * machine can have more than 4GB of physical memory
-	 *
-	 * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted.
-	 * If it fails use sysinfo, if that fails return 0
-	 */
-	long long num_pages = sysconf(_SC_PHYS_PAGES);
-	long long page_size = sysconf(_SC_PAGESIZE);
-
 	if(num_pages == -1 || page_size == -1) {
 		struct sysinfo sys;
 		int res = sysinfo(&sys);
diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
index 88d0b5c..1beefef 100644
--- a/squashfs-tools/mksquashfs.h
+++ b/squashfs-tools/mksquashfs.h
@@ -24,7 +24,6 @@
  * mksquashfs.h
  *
  */
-#include <pthread.h>

 struct dir_info {
 	char			*pathname;
diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
index f8fd529..48e6b27 100644
--- a/squashfs-tools/pseudo.c
+++ b/squashfs-tools/pseudo.c
@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
index 00615ce..c1a6183 100644
--- a/squashfs-tools/unsquashfs.c
+++ b/squashfs-tools/unsquashfs.c
@@ -38,7 +38,6 @@
 #include <sys/sysinfo.h>
 #include <sys/sysmacros.h>
 #endif
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -1085,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i)
 			break;
 		case SQUASHFS_SYMLINK_TYPE:
 		case SQUASHFS_LSYMLINK_TYPE: {
-			struct timespec times[2] = {
+			struct timeval times[2] = {
 				{ i->time, 0 },
 				{ i->time, 0 }
 			};
@@ -1104,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i)
 				goto failed;
 			}

-			res = utimensat(AT_FDCWD, pathname, times,
-					AT_SYMLINK_NOFOLLOW);
+			res = lutimes(pathname, times);
 			if(res == -1) {
 				EXIT_UNSQUASH_STRICT("create_inode: failed to set time on "
 					"%s, because %s\n", pathname,
2019-09-10 21:02:51 +02:00
Jan Tojnar 9b6789de73
tree-wide: replace wrapProgram with wrapGApp
where appropriate
2019-09-10 17:54:57 +02:00
Johan Thomsen b3de7e26fd morph: 1.3.0 -> 1.3.1 2019-09-10 17:06:23 +02:00
worldofpeace 0f3f515647
Merge pull request #68355 from nlewo/pr-remove-skydive
skydive: remove it from nixpkgs
2019-09-10 09:10:00 -04:00
Anderson Torres 868bf106f1
Merge pull request #66404 from eraserhd/pr/master/plan9port-mac-compiler-fixes
plan9port: use C compiler from Nix
2019-09-10 07:45:51 -03:00
Michiel Leenaars 14bb6f07df datefudge: 1.22 -> 1.23 2019-09-10 10:00:11 +02:00
Antoine Eiche 636e15507b skydive: remove it from nixpkgs
The current Skydive version can not be build with a recent Go version
and the maintainer (lewo) is no longer interested in maintaining it.
2019-09-10 08:34:54 +02: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 2eb7541b1a
zbar: use libsForQt5.callPackage 2019-09-10 05:54:35 +02:00
Jan Tojnar 86f3b3f628
zbar: drop Perl dependency
It does not appear to be necessary
2019-09-10 01:56:40 +02:00
Jan Tojnar 021faed5ba
zbar: switch to GTK 3 2019-09-10 01:56:40 +02:00
Jan Tojnar 61fdd203d6
zbar: wrap Qt frontend 2019-09-10 01:56:40 +02:00
Jan Tojnar da135c2704
zbar: drop pygtk support
It is deprecated and we do not actually use it anywhere
2019-09-10 01:56:39 +02:00
Allan Odgaard 49d7cc2941 Patch remind source to work on macOS (#67870)
The default version of the source will show a banner on macOS and Windows which tells the user that the author would rather that they didn’t use remind on Apple or Microsoft products, and then sleep for 5 seconds.

There is no way for the user to remove this obstacle other than patch the source and recompile, which is also what other package managers do.

This commit also changes supported platform from linux to unix.
2019-09-09 19:52:34 -04: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
Jan Tojnar b27da0dde7
gmic & gmic-qt: update & clean-up (#68257)
gmic & gmic-qt: update & clean-up
2019-09-10 01:21:17 +02:00
Jan Tojnar 41fbd55689
zbar: format with nixpkgs-fmt 2019-09-10 00:32:22 +02:00
Alyssa Ross 5617881a42
appleseed: fix build 2019-09-09 22:14:34 +00:00
Sander van der Burg e0af0be6e6 DisnixWebService: 0.8 -> 0.9 2019-09-09 23:26:03 +02:00
Sander van der Burg 67879a7f0d disnixos: 0.7.1 -> 0.8 2019-09-09 23:25:33 +02:00
Sander van der Burg 46f190b40d disnix: 0.8 -> 0.9 2019-09-09 23:25:06 +02:00
Sander van der Burg 95464bab66 dysnomia: 0.8 -> 0.9 2019-09-09 23:23:02 +02:00
toonn 5acfae8285 toxvpn: 2018-04-07 -> 2019-09-09
Added myself as maintainer for problems related to mac OS.
2019-09-09 19:16:33 +02:00
Jason Felice 51faa42af6 plan9port: avoid needing to propagate "which" 2019-09-09 12:31:09 -04:00
Gabriel Ebner e5bbe65516 vdirsyncer: fix build 2019-09-09 18:16:11 +02:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
worldofpeace e2b638df5f
Merge pull request #68330 from lilyball/ffsend-installShellFiles
ffsend: adopt installShellFiles
2019-09-09 06:53:50 -04:00
Elis Hirwing eae0eb0892
Merge pull request #68344 from Izorkin/gixy
gixy: fix error - no module named pkg_resources
2019-09-09 11:27:08 +02:00
Maximilian Bosch 9fd9768c74
Merge pull request #68329 from lilyball/exa-installShellFiles
exa: adopt installShellFiles
2019-09-09 11:24:45 +02:00
Izorkin 8af0412e90 gixy: fix error - no module named pkg_resources 2019-09-09 10:59:58 +03:00
Frederik Rietdijk e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
Frederik Rietdijk 731c82a447
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
2019-09-09 08:09:36 +02:00
Silvan Mosberger 6128371279
Merge pull request #65489 from arcnmx/pr-bukubrow-update
bukubrow: 2.4.0 -> 5.0.0
2019-09-09 02:21:07 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Lily Ballard a8c3fb990f exa: adopt installShellFiles
Also declare a separate "man" output.
2019-09-08 15:07:13 -07:00
Lily Ballard ed620603d4 ffsend: adopt installShellFiles 2019-09-08 15:00:52 -07:00
Frederik Rietdijk 47caef475f Merge master into staging-next 2019-09-08 20:45:29 +02: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
Vladimír Čunát 6756cc5408
jing-trang: fixup build
Thanks to lopsided98.  Fixes #68307.
2019-09-08 18:19:51 +02:00
arcnmx c33a44a885 bukubrow: 2.4.0 -> 5.0.0 2019-09-08 08:48:19 -07:00
Orivej Desh 88825bbbde freeimage: 3.17.0 -> 3.18.0 2019-09-08 14:46:31 +00:00
Frederik Rietdijk e73f871285 Merge master into staging-next 2019-09-08 14:49:25 +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
zimbatm 1fff2b0760
nixpkgs-fmt: 0.3.1 -> 0.5.0 2019-09-07 23:54:49 +02:00
Mario Rodas 493e51dead
Merge pull request #68270 from marsam/update-starship
starship: 0.13.1 -> 0.15.0
2019-09-07 14:40:31 -05:00
Jan Tojnar 7a0f2fc3a0
gmic-qt: 2.3.6 → 2.7.1 2019-09-07 20:15:57 +02:00
Jan Tojnar ac757fbd42
gmic: 2.2.2 → 2.7.1 2019-09-07 20:15:56 +02:00
Jan Tojnar d8749430e4
gmic-qt: allow building non-Krita hosts
* Use qt5’s mkDerivation
* Also switch gimpPlugins.gmic to qmic-qt
2019-09-07 19:55:11 +02:00
Jan Tojnar 8ad04d92f6
gmic-qt: format with nixpkgs-fmt 2019-09-07 19:55:11 +02:00
Jan Tojnar 7c22e3af30
gmic-qt-krita: rename from gmic_krita_qt 2019-09-07 19:55:10 +02:00
Doron Behar 176395f0f4 sequoia: 0.9.0 -> 0.10.0 2019-09-07 20:36:02 +03:00
Ruud van Asseldonk 14d2c3669f squashfsTools: make Darwin patch apply to 4.4
I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged. It applied cleanly. Then I rebased that on top
of master, and resolved the conflicts. I'm not sure I resolved them
correctly though, I don't have access to Darwin. Somebody needs to
review this.
2019-09-07 19:16:57 +02:00
Ruud van Asseldonk a60ee9a74c squashfsTools: make alignment patch apply to 4.4
I took the patch, and applied it on top of the previous squashfs-tools
commit that we packaged (which required editing one line in the patch,
as it assumed to be applied on top of the reproducibility patches). Then
I rebased that on top of master, resolved one conflict, and I formatted
a new patch for this.
2019-09-07 18:58:31 +02:00
Michael Weiss 629e8a1c77
html-proofer: 3.12.0 -> 3.12.2 2019-09-07 18:38:31 +02:00
Ruud van Asseldonk 442cf4f783 squashfsTools: 4.4dev_20180612 -> 4.4
A new release has been made upstream. Reproducibility issues were fixed
in that release, so we no longer need those patches. For a full overview
of the changes, see the 4.4-specific readme at [1].

The alignment patch no longer applies cleanly; I disabled it for now,
and I will try to restore it in a follow-up commit.

[1]: 52eb4c279c/README-4.4
2019-09-07 16:12:07 +02:00
Jan Tojnar 9fcdb3bd16
Merge branch 'master' into staging-next 2019-09-07 14:55:03 +02:00
adisbladis 723148f92e
elastic7: 7.0.1 -> 7.3.1 2019-09-07 12:48:42 +01:00
adisbladis 3ab433df34
elastic6: 6.7.2 -> 6.8.3 2019-09-07 12:43:40 +01:00
Mario Rodas 7a77001b07
starship: 0.13.1 -> 0.15.0 2019-09-07 04:20:00 -05:00
Marek Mahut 0822314bba
Merge pull request #68230 from johanot/morph-1.3.0
morph: 1.2.0 -> 1.3.0
2019-09-07 09:56:16 +02:00
Frederik Rietdijk 7e9e5cab45 Merge master into staging-next 2019-09-07 09:53:09 +02:00
zimbatm 406e29ff78 nix-store-gcs-proxy: init at 0.1.0 (#68139)
* nix-store-gcs-proxy: init at 0.1.0

Co-Authored-By: Florian Klink <flokli@flokli.de>
2019-09-06 20:25:45 -07:00
Johan Thomsen a932f966c3 morph: 1.2.0 -> 1.3.0 2019-09-07 00:14:41 +02:00
Frederik Rietdijk e68505e735 Merge remote-tracking branch 'upstream/gcc8' into staging-next 2019-09-06 23:25:18 +02:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Dylan Simon d42ed9b401 graphviz: use git hash for removed release tag 2019-09-06 21:55:53 +02:00
xrelkd 2b53a91467 eksctl: 0.5.1 -> 0.5.2 2019-09-06 21:50:46 +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
Doron Behar f1bf4ec1f1 tinc: 1.0.35 -> 1.0.36 2019-09-06 19:13:29 +02:00
worldofpeace 5d4890b58d
Merge pull request #67585 from worldofpeace/system-config-printer
nixos/system-config-printer: init
2019-09-06 12:08:23 -04:00
worldofpeace 4c722b3351 system-config-printer: hardcode executable in udev rule 2019-09-06 12:06:32 -04:00
Jan Tojnar f9237f3152
Merge branch 'master' into staging-next 2019-09-06 16:55:11 +02:00
adisbladis 4a1189e0ab
Merge pull request #68207 from adisbladis/elk-5-removal
elasticsearch5/kibana5/beats5: Remove EOL packages
2019-09-06 15:29:09 +01:00
Jörg Thalheim 35f0ffb704
eksctl: 0.5.0 -> 0.5.1 (#68188)
eksctl: 0.5.0 -> 0.5.1
2019-09-06 15:03:20 +01:00
adisbladis 4e30b30a65
logstash5: Remove EOL package 2019-09-06 14:22:15 +01:00
adisbladis 1b64fd7f53
journalbeat5: Remove EOL package 2019-09-06 14:22:15 +01:00
Mario Rodas 79303d4065
Merge pull request #68186 from marsam/update-procs
procs: 0.8.5 -> 0.8.9
2019-09-06 06:10:47 -05:00
Robert Hensing 089011e4f9
Merge pull request #68006 from volth/patch-361
megacli: requireFile -> fetchurl
2019-09-06 12:49:45 +02:00
worldofpeace 8b8b4abd55
Merge pull request #67280 from dtzWill/update/fortune-2.10.0
fortune: 2.6.2 -> 2.10.0, use official tarball
2019-09-06 05:29:04 -04:00
Jonathan Ringer 385567858f xmlroff: remove old patch 2019-09-06 02:08:09 -07:00
Jörg Thalheim 151dcce6d1
Merge pull request #68172 from jonringer/bump-xmlroff
xmlroff: 0.6.2 -> 0.6.3
2019-09-06 09:52:52 +01:00
Jonathan Ringer 34c089e7ce xmlroff: 0.6.2 -> 0.6.3 2019-09-05 23:59:03 -07:00
xrelkd 76064c57b9 eksctl: 0.5.0 -> 0.5.1 2019-09-06 14:53:20 +08:00
Sarah Brofeldt 57b66eb3f2
Merge pull request #68138 from johanot/ceph-14.2.3
ceph: 14.2.1 -> 14.2.3
2019-09-06 07:31:45 +02:00
Mario Rodas 56ddfa9d8f
procs: 0.8.5 -> 0.8.9 2019-09-06 00:00:00 -05: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
Utku Demir 8376cd42a4
shunit2: init at 2019-08-10 2019-09-06 12:16:16 +12:00