R. Ryantm
|
1555480a4a
|
v2ray-geoip: 202202030030 -> 202202100032
|
2022-02-13 11:40:33 +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
|
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 |
|
Ellie Hermaszewska
|
626b1ef8ec
|
all-cabal-hashes: 2022-01-18T22:54:05Z -> 2022-01-24T10:21:35Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
|
2022-01-24 19:39:53 +08:00 |
|
github-actions[bot]
|
3c20f80ae5
|
Merge master into haskell-updates
|
2022-01-22 00:07:43 +00:00 |
|
github-actions[bot]
|
69b5682348
|
Merge master into staging-next
|
2022-01-21 06:01:27 +00:00 |
|
R. Ryantm
|
115521dbdc
|
v2ray-geoip: 202201130034 -> 202201200035
|
2022-01-21 03:03:00 +00:00 |
|
github-actions[bot]
|
934d058a48
|
Merge master into haskell-updates
|
2022-01-20 00:08:47 +00:00 |
|
github-actions[bot]
|
b74b591fbe
|
Merge master into staging-next
|
2022-01-20 00:01:46 +00:00 |
|
Andreas Rammhold
|
31e5b8dc21
|
Remove myself from maintainers
I don't have time and energy to deal with all of this anymore.
|
2022-01-20 00:24:52 +01:00 |
|
github-actions[bot]
|
28abf69ffd
|
Merge master into staging-next
|
2022-01-19 12:01:24 +00:00 |
|
R. Ryantm
|
b9a0726261
|
v2ray-geoip: 202201060033 -> 202201130034
|
2022-01-19 06:40:59 +00:00 |
|
github-actions[bot]
|
1b54e5bb50
|
Merge master into staging-next
|
2022-01-19 06:01:24 +00:00 |
|
Ellie Hermaszewska
|
5f8b849418
|
all-cabal-hashes: 2022-01-14T12:47:41Z -> 2022-01-18T22:54:05Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
|
2022-01-19 09:42:41 +08:00 |
|
github-actions[bot]
|
2d19cc436b
|
Merge master into haskell-updates
|
2022-01-16 00:09:16 +00:00 |
|
github-actions[bot]
|
ed9751296d
|
Merge master into staging-next
|
2022-01-15 18:01:07 +00:00 |
|
José Romildo Malaquias
|
e924173cf3
|
Merge pull request #154092 from NickCao/adapta-backgrounds
adapta-backgrounds: fix cross compilation and set strictDeps
|
2022-01-15 12:05:43 -03:00 |
|
Nick Cao
|
e8a7b9cd20
|
v2ray-domain-list-community: 20211228022859 -> 20220114024213
|
2022-01-15 20:28:55 +08:00 |
|
Ellie Hermaszewska
|
e4cf20c00f
|
all-cabal-hashes: 2022-01-11T06:28:14Z -> 2022-01-14T12:47:41Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
|
2022-01-14 22:50:06 +08:00 |
|
github-actions[bot]
|
d15d1eee10
|
Merge master into haskell-updates
|
2022-01-12 00:08:56 +00:00 |
|
Alyssa Ross
|
d77022e114
|
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
nixos/doc/manual/release-notes/rl-2205.section.md
|
2022-01-11 16:35:43 +00:00 |
|
Alyssa Ross
|
23f24c95d7
|
shared-mime-info: 2.1 -> unstable-2021-12-03
We need https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162
("migrate from itstool to msgfmt for creating translated XML") to fix
the build with Meson 0.60.0.
Signed-off-by: Patrick Hilhorst <git@hilhorst.be>
|
2022-01-11 12:51:09 +00:00 |
|
Ellie Hermaszewska
|
4326f3ec84
|
all-cabal-hashes: 2022-01-05T00:50:25Z -> 2022-01-11T06:28:14Z
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
|
2022-01-11 15:14:39 +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 |
|
github-actions[bot]
|
47c5df190a
|
Merge staging-next into staging
|
2022-01-11 06:02:00 +00: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 |
|
github-actions[bot]
|
0f8ce42c1f
|
Merge staging-next into staging
|
2022-01-10 06:01:45 +00:00 |
|
zowoq
|
00d2701b97
|
v2ray, v2ray-domain-list-community: switch to go_1_17, update vendorSha256
|
2022-01-10 12:44:07 +10:00 |
|