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]
be4f006d3c
Merge master into staging-next
2022-03-31 18:01:13 +00: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
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
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
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next
2022-03-26 09:20:38 +01:00
Jan Tojnar
652c099789
mobile-broadband-provider-info: 20210805 → 20220315
...
20210805...20220315
2022-03-25 15:02:38 +01:00
github-actions[bot]
a9efb8b792
Merge master into staging-next
2022-03-25 12:01:27 +00:00
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
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next
2022-03-25 10:16:56 +01: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
github-actions[bot]
79b7796557
Merge master into haskell-updates
2022-03-25 00:11:06 +00:00
Felix Buehler
3bc5196252
treewide: rename name to pname&version
2022-03-23 22:55:50 +01:00
Felix Buehler
e6ab13f005
dns-root-data: replace name with pname&version
2022-03-23 22:23:48 +01:00
Felix Buehler
6d5605afcd
freepats: replace name with pname&version
2022-03-23 22:07:29 +01:00
Sandro
2b39f2d4bc
Merge pull request #164567 from panicgh/tzdata
2022-03-23 02:53:16 +01:00
Malte Brandy
add80ae7d0
all-cabal-hashes: 2022-03-20T09:57:59Z -> 2022-03-22T14:25:11Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-22 15:37:20 +01:00
Felix Buehler
1f7cc8a6e1
iana-etc: replace name with pname&version
2022-03-22 13:58:51 +01:00
sternenseemann
7c53f076ef
all-cabal-hashes: 2022-03-19T10:17:05Z -> 2022-03-20T09:57:59Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-20 11:12:02 +01:00
sternenseemann
6ef31eaf00
all-cabal-hashes: 2022-03-11T16:24:54Z -> 2022-03-19T10:17:05Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-19 11:37:08 +01:00
github-actions[bot]
3ceb419846
Merge master into haskell-updates
2022-03-19 00:10:07 +00:00
R. Ryantm
6fd43b8e74
v2ray-geoip: 202203100039 -> 202203170039
2022-03-17 21:17:25 +00:00
Nicolas Benes
1dad933e18
tzdata: 2021e -> 2022a
2022-03-17 10:52:51 +01:00
github-actions[bot]
d6c63a3ceb
Merge master into haskell-updates
2022-03-16 00:10:32 +00:00
github-actions[bot]
6182623035
Merge master into haskell-updates
2022-03-14 00:11:26 +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
Robert Hensing
14fd583715
all-cabal-hashes: 2022-03-09T16:42:26Z -> 2022-03-11T16:24:54Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-11 17:28:54 +01:00
sternenseemann
da80bef7ba
all-cabal-hashes: 2022-03-08T11:03:28Z -> 2022-03-09T16:42:26Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-09 17:55:06 +01:00
sternenseemann
33f275b4c2
all-cabal-hashes: 2022-03-03T10:08:52Z -> 2022-03-08T11:03:28Z
...
* Regenerate package set
* Adjust overrides for upgrades of ghc-lib* and Cabal.
2022-03-08 13:57:59 +01:00
Malte Brandy
cb8de4139a
Merge branch 'master' into haskell-updates
2022-03-05 20:52:26 +01: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]
4ae95d3027
Merge master into haskell-updates
2022-03-04 00:12:11 +00:00
sternenseemann
63d53c31bb
all-cabal-hashes: 2022-03-02T22:17:55Z -> 2022-03-03T10:08:52Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-03 12:40:43 +01:00
github-actions[bot]
0b6df04503
Merge master into staging-next
2022-03-03 06:05:53 +00:00
sternenseemann
79a75f971c
all-cabal-hashes: 2022-02-27T02:04:39Z -> 2022-03-02T22:17:55Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-02 23:24:42 +01:00
R. Ryantm
a5ae949520
v2ray-geoip: 202202170030 -> 202203020509
2022-03-02 18:52:49 +00:00
sternenseemann
f2ff3e9ecb
all-cabal-hashes: 2022-02-25T10:27:38Z -> 2022-02-27T02:04:39Z
...
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-02-27 10:39:26 +01: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