BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
202433 commits 1 branch 0 tags 3.8 GiB
Commit graph

3095 commits

Author SHA1 Message Date
Peter Hoeg
751b661a09 hedgewars: 1.0.0-beta1 -> 1.0.0-beta2 2019-09-19 20:45:35 +08:00
Will Dietz
7b449bcf03 openttd: 1.9.2 -> 1.9.3 
https://www.openttd.org/news/2019/09/16/openttd-1-9-3.html
 2019-09-19 19:10:02 +09:00
worldofpeace
b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible 
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
 2019-09-18 22:47:26 +02:00
hyperfekt
3a635da857 minecraft: 2015-07-24 -> 2.1.5965 
switched to the new official launcher, renamed to minecraft-launcher,
and added an update script
 2019-09-18 14:07:33 +02:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Elmo Todurov
d3f6aef265 tome2: init at 2.4 2019-09-15 18:59:06 +03:00
Elmo Todurov
7cc7645fb0 maintainers: renamed myself 2019-09-15 18:54:36 +03:00
Aaron Andersen
d2ecbb38a2
Merge pull request #68806 from delroth/chiaki-1.0.3 
chiaki: init at 1.0.3
 2019-09-15 09:24:21 -04:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Pierre Bourdon
9165e72c7f
chiaki: init at 1.0.3 2019-09-15 05:08:45 +02:00
Miguel Madrid Mencía
148c82e07e
maintainer: mimadrid: update github username and personal data 2019-09-14 12:15:46 +02:00
Aaron Andersen
792f80d918 tome4: fix broken build 2019-09-13 21:10:11 -04:00
Philipp
a26445a2dd mudlet: 4.0.3 -> 4.1.2 2019-09-13 14:44:13 +03:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Ivan Kozik
2769d610ac anki: fix startup 
Related: #68314

This fixes startup of anki, which currently shows this in a dialog:

Error during startup:
Traceback (most recent call last):
  File "/nix/store/0h395dwc6b80n5xg93p86ywaz6kpz6ck-anki-2.1.15/lib/python3.7/site-packages/aqt/main.py", line 46, in __init__
    self.setupAddons()
  File "/nix/store/0h395dwc6b80n5xg93p86ywaz6kpz6ck-anki-2.1.15/lib/python3.7/site-packages/aqt/main.py", line 657, in setupAddons
    import aqt.addons
  File "/nix/store/0h395dwc6b80n5xg93p86ywaz6kpz6ck-anki-2.1.15/lib/python3.7/site-packages/aqt/addons.py", line 9, in <module>
    import markdown
  File "/nix/store/knq8798kl0xzzr7ii4bchskg1c8mq6pj-python3.7-Markdown-3.1.1/lib/python3.7/site-packages/markdown/__init__.py", line 25, in <module>
    from .core import Markdown, markdown, markdownFromFile
  File "/nix/store/knq8798kl0xzzr7ii4bchskg1c8mq6pj-python3.7-Markdown-3.1.1/lib/python3.7/site-packages/markdown/core.py", line 29, in <module>
    import pkg_resources
ModuleNotFoundError: No module named 'pkg_resources'
 2019-09-12 17:21:42 +00:00
Michael Raskin
0aa63cae1e
Merge pull request #68598 from aanderse/zhf/liquidwar5 
liquidwar5: fix broken build
 2019-09-12 16:47:09 +00:00
Aaron Andersen
26a48bb037 liquidwar5: fix broken build 2019-09-12 12:28:56 -04:00
Peter Hoeg
6759d15465
Merge pull request #68512 from nspin/pr/stdenv-spelling 
stdenv: fix misspellings of dontPatchELF
 2019-09-12 17:04:49 +08:00
