Commit graph

81 commits

Author SHA1 Message Date
github-actions[bot] 0a0c0a9fb9
Merge staging-next into staging 2021-05-20 18:36:04 +00:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Michael Francis c5ef875426 wayland: broken for darwin 2021-05-19 17:56:21 -07:00
Michael Weiss d916642bc5
Merge pull request #121727 from primeos/wayland-protocols-switch-to-meson
wayland-protocols: Switch to Meson
2021-05-17 16:52:10 +02:00
Michael Weiss a605e0318d
Merge pull request #122475 from stephank/fix-wayland-darwin
wayland: fix build on darwin
2021-05-12 20:18:48 +02:00
Stéphan Kochen 6543ad4db0
wayland: fix build on darwin 2021-05-11 12:16:59 +02:00
Michael Weiss a893df3f9f
wayland-protocols: Switch to Meson
According to diffoscope this is fine (only the Nix store path changes).

Cross-compilation with doCheck=true is broken (requires pkg-config in
nativeBuildInputs but doesn't play nicely with checkInputs).
2021-05-05 22:00:26 +02:00
Michael Weiss 62b0f89f4e
Merge pull request #121726 from primeos/wayland-scanner-fix-cross-compilation
wayland{.bin,-scanner}: Add a pkg-config file for cross-compilation
2021-05-05 21:59:13 +02:00
Michael Weiss b062135493
wayland{.bin,-scanner}: Add a pkg-config file for cross-compilation
Only "wayland_scanner" and "Version" are required so it's easier to
create wayland-scanner.pc manually than to copy it from $dev and avoid
dependency cycles.
2021-05-04 20:43:50 +02:00
Michael Weiss 1be2221634
wayland-protocols: 1.20 -> 1.21
Announcement:
https://lists.freedesktop.org/archives/wayland-devel/2021-April/041815.html
2021-04-30 21:45:59 +02:00
Michael Weiss 6a30a601c7
wayland: Add a "bin" and "dev" output
Another advantage is that we can now use the wayland-scanner alias for
nativeBuildInputs (which is less confusing than adding "wayland" to both
nativeBuildInputs and buildInputs).
2021-04-03 15:31:27 +02:00
Michael Weiss ea099211e0
wayland: Refactor the Nix expression
This should make it a bit easier to read, expat is not optional (only
for cross-compiling - WIP), and fetchpatch is no longer required.
2021-04-03 13:36:34 +02:00
Alyssa Ross ae758ea389
wayland: add myself to maintainers 2021-04-02 19:06:52 +02:00
Alyssa Ross 4d8adb49d5
wayland: fix build on non-Linux
The Wayland libraries themselves only build on Linux, but other
platforms need wayland-scanner for cross-compiling to Linux.  So for
them, disable the libraries so only wayland-scanner is built.
2021-04-02 19:06:27 +02:00
Michael Weiss 106ca78aff
wayland: 1.18.0 -> 1.19.0 (#107324)
Announcements:
- Alpha: https://lists.freedesktop.org/archives/wayland-devel/2020-December/041668.html
- Beta: https://lists.freedesktop.org/archives/wayland-devel/2021-January/041683.html
- RC1: https://lists.freedesktop.org/archives/wayland-devel/2021-January/041691.html
- Final: https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html
2021-01-28 16:46:53 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Florian Klink ab0607e337
wayland: fix cross (#105103)
substituteInPlace stopped working, let's replace this with a patch which
is more reliable.
2020-11-27 12:09:53 +01:00
Alyssa Ross dfe75b97ca
wayland: make reproducible
Upstream MR:
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/93
2020-10-29 13:14:08 +00:00
Alyssa Ross ee5f7058a4
wayland: documentation outputs
Build the documentation by default, but install it to seperate outputs
so it doesn't have to be downloaded.  Documentation is still disabled
when cross-compiling, because that is currently broken:
wayland -> graphviz -> libdevil -> openexr -> ilmbase (broken)
2020-07-04 12:22:59 +00:00
John Ericson f005272623 wayland: Simplify cross build
Now that we have a pkg-config wrapper, we can get build-time deps via
pkg-config.
2020-05-27 17:27:24 +00:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Weiss 95e3292eed
wayland-protocols: 1.18 -> 1.20
Release announcements and changelogs:
- 1.19: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041267.html
- 1.20: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html
2020-02-29 21:32:07 +01:00
Michael Weiss ded18bd210
wayland-protocols: Update meta and add myself as maintainer 2020-02-12 12:46:10 +01:00
Michael Weiss de3f4fe900
wayland: Fix the cross-compilation with Meson
The build sandbox provides only wayland-scanner and not the library and
the wayland-egl symbols check test must use nm prefixed with the target
triplet.
2020-02-12 12:46:09 +01:00
Michael Weiss c16b065cc9
wayland: Add a flag to build the documentation
But don't build the documentation by default.
2020-02-12 12:46:09 +01:00
Michael Weiss 1c82542488
wayland: 1.17.0 -> 1.18.0
This also switches the build from Autotools to Meson. The only
difference should be that the libtool archives (.la files) aren't
generated anymore.
Additionally I've updated the meta attributes and added myself as
maintainer.

The changelog is in the final release announcement [0] and an overview
of most commits is in the alpha release announcement [1].

[0]: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
[1]: https://lists.freedesktop.org/archives/wayland-devel/2020-January/041140.html
2020-02-12 12:46:08 +01:00
Robin Gloster 8b3a1c0ed0
wayland_1_9: remove
ancient compat version, that no longer has any use

was introduced > 3 yrs ago in 0593ad2b16
2019-10-04 02:08:00 +02:00
Michael Weiss a48865eea0
wayland-protocols: 1.17 -> 1.18 2019-08-24 16:30:46 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Will Dietz 480293b6f6 wayland: 1.16.0 -> 1.17.0
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040291.html
2019-03-21 16:25:00 -05:00
Yorick be5181bc47
wayland: separateDebugInfo = true 2019-01-31 15:47:51 +01:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Jörg Thalheim d66c960c23
Merge pull request #51154 from Mic92/cross-fixes
Various cross-compilation fixes
2018-12-12 00:56:12 +00:00
Will Dietz 627e135935 wayland-protocols: 1.16 -> 1.17 2018-12-07 21:01:08 -06:00
Jörg Thalheim fbb114107d
wayland: fix cross-build 2018-11-28 01:06:42 +00:00
R. RyanTM 01f68e8f6b wayland: 1.15.0 -> 1.16.0 (#45795)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
wayland
2018-08-31 13:46:46 +02:00
R. RyanTM 9024d2e15d wayland-protocols: 1.15 -> 1.16 (#45123)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wayland-protocols/versions.
2018-08-19 23:47:22 +02:00
John Ericson db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
Frederik Rietdijk ad47d658d1 Merge master into staging-next 2018-07-21 19:43:53 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
R. RyanTM db8bebf816 wayland-protocols: 1.14 -> 1.15 (#43151)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wayland-protocols/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.15 with grep in /nix/store/acbjqscvbj2a369m2cmx5waxpab9b3fp-wayland-protocols-1.15
- directory tree listing: https://gist.github.com/ed6b2fe913e7aa8189e99f99b8d56511
- du listing: https://gist.github.com/f55c3123eacd3a802f5007f3d8f49d3d
2018-07-09 22:33:28 +02:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Ryan Mulligan fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
R. RyanTM 280fba591d wayland-protocols: 1.13 -> 1.14 (#40312)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wayland-protocols/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14 with grep in /nix/store/ibl7b0wvz8l75vrp86mbm80ds7xzcwkb-wayland-protocols-1.14
- directory tree listing: https://gist.github.com/f3bc0989bebcd51aafb53ff19f920d69
2018-05-12 14:08:55 +02:00
R. RyanTM f43da349ba wayland: 1.14.0 -> 1.15.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wayland/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -h’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --help’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner help’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -v’ and found version 1.15.0
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --version’ and found version 1.15.0
- found 1.15.0 with grep in /nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0
- directory tree listing: https://gist.github.com/4f5bd9b49f975338e758858eb2b89e4d
2018-04-10 09:41:36 -07:00
Tor Hedin Brønner 8f789693d4 wayland-protocols: 1.11 -> 1.13 2018-02-23 09:27:30 +01:00
Samuel Dionne-Riel 7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Joerg Thalheim 2ac6343d56 wayland-protocols: 1.10 -> 1.11 2017-11-20 17:20:18 +00:00
Joerg Thalheim c30d535c7b wayland: 1.12.0 -> 1.14.0 2017-11-20 17:20:17 +00:00
Vladimír Čunát b04a77a1d4
wayland-protocols: 1.7 -> 1.10
Needed for gtk3 to build after the minor updates.
2017-08-14 09:15:46 +02:00