3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

489 commits

Author SHA1 Message Date
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM 078e0b6f93 fcitx-engines.anthy: 0.2.3 -> 0.2.4 2021-05-08 17:42:11 -07:00
R. RyanTM 54933eeef0 ibus-engines.m17n: 1.4.4 -> 1.4.5 2021-05-08 17:39:30 -07:00
R. RyanTM 3a9d159ed1 libsForQt5.fcitx5-qt: 5.0.4 -> 5.0.6 2021-05-09 01:11:05 +02:00
Martin Weinelt 9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
github-actions[bot] e5f4def056
Merge staging-next into staging 2021-05-07 00:46:58 +00:00
R. RyanTM c0226eff76 fcitx5-m17n: 5.0.4 -> 5.0.5 2021-05-06 15:07:45 +00:00
github-actions[bot] e6037ce5fe
Merge staging-next into staging 2021-05-02 00:58:46 +00:00
Riey 64042dc2c6
kime: 2.5.2 -> 2.5.3 2021-05-02 01:58:06 +09:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
Maëlys Bras de fer d274222c3b
fcitx5-configtool: 5.0.2 -> 5.0.4
Fixes fcitx/fcitx5-configtool#38 that prevented compiling.
2021-04-26 17:46:02 +02:00
Luke Granger-Brown c14b9e5f86
Merge pull request #120127 from schnusch/remote-touchpad
remote-touchpad: init at 1.0.1
2021-04-25 13:13:45 +01:00
schnusch f96a6606d6 remote-touchpad: init at 1.0.1 2021-04-24 18:18:10 +02:00
Martin Weinelt 6b34489f81
Merge branch 'master' into staging-next 2021-04-20 02:06:07 +02:00
Riey 7ba68694a0
kime: init at 2.5.2 2021-04-18 13:02:20 +09:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Technical27 e019872af8
fcitx5-m17n: init at 5.0.4 (#119357)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-13 21:44:15 +02:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
R. RyanTM e23957211c fcitx5-lua: 5.0.3 -> 5.0.4 2021-04-11 21:09:31 +02:00
R. RyanTM 03a196c26a libsForQt5.fcitx5-qt: 5.0.2 -> 5.0.4 2021-04-11 21:09:18 +02:00
Gabriel Ebner 46a702eba1 fcitx5-mozc: remove unused mesa dependency 2021-04-09 09:26:12 +02:00
Frederik Rietdijk 5984dd57d5 ibus-mozc: remove unused python parameter 2021-04-03 17:06:09 +02:00
Robert Schütz f35dd88c64 lisgd: init at 0.3.0 2021-04-01 23:44:16 +02:00
Mario Rodas f3228cce6d fcitx5-mozc: use nixpkgs abseil 2021-03-20 04:20:00 +00:00
Jan Tojnar 01a4d350c7
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.

It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
R. RyanTM ddd71dd0c9 ibus-engines.table: 1.12.3 -> 1.12.4 2021-03-13 15:52:13 +01:00
R. RyanTM 805e9c5f69 ibus-engines.anthy: 1.5.11 -> 1.5.12 2021-03-13 15:51:03 +01:00
github-actions[bot] f9d4095295
Merge staging-next into staging 2021-03-07 00:41:13 +00:00
R. RyanTM 64676e99a6 ibus-engines.bamboo: 0.6.8 -> 0.6.9 2021-03-06 23:49:25 +01:00
Ben Siraphob 4cd3c27aee anthy: expand platforms to unix 2021-03-06 21:02:44 +07:00
github-actions[bot] f5bb0053a6
Merge staging-next into staging 2021-03-02 18:17:42 +00:00
Jakub Kądziołka 8813b5a191
fcitx: wrap with xmodmap in PATH
fcitx contains functionality to execute xmodmap when changing the
layout, which triggers if ~/.Xmodmap is present. However, this breaks
if xmodmap isn't present in fcitx's PATH.
2021-03-01 21:52:38 +01:00
Robert Schütz 54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Thomas Tuegel ca6fafaf23
Merge pull request #114070 from r-ryantm/auto-update/ibus
ibus: 1.5.23 -> 1.5.24
2021-02-24 16:24:32 -06:00
Mario Rodas 652b80da04
Merge pull request #113907 from r-ryantm/auto-update/fcitx5-rime
fcitx5-rime: 5.0.3 -> 5.0.4
2021-02-23 20:25:59 -05:00
Mario Rodas a056a197ad
Merge pull request #113910 from r-ryantm/auto-update/fcitx5-lua
fcitx5-lua: 5.0.2 -> 5.0.3
2021-02-23 20:25:30 -05:00
Mario Rodas f22345c94f
Merge pull request #113924 from r-ryantm/auto-update/fcitx5-table-other
fcitx5-table-other: 5.0.2 -> 5.0.3
2021-02-23 20:21:09 -05:00
R. RyanTM 4365ff8c0e ibus: 1.5.23 -> 1.5.24 2021-02-23 04:40:05 +00:00
Sandro Jäckel 0b703039ca
fcitx5: remove unused input 2021-02-22 02:28:02 +01:00
R. RyanTM 6e8f7b2164 fcitx5-table-other: 5.0.2 -> 5.0.3 2021-02-21 16:09:58 +00:00
R. RyanTM 2560e8a6b9 fcitx5-lua: 5.0.2 -> 5.0.3 2021-02-21 14:17:02 +00:00
R. RyanTM 5f24a13cbf fcitx5-rime: 5.0.3 -> 5.0.4 2021-02-21 14:09:37 +00:00
Ben Siraphob 127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
zowoq ae66c3e404 evscript: remove verifyCargoDeps 2021-02-19 13:13:16 +10:00
github-actions[bot] 402b752521
Merge master into staging-next 2021-02-11 18:16:48 +00:00
ajs124 ff65ba7a2b
Merge pull request #112670 from helsinki-systems/fcitx5_gtk4
fcitx5: enable gtk4
2021-02-11 17:34:47 +01:00
github-actions[bot] 9185e731d2
Merge master into staging-next 2021-02-11 12:20:09 +00:00