public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
293,246 Commits 1 Branch 0 Tags
b69f8981c8fd6ae94f33a8289ab9f81d82ea0ebb
Commit Graph

4451 Commits

Author SHA1 Message Date
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
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
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
Peter Hoeg
7fe78d4f9e openmw-tes3mp: unstable-2019-11-19 -> unstable-2020-08-07 2021-05-20 09:06:25 +08:00
Peter Hoeg
5c87334112 openmw: ffmpeg_3 -> ffmpeg 2021-05-20 09:06:25 +08:00
Reed
029d53dbf9 r2mod_cli: 1.0.7 -> 1.2.0 2021-05-19 12:39:26 -07:00
Jonathan Ringer
f7a112f6c4 Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
 2021-05-18 08:57:16 -07:00
Vladimír Čunát
e3088f6793 Merge #123483: privateer: drop, broken for years 2021-05-18 12:13:20 +02:00
Robert Schütz
0b7ebd1b51 privateer: drop 
It was marked as broken in August 2015.
 2021-05-18 11:59:54 +02:00
Sandro
32fd19653c Merge pull request #123468 from Atemu/update/anki-bin 
anki-bin: 2.1.43 -> 2.1.44
 2021-05-18 11:49:58 +02:00
Profpatsch
d7cfce0e47 ultrastardx: 2020.4.0 -> 2021-04-03 
Not a lot has changed since last update, a few fixes were pushed to
the master tree.
We take the liberty to update to master for now.

This updates the ffmpeg version from 2.x to 4.x, which seems to be
supported upstream when we bend the minor version restriction a
little.
A simple karaoke song played just fine in my test.
 2021-05-18 09:04:32 +02:00
Martin Weinelt
707234bf0d steam: add json-glib to fhsenv 
Fixes the Paradox Launcher for Stellaris.

Fixes: #123447
 2021-05-17 23:19:33 -07:00
OPNA2608
fc2e0709f0 openxray: 784-october-preview -> 822-december-preview 2021-05-17 20:21:04 -07:00
github-actions[bot]
3ff6965554 Merge master into staging-next 2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41 Merge remote-tracking branch 'origin/master' into staging-next 
Fix cargo-flash build
 2021-05-16 18:27:14 -07:00
Sandro
700942d2a5 Merge pull request #121119 from SuperSandro2000/remove-gnidorah 
treewide: remove gnidorah
 2021-05-17 02:42:24 +02:00
Sandro
65e349506f Merge pull request #122837 from cyberdront/patch-1 
terraria-server: 1.4.1.2 -> 1.4.2.2
 2021-05-17 02:27:57 +02:00
Sandro
622c2c2382 Merge pull request #122994 from mweinelt/remove-inactive-maintainer/nand0p 
treewide: remove nand0p as maintainer
 2021-05-17 02:18:03 +02:00
Sandro
b2cd6ba7f5 Merge pull request #123275 from oxalica/osu 
osu-lazer: 2021.502.0 -> 2021.515.0
 2021-05-17 02:06:17 +02:00
Martin Weinelt
7bd65d54f7 treewide: remove nand0p as maintainer 
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
 2021-05-17 01:50:49 +02:00
Michael Raskin
5e9437ef57 Merge pull request #123289 from OPNA2608/fix/supertuxkart-darwin/21.05 
superTuxKart: Build on Darwin
 2021-05-16 22:59:10 +00:00
sophrosyne97
1372b429cc cataclysm-dda-git: 2019-11-22 -> 2020-12-09 2021-05-16 15:44:54 -07:00
OPNA2608
f2a29c1ee9 superTuxKart: Make Darwin-compatible 2021-05-16 22:24:34 +02:00
oxalica
cf1db5812d osu-lazer: 2021.502.0 -> 2021.515.0 2021-05-17 02:57:46 +08:00
github-actions[bot]
9911b1c75b Merge staging-next into staging 2021-05-16 01:01:01 +00:00
Stéphan Kochen
5ed1f1f2a6 frotz: fix darwin build 2021-05-15 14:18:41 +02:00
Marat
ad96c7eb13 terraria-server: 1.4.1.2 -> 1.4.2.2 2021-05-14 13:25:29 +04:00
Atemu
e2b86ad1e7 anki-bin: 2.1.43 -> 2.1.44 2021-05-13 17:31:54 +02:00
Jan Tojnar
0313c77b55 Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00