Commit Graph

4910 Commits

Author SHA1 Message Date
Martin Weinelt
dc08c7d7ea
Merge pull request #164511 from helsinki-systems/refactor/nss-latest-esr 2022-04-04 03:48:19 +02:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +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
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
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
midchildan
32c0743a20
noto-fonts-cjk: switch back to variable font
Fixes #156131.

This reverts commit 88ef066644.
2022-04-01 02:20:21 +09:00
Maxine Aubrey
f6a4228db4
yaru-theme: 22.04.2 -> 22.04.3.1 2022-03-31 18:07:27 +02:00
R. Ryantm
b9d338c8e5 v2ray-geoip: 202203240042 -> 202203310042 2022-03-31 13:23:36 +00:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross
ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Alyssa Ross
22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
Ben Siraphob
5187709ff7
Merge pull request #166508 from siraben/automake-buildinputs 2022-03-31 03:15:41 -05:00
Martin Weinelt
d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
Malte Brandy
70eb13f45e all-cabal-hashes: 2022-03-26T03:24:04Z -> 2022-03-30T19:23:57Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-30 21:33:39 +02:00
github-actions[bot]
01c08ff8bf
Merge master into haskell-updates 2022-03-30 00:10:53 +00:00
Frederik Rietdijk
25c014324b Merge master into staging-next 2022-03-29 13:25:16 +02:00
Sandro
705d23909e
Merge pull request #166057 from wdavidw/dancing-script 2022-03-29 12:38:23 +02:00
github-actions[bot]
03106b0236
Merge master into haskell-updates 2022-03-29 00:12:40 +00:00
David Worms
c1a3665786 dancing-script: init at 2.0
Notes, version is coming from the .glyphs source file and is called 
2.000 in the readme 
https://raw.githubusercontent.com/impallari/DancingScript/master/sources/DancingScript.glyphs
2022-03-28 18:24:00 +02:00
Jan Tojnar
c8a5db3854 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00
Jan Tojnar
997bb5e42c Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/dnspython/default.nix
;	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro
72dab1fa30
Merge pull request #151705 from uakci/mplus-add-github-release 2022-03-28 13:40:32 +02:00
github-actions[bot]
f0839d8bcd
Merge master into haskell-updates 2022-03-28 00:11:42 +00:00
github-actions[bot]
36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
Martin Weinelt
d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
Sandro
cd1410a7d4
Merge pull request #165438 from 06kellyjac/flat-remix 2022-03-27 15:31:13 +02:00
Sandro
806319e029
Merge pull request #165641 from romildo/upd.humanity-icon-theme 2022-03-27 14:43:31 +02:00
Sandro
3cc111d919
Merge pull request #165597 from ckiee/generaluser-init 2022-03-27 12:54:25 +02:00
Sandro
7bd4e00ea3
Merge pull request #165442 from romildo/upd.greybird 2022-03-27 11:43:49 +02:00
github-actions[bot]
ec92b288e2
Merge staging-next into staging 2022-03-27 06:01:57 +00:00
Martin Weinelt
7be28200e2 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 01:45:13 +01:00
github-actions[bot]
61d6c3bc7c
Merge master into haskell-updates 2022-03-27 00:12:02 +00:00
uakci
6c5a2b69b4 maintainers: add uakci 2022-03-26 22:01:40 +01:00
uakci
8ceca9f36b mplus-outline-fonts: init github release 2022-03-26 22:01:40 +01:00
Naïm Favier
56b755cebf twitter-color-emoji: 13.0.2 -> 14.0.0 2022-03-26 21:38:01 +01:00
github-actions[bot]
b2fc63a844
Merge staging-next into staging 2022-03-26 12:02:50 +00:00
Sandro
bfdc46fce4
Merge pull request #165271 from Stunkymonkey/dns-root-data-pname-version 2022-03-26 11:35:40 +01:00
Sandro
1ba15560fd
Merge pull request #165269 from Stunkymonkey/freepats-pname-version 2022-03-26 11:30:47 +01:00
sternenseemann
372d0a707e Merge remote-tracking branch 'origin/master' into haskell-updates 2022-03-26 09:59:28 +01:00
sternenseemann
66996acc2a all-cabal-hashes: 2022-03-22T14:25:11Z -> 2022-03-26T03:24:04Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
and maintainers/scripts/haskell/regenerate-hackage-packages.sh
2022-03-26 09:54:41 +01:00