public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
295,467 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

4477 Commits

Author SHA1 Message Date
Tristan Gosselin-Hane 28188b0b42 multimc: don't re-distribute package 
Fixes NixOS#131983

(cherry picked from commit 8dfddb341ebaf718904722692dbbcd1d5d9d5e12)
 2021-10-27 19:06:27 +00:00
Tristan Gosselin-Hane 27db642c65 multimc: change license to asl20 
(cherry picked from commit 9a8f5b712fa5beb86659dd1f2d0a830c16f4cfc9)
 2021-10-27 19:06:26 +00:00
Artturi 49017a1c5a
Merge pull request #140728 from NixOS/backport-140716-to-release-21.05 
[Backport release-21.05] steam: 1.0.0.70 -> 1.0.0.72
 2021-10-07 02:49:07 +03:00
TredwellGit 78412cdde1 steamPackages.steam-runtime: 0.20210630.0 -> 0.20210906.1 
(cherry picked from commit 7e5136fcc483af9ca14e3655c1a38bc056b6e26e)
 2021-10-06 07:46:27 +00:00
TredwellGit 93f8812cbb steam: 1.0.0.70 -> 1.0.0.72 
(cherry picked from commit 5ac32013ca5f58863e1846621c808c4d2819efcd)
 2021-10-06 07:43:51 +00:00
TredwellGit 0d85dce13f steam: fix steamwebhelper 
Fixes https://github.com/NixOS/nixpkgs/issues/137279 and https://github.com/ValveSoftware/steam-runtime/issues/462.

(cherry picked from commit 64c6851fd3acb13440bbffccf1fe386702725291)
 2021-09-12 12:13:37 -07:00
Artturin 861412d485 vintagestory: init at 1.15.5 
(cherry picked from commit 176705c2953c17d6f7c703745d926c053e59e9f1)
 2021-08-28 00:47:49 +00:00
Francesco Gazzetta 9e28807d03 warzone2100: 4.1.1 -> 4.1.3 
(cherry picked from commit 4b5f0bfa393e45e9f9c2704d000e07dc689b4e51)
 2021-08-21 00:24:37 +00:00
Angus Trau c21331c85e liberation-circuit: init at 1.3 
(cherry picked from commit 005f28eca8a755d750e49ddea348d14074310592)
 2021-08-13 11:09:53 +00:00
Artturi 9eb3be2890
Merge pull request #131553 from fgaz/backport/21.05/warzone2100/4.1.1 2021-08-10 05:47:23 +03:00
Sander van der Burg 22f37f4aee dhewm: add desktop item 
(cherry picked from commit f7ae4163e027ad6269e6f51a7f9d0726a97be96b)
 2021-08-07 20:36:20 +02:00
Sander van der Burg b6e71616f8 quakespasm: add desktop item 
(cherry picked from commit 55c21071de9d58498166ad96ddb157a4f5051702)
 2021-08-07 20:36:02 +02:00
Sander van der Burg 07d959d0b0 gzdoom: add desktop item 
(cherry picked from commit 246ac3167d82c7adafed4a861ddb71817810586c)
 2021-08-07 20:34:08 +02:00
Artturi 9f9f6563cc
Merge pull request #126238 from NixOS/backport-126226-to-release-21.05 
[Backport release-21.05] minecraft-server: 1.16.5 -> 1.17
 2021-08-06 23:47:13 +03:00
