Commit Graph

5639 Commits

Author SHA1 Message Date
AndersonTorres
edc25332f4 ltris: 1.0.19 -> 1.2.4 2022-04-18 01:03:24 -03:00
AndersonTorres
fd1492cdf7 ltris: move to lgames/ subdir 2022-04-18 01:03:24 -03:00
AndersonTorres
35ea9f1a6f lbreakout2: move to lgames/ subdir 2022-04-18 01:03:24 -03:00
Fabián Heredia Montiel
a8b50d73b2 deliantra: refactor and override stdenv 2022-04-16 11:11:28 -05:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Lassulus
92734ac395
Merge pull request #166865 from malob/treewide-mainProgram
treewide: add meta.mainProgram to many packages
2022-04-15 09:28:00 +01:00
github-actions[bot]
1c0229dbfd
Merge staging-next into staging 2022-04-15 00:03:21 +00:00
Pascal Bach
00e178b597
Merge pull request #168559 from astro/frogatto
frogatto: unstable-2021-05-24 -> unstable-2022-04-13
2022-04-14 21:47:03 +02:00
Artturi
0388bba624
Merge pull request #168004 from leiserfg/patch-2 2022-04-14 22:37:11 +03:00
github-actions[bot]
795332a20e
Merge staging-next into staging 2022-04-14 18:01:48 +00:00
Malo Bourgon
0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
Ryan Mulligan
4b01c99e18
Merge pull request #167961 from izik1/osu-lazer-bump-2022405
osu-lazer: 2022.205.0 -> 2022.409.0
2022-04-14 08:22:12 -07:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Astro
d7bd0d2fd7 frogatto: unstable-2021-05-24 -> unstable-2022-04-13 2022-04-14 01:42:17 +02:00
Skyler Rain Ross
d8e5afd783
osu-lazer: 2022.205.0 -> 2022.409.0 2022-04-11 16:02:07 -07:00
Thiago Kenji Okada
b1cdb609b0
Merge pull request #168035 from r-ryantm/auto-update/fheroes2
fheroes2: 0.9.13 -> 0.9.14
2022-04-11 21:22:25 +01:00
ajs124
5949b253ad
Merge pull request #165037 from tgunnoe/openjk-updates
openjk: update and add Jedi Outcast output
2022-04-10 22:36:09 +01:00
Artturi
5be8702e8b
Merge pull request #166951 from iblech/patch-jumpnbump1.30
enigma: 1.30-alpha -> 1.30
2022-04-10 14:33:51 +03:00
Leiser Fernández Gallo
6a54835299 mindustry: Set ALSA_PLUGIN_DIR environment variable
Without it, there is no audio.
2022-04-10 00:01:30 +02:00
R. Ryantm
9de6fad194 fheroes2: 0.9.13 -> 0.9.14 2022-04-09 19:33:52 +00:00
github-actions[bot]
f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Frederik Rietdijk
1d63f89caa cudaPackages: overhaul of how we package cuda packages
There are many different versions of the `cudatoolkit` and related
cuda packages, and it can be tricky to ensure they remain compatible.

- `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist");
- expressions should now use `cudaPackages` as parameter instead of the individual cuda packages;
- `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version;
- `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
2022-04-09 08:50:22 +02:00
github-actions[bot]
62fec6748f
Merge staging-next into staging 2022-04-08 06:02:02 +00:00
Anderson Torres
c804ddb129
Merge pull request #108990 from iblech/patch-bb
koules: init at 1.4
2022-04-07 21:59:33 -03:00
Ingo Blechschmidt
03b659b9b2 koules: init at 1.4 2022-04-07 09:04:00 +02:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
OPNA2608
b75018a789 bugdom: Enable on Darwin 2022-04-05 23:57:06 +02:00
Vladimír Čunát
b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Lassulus
1eaa0a1212
Merge pull request #152454 from luxferresum/bugdom
bugdom: init at 1.3.1
2022-04-05 13:37:50 +01:00
github-actions[bot]
c9154e5e14
Merge staging-next into staging 2022-04-04 00:02:45 +00:00
Martin Weinelt
bb7e4b378e Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 00:46:44 +02:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
Lassulus
6ca329b77e
Merge pull request #160602 from emilytrau/liberation-circuit-save
liberation-circuit: 1.3 -> unstable-2022-01-02
2022-04-03 20:15:14 +01:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Stefan Frijters
6fc9e4b700
openttd-jgrpp: Add optional but recommended zstd dependency
Fixes

```
CMake Warning at cmake/LinkPackage.cmake:23 (message):
  ZSTD not found; compiling OpenTTD without ZSTD is not recommended
  Call Stack (most recent call first):
    CMakeLists.txt:330 (link_package)
```
2022-04-03 13:52:24 +02:00
Stefan Frijters
3d16e9db85
openttd-jgrpp: 0.44.0 -> 0.47.1 2022-04-03 13:43:24 +02:00
Stefan Frijters
98e1f0ba4e
openttd: 12.1 -> 12.2 2022-04-03 13:43:09 +02:00
github-actions[bot]
fa7a0dbb82
Merge staging-next into staging 2022-04-03 00:03:35 +00:00
github-actions[bot]
fc36f69a60
Merge master into staging-next 2022-04-03 00:02:50 +00:00
Ben Siraphob
da2ff7edbc
Merge pull request #166807 from hqurve/space-cadet-pinball 2022-04-02 16:16:55 -05:00
Fabián Heredia Montiel
40a18fbf7c steam-fhs: remove unecessary symlink 2022-04-02 22:16:56 +02:00
Ingo Blechschmidt
ba46176d4e enigma: 1.30-alpha -> 1.30 2022-04-02 19:56:17 +02:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
hqurve
7683eadc87 space-cadet-pinball: reimplement fix darwin build
Darwin builds need a custom installPhase since it is excluded from the cmake install
0f88e43ba2/CMakeLists.txt (L221)
2022-04-01 07:54:58 -04:00
hqurve
00bbc3f18e Revert "space-cadet-pinball: fix darwin build"
This reverts commit d066c12298.
2022-04-01 07:13:52 -04:00
github-actions[bot]
be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00
Ben Siraphob
4c38fcb192
treewide: move cmake into nativeBuildInputs 2022-03-31 12:35:21 -05:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross
ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Alyssa Ross
22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00