Commit Graph

9485 Commits

Author SHA1 Message Date
github-actions[bot]
4bba3c5730
Merge master into staging-next 2024-07-05 12:01:14 +00:00
jacekpoz
1d9a056400 anki-bin: inherit mainProgram from anki 2024-07-05 13:28:31 +02:00
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
Sandro
3243676fad
Merge pull request #316218 from fgaz/astromenace/1.4.2
astromenace: 1.4.1 -> 1.4.2, adopt
2024-07-05 10:15:40 +02:00
github-actions[bot]
30cfd4445f
Merge master into staging-next 2024-07-05 00:02:21 +00:00
Weijia Wang
c96b150a88
Merge pull request #324437 from wegank/maven-bump
maven: 3.9.6 -> 3.9.8
2024-07-04 23:16:32 +02:00
github-actions[bot]
9cede82051
Merge master into staging-next 2024-07-04 12:01:10 +00:00
Francesco Gazzetta
9e5283f360 astromenace: add fgaz to maintainers 2024-07-04 13:36:30 +02:00
Francesco Gazzetta
a3b22afe4a astromenace: 1.4.1 -> 1.4.2 2024-07-04 13:36:30 +02:00
Aaron Andersen
1feb3d81fd
Merge pull request #324275 from Lurkki14/gpl2-pkgs-games
pkgs/games: remove licenses.gpl2
2024-07-04 07:25:58 -04: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
adisbladis
1be927ca66
Merge pull request #316983 from edolstra/let-float-json
Let-float various fromJSON calls to avoid repeated JSON reading/parsing
2024-07-04 13:47:08 +12:00
Weijia Wang
e7899adcd0 runelite: update mvnHash 2024-07-04 01:16:55 +02:00
github-actions[bot]
aba75819b6
Merge master into staging-next 2024-07-03 18:01:04 +00:00
github-actions[bot]
0983fe3e50
Merge master into staging-next 2024-07-03 12:01:17 +00:00
Delan Azabani
01aa077998 maintainers: remove delan 2024-07-03 19:54:30 +08:00
Jussi Kuokkanen
e1f68ae7cc pkgs/games: remove licenses.gpl2 2024-07-03 12:46:48 +03:00
Sandro
e5a805b37a
Merge pull request #324227 from soukouki/factorio1.1.109 2024-07-03 11:38:40 +02:00
github-actions[bot]
6c668cb3e5
Merge master into staging-next 2024-07-03 09:24:52 +00:00
Weijia Wang
2e09c8f650
Merge pull request #324112 from r-ryantm/auto-update/papermc
papermc: 1.21-37 -> 1.21-40
2024-07-03 10:47:40 +02:00
soukouki
68c92b267f factorio: 1.1.107 -> 1.1.109
https://wiki.factorio.com/Version_history/1.1.0#1.1.109
2024-07-03 14:09:17 +09:00
R. Ryantm
9fd74e9ec4 papermc: 1.21-37 -> 1.21-40 2024-07-02 17:56:50 +00:00
K900
ac42e4ac39 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-02 19:52:45 +03:00
Aleksana
04d2d06446
Merge pull request #322654 from wegank/papermc-darwin
minecraft-server, papermc: restore darwin support
2024-07-02 23:38:29 +08:00
TomaSajt
e70802d362 domination: make deterministic and clean up 2024-07-02 12:39:06 +00:00
Martin Weinelt
7b8429bbc4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/jaxtyping/default.nix
2024-07-02 12:08:49 +02:00
Jan Tojnar
0f56e32213
Merge pull request #319659 from jtojnar/gnome-extract
Move various packages out of gnome scope
2024-07-02 08:03:53 +02:00
Jan Tojnar
7a2c8f9c01
Merge pull request #322986 from jtojnar/gnome-vfs-dependents
Remove some gnome2 dependents
2024-07-02 08:02:51 +02:00
K900
665f1d6183 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-02 08:32:46 +03:00
kirillrdy
c57e7bfc16
Merge pull request #323777 from mahmoudk1000/master
anki-bin: 24.04.2 -> 24.06.3
2024-07-02 11:22:00 +10:00
ckie
7d34b64eca maintainers: remove ckie
well, we failed. we have not saved nix together[0], and today's show of
utter incompetence[1] has pushed me over the edge along with many others[2]

