Commit Graph

7657 Commits

Author SHA1 Message Date
github-actions[bot]
e985f375f2
Merge master into staging-next 2023-08-02 12:01:27 +00:00
R. Ryantm
a50da75c9d unciv: 4.7.8-patch1 -> 4.7.11 2023-08-01 09:01:22 +00:00
github-actions[bot]
8faf32ac60
Merge master into staging-next 2023-08-01 00:02:30 +00:00
Weijia Wang
e658ffa994 treewide: cleanup maven packages 2023-07-31 21:13:09 +02:00
github-actions[bot]
f77112cc67
Merge master into staging-next 2023-07-31 18:01:05 +00:00
Pol Dellaiera
e80662ed6d
Merge pull request #246317 from rs0vere/hmcl
hmcl: init at 3.5.5
2023-07-31 15:43:23 +02:00
7c6f434c
380f998fe8
Merge pull request #246316 from wegank/ogre-14-init
ogre_14: init at 14.0.1
2023-07-31 13:11:07 +00:00
github-actions[bot]
050b858d31
Merge master into staging-next 2023-07-31 12:01:34 +00:00
Weijia Wang
2d69842838
Merge pull request #245931 from soupglasses/pkg/ns-usbloader-7.0
ns-usbloader: init at 7.0
2023-07-31 11:56:30 +02:00
Red Star Over Earth
b4395db675
hmcl: init at 3.5.5 2023-07-31 17:03:00 +08:00
SamLukeYes
bf287a02ca gnubg: add desktop item 2023-07-31 09:47:32 +01:00
SamLukeYes
45cbde5b8d gnubg: 1.06.002 -> 1.07.001 2023-07-31 09:47:32 +01:00
Weijia Wang
956bdd6f22 ogre_14: init at 14.0.1 2023-07-31 10:08:12 +02:00
Weijia Wang
b21b03e8f7
Merge pull request #244457 from wegank/ogre-cleanup
opendungeons: unstable-2021-11-06 -> unstable-2023-03-18
2023-07-31 10:15:35 +03:00
github-actions[bot]
28f4120163
Merge master into staging-next 2023-07-31 06:01:30 +00:00
R. Ryantm
15cadbb7c0 aaaaxy: 1.4.33 -> 1.4.39 2023-07-30 19:49:21 +00:00
Martin Weinelt
167f6dfee4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/science/astronomy/cfitsio/default.nix
2023-07-30 03:54:27 +02:00
Janik
7cdce123f5
Merge pull request #245350 from cmm/update/freeciv 2023-07-30 00:58:48 +02:00
Martin Weinelt
81f9ddb449
Merge pull request #245647 from majiru/jfsw
jfsw: init at 20211225
2023-07-29 14:03:50 +02:00
github-actions[bot]
e6cd0a7c69
Merge master into staging-next 2023-07-29 00:02:02 +00:00
Pol Dellaiera
bc647c0e38
Merge pull request #245873 from keenanweaver/doomrunner1.8.0
doomrunner: 1.7.3 -> 1.8.0
2023-07-28 23:19:51 +02:00
Silvan Mosberger
a0b8caf3bc
Revert "lib.customisation: uncurry makeScopeWithSplicing" 2023-07-28 23:04:09 +02:00
Adam Joseph
12cb207d20
Merge pull request #245824 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing
lib.customisation: uncurry makeScopeWithSplicing
2023-07-28 20:55:44 +00:00
github-actions[bot]
039200b6c4
Merge staging-next into staging 2023-07-28 18:01:52 +00:00
Sofi
00d7684ad8
maintainers: rename imsofi to soupglasses 2023-07-28 20:01:06 +02:00
Artturi
314c4c1b6d
Merge pull request #244879 from Atemu/steam-small-dbus-steamvr 2023-07-28 19:04:25 +03:00
Artturin
3716ef19d8 lib.makeScopeWithSplicing: provide default for keep,extra
These are often unneeded by the user.
2023-07-28 17:41:01 +03:00
Keenan Weaver
45e394f5aa
doomrunner: 1.7.3 -> 1.8.0 2023-07-28 08:07:04 -05:00
Adam Joseph
cb13669b00 lib.customisation: uncurry makeScopeWithSplicing
Deeply-curried functions are pretty error-prone in untyped languages
like Nix.  This is a particularly bad case because
`top-level/splice.nix` *also* declares a makeScopeWithSplicing, but
it takes *two fewer arguments*.

