public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
288,718 Commits 1 Branch 0 Tags
Commit Graph

288718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruce Toll
beed9092dd mapnik: fix missing proj and libxml2 support 
This commit provides three minor improvements:

1. Fix missing proj support. Fixes #91889.
2. Fix missing libxml2 support.
3. Improve build time with parallel build.

Fix missing proj support:
-------------------------
The 2019-07-09 update to proj version 6.1.1 in nixpkgs
commit d55cba68ff3 caused two problems for mapnik:

1. The separation of the dev output was not reflected in the mapnik
   expression. Since proj support is optional in the mapnik build,
   the build succeeded but no longer included proj support.

   See build log for: https://hydra.nixos.org/build/96274475.

2. Even if the mapnik expression was updated to use the separate
   dev output, it would still have dropped proj support because mapnik
   has not been updated for the proj 6 API.

This commit fixes the PROJ_INCLUDES to use the correct dev output and
also makes the PROJ_LIBS output explicit. In addition, it defines
ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 since mapnik still does not have
a tagged release that supports the proj 6 api.

Looking to the future, it appears that the mapnik master branch includes
proj 6 support, so some checks were included to help insure that this
workaround gets removed once it is no longer required.

Fix missing libxml2 support:
----------------------------
Configure with "XMLPARSER=libxml2" to get libxml2 support. This has been
needed since mapnik 3.0.2. Remove XML2_INCLUDES and XML2_LIBS which
trigger a bug in the supplied SConstruct script (when used with
"XMLPARSER=libxml2.

In addition, libxml2 needs to be a propagatedBuildInput to avoid
errors building apacheHttpdPackages.mod_tile, python-mapnik, and
possibly other packages.

Enable parallel build:
----------------------
Setting enableParallelBuild does not result in a parallel build
with mapnik. However, setting JOBS=$(NIX_BUILD_CORES) in buildFlags
works and significantly reduces the build time.
 2021-05-11 13:10:37 -04:00
Maximilian Bosch
3385397ca1
Merge pull request #122328 from Ma27/bump-gitea 
gitea: 1.14.1 -> 1.14.2
 2021-05-11 14:43:44 +02:00
Marek Mahut
5e7fe16211
Merge pull request #122560 from andresilva/ledger-live-2.26.1 
ledger-live-desktop: 2.24.0 -> 2.26.1
 2021-05-11 14:05:41 +02:00
Arthur Gautier
ab8e2e46d9
hashcat: fixup opencl support (#121961) 
This fixes the following compilation error:
```
clBuildProgram(): CL_BUILD_PROGRAM_FAILURE

/run/user/1000/comgr-64ff7f/input/CompileSource:2252:18: fatal error:
cannot open file
'/run/user/1000/comgr-64ff7f/input/inc_comp_multi_bs.cl': No such file
or directory
        #include COMPARE_M
                 ^
/run/user/1000/comgr-64ff7f/input/CompileSource:16:19: note: expanded
from macro 'COMPARE_M'
                  ^
1 error generated.
Error: Failed to compile opencl source (from CL or HIP source to LLVM
IR).
```

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
 2021-05-11 14:01:35 +02:00
Winter
93123faae0
bottom-rs: init at unstable-2021-04-27 (#120937) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-05-11 11:46:24 +02:00
André Silva
bd7ea80d87
ledger-live-desktop: 2.24.0 -> 2.26.1 2021-05-11 10:43:57 +01:00
Sandro
5f86a5de27
Merge pull request #120334 from LumiGuide/upd-balena 2021-05-11 11:02:30 +02:00
Jörg Thalheim
b38859eed7
Merge pull request #122515 from fortuneteller2k/fix-xplr-darwin 
xplr: add libiconv as dependency when on darwin
 2021-05-11 09:48:59 +01:00
Jörg Thalheim
0311ef3f96
Merge pull request #122548 from stephank/fix-cargo-expand-darwin 
cargo-expand: fix darwin build
 2021-05-11 09:47:18 +01:00
Jörg Thalheim
31998088ec
Merge pull request #122550 from stephank/fix-cargo-feature-darwin 
cargo-feature: fix darwin build
 2021-05-11 09:47:01 +01:00
Jörg Thalheim
22011bda5c
Merge pull request #122552 from stephank/fix-cargo-fuzz-darwin 
cargo-fuzz: fix darwin build
 2021-05-11 09:46:43 +01:00
Jörg Thalheim
9d8d0b89c9
Merge pull request #122553 from stephank/fix-cargo-msrv-darwin 
cargo-msrv: fix darwin build
 2021-05-11 09:46:27 +01:00
Jörg Thalheim
3926c6ffe8
Merge pull request #120229 from cmm/fix-clangd-wrapper 
fix clangd wrapper
 2021-05-11 09:40:45 +01:00
Stéphan Kochen
67e530be79 cargo-msrv: fix darwin build 2021-05-11 10:33:52 +02:00
Jörg Thalheim
d660a7d361
Merge pull request #122542 from Mic92/mbp2018-bridge-drv 
mbp2018-bridge-drv: fix source
 2021-05-11 09:27:24 +01:00
Stéphan Kochen
f2dd8762ef cargo-fuzz: fix darwin build 2021-05-11 10:22:29 +02:00
Stéphan Kochen
d9fa8e811e cargo-feature: fix darwin build 2021-05-11 10:17:50 +02:00
Stéphan Kochen
a2f26bfaa9 cargo-expand: fix darwin build 2021-05-11 10:11:41 +02:00
Jörg Thalheim
188a70bde5
Merge pull request #122546 from stephank/fix-cargo-about-darwin 
cargo-about: fix darwin build
 2021-05-11 09:10:55 +01:00
Tom
33a4c43126
nixos/tor: fix HidServAuth (#122439) 
* add an example for services.tor.settings.HidServAuth

* fix HidServAuth validation to require ".onion"
  Per https://manpages.debian.org/testing/tor/torrc.5.en.html :
  > Valid onion addresses contain 16 characters in a-z2-7 plus ".onion"
 2021-05-11 10:10:32 +02:00
Jörg Thalheim
e661b70903
mbp2018-bridge-drv: fix source 
the 0.01 tag was deleted
 2021-05-11 10:08:53 +02:00
Stéphan Kochen
e3fe2937a5 cargo-about: fix darwin build 2021-05-11 10:05:40 +02:00
R. RyanTM
b5227312c8
abcmidi: 2021.04.26 -> 2021.05.09 (#122544) 2021-05-11 09:50:36 +02:00
Jan Tojnar
b1ce4b41a3
Merge pull request #122530 from veprbl/pr/gcr_on_darwin 
gcr: enable on darwin
 2021-05-11 09:46:52 +02:00
Dmitry Kalinkin
4bb528424e
gcr: enable on darwin 2021-05-11 03:28:42 -04:00
Fabian Affolter
0249e0417e
Merge pull request #122523 from r-ryantm/auto-update/findomain 
findomain: 4.1.0 -> 4.1.1
 2021-05-11 09:05:20 +02:00
Jörg Thalheim
958f32bebb
Merge pull request #122540 from Mic92/nvidia-x11-legacy304 
nvidia_x11_legacy304: remove
 2021-05-11 07:53:26 +01:00
Jörg Thalheim
1e76a18478
Merge pull request #121898 from pinpox/update-wezterm 
wezterm: update to 2021-04-07
 2021-05-11 07:52:26 +01:00
Guillaume Girol
fa10f148d5
Merge pull request #121664 from ilya-fedin/update-dbus-broker 
dbus-broker: 22 -> 28
 2021-05-11 06:40:21 +00:00
Jörg Thalheim
0f0660d8ef
nvidia_x11_legacy304: remove 
The patch used to build is no longer available.
We only have one kernel 4.14 that could theoretical build with it?
 2021-05-11 08:36:21 +02:00
Fabian Affolter
06f7b90cd4
Merge pull request #122489 from rmcgibbo/tablib 
python3Packages.tablib: fix build
 2021-05-11 08:03:31 +02:00
Jörg Thalheim
977e8aca68
Merge pull request #122529 from r-ryantm/auto-update/golangci-lint 
golangci-lint: 1.39.0 -> 1.40.0
 2021-05-11 06:17:23 +01:00
Jörg Thalheim
8af4bf61fd
Merge pull request #122423 from Izorkin/update-netdata 
nixos/netdata: update configuration
 2021-05-11 06:07:48 +01:00
sterni
f93d83d21b
ocamlPackages: cohttp: 2.5.0 -> 4.0.0; conduit: 2.2.2 -> 4.0.0 (#118144) 
* ocamlPackages.x509: 0.12.0 -> 0.13.0

https://github.com/mirleft/ocaml-x509/releases/tag/v0.13.0

* ocamlPackages.tls{,-mirage}: 0.12.8 -> 0.13.1

https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.0
https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.1

* ocamlPackages.ca-certs: 0.2.0 -> 0.2.1

Adds support for NIX_SSL_CERT_FILE, so we can finally run its test
suite! https://github.com/mirage/ca-certs/releases/tag/v0.2.1

* ocamlPackages.dns*: 4.6.3 -> 5.0.0

* jackline: unstable-2020-09-03 -> unstable-2021-04-23

Compatibility with tls >= 0.13.0

* ocamlPackages.ca-certs-nss: init at 3.64.0.1

* ocamlPackages.conduit: 2.2.2 -> 2.3.0

https://github.com/mirage/ocaml-conduit/releases/tag/v2.3.0

* ocamlPackages.curly: fix tests with new ca-certs behavior

* ocamlPackages.cohttp: 2.5.0 -> 4.0.0

ocamlPackages.cohttp-lwt-unix: add description

https://github.com/mirage/ocaml-cohttp/releases/tag/v4.0.0

* ocamlPackages.mirage{,-runtime,-types*}: 3.10.1 -> 3.10.3

Adjust to a few changed dependencies:
https://github.com/mirage/mirage/releases/tag/v3.10.2
https://github.com/mirage/mirage/releases/tag/v3.10.3

* ocamlPackages.conduit*: 2.3.0 -> 4.0.0

https://github.com/mirage/ocaml-conduit/releases/tag/v4.0.0

* ocamlPackages.cohttp-lwt-unix: disable tests

* ocamlPackages.dns*: 5.0.0 -> 5.0.1

https://github.com/mirage/ocaml-dns/releases/tag/v5.0.1

* ocamlPackages.awa*: 0.0.1 -> 0.0.3

https://github.com/mirage/awa-ssh/releases/tag/v0.0.2
https://github.com/mirage/awa-ssh/releases/tag/v0.0.3

* ocamlPackages.optint: 0.0.4 -> 0.1.0

https://github.com/mirage/optint/releases/tag/v0.0.5
https://github.com/mirage/optint/releases/tag/v0.1.0

* ocamlPackages.decompress: 1.3.0 -> 1.4.0

https://github.com/mirage/decompress/releases/tag/v1.4.0

* ocamlPackages.checkseum: 0.2.1 -> 0.3.1

https://github.com/mirage/checkseum/releases/tag/v0.3.0
https://github.com/mirage/checkseum/releases/tag/v0.3.1

* ocamlPackages.checkseum: allow compilation with ocaml-freestanding

* ocamlPackages.carton: 0.4.0 -> 0.4.1

https://github.com/mirage/ocaml-git/releases/tag/carton-v0.4.1

* ocamlPackages.mimic: 0.0.2 -> 0.0.3

* Upstream changed.
* https://github.com/dinosaure/mimic/releases/tag/0.0.3

* ocamlPackages.letsencrypt: 0.2.4 -> 0.2.5

* ocamlPackages.paf: 0.0.1 -> 0.0.3

* ocamlPackages.git-cohttp-mirage: remove at 3.3.3

Will be replaced by git-paf 3.4.0.

* ocamlPackages.git*: 3.3.3 -> 3.4.0

ocamlPackages.git-paf: init at 3.4.0

https://github.com/mirage/ocaml-git/releases/tag/3.4.0

* ocamlPackages.irmin*: 2.5.3 -> 2.6.0

https://github.com/mirage/irmin/releases/tag/2.6.0
 2021-05-11 06:54:15 +02:00
Robin Gloster
966aa896a7
Merge pull request #122526 from fortuneteller2k/bump-zfsunstable 
zfsUnstable: 2.1.0-rc4 -> 2.1.0-rc5
 2021-05-10 23:25:21 -05:00
R. RyanTM
768075ffb9 golangci-lint: 1.39.0 -> 1.40.0 2021-05-11 04:13:56 +00:00
Dmitry Kalinkin
8366be903c
Merge pull request #122493 from onsails/nym 
nym: fix build on darwin
 2021-05-10 23:49:42 -04:00
fortuneteller2k
e97d557475 zfsUnstable: 2.1.0-rc4 -> 2.1.0-rc5 2021-05-11 11:35:33 +08:00
R. RyanTM
971d2ea6cc findomain: 4.1.0 -> 4.1.1 2021-05-11 03:13:59 +00:00
fortuneteller2k
ee4520e789 vimPlugins.aurora: init at 2021-05-10 2021-05-10 19:54:21 -07:00
fortuneteller2k
7cda01fcb8 vimPlugins.fwatch-nvim: init at 2021-04-26 2021-05-10 19:54:21 -07:00
fortuneteller2k
8e5211de81 vimPlugins.floating-nvim: init at 2021-05-08 2021-05-10 19:54:21 -07:00
fortuneteller2k
28ed9e7f3c vimPlugins.Shade-nvim: init at 2021-04-29 2021-05-10 19:54:21 -07:00
fortuneteller2k
63872607cd vimPlugins: update 2021-05-10 19:54:21 -07:00
Robin Gloster
74399aadaf
Merge pull request #122478 from hmenke/zfs 
Fix ofborg evaluation failure for zfs with unsupported kernels
 2021-05-10 21:26:49 -05:00
Evils
b8a7603c6d pycflow2dot: init at 0.2.3 2021-05-10 19:20:33 -07:00
fortuneteller2k
9fea194ecd xplr: add libiconv as dependency when on darwin 2021-05-11 09:47:33 +08:00
adisbladis
d67b19f223
Merge pull request #122437 from kalekseev/update/overmind 
overmind: 2.2.0 -> 2.2.2
 2021-05-10 20:21:11 -05:00
Ryan Mulligan
f48661fbbe
Merge pull request #122509 from r-ryantm/auto-update/agi 
agi: 1.1.0-dev-20210506 -> 1.1.0-dev-20210507
 2021-05-10 18:02:34 -07:00
Martin Weinelt
64f56c7fef
Merge pull request #122503 from mweinelt/home-assistant 2021-05-11 02:52:54 +02:00