Commit Graph

1155 Commits

Author SHA1 Message Date
github-actions[bot]
1a74c5d703
Merge master into staging-next 2022-07-14 18:01:27 +00:00
Vladimír Čunát
8169a7fce0
Merge branch 'master' into staging-next 2022-07-13 09:57:41 +02:00
sternenseemann
2733e996ea all-cabal-hashes: 2022-07-07T10:54:07Z -> 2022-07-12T21:40:07Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-07-13 00:19:54 +02:00
Vladimír Čunát
09219df985
Merge #179576: shared-mime-info: 2021-21-03 -> 2.2
...into staging
2022-07-11 18:13:12 +02:00
github-actions[bot]
de243bc796
Merge master into haskell-updates 2022-07-10 00:16:01 +00:00
Nick Cao
cbee67a9ba
v2ray-domain-list-community: 20220624025859 -> 20220708161253 2022-07-09 13:47:19 +08:00
Nick Cao
b85fe98d49
v2ray-geoip: 202206230045 -> 202207070057 2022-07-09 13:47:16 +08:00
github-actions[bot]
03d8007e72
Merge master into haskell-updates 2022-07-09 00:12:18 +00:00
github-actions[bot]
900ca12b33
Merge master into haskell-updates 2022-07-08 00:15:29 +00:00
Vladimír Čunát
c869aa9ac9
Merge branch 'master' into staging-next
The purpose is to integrate the usual Haskell rebuild.
2022-07-07 18:50:02 +02:00
Dennis Gosnell
6e3da6f98e
all-cabal-hashes: 2022-07-02T15:59:48Z -> 2022-07-07T10:54:07Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-07-07 21:18:51 +09:00
Dennis Gosnell
b2b431c2f1
Merge pull request #179211 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2022-07-07 21:17:59 +09:00
github-actions[bot]
a9e0051c3f
Merge master into staging-next 2022-07-07 06:01:20 +00:00
Anderson Torres
06fa4a5bc2
Merge pull request #179933 from aacebedo/papirus-folders
papirus-folders: init at 1.12.0
2022-07-06 21:48:45 -03:00
github-actions[bot]
5dcf079fac
Merge master into haskell-updates 2022-07-07 00:15:12 +00:00
github-actions[bot]
c0b6f4c121
Merge master into staging-next 2022-07-07 00:02:29 +00:00
Alexandre Acebedo
2126944e09 papirus-folders: init at 1.12.0 2022-07-06 08:21:06 +02:00
Dennis Gosnell
98365428b0
all-cabal-hashes: 2022-07-02T15:59:48Z -> 2022-07-02T15:59:48Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-07-03 01:29:56 +09:00
kilianar
6723b43aa8 osinfo-db: 20220214 -> 20220516 2022-07-02 09:28:54 +02:00
github-actions[bot]
70fcdaa82a
Merge master into haskell-updates 2022-07-02 00:14:56 +00:00
github-actions[bot]
1961d0a79b
Merge master into staging-next 2022-07-02 00:01:58 +00:00
kilianar
12218a56e0 wireless-regdb: 2022.02.18 -> 2022.06.06 2022-07-01 21:07:51 +02:00
kilianar
55463392f0 shared-mime-info: 2021-21-03 -> 2.2 2022-06-29 16:30:22 +02:00
Dennis Gosnell
8d49c0ba6d
all-cabal-hashes: 2022-06-26T16:08:53Z -> 2022-06-28T01:15:54Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-06-28 13:40:58 +09:00
Martin Weinelt
bfffecf36f
Merge pull request #178862 from helsinki-systems/upd/cacert 2022-06-27 15:52:55 +02:00
Dennis Gosnell
b5ea807275
all-cabal-hashes: 2022-06-23T03:01:47Z -> 2022-06-26T16:08:53Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-06-27 01:49:32 +09:00
github-actions[bot]
e866ce7680
Merge master into haskell-updates 2022-06-25 00:13:01 +00:00
ajs124
04be37dead cacert: 3.77 -> 3.80 2022-06-24 15:09:56 +02:00
Bobby Rong
65e7e9395a
Merge pull request #178844 from NickCao/geoip
v2ray-geoip: 202205260055 -> 202206230045
2022-06-24 17:06:42 +08:00
Nick Cao
5525e6a202
v2ray-domain-list-community: 20220528180904 -> 20220624025859 2022-06-24 16:34:52 +08:00
Nick Cao
de43d937f5
v2ray-geoip: 202205260055 -> 202206230045 2022-06-24 16:30:00 +08:00
Dennis Gosnell
f8e6e1b688
all-cabal-hashes: 2022-06-17T13:13:15Z -> 2022-06-23T03:01:47Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-06-23 13:15:16 +09:00
github-actions[bot]
fe2a5e2ebb
Merge master into haskell-updates 2022-06-20 00:12:24 +00:00
Jan Tojnar
222bf23c35 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/top-level/python-packages.nix
2022-06-17 20:30:43 +02:00
Dennis Gosnell
2a054cbf07
all-cabal-hashes: 2022-06-07T15:13:17Z -> 2022-06-17T13:13:15Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-06-17 22:43:32 +09:00
github-actions[bot]
3975a7ac58
Merge master into haskell-updates 2022-06-14 00:14:52 +00:00
github-actions[bot]
6ccd35f78f
Merge master into staging-next 2022-06-13 18:01:35 +00:00
R. Ryantm
d7f012f33c mobile-broadband-provider-info: 20220315 -> 20220511 2022-06-09 20:53:33 +02:00
Martin Weinelt
6451e9d4a5 Merge remote-tracking branch 'origin/staging-next' into staging 2022-06-08 22:22:26 +02:00
Alvar Penning
0b7397aadb spdx-license-list-data: 3.16 -> 3.17
https://github.com/spdx/license-list-data/releases/tag/v3.17
2022-06-08 21:22:41 +02:00
sternenseemann
bf5ada3db1 all-cabal-hashes: 2022-06-04T09:01:11Z -> 2022-06-07T15:13:17Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-06-07 21:34:43 +02:00
Artturin
80f9a78c01 mailcap: fix build
and prevent future inf rec issues
2022-06-05 00:09:20 +03:00
sternenseemann
c198b6e76e all-cabal-hashes: 2022-05-29T17:05:02Z -> 2022-06-04T09:01:11Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-06-04 11:46:19 +02:00
sternenseemann
0d9edbcdd0 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-06-02 10:48:49 +02:00
github-actions[bot]
1767ba1baa
Merge master into staging-next 2022-05-29 18:01:10 +00:00
Malte Brandy
8f4dd98a47 all-cabal-hashes: 2022-05-20T19:45:02Z -> 2022-05-29T17:05:02Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-05-29 19:12:54 +02:00
Malte Brandy
9138527da7 Merge branch 'master' into haskell-updates 2022-05-29 19:01:15 +02:00
Bobby Rong
5908b6d222
Merge pull request #175296 from NickCao/v2ray-geoip
v2ray-geoip: 202203310042 -> 202205260055
2022-05-29 22:21:03 +08:00
Nick Cao
565851ab19
v2ray-geoip: 202203310042 -> 202205260055 2022-05-29 21:51:06 +08:00
Nick Cao
ffaa0a94e9
v2ray-domain-list-community: 20220324104603 -> 20220528180904 2022-05-29 21:45:50 +08:00