Commit Graph

1087 Commits

Author SHA1 Message Date
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
Martin Weinelt
c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
Thomas Tuegel
85d32acd32
Merge pull request #166160 from DeeUnderscore/misc/ibus-emoji-14
unicode-emoji: 12.1 -> 14.0; cldr-common: init at 40.0; ibus: update for Emoji 14
2022-04-04 09:42:17 -05:00
Martin Weinelt
dc08c7d7ea
Merge pull request #164511 from helsinki-systems/refactor/nss-latest-esr 2022-04-04 03:48:19 +02:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
D Anzorge
36a2f67a64 cldr-annotations: init at 40.0 2022-04-03 22:43:05 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
sternenseemann
820408b2e8
Merge pull request #166598 from hercules-ci/all-cabal-hashes-name
all-cabal-hashes: Set name
2022-04-03 14:27:28 +02:00
Malte Brandy
f513fcc9a9 all-cabal-hashes: 2022-03-30T19:23:57Z -> 2022-04-03T10:13:27Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-04-03 14:16:15 +02:00
ajs124
8e77380250 cacert: 3.74 -> 3.77 2022-04-03 13:14:08 +01:00
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]
e5622af8b6
Merge master into haskell-updates 2022-04-01 00:12:42 +00:00
github-actions[bot]
be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00
Robert Hensing
1d3b238d28 all-cabal-hashes: Set name
Used to be just the hash from the basename, which was
not informative when appearing in logs etc.
2022-03-31 18:55:35 +02: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
Malte Brandy
70eb13f45e all-cabal-hashes: 2022-03-26T03:24:04Z -> 2022-03-30T19:23:57Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
2022-03-30 21:33:39 +02:00
D Anzorge
63c705fda9 unicode-emoji: 12.1 -> 14.0
In Unicode 13.0 and later, emoji-data.txt and
emoji-variation-sequences.txt are part of UCD proper.
2022-03-28 19:56:18 +02: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