Let's switch to attrset-passing form, to provide some minimal level
of sanity-checking.
2023-07-27 21:31:59 -07:00
github-actions[bot]
d1b1f7fda7
Merge staging-next into staging 2023-07-27 06:01:53 +00:00
Jacob Moody
cd68dbf4c1 jfsw: init at stable-20211225 2023-07-27 00:04:23 -05:00
Jacob Moody
38bfa58772 hhexen: sdlmixer audio backend and various tidy 2023-07-27 00:16:48 -03:00
Jacob Moody
c56fec9f9f hheretic: init at 0.2.3 2023-07-27 00:16:48 -03:00
Nick Cao
e9d8b5d831
Merge pull request #245629 from r-ryantm/auto-update/minesweep-rs
minesweep-rs: 6.0.16 -> 6.0.19
2023-07-26 19:04:37 -06:00
R. Ryantm
d4e1c00fa0 minesweep-rs: 6.0.16 -> 6.0.19 2023-07-27 00:16:58 +00:00
github-actions[bot]
dc058faf6b
Merge staging-next into staging 2023-07-27 00:02:38 +00:00
Sandro
3128d51163
Merge pull request #245529 from Scrumplex/prismlauncher-7.2
prismlauncher: 7.1 -> 7.2
2023-07-27 00:37:42 +02:00
Vladimír Čunát
1c0d654684
Merge #239191: treewide: gobject-introspection from buildInputs to nativeBuildInputs
...into staging
2023-07-26 20:53:32 +02:00
Pol Dellaiera
4d01d2bcb1
Merge pull request #222390 from Zahrun/doc/steam
steam: add indication for the nix option
2023-07-26 15:04:57 +02:00
Sefa Eyeoglu
68c080daae
prismlauncher: 7.1 -> 7.2
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-26 14:26:32 +02:00
Connor Baker
495875182e
Merge pull request #224068 from SomeoneSerge/respect-config-cudaSupport
Respect global config.cudaSupport
2023-07-25 14:18:14 -04:00
Michael Livshin
85c49c09da freeciv: 3.0.4 -> 3.0.8 2023-07-25 12:11:45 +03:00
R. Ryantm
f19af41132 scummvm: 2.7.0 -> 2.7.1 2023-07-25 04:20:20 +00:00
surfaceflinger
4ec8ab12c5
jazz2: 2.0.0 -> 2.1.0 2023-07-24 13:45:37 +02:00
Sandro
4bb451da7d
Merge pull request #185825 from necrophcodr/add-fteqw
fteqw: init at unstable-2022-08-09
2023-07-24 00:53:51 +02:00
Atemu
21856d71a4 steam-small: add dbus
Required for SteamVR's steamwebhelper

Closure size 3723142072 -> 3724440544. Roughly +2MiB.

See https://github.com/ValveSoftware/steam-for-linux/issues/7058 for reference
2023-07-22 20:36:24 +02:00
figsoda
f18b8ec8c6 gambit-chess: init at 0.1.0
https://github.com/maaslalani/gambit
2023-07-22 13:59:45 -03:00
Mario Rodas
355d069f35
Merge pull request #242625 from OPNA2608/update/easyrpg
easyrpg-player: update, enable on Darwin
2023-07-22 06:30:53 -05:00
Justin Rubek
9f4b5b7530 factorio: 1.1.80 -> 1.1.87 2023-07-20 17:28:33 -05:00
Someone Serge
471dbe9bcf
treewide: consume config.cudaSupport as required
Eliminate uses of `config.cudaSupport or false` and alike, since the
option is now declared in config.nix with a default value

fd .nix -t f -x sed 's/config\.cudaSupport or false, cudaPackages [?] [{][}]/config.cudaSupport, cudaPackages ? { }/' '{}' -i
fd .nix -t f -x sed 's/config\.cudaSupport or false/config.cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = pkgs.config.cudaSupport/inherit (pkgs.config) cudaSupport/' '{}' -i
fd .nix -t f -x sed 's/cudaSupport = config.cudaSupport/inherit (config) cudaSupport/' '{}' -i
2023-07-20 18:08:19 +03:00