Commit Graph

6006 Commits

Author SHA1 Message Date
github-actions[bot]
de49fc16bc
Merge staging-next into staging 2023-10-16 12:01:54 +00:00
Alyssa Ross
579ae9b989
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/cirq-core/default.nix
2023-10-16 08:49:23 +00:00
Weijia Wang
7ac98903e7
Merge pull request #251825 from ditsuke/add/modern-cpp-kafka
modern-cpp-kafka: init at 2023.03.07
2023-10-16 09:17:16 +02:00
github-actions[bot]
ae77d35744
Merge staging-next into staging 2023-10-16 00:03:09 +00:00
Matthieu Coudron
252412c2b8 vimPluginsUpdater: fix treesitter updates 2023-10-15 23:56:45 +02:00
Weijia Wang
e2246cd1c7
Merge pull request #241283 from u2x1/master
cups-brother-hl2260d: init at 3.2.0-1
2023-10-15 23:36:25 +02:00
ditsuke
f0f2372ac4 maintainers: add ditsuke 2023-10-15 23:26:58 +02:00
Martin Weinelt
94c8c31bee
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/numba/default.nix
2023-10-15 22:31:34 +02:00
Azat Bahawi
f492cdbc3f
Merge pull request #261006 from vgskye/add-vesktop
vesktop: init at 0.3.3
2023-10-15 16:44:45 +03:00
Artturi
982b24c40e
Merge pull request #258114 from EsAu79p/init-aw-watcher-window-wayland 2023-10-15 07:24:59 +03:00
Matthieu Coudron
0be613cb81 luaPackages.lpty: remove because unmaintained/broken
lpty was introduced in https://github.com/NixOS/nixpkgs/pull/6529, no release in 6 years https://luarocks.org/modules/gunnar_z/lpty
and the archive with source code has disappeared (could be fetched from
the rock or nix cache but probably not worth it).
2023-10-14 22:03:53 +02:00
Skye
b6f4c16d0e
maintainers: add vgskye 2023-10-14 16:06:38 +09:00
github-actions[bot]
c68d98e9d4
Merge staging-next into staging 2023-10-13 18:01:31 +00:00
github-actions[bot]
4a7eb88e55
Merge master into staging-next 2023-10-13 18:01:03 +00:00
Weijia Wang
7546bc6180
Merge pull request #259450 from npulidomateo/reinit-typora
Reinit typora
2023-10-13 15:56:55 +02:00
Matthieu Coudron
922a4d82c5
Merge pull request #260759 from mrcjkb/toml-edit
luaPackages: add some lua packages
2023-10-13 15:28:36 +02:00
Marc Jakobi
3425b6cee6 luaPackages: use overrides for toml and toml-edit 2023-10-13 15:06:28 +02:00
github-actions[bot]
49523dec15
Merge staging-next into staging 2023-10-13 06:01:45 +00:00
github-actions[bot]
8a68e0b5f5
Merge master into staging-next 2023-10-13 06:01:14 +00:00
Nick Cao
d1a8d93744
Merge pull request #258616 from ctron/add-trunk-ng
add trunk-ng, a fork of trunk
2023-10-12 20:05:04 -04:00
github-actions[bot]
58485aaddb
Merge master into staging-next 2023-10-13 00:02:24 +00:00
Weijia Wang
390553bdec
Merge pull request #258556 from maxhille/remove-aether
aether: remove
2023-10-13 01:28:14 +02:00
Weijia Wang
eebae19a25
Merge pull request #259990 from eclairevoyant/fix-maintainers
maintainers/fix-maintainers.pl: fix and run script
2023-10-12 23:39:07 +02:00
Marc Jakobi
d78d7cbc64 luaPackages.nui-nvim: init at 0.2.0 2023-10-12 22:43:22 +02:00
Marc Jakobi
ec41f69f34 luaPackages.toml-edit: init at 0.1.4 2023-10-12 22:12:39 +02:00
github-actions[bot]
80ddbc41e6
Merge staging-next into staging 2023-10-12 18:01:34 +00:00
github-actions[bot]
176015fc74
Merge master into staging-next 2023-10-12 18:01:06 +00:00
Weijia Wang
7f480265db
Merge pull request #260469 from figsoda/ocaml
team-list.nix: add ocaml
2023-10-12 19:57:35 +02:00
Jens Reimann
3a1d1dac62 maintainers: add ctron 2023-10-12 18:06:56 +02:00
github-actions[bot]
4da0322a88
Merge staging-next into staging 2023-10-12 12:02:01 +00:00
github-actions[bot]
f220ef48f8
Merge master into staging-next 2023-10-12 12:01:25 +00:00
Domen Kožar
e6ed54683d
Merge pull request #260286 from jgoux/infisical-0.14.2
infisical: 0.3.7 -> 0.14.2
2023-10-12 12:39:31 +01:00
James Groom
65c4ec5964 maintainers: add YoshiRulz 2023-10-12 13:24:56 +02:00
Alyssa Ross
1bb67a90ba
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/bambi/default.nix
	pkgs/development/python-modules/jaxopt/default.nix
2023-10-12 09:08:12 +00:00
lewo
dfe563cbdb
Merge pull request #259915 from zeuner/minetest-mapserver
minetest-mapserver: init at 4.7.0
2023-10-11 22:16:40 +02:00
figsoda
a3a74c2e8e team-list.nix: add ocaml 2023-10-11 14:17:10 -04:00
github-actions[bot]
630f45884e
Merge staging-next into staging 2023-10-11 18:01:37 +00:00
github-actions[bot]
b8d473b6d2
Merge master into staging-next 2023-10-11 18:01:06 +00:00
Matthias Beyer
872740f395
Merge pull request #230459 from ConsumingChaos/cargo-bazel
cargo-bazel: init at 0.8.0
2023-10-11 18:19:59 +02:00
github-actions[bot]
aca616eec2
Merge staging-next into staging 2023-10-11 12:01:48 +00:00
github-actions[bot]
0e9411554d
Merge master into staging-next 2023-10-11 12:01:09 +00:00
Janik
2316d05913
Merge pull request #256548 from schinmai-akamai/master 2023-10-11 12:47:26 +02:00
Muhammad Falak R Wani
aaad7b2e34 maintainers/team-list: add mfrw to golang team
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2023-10-11 14:01:08 +05:30
jgoux
71f562e0e8 infisical: 0.3.7 -> 0.14.2 2023-10-10 22:16:39 +02:00
Tarun Chinmai Sekar
d75c2dbb23 goodhosts: init at v1.1.1 2023-10-10 14:22:54 -04:00
github-actions[bot]
d384d8bec5
Merge staging-next into staging 2023-10-10 12:02:04 +00:00
K900
e2071a1ad0
Merge pull request #260180 from ProminentRetail/maintainer
maintainers: add prominentretail
2023-10-10 13:57:38 +03:00
ProminentRetail
4f51764e23
maintainers: add prominentretail 2023-10-10 20:50:37 +11:00
Alex Andrews
47fe8e15ea maintainers: add alias-dev 2023-10-09 21:55:53 +01:00
github-actions[bot]
e1565d6a86
Merge staging-next into staging 2023-10-09 18:01:36 +00:00