Commit graph

936 commits

Author SHA1 Message Date
Nick Cao
e8a7b9cd20
v2ray-domain-list-community: 20211228022859 -> 20220114024213 2022-01-15 20:28:55 +08:00
Ellie Hermaszewska
14921f050a
Merge pull request #153536 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
2022-01-11 15:13:59 +08:00
R. Ryantm
b2dea1626e v2ray-geoip: 202112300030 -> 202201060033 2022-01-11 03:00:57 +00:00
github-actions[bot]
1f4785f32c
Merge master into haskell-updates 2022-01-11 00:08:39 +00:00
zowoq
00d2701b97 v2ray, v2ray-domain-list-community: switch to go_1_17, update vendorSha256 2022-01-10 12:44:07 +10:00
github-actions[bot]
d79785deed
Merge master into haskell-updates 2022-01-10 00:08:34 +00:00
Bobby Rong
c0e55c5888
Merge pull request #154140 from wineee/rime-data
rime-data: 0.38.20210628 -> 0.38.20211002
2022-01-09 22:53:14 +08:00
rewine
08e6b80248 rime-data: 0.38.20210628 -> 0.38.20211002 2022-01-09 21:51:48 +08:00
sternenseemann
0d065994f6 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-01-09 12:12:34 +01:00
github-actions[bot]
44dc8255ad
Merge master into haskell-updates 2022-01-08 00:08:05 +00:00
github-actions[bot]
b48a41c77c
Merge master into staging-next 2022-01-07 06:01:27 +00:00
Ben Siraphob
9a58b51e6a
treewide: fix homepages with permanent redirect to https 2022-01-07 09:57:54 +07:00
github-actions[bot]
4b70e0e343
Merge master into staging-next 2022-01-05 06:01:16 +00:00
Dennis Gosnell
7269b84957
all-cabal-hashes: 2021-12-28T00:33:48Z -> 2022-01-05T00:50:25Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-05 10:49:47 +09:00
Martin Weinelt
11a0b61783 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-03 23:21:08 +01:00
github-actions[bot]
4acff2bbde
Merge master into haskell-updates 2022-01-03 00:08:40 +00:00
R. RyanTM
82a3519a78
unicode-character-database: 13.0.0 -> 14.0.0
(#138892)
2022-01-02 10:08:44 +01:00
github-actions[bot]
b0c76508ef
Merge master into haskell-updates 2022-01-02 00:08:53 +00:00
Bobby Rong
b322fa1db2
Merge pull request #153027 from NickCao/v2ray-dlc
v2ray-domain-list-community: 20211119143108 -> 20211228022859
2022-01-01 12:52:09 +08:00
Dennis Gosnell
e122507667
Merge remote-tracking branch 'origin/master' into haskell-updates 2022-01-01 13:29:15 +09:00
Nick Cao
0382c9a9ce
v2ray-domain-list-community: 20211119143108 -> 20211228022859 2022-01-01 12:01:44 +08:00
R. Ryantm
746f4a3568 v2ray-geoip: 202112160030 -> 202112300030 2021-12-31 20:16:42 +00:00
Dennis Gosnell
28f2bea62c
all-cabal-hashes: 2021-12-27T15:07:56Z -> 2021-12-28T00:33:48Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-28 09:49:24 +09:00
github-actions[bot]
8ce4686310
Merge master into staging-next 2021-12-27 18:01:11 +00:00
sternenseemann
f7a3ebf051 all-cabal-hashes: 2021-12-21T13:58:08Z -> 2021-12-27T15:07:56Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-27 16:17:15 +01:00
github-actions[bot]
e5ae98c9e2
Merge master into haskell-updates 2021-12-26 00:09:07 +00:00
R. RyanTM
05cfc5fdab
poppler_data: 0.4.10 -> 0.4.11 (#149621) 2021-12-25 17:05:20 -05:00
Sergei Trofimovich
f394545b13
tzdata: 2021c -> 2021e (#151446) 2021-12-25 16:54:42 -05:00
github-actions[bot]
a7f62c75af
Merge master into staging-next 2021-12-21 18:01:15 +00:00
sternenseemann
a845bdf341 all-cabal-hashes: 2021-12-09T20:50:23Z -> 2021-12-21T13:58:08Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-21 15:08:21 +01:00
github-actions[bot]
0c19ae0aba
Merge master into haskell-updates 2021-12-19 00:08:41 +00:00
github-actions[bot]
2add1758ab
Merge master into staging-next 2021-12-18 18:01:03 +00:00
Nick Cao
b8ea60f47b
v2ray-domain-list-community: fix cross compilation 2021-12-18 21:15:05 +08:00
github-actions[bot]
2189a53dad
Merge master into haskell-updates 2021-12-17 00:07:55 +00:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
R. Ryantm
858df33c59 v2ray-geoip: 202112090029 -> 202112160030 2021-12-16 16:36:04 +00:00
github-actions[bot]
d3da112c8c
Merge master into haskell-updates 2021-12-15 00:08:01 +00:00
github-actions[bot]
0242879f3f
Merge master into staging-next 2021-12-14 12:01:17 +00:00
Nick Cao
7747c15593
v2ray-geoip: init at 202112090029 2021-12-14 14:22:51 +08:00
github-actions[bot]
92aabc6576
Merge master into staging-next 2021-12-10 00:01:53 +00:00
Malte Brandy
02d2a9f55f
all-cabal-hashes: 2021-12-08T21:36:39Z -> 2021-12-09T20:50:23Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-09 22:31:38 +01:00
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master.  Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
Malte Brandy
c8234d693b
all-cabal-hashes: 2021-12-07T20:15:21Z -> 2021-12-08T21:36:39Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-08 23:01:43 +01:00
sternenseemann
49eba10372 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-08 21:50:23 +01:00
github-actions[bot]
ac0d4017c5
Merge master into staging-next 2021-12-08 12:01:20 +00:00
Malte Brandy
25c0241b8a
all-cabal-hashes: 2021-12-02T21:05:02Z -> 2021-12-07T20:15:21Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2021-12-07 21:20:13 +01:00
R. Ryantm
491ef7707d scowl: 2019.10.06 -> 2020.12.07 2021-12-07 01:01:43 +00:00
github-actions[bot]
41895efeb5
Merge master into staging-next 2021-12-06 12:01:16 +00:00
sternenseemann
5f9cdd06ef Merge remote-tracking branch 'origin/master' into haskell-updates 2021-12-06 11:17:24 +01:00
Mauricio Collares
d93f7e5de8 elliptic_curves: use Python 3 2021-12-05 22:59:22 -08:00