mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity
300162 commits 271 branches 124 tags 6.1 GiB
Commit graph

4566 commits

Author SHA1 Message Date
Martin Weinelt 3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
Sandro ae18d436e5
Merge pull request #126215 from fgaz/shattered-pixel-dungeon/0.9.3 
shattered-pixel-dungeon: 0.9.2b -> 0.9.3
 2021-06-09 13:30:13 +02:00
Sandro 14e6e83b60
Merge pull request #125904 from legendofmiracles/update/rpg-cli 
rpg-cli: 0.3.0 -> 0.4.0
 2021-06-09 12:42:31 +02:00
Alyssa Ross 013d3cb42d xsnow: 1.42 -> 3.3.0 
Since this package was last updated, xsnow has been relicensed, and
then forked.  It's also had its build system replaced.
 2021-06-09 10:21:20 +00:00
github-actions[bot] b61efd9db1
Merge master into staging-next 2021-06-09 00:09:07 +00:00
Peter Simons 51bb9f3e9a minecraft-server: 1.16.5 -> 1.17 2021-06-08 14:17:06 -04:00
github-actions[bot] e8f8906d68
Merge master into staging-next 2021-06-08 18:16:27 +00:00
Sandro 4ebc8bcf01
Merge pull request #126133 from ZerataX/papermc 2021-06-08 17:57:13 +02:00
Jonathan Ringer e6903f1e94 steam/fhsenv: add pipewire as hard requirement 2021-06-08 08:51:18 -07:00
Francesco Gazzetta 9306fb9f3d shattered-pixel-dungeon: 0.9.2b -> 0.9.3 2021-06-08 16:21:41 +02:00
github-actions[bot] 89746ce131
Merge master into staging-next 2021-06-08 06:12:14 +00:00
Artturin 2033f37fb2 steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0 2021-06-08 03:47:26 +03:00
ZerataX b2c045c07b
papermc: 1.16.5r488 -> 1.16.5r771 2021-06-08 00:59:38 +02:00
github-actions[bot] 6076dbb085
Merge master into staging-next 2021-06-06 12:14:32 +00:00
Peter Simons c850d5a550
Merge pull request #125837 from r-burns/stockfish 
stockfish: 12 -> 13
 2021-06-06 09:10:10 +02:00
legendofmiracles 1aefc955f7
rpg-cli: 0.3.0 -> 0.4.0 2021-06-05 23:45:14 -06:00
github-actions[bot] 51ecdeca84
Merge master into staging-next 2021-06-06 00:15:19 +00:00
Sandro 5e852ca257
Merge pull request #125692 from fgaz/tumiki-fighters/init 
tumiki-fighters: init at 0.21
 2021-06-06 01:49:44 +02:00
Sandro 7935dbda8a
Merge pull request #125651 from fgaz/torus-trooper/init 
torus-trooper: init at 0.22
 2021-06-05 23:40:47 +02:00
Sandro abcf2ce8e0
Merge pull request #125828 from musfay/lunar 2021-06-05 23:27:40 +02:00
Francesco Gazzetta 3a9b42c07e tumiki-fighters: init at 0.21 2021-06-05 21:23:35 +02:00
Francesco Gazzetta 7c1a214125 torus-trooper: init at 0.22 2021-06-05 21:22:14 +02:00
Ryan Burns 68f8c1fc66 stockfish: 12 -> 13 2021-06-05 12:18:53 -07:00
Sandro 929c876f65
Merge pull request #125654 from karolchmist/init-fheroes2-0.9.4 
fheroes2: init at 0.9.4
 2021-06-05 20:45:29 +02:00
