Commit Graph

4948 Commits

Author SHA1 Message Date
github-actions[bot]
bf63dd7434
Merge staging-next into staging 2022-04-10 18:01:38 +00:00
Vladimír Čunát
5e845236f2
Merge branch 'staging-next' into staging 2022-04-10 17:11:36 +02:00
Mario Rodas
020c88b315
Merge pull request #168055 from r-ryantm/auto-update/sudo-font
sudo-font: 0.63.1 -> 0.64
2022-04-10 08:05:03 -05:00
Lassulus
c274af4b7b
Merge pull request #166509 from jtojnar/man-opt-nodup
nixos/man: prevent duplication of options
2022-04-10 11:09:12 +01:00
github-actions[bot]
28c6c88d42
Merge staging-next into staging 2022-04-10 00:02:52 +00:00
R. Ryantm
86a9d06c7d sudo-font: 0.63.1 -> 0.64 2022-04-09 21:24:55 +00:00
sternenseemann
bbd50af0d5
Merge pull request #167612 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2022-04-09 22:51:23 +02:00
github-actions[bot]
55db28db36
Merge staging-next into staging 2022-04-09 18:01:56 +00:00
sternenseemann
5b8e4d9de7 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-09 14:23:08 +02:00
github-actions[bot]
f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
José Romildo
df0feb7a1f elementary-xfce-icon-theme: transfer maintainership to xfce team 2022-04-09 08:33:08 -03:00
github-actions[bot]
d685083974
Merge master into haskell-updates 2022-04-09 00:12:38 +00:00
Vanilla
f0bc2c7874
flat-remix-gnome: 20211223 -> 20220407 2022-04-08 22:02:33 +08:00
github-actions[bot]
a36cec68d4
Merge staging-next into staging 2022-04-08 12:02:01 +00:00
José Romildo Malaquias
5df8b35e4f
Merge pull request #167658 from r-ryantm/auto-update/arc-theme
arc-theme: 20220223 -> 20220405
2022-04-08 08:34:14 -03:00
José Romildo Malaquias
2674e1469e
Merge pull request #167176 from r-ryantm/auto-update/elementary-xfce-icon-theme
elementary-xfce-icon-theme: 0.15.2 -> 0.16
2022-04-08 08:22:44 -03:00
github-actions[bot]
62fec6748f
Merge staging-next into staging 2022-04-08 06:02:02 +00:00
Bobby Rong
214c3d9c3e
Merge pull request #166967 from dbirks/material-design-icons-6.6.96
material-design-icons: 5.3.45 -> 6.6.96
2022-04-08 13:36:00 +08:00
David Birks
24f995fa2d
material-design-icons: 5.3.45 -> 6.6.96 2022-04-07 10:32:00 -04:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
R. Ryantm
56a43116e5 arc-theme: 20220223 -> 20220405 2022-04-07 07:41:00 +00:00
sternenseemann
493062e5fa all-cabal-hashes: 2022-04-03T10:13:27Z -> 2022-04-06T22:24:53Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-04-07 01:54:02 +02:00
sternenseemann
5eeb531210 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-07 00:36:06 +02:00
Maciej Krüger
b93c01c5f1
Merge pull request #166848 from r-ryantm/auto-update/flat-remix-gtk 2022-04-06 23:25:39 +02:00
sternenseemann
fb2fc3b4a4 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-05 21:21:42 +02:00
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
github-actions[bot]
789aea7658
Merge master into haskell-updates 2022-04-05 00:11:09 +00:00
Martin Weinelt
c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
Thomas Tuegel
85d32acd32
Merge pull request #166160 from DeeUnderscore/misc/ibus-emoji-14
unicode-emoji: 12.1 -> 14.0; cldr-common: init at 40.0; ibus: update for Emoji 14
2022-04-04 09:42:17 -05:00
R. Ryantm
89adbcc9b3 elementary-xfce-icon-theme: 0.15.2 -> 0.16 2022-04-04 12:51:28 +00:00
Martin Weinelt
dc08c7d7ea
Merge pull request #164511 from helsinki-systems/refactor/nss-latest-esr 2022-04-04 03:48:19 +02:00
github-actions[bot]
493d6516dd
Merge master into haskell-updates 2022-04-04 00:11:26 +00:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
D Anzorge
36a2f67a64 cldr-annotations: init at 40.0 2022-04-03 22:43:05 +02:00
Jan Tojnar
84d6565d52 nixos/man: prevent duplication of options
libxslt 1.1.35 fixed conflict resolution for templates to match the specification.
This uncovered a bug in docbook-xsl (https://github.com/docbook/xslt10-stylesheets/issues/240),
which causes option names to be duplicated into the option descriptions.

Let’s resolve the conflict by patching the stylesheets.

Fixes: https://github.com/NixOS/nixpkgs/issues/166304
2022-04-03 21:22:47 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
ajs124
2be6396776 r3rs: remove after being marked broken for over two years
It was marked in commit d7f3e5a8f0 by Robin Gloster on 2017-03-29 (commited on 2017-03-30)
2022-04-03 16:15:00 +01:00
sternenseemann
820408b2e8
Merge pull request #166598 from hercules-ci/all-cabal-hashes-name
all-cabal-hashes: Set name
2022-04-03 14:27:28 +02:00
Malte Brandy
f513fcc9a9 all-cabal-hashes: 2022-03-30T19:23:57Z -> 2022-04-03T10:13:27Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-04-03 14:16:15 +02:00
ajs124
8e77380250 cacert: 3.74 -> 3.77 2022-04-03 13:14:08 +01:00
github-actions[bot]
383143a3c0
Merge master into haskell-updates 2022-04-03 00:11:52 +00:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
github-actions[bot]
fd5d77aa66
Merge master into staging-next 2022-04-02 06:01:21 +00:00
Bobby Rong
80a7ae8fa3
Merge pull request #166600 from midchildan/feat/noto-cjk-variable
noto-fonts-cjk: switch back to variable font
2022-04-02 13:51:06 +08:00
github-actions[bot]
ab393cab63
Merge master into haskell-updates 2022-04-02 00:10:53 +00:00
R. Ryantm
f787a94d5e flat-remix-gtk: 20220321 -> 20220330 2022-04-01 17:56:06 +00:00
github-actions[bot]
50497647fa
Merge master into staging-next 2022-04-01 12:01:21 +00:00
maxine [they]
db5e4dbdd5
Merge pull request #166589 from maxeaubrey/yaru_22.04.3.1
yaru-theme: 22.04.2 -> 22.04.3.1
2022-04-01 10:33:49 +02:00
github-actions[bot]
e5622af8b6
Merge master into haskell-updates 2022-04-01 00:12:42 +00:00
github-actions[bot]
be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00