3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1012 commits

Author SHA1 Message Date
Bobby Rong d31b9b0052
Merge pull request #165728 from NickCao/v2ray-dlc
v2ray-domain-list-community: 20220201175515 -> 20220324104603
2022-03-25 19:20:24 +08:00
Nick Cao 6139e6c99d
v2ray-domain-list-community: 20220201175515 -> 20220324104603 2022-03-25 10:48:12 +08:00
Bobby Rong c7c341796d
Merge pull request #165721 from r-ryantm/auto-update/v2ray-geoip
v2ray-geoip: 202203170039 -> 202203240042
2022-03-25 10:37:14 +08:00
R. Ryantm 199a706caf v2ray-geoip: 202203170039 -> 202203240042 2022-03-25 01:47:07 +00:00
Felix Buehler 3bc5196252 treewide: rename name to pname&version 2022-03-23 22:55:50 +01:00
R. Ryantm 6fd43b8e74 v2ray-geoip: 202203100039 -> 202203170039 2022-03-17 21:17:25 +00:00
github-actions[bot] 1630ab9b47
Merge master into staging-next 2022-03-13 06:05:11 +00:00
R. Ryantm cb75063bcc v2ray-geoip: 202203020509 -> 202203100039 2022-03-13 01:24:36 +00:00
github-actions[bot] 61655037aa
Merge master into staging-next 2022-03-05 18:01:16 +00:00
Renaud 23ce610123
Merge pull request #161958 from c0bw3b/data/spdx_all_formats
spdx-license-list-data: make all formats available
2022-03-05 14:41:35 +01:00
github-actions[bot] 0b6df04503
Merge master into staging-next 2022-03-03 06:05:53 +00:00
R. Ryantm a5ae949520 v2ray-geoip: 202202170030 -> 202203020509 2022-03-02 18:52:49 +00:00
c0bw3b 88198555d0 spdx-license-list-data: make all formats available
Since the whole lot is quite big, split this derivation into multiple
outputs (one output for each file format).

And update to v3.16

Co-authored-by: Alvar Penning <post@0x21.biz>
2022-02-26 15:13:14 +01:00
github-actions[bot] cd6011bf17
Merge master into staging-next 2022-02-24 00:02:03 +00:00
Jan Tojnar 9a6974d579 osinfo-db: 20211216 → 20220214
https://gitlab.com/libosinfo/osinfo-db/-/commits/v20220214
2022-02-23 20:30:21 +01:00
Vladimír Čunát 32d8acf3b3
Merge #151247: tzdata: fix for darwin sandbox (into staging) 2022-02-22 12:00:02 +01:00
Mario Rodas e6b7245fc3
Merge pull request #159663 from r-ryantm/auto-update/osinfo-db
osinfo-db: 20210312 -> 20211216
2022-02-19 15:49:19 -05:00
Bobby Rong 0725034675
Merge pull request #160844 from r-ryantm/auto-update/v2ray-geoip
v2ray-geoip: 202202100032 -> 202202170030
2022-02-19 14:53:44 +08:00
R. Ryantm abf750fd2d ddccontrol-db: 20220119 -> 20220216 2022-02-19 07:32:54 +01:00
R. Ryantm 6f893105a0 v2ray-geoip: 202202100032 -> 202202170030 2022-02-19 06:17:54 +00:00
Nikolay Amiantov 3965d4c962 geolite-legacy: 2017-12-02 -> 2022-01-25
Use database from mailfud.org, with Arch Linux package as a snapshot.
2022-02-18 11:09:20 +03:00
sternenseemann aeb2d5e2bc all-cabal-hashes: 2022-02-06T15:34:38Z -> 2022-02-14T17:17:31Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-14 18:32:04 +01:00
github-actions[bot] 0f3d35981c
Merge master into haskell-updates 2022-02-14 00:08:17 +00:00
R. Ryantm 1555480a4a v2ray-geoip: 202202030030 -> 202202100032 2022-02-13 11:40:33 +00:00
R. Ryantm 550284efe2 osinfo-db: 20210312 -> 20211216 2022-02-12 21:25:28 +00:00
github-actions[bot] 0648f0d8a3
Merge master into haskell-updates 2022-02-11 00:09:24 +00:00
Jonathan Ringer 46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
Malte Brandy d659bfd023 all-cabal-hashes: 2022-01-31T19:23:21Z -> 2022-02-06T15:34:38Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-06 23:56:34 +01:00
Malte Brandy 3d9faff0b0 Merge branch 'master' into haskell-updates 2022-02-06 23:09:03 +01:00
Vladimír Čunát 3dfddd89c6
Merge branch 'master' into staging-next
Trivial conflict in pkgs/top-level/aliases.nix
2022-02-06 10:29:49 +01:00
Nick Cao f327a0de15
v2ray-domain-list-community: 20220114024213 -> 20220201175515 2022-02-06 10:41:46 +08:00
github-actions[bot] 62580dc6fb
Merge master into haskell-updates 2022-02-06 00:12:03 +00:00
github-actions[bot] c86cbc2a8a
Merge master into staging-next 2022-02-05 18:01:08 +00:00
R. Ryantm 4ef8f177a4 v2ray-geoip: 202201270031 -> 202202030030 2022-02-05 13:35:29 +00:00
github-actions[bot] aee8ca6639
Merge staging-next into staging 2022-02-01 00:02:21 +00:00
Malte Brandy 95a2d28f1a all-cabal-hashes: 2022-01-27T16:52:24Z -> 2022-01-31T19:23:21Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-31 21:44:24 +01:00
Malte Brandy b73e03f9ba Merge branch 'master' into haskell-updates 2022-01-31 21:09:56 +01:00
github-actions[bot] ed5ed282df
Merge staging-next into staging 2022-01-31 18:06:44 +00:00
R. Ryantm 06add8131e ddccontrol-db: 20210812 -> 20220119 2022-01-31 09:21:07 -08:00
github-actions[bot] 524447ebae
Merge master into haskell-updates 2022-01-30 00:08:42 +00:00
github-actions[bot] 3656f37a2e
Merge staging-next into staging 2022-01-29 06:01:48 +00:00
R. Ryantm 019bc5f7a1 v2ray-geoip: 202201200035 -> 202201270031 2022-01-29 03:09:44 +00:00
github-actions[bot] ce560ad476
Merge master into haskell-updates 2022-01-29 00:07:52 +00:00
Jan Tojnar 2da5ce4ab3 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/development/python-modules/fakeredis/default.nix
2022-01-28 14:05:11 +01:00
Jan Tojnar 8152911f61
Merge pull request #149570 from r-ryantm/auto-update/poppler-glib
poppler: 21.06.1 -> 22.01.0
2022-01-28 11:42:30 +01:00
Malte Brandy 70de31784c all-cabal-hashes: 2022-01-24T10:21:35Z -> 2022-01-27T16:52:24Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-01-27 18:02:09 +01:00
Jan Tojnar 490b9b0fa0 poppler-data: clean up
https://lists.freedesktop.org/archives/poppler/2021-September/014871.html
2022-01-27 17:49:12 +01:00
Sandro Jäckel e0c98448bb mime-types: drop, gentoo replaced it with mailcap, marked for removal 2022-01-26 14:30:10 -08:00
Malte Brandy 4742183dcd Merge branch 'master' into haskell-updates 2022-01-25 21:32:29 +01:00
github-actions[bot] 6fee71d339
Merge master into staging-next 2022-01-24 12:01:16 +00:00