github-actions[bot] d9d6f71e43
Merge master into staging-next 2021-06-05 18:30:28 +00:00
Mustafa Çalışkan 22e0fe2f29
lunar-client: 2.6.0 -> 2.7.3 2021-06-05 21:09:53 +03:00
github-actions[bot] ad63c3d31f
Merge master into staging-next 2021-06-04 19:40:59 +00:00
Karol Chmist e1b8ef38ea fheroes2: init at 0.9.4 2021-06-04 20:44:07 +02:00
Antoine Fontaine 758c87007c unvanquished: init at 0.52.0 2021-06-04 17:48:46 +02:00
oxalica 24c6e52af8
osu-lazer: 2021.515.0 -> 2021.602.0 2021-06-04 20:01:22 +08:00
github-actions[bot] a9f286f5cf
Merge master into staging-next 2021-06-03 19:52:02 +00:00
polygon 388bc58b7f
liquidwar: fix build (#125480) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-06-03 16:36:26 +02:00
github-actions[bot] a12e0d5bff
Merge master into staging-next 2021-06-03 12:49:11 +00:00
Sandro Jäckel 89d5f4b3d0
treewide: setuptools_scm -> setuptools-scm 2021-06-03 12:44:33 +02:00
Sandro 9a5a639608
Merge pull request #125006 from astro/frogatto 2021-06-03 12:03:00 +02:00
github-actions[bot] 1fe3553272
Merge master into staging-next 2021-06-03 02:08:32 +00:00
Luke Granger-Brown 7876162722 factorio-demo: 1.1.32 -> 1.1.34 2021-06-02 18:32:28 +00:00
Luke Granger-Brown 266fa7f015 factorio-experimental: 1.1.33 -> 1.1.34 2021-06-02 18:31:23 +00:00
Luke Granger-Brown e5173c8481 factorio: 1.1.32 -> 1.1.34 2021-06-02 18:30:25 +00:00
Astro 39a9499774 frogatto: unstable-2021-05-24 -> unstable-2018-12-18, unbreak 2021-06-02 19:21:38 +02:00
github-actions[bot] 1176851146
Merge master into staging-next 2021-06-02 07:51:53 +00:00
Ryan Mulligan 1848d4270a
Merge pull request #125023 from r-ryantm/auto-update/ckan 
ckan: 1.30.2 -> 1.30.4
 2021-06-01 20:37:17 -07:00
github-actions[bot] 42b70ad7f1
Merge master into staging-next 2021-06-01 20:30:45 +00:00
Sandro c7aece5a48
Merge pull request #125245 from rnhmjoj/warzone 
warzone2100: fix build
 2021-06-01 20:15:18 +02:00
rnhmjoj 302d6b1b8b
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
 2021-06-01 17:54:10 +02:00
github-actions[bot] 7f14676873
Merge master into staging-next 2021-05-31 19:44:13 +00:00
R. RyanTM fe414b367d cbonsai: 1.1.1 -> 1.2.0 2021-05-31 10:58:03 +00:00
R. RyanTM a57fcabd33 ckan: 1.30.2 -> 1.30.4 2021-05-31 01:49:11 +00:00
github-actions[bot] 2867d5301f
Merge master into staging-next 2021-05-30 19:15:10 +00:00
Sandro 58a2737645
Merge pull request #124981 from legendofmiracles/rpg 
rpg-cli: unstable-2021-05-27 -> 0.3.0
 2021-05-30 19:57:52 +02:00
legendofmiracles e546f97664
rpg-cli: unstable-2021-05-27 -> 0.3.0 2021-05-30 11:13:15 -06:00
github-actions[bot] 4fd76aacd3
Merge master into staging-next 2021-05-30 01:54:11 +00:00
Karl Meakin 6ee94fc354 runelite: 2.0.0 -> 2.1.5 2021-05-29 16:11:41 -07:00
github-actions[bot] 4cfefea5b2
Merge master into staging-next 2021-05-29 01:43:58 +00:00
Sandro c95522aac2
Merge pull request #124685 from greaka/patch-1 
terraria-server: 1.4.2.2 -> 1.4.2.3
 2021-05-29 02:57:53 +02:00
Sandro 3e69f71e77
Merge pull request #124539 from legendofmiracles/rpg 
rpg-cli: init at 0.2.0
 2021-05-29 02:29:27 +02:00
Sandro 5730083206
Merge pull request #124195 from atopuzov/augustus-3.0.1 2021-05-29 02:09:03 +02:00
R. RyanTM 262658cca8 cbonsai: 1.0.4 -> 1.1.1 2021-05-28 10:51:27 +00:00
github-actions[bot] a743ebe846
Merge master into staging-next 2021-05-27 18:58:59 +00:00
greaka 4e9bd87f5a
terraria-server: 1.4.2.2 -> 1.4.2.3 2021-05-27 19:34:05 +02:00
Ryan Mulligan ea595a2013
Merge pull request #124021 from r-ryantm/auto-update/cdogs 
cdogs-sdl: 0.11.1 -> 0.12.0
 2021-05-27 06:05:31 -07:00
github-actions[bot] f385b431a7
Merge master into staging-next 2021-05-27 06:45:59 +00:00
legendofmiracles bfcd6bd009
rpg-cli: init at 0.2.0 2021-05-27 00:40:07 -06:00
Stéphan Kochen 2353879e8d toppler: fix darwin build 2021-05-26 18:17:40 +02:00
Aleksandar Topuzović b5a50d1486
augustus: 2.0.1 -> 3.0.1 2021-05-23 21:22:29 +01:00
github-actions[bot] 2aa5735c09
Merge master into staging-next 2021-05-23 18:33:25 +00:00
Sandro ebd5042606
Merge pull request #124041 from fgaz/shattered-pixel-dungeon/0.9.2b 2021-05-23 17:03:28 +02:00
Jonathan Ringer b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next 2021-05-22 19:23:14 -07: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
Francesco Gazzetta fc8eefe2fe shattered-pixel-dungeon: 0.9.2 -> 0.9.2b 2021-05-22 18:13:12 +02: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
R. RyanTM 51f861a25c cdogs-sdl: 0.11.1 -> 0.12.0 2021-05-22 11:50:52 +00:00
github-actions[bot] d5714df652
Merge staging-next into staging 2021-05-22 06:21:58 +00: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
Andrew Brooks a49a274abf Revert "xconq: Simplify package with tcl.tclPackageHook" 
This reverts commit 113826a892512eb2e19985310fd7d4a39db4d75e, which
ended up breaking the Tk import at runtime.
 2021-05-21 15:18:25 -05:00
Andrew Brooks 17a561e1cf scid: Correct typo in maintainers 2021-05-21 15:18:24 -05:00
Andrew Brooks c677478b0b scid-vs-pc: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:13 -05:00
Andrew Brooks 9979565b0c scid: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:12 -05:00
Andrew Brooks a4f54890d5 xconq: Simplify package with tcl.tclPackageHook 2021-05-21 15:18:11 -05:00
Andrew Brooks f17ca3f517 tcl2048: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:11 -05: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