Commit Graph

1121 Commits

Author SHA1 Message Date
Jan Tojnar
222bf23c35 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/top-level/python-packages.nix
2022-06-17 20:30:43 +02: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
github-actions[bot]
9fd1366f68
Merge master into haskell-updates 2022-05-29 00:14:11 +00:00
github-actions[bot]
c74c0a18ba
Merge master into staging-next 2022-05-29 00:02:55 +00:00
Jörg Thalheim
a981aa1ab5
Merge pull request #173990 from Mic92/iana-etc
[staging] iana-etc: 20211124 -> 20220520
2022-05-28 08:33:07 +01:00
Mauricio Collares
73a936afa2 elliptic_curves: 0.8 -> 0.8.1 2022-05-27 15:45:35 -07:00
github-actions[bot]
65d7b88994
Merge master into haskell-updates 2022-05-26 00:14:03 +00:00
R. Ryantm
fecd0b1e0d ddccontrol-db: 20220216 -> 20220414 2022-05-25 17:11:54 +00:00
Jörg Thalheim
e0ecf69705
iana-etc: 20211124 -> 20220520 2022-05-22 15:35:44 +02:00
Malte Brandy
341d31a36f all-cabal-hashes: 2022-05-14T01:13:33Z -> 2022-05-20T19:45:02Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-05-20 22:28:26 +02:00
Ellie Hermaszewska
2262ecdb5e
all-cabal-hashes: 2022-05-10T13:45:20Z -> 2022-05-14T01:13:33Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-05-14 13:57:27 +08:00
Ellie Hermaszewska
48534468e5
all-cabal-hashes: 2022-05-05T15:07:55Z -> 2022-05-10T13:45:20Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-05-10 21:57:39 +08:00
github-actions[bot]
cb61a6c576
Merge master into haskell-updates 2022-05-10 00:13:05 +00:00
Bobby Rong
4fea68fd73
Merge pull request #167914 from DeeUnderscore/update/cldr-annotations-41.0
cldr-annotations: 40.0 -> 41.0
2022-05-09 12:48:54 +08:00
Ellie Hermaszewska
0a8381fc7c
all-cabal-hashes: 2022-05-01T06:09:30Z -> 2022-05-05T15:07:55Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-05-06 12:06:54 +08:00
Dennis Gosnell
d36e5507ff
all-cabal-hashes: 2022-04-20T23:34:08Z -> 2022-05-01T06:09:30Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-05-01 16:20:26 +09:00
D Anzorge
ff2aff2a1b cldr-annotations: 40.0 -> 41.0
https://cldr.unicode.org/index/downloads/cldr-41
2022-04-28 17:15:15 +02:00
github-actions[bot]
8022f71559
Merge master into haskell-updates 2022-04-26 00:13:05 +00:00
Thomas Tuegel
1f117e37a2
Merge pull request #167094 from DeeUnderscore/misc/fcitx-cldr
fcitx5: use up-to-date cldr-annotations
2022-04-25 11:14:16 -05:00
github-actions[bot]
4d528f22b8
Merge master into haskell-updates 2022-04-22 00:13:51 +00:00
Jan Tojnar
af4c715cfc
Merge pull request #169521 from babbaj/fix-gnome-backgrounds
nixos-artwork: fix gnome not adding nixos wallpapers to list of backgrounds
2022-04-21 21:35:56 +02:00
Babbaj
212074cde1
nixos-artwork: fix gnome not adding wallpapers to list of backgrounds 2022-04-21 15:11:28 -04:00
Dennis Gosnell
af193985be
all-cabal-hashes: 2022-04-09T11:23:17Z -> 2022-04-20T23:34:08Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-04-21 11:31:05 +09:00
github-actions[bot]
77dcdbb46c
Merge master into haskell-updates 2022-04-21 00:13:51 +00:00
Lassulus
4563bf4a32
Merge pull request #161469 from r-ryantm/auto-update/wireless-regdb
wireless-regdb: 2021.08.28 -> 2022.02.18
2022-04-20 16:57:51 +01:00
sternenseemann
c686666265 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-17 20:50:30 +02:00
github-actions[bot]
d2a3434bd4
Merge master into haskell-updates 2022-04-16 00:12:16 +00:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Malo Bourgon
0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
github-actions[bot]
28c6c88d42
Merge staging-next into staging 2022-04-10 00:02:52 +00:00
sternenseemann
ef0a727ee5 all-cabal-hashes: 2022-04-06T22:24:53Z -> 2022-04-09T11:23:17Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-04-09 22:53:30 +02:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02: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
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