Nick Spinale
d2333beb86 stdenv: fix misspellings of dontPatchELF 2019-09-11 13:10:09 +00:00
Jörg Thalheim
32030530a8
warzone: 3.2.3 -> 3.3.0 (#66500) 
warzone: 3.2.3 -> 3.3.0
 2019-09-10 20:12:50 +01:00
Jan Tojnar
1716d62f63
Merge branch 'staging-next' into staging 2019-09-10 07:06:45 +02:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
Jan Tojnar
16203d6a8b
gnome-hexgl: unstable-2019-08-21 → 0.2.0 
https://github.com/alexlarsson/gnome-hexgl/releases/tag/0.2.0
 2019-09-09 14:02:09 +02:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
rnhmjoj
3516b1ddc5
warzone: 3.3.0_beta1 -> 3.3.0 2019-09-08 12:15:57 +02:00
Philipp
3b5b9a73f5 mudlet: 3.0.0-delta -> 4.0.3 
Fixed broken package.
 2019-09-07 23:05:55 +09:00
Frederik Rietdijk
98ef78326d Merge staging-next into staging 2019-08-31 18:07:33 +02:00
volth
7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
Samuel Leathers
4b515cf6ef
Merge remote-tracking branch 'upstream/master' into staging-next 
* upstream/master:
  vimPlugins: update (#67823)
  mattermost-desktop: 4.2.0 -> 4.2.3 (#67717)
  lightspark: init at 0.8.1 (#67425)
  anki: 2.1.11 -> 2.1.14 (#67738)
  nixos/{namecoind,bitcoind}: removing the altcoin prefix
  rust-cbindgen: 0.8.7 -> 0.9.0
 2019-08-31 06:53:44 -04:00
averelld
560ce2a4a7 anki: 2.1.11 -> 2.1.14 (#67738) 
* anki: 2.1.11 -> 2.1.14

* anki: 2.1.14 -> 2.1.15
 2019-08-31 11:40:35 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Samuel Dionne-Riel
d9076f6503 sgtpuzzles: 20180429.31384ca -> 20190415.e2135d5 2019-08-30 17:18:40 -04:00
worldofpeace
bde1c6b5e8
Merge pull request #67604 from peterhoeg/f/gcompris 
gcompris: use Qt mkDerivation
 2019-08-28 22:26:43 -04:00
Peter Hoeg
8d3c2c8538 gcompris: use Qt mkDerivation 2019-08-29 10:22:22 +08:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Timo Kaufmann
09cc90827a
Merge pull request #66796 from oxij/pkgs/fix-anki 
anki: use wrapQtAppsHook to fix execution
 2019-08-26 12:11:04 +02:00
Robin Gloster
48191315aa
Merge pull request #66916 from nyanloutre/steam_update_1_0_0_61 
steam: 1.0.0.59 -> 1.0.0.61
 2019-08-25 18:42:11 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
 2019-08-24 08:55:37 +02:00
Will Dietz
a986f7d46c
solarus{,-quest-editor}: use qt's mkDerivation, fix 2019-08-22 13:10:53 -05:00
Will Dietz
4b9f0774bf
solarus{,-quest-editor}: 1.6.0 -> 1.6.2 
https://www.solarus-games.org/en/news/2019-08-15-solarus-1-6-2-bugfix-release
 2019-08-22 13:10:50 -05:00
Jan Tojnar
b992565455
Merge pull request #67222 from jtojnar/glthree 
gnome-hexgl: init at unstable-2019-08-21
 2019-08-22 03:18:29 +02:00
Jan Tojnar
80354ee314
gnome-hexgl: init at unstable-2019-08-21 2019-08-22 02:24:55 +02:00
Marek Mahut
5b3467d2c6
Merge pull request #67184 from delroth/warsow-url 
warsow,warsow-engine: fix mirror URL
 2019-08-21 16:24:10 +02:00
Marek Mahut
e79212611e warsow: mark as broken on aarch64 2019-08-21 15:02:36 +02:00
Pierre Bourdon
fe3dca6e73
warsow,warsow-engine: fix mirror URL 
Current one does not resolve. New one is the one currently present on
warsow.net.
 2019-08-21 12:27:20 +02:00
Peter Hoeg
8b8f03682c btanks: fix building with lua 5.2 2019-08-20 12:22:50 +09:00
Marek Mahut
8f2a13d584
Merge pull request #66895 from r-ryantm/auto-update/gzdoom 
gzdoom: 4.1.3 -> 4.2.0
 2019-08-19 20:39:25 +02:00
Marek Mahut
147b7ab692 btanks: patching away wrong lua library 2019-08-19 22:18:27 +09:00
nyanloutre
6eec415644
steam: 1.0.0.59 -> 1.0.0.61 2019-08-19 15:11:53 +02:00
R. RyanTM
21b3a0260a gzdoom: 4.1.3 -> 4.2.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gzdoom/versions
 2019-08-19 02:50:06 -07:00
Marek Mahut
0b78d7a13f
Merge pull request #66878 from r-ryantm/auto-update/easyrpg-player 
easyrpg-player: 0.6.0 -> 0.6.1
 2019-08-19 11:47:14 +02:00
R. RyanTM
85b2cd08d5 easyrpg-player: 0.6.0 -> 0.6.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/easyrpg-player/versions
 2019-08-19 00:18:34 -07:00
gnidorah
f72d2041b7 openmw: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
Colin Rice
965cddb7ec steam: Update dependencies for steamrt 2019-08-19 01:15:34 +03:00
Jan Malakhovski
39028ee8a7 anki: simplify the expression, elide superfluous wappers 
As suggested by @worldofpeace.
 2019-08-18 17:44:25 +00:00
Sarah Brofeldt
754d626411
Merge pull request #66828 from jD91mZM2/multimc 
multimc: 0.6.6 -> 0.6.7
 2019-08-18 17:56:43 +02:00
Marek Mahut
f9676fb94b
Merge pull request #66800 from r-ryantm/auto-update/cutemaze 
cutemaze: 1.2.4 -> 1.2.5
 2019-08-18 16:15:32 +02:00
jD91mZM2
c86c704289
multimc: 0.6.6 -> 0.6.7 2019-08-18 14:53:59 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Marek Mahut
43fcb94fcc cutemaze: use qt5's mkDerivation 2019-08-18 10:14:38 +02:00
R. RyanTM
a52cab84f0 cutemaze: 1.2.4 -> 1.2.5 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cutemaze/versions
 2019-08-17 15:05:28 -07:00
Jan Malakhovski
1a11eb34a1 anki: add myself as a maintainer 
(Adding to the front of the list because it was I who added this expression to
nixpkgs in e00c03101f 7 years ago. :])
 2019-08-17 20:31:33 +00:00
Jan Malakhovski
2326319b38 anki: use wrapQtAppsHook from pyqtwebengine 2019-08-17 20:31:33 +00:00
R. RyanTM
27f48d27d5 angband: 4.1.3 -> 4.2.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/angband/versions
 2019-08-17 10:51:38 -07:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Marek Mahut
03b47280b9
Merge pull request #62650 from marius851000/azimuth-1.0.3 
azimuth: use the builtins install target
 2019-08-12 19:18:06 +02:00
Marek Mahut
79b28f5a53
Merge pull request #63116 from peterhoeg/f/opendune 
opendune: support ALSA and pulseaudio (move to SDL2)
 2019-08-12 19:04:00 +02:00
Herwig Hochleitner
ff79e9dad2 steam: fix for screeps 2019-08-12 02:52:51 +02:00
Herwig Hochleitner
9acdab85e2 steam: add /lib32 and /lib64 to ldpath in chroot 2019-08-12 02:52:51 +02:00
rnhmjoj
bdda1e5b66
warzone: 3.2.3 -> 3.3.0_beta1 2019-08-12 02:49:56 +02:00
davidak
d568509a0f steam chrootenv: add lsb-release 
Fixes issue with operating system detection
sh: lsb_release: command not found
 2019-08-09 12:29:58 +03:00
Jörg Thalheim
073730c040
hedgewars: 0.9.25 -> 1.0.0-beta1 (#66289) 
hedgewars: 0.9.25 -> 1.0.0-beta1
 2019-08-08 08:07:49 +01:00
Trolli Schmittlauch
7030004ad6 hedgewars: 0.9.25 -> 1.0.0-beta1 
- unbreak build by bumping version to latest beta as that
removes the broken `bytestring-show` dependency

- beta needs to be fetched from Mercurial repo
 2019-08-07 20:04:47 +02:00
Aaron Andersen
ad9e905ecc speed-dreams: 2.2.1-r6404 -> 2.2.2-r6553 2019-08-06 17:12:12 -04:00
Aaron Andersen
c72d4f947c flightgear: 2018.3.1 -> 2019.1.1 2019-08-06 17:12:08 -04:00
Karol Chmist
983c30f5ab devilutionx: init at unstable-2019-07-28 2019-08-06 14:40:41 +02:00
Marek Mahut
59e570324a
Merge pull request #65897 from r-ryantm/auto-update/crispy-doom 
crispyDoom: 5.5.2 -> 5.6
 2019-08-05 19:42:36 +02:00
worldofpeace
df58d379ca
Merge pull request #65494 from virusdave/dnicponski/scratch/add_dcss 
crawl: use static config for data files
 2019-08-04 16:40:11 -04:00
Dave Nicponski
f6ebeb801d crawl: use static config for data files. 
This allows the game to be executed from anywhere, not just
the install directory in the nix store.
 2019-08-04 16:38:14 -04:00
R. RyanTM
28298df9f5 crispyDoom: 5.5.2 -> 5.6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/crispy-doom/versions
 2019-08-03 20:25:06 -07:00
Robin Gloster
e1f0d24454
Merge pull request #65841 from aanderse/flare 
flare: 1.10 -> 1.11
 2019-08-03 15:48:27 +00:00
Frederik Rietdijk
33a876e619 anki: fix with pyqtwebengine 2019-08-03 16:04:34 +02:00
Aaron Andersen
3c1458c065 flare: add darwin support 2019-08-03 08:12:24 -04:00
Aaron Andersen
14e3ee4860 flare: 1.10 -> 1.11 2019-08-03 07:19:11 -04:00
Frederik Rietdijk
d20a59d2e5 Merge master into staging-next 2019-08-02 23:27:18 +02:00
Maximilian Bosch
727921c7a6
Merge pull request #65777 from lheckemann/emptyepsilon-bump 
EmptyEpsilon: 2019.01.19 -> 2019.05.21
 2019-08-02 11:48:48 +02:00
Linus Heckemann
bc2a9aca6f EmptyEpsilon: add lheckemann as maintainer 2019-08-02 10:15:58 +02:00
Linus Heckemann
a04ce7f5f8 EmptyEpsilon: 2019.01.19 -> 2019.05.21 2019-08-02 10:14:52 +02:00
Frederik Rietdijk
55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Milan Pässler
c79aa36292 multimc: 0.6.4 -> 0.6.6 
Use -DMultiMC_LAYOUT=lin-system to install shared object files to
$out/lib and the jars required at runtime to $out/share/multimc.
 2019-07-29 12:30:56 +02:00
worldofpeace
59f3cfa405
Merge pull request #65528 from mmahut/nethack 
nethack: wrapQtApp only in qtMode
 2019-07-28 20:20:42 -04:00
Marek Mahut
6f9fa0644a nethack: wrapQtApp only in qtMode 
Regression introduced in #54525, tracked in #65399.
 2019-07-28 23:23:19 +02:00
Samuel Dionne-Riel
ed51432500
Merge pull request #65486 from TheSandwichMakr/master 
multimc: wrapQtAppsHook, add xrandr for lwjgl 2.9.2
 2019-07-28 17:09:47 -04:00
Frederik Rietdijk
cb3ce5d26d Merge master into staging-next 2019-07-28 12:11:37 +02:00
Michael Raskin
bca933e217
Merge pull request #65493 from virusdave/dnicponski/scratch/add_dcss 
games/crawl: add support for MacOS/Darwin builds for Dungeon Crawl
 2019-07-28 07:13:16 +00:00
Frederik Rietdijk
cca5ee9c07 Merge staging-next into staging 2019-07-28 09:10:03 +02:00
Dave Nicponski
b3b4184786 games/crawl: add support for MacOS/Darwin builds 
games/crawl: Add support for darwin builds.  Also,
compression/advancecomp: Add support for darwin builds in meta (which already worked).
 2019-07-28 02:25:17 -04:00
TheSandwichMakr
f3b1693759
multimc: wrapQtAppsHook, add xrandr for lwjgl 2.9.2 2019-07-27 22:17:02 +00:00
Orivej Desh
32fbbc6f9b Merge master into staging 2019-07-25 09:23:21 +00:00
Free Potion
ebafb799dc
harmonist: 0.1 -> 0.2 2019-07-25 00:40:28 +03:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Robin Gloster
dac6a17558
Merge pull request #65184 from rleppink/master 
minecraft-server: 1.14.3 -> 1.14.4
 2019-07-22 17:45:52 +00:00
Aaron Andersen
f5945fcf0e
Merge pull request #64408 from scubed2/nxengine 
nxengine-evo: init at 2.6.4
 2019-07-20 18:20:20 -04:00
Ronald Leppink
1153481150 minecraft-server: 1.14.3 -> 1.14.4 2019-07-20 19:46:47 +02:00
Chris Rendle-Short
5563ff5a27 openrct2: 0.2.2 -> 0.2.3 2019-07-20 11:35:09 +02:00
gnidorah
32e72ad896 openmw-tes3mp: 0.7.0-alpha -> 2019-06-09 
Closes #64587.

abbradar: clarify source of CrabNet revision.
 2019-07-20 10:24:43 +03:00
Sterling Stein
e0c2e7f65f nxengine-evo: init at 2.6.4 2019-07-19 22:52:07 -07:00
Ryan Mulligan
c10ef47914
Merge pull request #64858 from r-ryantm/auto-update/openttd 
openttd: 1.9.1 -> 1.9.2
 2019-07-16 20:16:48 -07:00
R. RyanTM
8c52d00e4a openttd: 1.9.1 -> 1.9.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openttd/versions
 2019-07-15 20:28:11 -07:00
Frederik Rietdijk
54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
Silvan Mosberger
807a62e68e
minecraft-server: 1.14 -> 1.14.3 (#63848) 
minecraft-server: 1.14 -> 1.14.3
 2019-07-13 03:02:23 +02:00
Linus Heckemann
5d04dcf4f5 minecraft-server: 1.14 -> 1.14.3 
Also removes older versions.
 2019-07-12 07:40:37 +02:00
Frederik Rietdijk
7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Vladimír Čunát
0746c4dbb4
Merge branch 'master' into staging-next 
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
 2019-07-06 13:44:40 +02:00
R. RyanTM
06c3247866 galaxis: 1.9 -> 1.10 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/galaxis/versions
 2019-07-05 23:28:24 +02:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps 
Wrap Qt applications
 2019-07-05 14:38:10 -05:00
Thomas Tuegel
51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Francesco Gazzetta
1c67718e23 curseofwar,curseofwar-sdl: init at 1.2.0 2019-07-05 05:23:58 +02:00
Elis Hirwing
47cef20b86
Merge pull request #64196 from fgaz/zaz/init 
zaz: init at 1.0.0
 2019-07-04 09:32:48 +02:00
markuskowa
a53646ddce
Merge pull request #64197 from fgaz/toppler/init 
toppler: init at 1.1.6
 2019-07-03 22:55:53 +02:00
Daiderd Jordan
56127c23c2
gargoyle: remove cf-private 2019-07-03 22:20:22 +02:00
Frederik Rietdijk
25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00
R. RyanTM
b85a00ee67 tintin: 2.01.7 -> 2.01.8 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tintin/versions
 2019-07-03 08:30:46 +02:00
Jonathan Ringer
bb7a367fed redeclipse: fix license info 2019-07-03 07:09:14 +02:00
Francesco Gazzetta
b51410c4bb toppler: init at 1.1.6 2019-07-02 23:58:11 +02:00
Francesco Gazzetta
bbfe534665 zaz: init at 1.0.0 2019-07-02 23:51:56 +02:00
R. RyanTM
a5596b451a klavaro: 3.07 -> 3.08 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/klavaro/versions
 2019-07-02 20:06:37 +02:00
Taran Lynn
e706a83f0d redeclipse: init at 1.6.0. 
See www.redeclipse.net for information.
 2019-07-02 18:16:55 +02:00
worldofpeace
3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
gnidorah
2647984501 openjk: 2018-09-17 -> 2019-06-24 (#63915) 2019-06-29 16:25:35 +00:00
Philipp Riegger
e231b58490 factorio: experimental 0.17.32 -> 0.17.52 (#63890) 2019-06-29 16:24:59 +00:00
Jan Tojnar
07d1d3ed68
Merge branch 'master' into staging 2019-06-25 18:06:43 +02:00
Frederik Rietdijk
4589a04299 Merge master into staging-next 2019-06-25 16:26:29 +02:00
Peter Hoeg
a2075a2c31
Merge pull request #63760 from peterhoeg/f/freeciv 
freeciv_qt: init at 2.6.0
 2019-06-25 16:20:31 +08:00
Peter Hoeg
31c33e3420 freeciv_qt: init at 2.6.0 2019-06-25 14:56:57 +08:00
Frederik Rietdijk
dafee3d91a Merge master into staging-next 2019-06-23 15:38:41 +02:00
R. RyanTM
7d8c6c978b enyo-doom: 1.06 -> 1.06.9 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/enyo-doom/versions
 2019-06-23 14:57:16 +02:00
Frederik Rietdijk
72d647f3d8 Merge master into staging-next 2019-06-21 08:20:26 +02:00
Matthieu Coudron
c33153bf13
Merge pull request #63108 from Shados/lua-packaging-improvements-pr 
Lua/luarocks packaging improvements
 2019-06-19 14:23:31 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl 
Add libGL* aliases
 2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa 
Just use mesa for these to be more clear. Move these to aliases.nix
 2019-06-17 14:43:18 -04:00
Ryan Mulligan
c2281cbf5d
Merge pull request #63263 from r-ryantm/auto-update/gzdoom 
gzdoom: 4.1.2 -> 4.1.3
 2019-06-17 05:52:32 -07:00
R. RyanTM
b62a696625 gzdoom: 4.1.2 -> 4.1.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gzdoom/versions
 2019-06-16 18:44:38 -07:00
Andreas Rammhold
04a7ef53fd
Merge pull request #62044 from freepotion/boohu-deps-update 
boohu: switching to termbox-go build
 2019-06-17 01:00:14 +02:00