Artturi 0faef908e6
Merge pull request #129801 from NixOS/backport-129770-to-release-21.05 2021-08-06 23:22:04 +03:00
github-actions[bot] 5ed554543c
[Backport release-21.05] terraria-server: update source URL (#132855) 
* terraria-server: update source URL

The old URL redirects to the main page.

(cherry picked from commit 1e919bfeedae2abefb520a4fad7e9e37e98be8e0)

* Apply suggestions from code review

Co-authored-by: Naïm Favier <n@monade.li>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
 2021-08-06 10:01:37 +01:00
davidak 3682a03cc8
Merge pull request #126456 from fgaz/backport/21.05/shattered-pixel-dungeon/0.9.3 
[backport 21.05] shattered-pixel-dungeon: 0.9.2 -> 0.9.3
 2021-08-03 06:09:14 +02:00
Artturin bb8978a77c openmw: add wrapQtAppsHook 
dontWrapQtApps was blanket added in
5590e365e4

(cherry picked from commit 854265777ced27a1d0b1bdead26463ce021bb779)
 2021-07-30 21:42:49 -04:00
Sander van der Burg 10320a355a rott: init at 1.1.2 
(cherry picked from commit 946ad968ffcb623d6473228c4390bf4262024e91)
 2021-07-30 16:13:07 +00:00
Sander van der Burg 099ec68772 ecwolf: fix compilation on darwin 
(cherry picked from commit f65e1d8793c76766c45d04a507196dbff4a4e10f)
 2021-07-28 07:48:59 +00:00
Sander van der Burg 6992766507 ecwolf: init at 1.3.3 
(cherry picked from commit de9913708c019a18adce74f6ecb143073fdbbec2)
 2021-07-27 19:58:15 +00:00
Sander van der Burg 6da1f11195 eduke32: 20200907 -> 20210722 
(cherry picked from commit 94ac68c879f4b172ade9cd7fabca1b9ed85bcdd1)
 2021-07-26 16:58:31 +02:00
Francesco Gazzetta b69f8981c8 warzone2100: 4.1.0 -> 4.1.1 
(cherry picked from commit 6be2cb762e9a12e9e1086682cd3f86aa35858207)
 2021-07-26 09:21:28 +02:00
Francesco Gazzetta 8fb41def7c warzone2100: 4.0.1 -> 4.1.0 
(cherry picked from commit 299f265ce50861b3733733df5da2506c8e25c054)
 2021-07-26 09:21:13 +02:00
Francesco Gazzetta 9e4f215465 warzone2100: better fix for absolute bindir 
(cherry picked from commit b5b5dbb62d959e743742e75ef342ff9fca392ada)
 2021-07-26 09:20:38 +02:00
Herman Fries f8a3b92fb2
steamPackages.steam-runtime: 20210527.0 -> 20210630.0 
(cherry picked from commit 7cae0551597ab2129c59fb2c93ca42e51aaf0f72)
 2021-07-17 15:49:20 +02:00
TredwellGit 8b39c06e41 steamPackages.steam-fhsenv: fix Proton 
LLVM must match version required by Mesa.

Fixes https://github.com/NixOS/nixpkgs/issues/127068

(cherry picked from commit b4d3ea24beddd761a40020e043fbe2979c518dbf)
 2021-07-16 15:34:43 -07:00
Sage Raflik 0d3a413302 papermc: 1.16.5r771 -> 1.17.1r97 2021-07-14 21:43:48 -05:00
Francesco Gazzetta f1a6b028cd powermanga: init at 0.93.1 
(cherry picked from commit 0851d84fed3d63481f4f8554003bec5b30ba8673)
 2021-07-09 23:03:53 +00:00
Francesco Gazzetta 6d732c1deb tecnoballz: init at 0.93.1 
(cherry picked from commit ff1b1874f8ff974a79f7f353c33d38738335d7ab)
 2021-07-09 23:03:53 +00:00
Mustafa Çalışkan 27b388113c multimc: hardcode jdk paths and use latest jdk by default 
(cherry picked from commit 3fd51087800666bc8aa11545dd37c0325601dee6)
 2021-06-30 00:06:03 -07:00
Mustafa Çalışkan 1374abeed1 multimc: 0.6.12 -> unstable-2021-06-21 
(cherry picked from commit 46c373b5e50b5f2667b8984ad368b9c9e84da2ae)
 2021-06-30 00:06:03 -07:00
Francesco Gazzetta 57c0c1104f shattered-pixel-dungeon: 0.9.2 -> 0.9.3 
(cherry picked from commit 9306fb9f3d8ecc0ad94fb36775f6155a35a71b92)
 2021-06-10 09:59:49 +02:00
Peter Simons 89093fdbc0 minecraft-server: 1.16.5 -> 1.17 
(cherry picked from commit 65a8bff54c03f748cb9442108701156eb90179b3)
 2021-06-08 18:21:12 +00:00
Jonathan Ringer a76d51dc52 steam/fhsenv: add pipewire as hard requirement 
(cherry picked from commit 1817df0beb89a26050c5e1a7f9a12e4256cab427)
 2021-06-08 10:12:58 -07:00
Artturin a29ce4a574 steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0 
(cherry picked from commit 2033f37fb284bd55159ea1650aa93a635caaffb3)
 2021-06-08 02:19:15 +00:00
rnhmjoj 047b146b74 warzone2100: fix build 
I'm not sure how the build broke[1] or how it worked before, but
the problem is zip is being used in place of p7zip, which obviously
fail as the flags have different meanings.

[1]: https://hydra.nixos.org/build/143354937

(cherry picked from commit 302d6b1b8b94f2082f9937d04e27c2aaefb93aa2)
 2021-06-01 18:19:01 +00:00
greaka 7b1072b4ff terraria-server: 1.4.2.2 -> 1.4.2.3 
(cherry picked from commit 4e9bd87f5a024a5b7cf3b94c389125732da7fb11)
 2021-05-29 01:02:37 +00:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/tools/networking/xh/default.nix
 2021-05-22 18:19:10 -07:00
Kira Bruneau cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Sandro b182609952
Merge pull request #114692 from r-ryantm/auto-update/chessx 
chessx: 1.5.0 -> 1.5.6
 2021-05-22 15:20:31 +02:00
Jonathan Ringer 7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
 2021-05-21 19:49:05 -07:00
R. RyanTM c7be0f932d ckan: 1.30.0 -> 1.30.2 2021-05-21 19:43:41 -07:00
Jonathan Ringer 6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
 2021-05-20 22:11:42 -07:00
Martin Weinelt dfe77a81af
Merge pull request #123180 from zeri42/zod-version-bump 2021-05-20 22:19:11 +02:00
github-actions[bot] 34a05e29f1
Merge master into staging-next 2021-05-20 18:36:00 +00:00
Profpatsch c8c7d0c448 ultrastardx: really don’t use ffmpeg_3 
Due to a merge error, usdx didn’t actually switch to ffmpeg 4.
This fixes that
 2021-05-20 19:38:54 +02:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
 2021-05-20 09:12:42 -07:00
zeri42 a75e32a0d0 zod: add scaling factor 
- add patch that allows to resize the zod_launcher window at compile
 time with `scalingFactor` option
 2021-05-20 12:44:02 +02:00
zeri42 1d58c8b095 zod: 2011-03-18 -> 2011-09-06 
- cleanup Derivation
- add map_editor and zod_launcher
- game is playable now (appears broken/orphaned in current version)
- fix comment about version
- add enableParallelBuilding=true;
- change source url to use mirror://
 2021-05-20 12:44:02 +02:00