it's been good. a lot of PRs. a lot of endless reviews.
some new friends, some old friends converted :P

cya in the next world, cuties <3

[0] https://save-nix-together.org/
[1] https://discourse.nixos.org/t/nca-member-jonringer-joint-announcement/48231
[2] https://github.com/NixOS/nixpkgs/issues?q=label%3A%228.has%3A+maintainer-list+%28update%29%22+remove+in%3Atitle+created%3A%3C2024-07-10
2024-07-02 02:40:02 +02:00
Janik H.
76cd1d2211 maintainers: drop janik
I guess my time has come as well...

With this commit, I'm not just dropping my maintainer entry, but I'm also
resigning from my duties as a board observer and NixCon project lead.
I also terminated my Summer of Nix contract today.
I'll also stop hosting the local NixOS meetup.

The only "project" I'll finish under the NixOS Foundation umbrella is
Google Summer of Code because the mentees aren't even remotely
responsible for why I'm leaving, and it would be unfair to leave them
hanging.

I'm grateful for all the things I was able to learn, for all the experiences
I could gather, and for all the friends I made along the way.
NixOS is what makes computers bearable for me, so I'll go and work on
some fork (*something something* you always meet twice in life).
2024-07-02 02:36:42 +02:00
Weijia Wang
227e0d45f6
Merge pull request #321865 from r-ryantm/auto-update/endless-sky
endless-sky: 0.10.6 -> 0.10.8
2024-07-02 01:08:39 +02:00
Weijia Wang
d427445f86
Merge pull request #322073 from r-ryantm/auto-update/space-station-14-launcher
space-station-14-launcher: 0.27.2 -> 0.28.0
2024-07-02 01:00:58 +02:00
dylan madisetti
6b4513fd20
steam-tui: 0.1.0 -> 0.3.0 2024-07-01 13:20:58 -04:00
dylan madisetti
6ecf516011
steam-tui: add dmadisetti as maintainer 2024-07-01 12:34:48 -04:00
Mahmoud Ayman
618405e587
anki-bin: sha256 -> hash 2024-07-01 14:08:11 +03:00
Mahmoud Ayman
4665cb527f
anki-bin: 24.04.2 -> 24.06.3 2024-07-01 13:28:38 +03:00
Jan Tojnar
b69ed4249d zenity: Move from gnome scope to top-level
It is widely used outside gnome, not much inside.
2024-07-01 08:26:47 +02:00
Jan Tojnar
5c5c20919b adwaita-icon-theme: Move from gnome scope to top-level
It is widely used outside gnome – although it probably should not be.
2024-07-01 08:26:46 +02:00
github-actions[bot]
0519df43f4
Merge master into staging-next 2024-07-01 06:01:15 +00:00
Jan Tojnar
3c24501e7e gtetrinet: Remove
It has hard dependency on derelict libgnome.
2024-07-01 07:59:00 +02:00
Pol Dellaiera
2b753fb3c6
Merge pull request #323667 from wegank/23.11-unmaintained-2
treewide: fix typo
2024-07-01 07:35:22 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
James Robinson
34fe9ad338 worldofgoo: fix typo in help message
File name in help message was incorrect
2024-06-30 23:14:17 +02:00
Sandro
338d49de54
Merge pull request #323540 from fgaz/mindustry-arc-fix
mindustry: fix build with gradle 8.8
2024-06-30 20:53:31 +02:00
Francesco Gazzetta
583466f8f6 mindustry: fix build with gradle 8.8
Fix breakage introduced in 084f8df2f3
2024-06-30 09:28:45 +02:00
Matteo Pacini
d90e424617 opensupaplex: nixfmt-rfc-style 2024-06-29 13:30:39 +01:00
Matteo Pacini
29d256b3d3 opensupaplex: add maintainer 2024-06-29 13:30:07 +01:00
github-actions[bot]
f018e44bd1
Merge master into staging-next 2024-06-29 12:01:32 +00:00