colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
291,333 Commits 126 Branches 0 Tags 3.1 GiB
34a05e29f1
Commit Graph

4429 Commits

Author SHA1 Message Date
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
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
Sandro
b3186b9860
Merge pull request #122657 from malob/0verkill-darwin-fix 
0verkill: fix darwin build
 2021-05-12 23:13:12 +02:00
Sandro
88df2cb177
Merge pull request #122765 from legendofmiracles/steam-tui 
steam-tui: adds missing runtime dependencies correctly
 2021-05-12 22:59:33 +02:00
legendofmiracles
65380bc338
steam-tui: adds missing runtime dependencies 2021-05-12 14:30:50 -06:00
github-actions[bot]
b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Malo Bourgon
9b03a74fb5 0verkill: fix darwin build 2021-05-12 10:01:12 -07:00
Sandro
d2d634c6ca
Merge pull request #122699 from legendofmiracles/steam-tui 
steam-tui: init at 0.1.0
 2021-05-12 17:29:00 +02:00
legendofmiracles
7dd35786f3
steam-tui: init at 0.1.0 2021-05-12 05:53:36 -06:00
github-actions[bot]
e2cf474986
Merge staging-next into staging 2021-05-12 06:21:36 +00:00
Peter Hoeg
e1ce68683f freeorion: 0.4.9 -> 0.4.10.1 2021-05-12 09:38:58 +08:00
github-actions[bot]
7ce907b413
Merge staging-next into staging 2021-05-10 12:24:36 +00:00
Lancelot SIX
e612d0e09a gnuchess: 6.2.7 -> 6.2.8 
See https://lists.gnu.org/archive/html/info-gnu/2021-05/msg00006.html
for release information.
 2021-05-10 09:24:02 +01:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
yurkobb
c8f5ce18fa assaultcube licensing: mark unfree 
The license of AssaultCube as a whole is not zlib, it's freeware, see: https://assault.cubers.net/docs/license.html

closes #121381
 2021-05-09 19:33:23 +00:00
Dmitry Kalinkin
9d1ff3bf10
Merge pull request #121911 from SFrijters/openttd-1.11.2 
openttd: 1.11.1 -> 1.11.2
 2021-05-09 00:59:24 -04:00
OPNA2608
b690ceff5d superTuxKart: Fix aarch64-linux build 2021-05-08 13:52:35 -07:00
Jan Tojnar
dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
Charlotte Van Petegem
b65155098b zeroad: Add myself as a maintainer 2021-05-08 10:53:49 -07:00
Charlotte Van Petegem
701664ea5c zeroad: Split data from binaries again 
The rootdir patch was lost in the update to 0.0.24b. Adding it allows
hydra to build the game. It can't when the binaries depend on the data
since the data is too big for hydra.
 2021-05-08 10:53:49 -07:00
Emery Hemingway
37cac60102 alephone: 1.3.1 -> 1.4 2021-05-08 15:28:09 +02:00
R. RyanTM
362edb1962 alephone-infinity: 20200904 -> 20210408 2021-05-08 10:06:10 +02:00
Jan Tojnar
468cb5980b gnome: rename from gnome3 
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
 2021-05-08 09:47:42 +02:00