1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 11:40:45 +00:00
Commit graph

8092 commits

Author SHA1 Message Date
Martin Weinelt fda13875da Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/deebot-client/default.nix
- pkgs/development/python-modules/pytest-examples/default.nix
- pkgs/development/python-modules/w3lib/default.nix
2024-07-05 13:04:01 +02:00
Benjamin Lee c8216ee1e9
maintainers: remove Benjamin-L
nope, absolutely not: <https://discourse.nixos.org/t/nca-member-jonringer-joint-announcement/48231>
2024-07-04 17:11:18 -07:00
github-actions[bot] 30cfd4445f
Merge master into staging-next 2024-07-05 00:02:21 +00:00
Franz Pletz feeebf963b
Merge pull request #324676 from tadeokondrak/remove-maintainer-tadeokondrak 2024-07-05 01:21:42 +02:00
❄️ a510ae897b
Merge pull request #288931 from heywoodlh/choose-gui
choose-gui: init 1.3.1
2024-07-04 20:17:08 -03:00
Tadeo Kondrak 7239208ca6 treewide: remove maintainer tadeokondrak 2024-07-04 15:04:04 -06:00
github-actions[bot] 36cbae9ff0
Merge master into staging-next 2024-07-04 18:01:19 +00:00
❄️ a5dad94280
Merge pull request #324083 from Djabx/fix-config-snapper
nixos/snapper: fix timeline options type
2024-07-04 12:50:01 -03:00
Masum Reza 39a1c7c963
Merge pull request #320832 from Jamalam360/master
reposilite: init at 3.5.13
2024-07-04 19:53:26 +05:30
Aleksana fafa99dd5e
Merge pull request #324314 from LilleAila/geogebra6-wayland
geogebra6: enable wayland when NIXOS_OZONE_WL=1
2024-07-04 22:06:20 +08:00
Weijia Wang f8145fda96
Merge pull request #324536 from buffet/remove-buffet
maintainers: remove buffet
2024-07-04 14:52:07 +02:00
github-actions[bot] 9cede82051
Merge master into staging-next 2024-07-04 12:01:10 +00:00
buffet 515050af78 maintainers: remove buffet 2024-07-04 13:17:34 +02:00
Aleksana f33fb076cd
Merge pull request #324521 from bb010g/maintainers/bb010g
maintainers: remove bb010g
2024-07-04 19:06:46 +08:00
Sandro c4762d6974
Merge pull request #322846 from ryand56/picocrypt 2024-07-04 11:50:12 +02:00
Dusk Banks 8c8c4ca2d6 maintainers: remove bb010g
SEE YOU SPACE COWBOY...
2024-07-04 02:41:05 -07:00
Dusk Banks e0f994357c maintainers: update bb010g 2024-07-04 02:41:03 -07:00
Vladimír Čunát 44b36397c2
Merge branch 'master' into staging-next
Conflicts - GitHub wouldn't auto-resolve them but my local git did:
	pkgs/development/cuda-modules/cuda/overrides.nix
2024-07-04 10:10:22 +02:00
h7x4 9f4128e00b
Merge pull request #323762 from x123/x123-add-phraze-tool
phraze: init at 0.3.11
2024-07-03 20:27:49 +02:00
github-actions[bot] aba75819b6
Merge master into staging-next 2024-07-03 18:01:04 +00:00
éclairevoyant 83a657cacd
Merge pull request #324353 from delan/bye
maintainers: remove delan
2024-07-03 17:39:29 +00:00
Vladimír Čunát c76085b3a9
Merge branch 'master' into staging-next 2024-07-03 19:07:35 +02:00
Aleksana bb9d961d54
Merge pull request #324089 from Lyndeno/add_lyndeno
maintainers: Add lyndeno
2024-07-03 22:26:53 +08:00
Delan Azabani 01aa077998 maintainers: remove delan 2024-07-03 19:54:30 +08:00
Alexandre Badez 0c80191081 nixos/snapper: add maintainer 2024-07-03 13:52:34 +02:00
LilleAila 2137ecc63e
maintainers: add LilleAila 2024-07-03 13:32:43 +02:00
github-actions[bot] 6c668cb3e5
Merge master into staging-next 2024-07-03 09:24:52 +00:00
Aleksana dbb0ec2270
Merge pull request #315139 from DSeeLP/finamp
finamp: init at 0.9.8-beta
2024-07-03 14:11:12 +08:00
github-actions[bot] d33a11464d
Merge master into staging-next 2024-07-03 06:01:11 +00:00
Pol Dellaiera 0859d23728
Merge pull request #324131 from piotrkwiecinski/team-php
maintainers/team-list: add piotrkwiecinski to php team
2024-07-03 07:31:01 +02:00
Aleksana c9c111d628
Merge pull request #323904 from crertel/crertel/add-maintainerships
maintainers: add crertel
2024-07-03 11:50:03 +08:00
Aleksana dd4d4f3480
Merge pull request #324104 from RCoeurjoly/master
mantainers: add rcoeurjoly
2024-07-03 11:40:46 +08:00
crertel 5fa7098733 maintainers: add crertel 2024-07-02 20:58:31 -05:00
github-actions[bot] d77a3adc09
Merge master into staging-next 2024-07-03 00:02:45 +00:00
Ryan Lahfa d387fafe2f
Merge pull request #324101 from hexchen/drop-hexchen
maintainers: remove myself
2024-07-02 23:38:02 +02:00
0x4A6F 260f801b5d
Merge pull request #316449 from rubenhoenle/master
container-structure-test: init at 1.18.1
2024-07-02 23:04:19 +02:00
Weijia Wang f5a7e092f3 Merge branch 'master' into staging-next 2024-07-02 22:22:02 +02:00
Weijia Wang 38172e747f
Merge pull request #320552 from Bot-wxt1221/updateqq
qq: 3.2.9_240606 -> 3.2.9_240617
2024-07-02 21:56:41 +02:00
Lily Ballard de99eb847f maintainers: remove lilyball 2024-07-02 15:32:33 -04:00
Piotr Kwiecinski 148e322192
maintainers/team-list: add piotrkwiecinski to php team 2024-07-02 21:28:18 +02:00
hexchen fe4c2f4402 maintainers: remove hexchen 2024-07-02 19:19:02 +00:00
Aleksana 2ecf26f51c
Merge pull request #324096 from liketechnik/remove-liketechnik
maintainers: remove liketechnik
2024-07-03 02:39:09 +08:00
Sandro 8fb21af54b
Merge pull request #298921 from DaniD3v/master
sddm-sugar-dark: init at 1.2
2024-07-02 20:32:07 +02:00
Aleksana 3a6769e21f
Merge pull request #324088 from merspieler/master
maintainers: remove nayala
2024-07-03 02:11:39 +08:00
Aleksana f2ac3e5203
Merge pull request #324087 from ashkitten/remove-ashkitten
maintainers: remove ashkitten
2024-07-03 02:11:24 +08:00
K900 c7268baf73 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-02 20:59:57 +03:00
Martino Fontana bbb13c92a1 maintainers: remove martfont 2024-07-02 19:12:00 +02:00
K900 ac42e4ac39 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-02 19:52:45 +03:00
Florian Warzecha 531f6e9e63
maintainers: remove liketechnik
My contributions were insignificant in the grand scheme of things anyway,
but this was the last of many steps too far:
https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
https://web.archive.org/web/20240701165505/https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
2024-07-02 18:42:56 +02:00
h7x4 a5f1a73d7e
Merge pull request #320485 from kfollesdal/kfollesdal/deltalake
python3Packages.deltalake: init at 0.18.1
2024-07-02 18:27:24 +02:00