Commit graph

3360 commits

Author SHA1 Message Date
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Jonathan Ringer
446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Jonathan Ringer
21958c0603 steam.chroot: add at-spi2-core
Needed by CrossCode
2019-12-30 17:13:12 +01:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Robin Gloster
65395a7105
treewide: installTargets is a list 2019-12-30 13:29:27 +01:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster
9052e1c5b7
pingus: *Flags are lists 2019-12-30 12:15:28 +01:00
Robin Gloster
ac8eaa8507
treewide: fix *Flags 2019-12-30 04:50:37 +01:00
Jan Tojnar
814dcd907f
xbomb: clean up
Use makeFlags instead of patching Makefile
2019-12-29 22:13:56 +01:00
Franz Pletz
43442880cf
cataclysm-dda: fix build on darwin 2019-12-27 05:21:41 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Aaron Andersen
088224843a
Merge pull request #76439 from r-ryantm/auto-update/tome4
tome4: 1.6.1 -> 1.6.5
2019-12-24 18:43:24 -05:00
Aaron Andersen
3fe099d2c5
Merge pull request #76449 from r-ryantm/auto-update/supertux
superTux: 0.6.0 -> 0.6.1.1
2019-12-24 17:51:15 -05:00
R. RyanTM
6f6c1d2f03 superTux: 0.6.0 -> 0.6.1.1 2019-12-24 12:44:48 -08:00
R. RyanTM
4196f26efa tome4: 1.6.1 -> 1.6.5 2019-12-24 11:38:20 -08:00
Mario Rodas
e6c6ba9fd4
Merge pull request #75280 from r-ryantm/auto-update/mnemosyne
mnemosyne: 2.6.1 -> 2.7
2019-12-22 18:10:13 -05:00
drakonis
2b725bbb69 gzdoom: include missing soundfont files 2019-12-22 12:51:43 +01:00
worldofpeace
e7c568a0b0
Merge pull request #45347 from bignaux/pysolfc
PySolFC: 2.0 -> 2.6.4
2019-12-21 22:20:48 -05:00
Renaud
60820d8d83
Merge pull request #75648 from jorsn/tintin.add-ssl
tintin: added ssl support via gnutls
2019-12-20 23:31:28 +01:00
Mario Rodas
6b935eb62a lgogdownloader: fix build 2019-12-19 16:56:01 +01:00
Bignaux Ronan
615742297f PySolFC: 2.0 -> 2.6.4 2019-12-16 01:43:08 +01:00
Philipp Middendorf
2b298a3ef1 quake3e: 2019-09-09 -> 2019-11-29 (#75511) 2019-12-15 02:16:53 -05:00
worldofpeace
be13df6c76
Merge pull request #75465 from worldofpeace/gnome-args
doc/gnome: update wrapper args example, remove proliferated uses
2019-12-15 00:13:17 -05:00
worldofpeace
abe3475df8 treewide: remove bash snippets in flags
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2019-12-15 00:10:41 -05:00
Johannes Rosenberger
9de076f45c tintin: added ssl support via gnutls
Now passwords can be sent encrypted via tls.

Closure size difference is +18.36 MB (+161.38%). Therefore there is a
switch `tlsSupport ? true` to turn off tls.
2019-12-14 12:44:07 +01:00
Free Potion
34cc9d7fa2
harmonist: 0.2 -> 0.3.0 2019-12-14 01:43:20 +03:00
Mario Rodas
98e57f8999
Merge pull request #74064 from shazow/cdda-git-bump
cataclysm-dda-git: 2019-05-03 -> 2019-11-22
2019-12-11 18:38:50 -05:00
Markus S. Wamser
1deb709fcf hexen: remove abandoned software 2019-12-11 01:03:44 +01:00
Orivej Desh
571c310007 qtads: init at 2.1.99.2019-04-12
This version is much easier to package than the last 2016 release.
It self-describes as 2.1.99 in Help > About.
https://github.com/realnc/qtads/issues/8
2019-12-09 00:55:40 +00:00
Orivej Desh
5bd1bd08ed instead: 3.3.0 -> 3.3.1 2019-12-09 00:17:28 +00:00
Michael Raskin
c142423a8d sgtpuzzles: 2019045 -> 20191114 2019-12-08 23:47:43 +01:00
R. RyanTM
c29da36845 mnemosyne: 2.6.1 -> 2.7 2019-12-08 10:34:43 -08:00
c0bw3b
69b393ace5 Treewide: update some problematic homepages
These URLs are reported as problematic by Repology.
It could be a permanent redirection
or the page does not exist anymore
2019-12-08 10:21:29 -08:00
Dima
fdefc23f7d mnemosyne: fix application
This application has been missing some dependencies and the
correct environment for Qt. Additionally I added a depdency
on anki to support the import feature.

The project has also moved development to Github, as very briefly
mentioned on https://mnemosyne-proj.org/contributing.php but the
2.6.1 version released there seems to differ and causes a bunch
of new problems, so leaving it for now.
2019-12-07 22:26:54 +01:00
Philipp
fc473f38d0 mudlet: 4.1.2 -> 4.3 2019-12-07 22:14:14 +01:00
Tristan Gosselin-Hane
289088ef72 minecraft: 2.1.7658 -> 2.1.9618 2019-12-05 16:03:02 -05:00
Mateusz Kowalczyk
1451a52a38 Remove myself (fuuzetsu) from maintainer lists
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
Lengyel Balazs
6fad697f96 factorio: update all versions to 0.17.79
and adds libpulseaudio as a dependency
2019-12-03 18:07:33 +01:00
Andrey Petrov
5e8770a8bb cataclysm-dda-git: 2019-05-03 -> 2019-11-22 2019-12-01 08:46:52 -08:00
R. RyanTM
e95664bab6 pioneer: 20191009 -> 20191117 2019-12-01 15:13:48 +01:00
lassulus
3b167789a6 zandronum: 3.0 -> 3.0.1 2019-11-30 21:48:03 -08:00
Jan Tojnar
a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
R. RyanTM
cb521df936 tintin: 2.01.91 -> 2.01.92 (#74684) 2019-11-30 14:43:31 +01:00
markuskowa
8833e8cfaf
Merge pull request #74678 from r-ryantm/auto-update/vkquake
vkquake: 1.02.1 -> 1.03.0
2019-11-30 12:41:22 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
R. RyanTM
731992a8b0 vkquake: 1.02.1 -> 1.03.0 2019-11-29 12:42:00 -08:00
R. RyanTM
66caa08067 tome4: 1.6.0 -> 1.6.1 2019-11-29 12:05:32 -08:00
Fabian Möller
b21700a6b6 alienarena: fix libGL path 2019-11-26 18:01:02 +01:00
Frederik Rietdijk
06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
gnidorah
c67d3f1a87 openxray: make it work again after #72199 2019-11-24 16:10:28 +01:00
worldofpeace
0f00c2aee2 chessx: use qt5's mkDerivation and latest qt
Fixes #74020

https://github.com/NixOS/nixpkgs/issues/65399
2019-11-24 06:29:47 -05:00
Frederik Rietdijk
1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
edef
0e76e6bee8 steam: refer to unaliased gtk3 and gdk-pixbuf 2019-11-23 03:53:39 +00:00
Michael Raskin
1ca8255fb2 construo: fix build 2019-11-22 17:41:47 +01:00
Michael Raskin
329ca619f8 extremetuxracer: fix build 2019-11-22 17:41:46 +01:00
lassulus
5923cf4248 gzdoom: 4.2.3 -> 4.2.4 2019-11-20 16:53:25 -08:00
Free Potion
f18e73c815 boohu: 0.12.0 -> 0.13.0 2019-11-20 15:40:45 -08:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
William G Hatch
4fbb59ab99 endless-sky: 0.9.8 -> 0.9.10 2019-11-18 14:58:30 -07:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Jonathan Ringer
87c674daef steam: use 32bit version of libva 2019-11-16 12:02:54 +01:00
c0bw3b
9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
Renaud
e8de40db65
Merge pull request #72212 from lightbulbjim/openrct2-update
openrct2: 0.2.3 -> 0.2.4
2019-11-14 18:55:24 +01:00
Aaron Andersen
9dbbfb78c5
Merge pull request #73108 from baldo/steam
steam: Add libva to chrootenv
2019-11-11 16:23:47 -05:00
Aaron Andersen
706fbecc3d
Merge pull request #72682 from r-ryantm/auto-update/tome4
tome4: 1.5.10 -> 1.6.0
2019-11-10 13:48:34 -05:00
Renaud
04d63387a4
Merge pull request #72155 from lightbulbjim/crawl-update
crawl: 0.23.2 -> 0.24.0
2019-11-10 14:15:29 +01:00
Aaron Andersen
4bdf29c94b
Merge pull request #72968 from fgaz/shattered-pixel-dungeon/0.7.5f
shattered-pixel-dungeon: 0.7.5e -> 0.7.5f
2019-11-10 08:02:34 -05:00
Andreas Baldeau
5a13b856c4 steam: Add libva to chrootenv
After the newest update Steam itself complained about missing files
and would not start:

* libva.so.2
* libva-x11.so.2
2019-11-09 12:02:51 +01:00
Matthew Bauer
11cc9d9851
Merge pull request #69176 from 0x4A6F/master-eidolon
eidolon: init at 1.4.6
2019-11-07 17:38:58 -05:00
Francesco Gazzetta
3b45b5bf7e shattered-pixel-dungeon: 0.7.5e -> 0.7.5f 2019-11-07 10:50:20 +01:00
Franz Pletz
8dca8b9ccb
Merge remote-tracking branch 'origin/master' into gcc-9 2019-11-05 01:07:22 +01:00
gnidorah
0f68bf333c openxray: 510 -> 558 2019-11-04 08:54:02 -08:00
gnidorah
b505f81181 openjk: 2019-06-24 -> 2019-10-25 2019-11-04 08:54:02 -08:00
gnidorah
1c3407f954 openmw-tes3mp: 2019-06-09 -> 2019-07-01 2019-11-04 08:54:02 -08:00
gnidorah
afb4d447ba vkquake: 1.01.0 -> 1.02.1 2019-11-04 08:54:02 -08:00
Michael Raskin
d690c20efd
Merge pull request #71814 from puckipedia/frozen-bubble
frozen-bubble: init at 2.212
2019-11-04 06:00:43 +00:00
worldofpeace
7c4f09f695
Merge pull request #72319 from gnidorah/mame
mame: init at 0.215
2019-11-03 19:18:53 +00:00
gnidorah
cf17479caa sdlmame: drop
There are no longer separate programs called SDLMAME or SDLMESS. Instead, the SDL capability is included in MAME and MESS, and the makefile will auto-detect if you are on a non-Windows system and run accordingly.
2019-11-03 20:02:16 +03:00
Franz Pletz
65eb7fe785
cataclysm-dda: fix build with gcc9 2019-11-03 14:43:34 +01:00
R. RyanTM
7d884032b2 tome4: 1.5.10 -> 1.6.0 2019-11-03 01:44:41 -07:00
Kevin Cox
6b61d85a9d
Merge branch 'master' into kevincox-oa_ded 2019-10-31 22:22:34 +00:00
Chris Rendle-Short
5dd2410bdc openrct2: 0.2.3 -> 0.2.4 2019-10-31 07:15:04 +11:00
Dmitry Kalinkin
3328244936
Merge pull request #72037 from kragniz/openrw-2019-10-26
openrw: 2017-09-17 -> 2019-10-26
2019-10-29 16:15:24 -04:00
Dmitry Kalinkin
ddbf53b855
openrw: move cmake to nativeBuildInputs, fix on darwin
Darwin fix as suggested by @risicle
2019-10-29 14:08:29 -04:00
Chris Rendle-Short
c972e1b0d5 crawl: 0.23.2 -> 0.24.0 2019-10-28 21:20:42 +11:00
Jonathan Ringer
eaa53f737e
minecraft: 2.1.5965 -> 2.1.7658 2019-10-26 13:55:05 -07:00
Louis Taylor
3affc7fb8f
openrw: 2017-09-17 -> 2019-10-26 2019-10-26 18:40:53 +01:00
Marek Mahut
14be1bdffe
Merge pull request #71764 from r-ryantm/auto-update/pioneer
pioneer: 20190203 -> 20191009
2019-10-26 14:03:43 +02:00
Ricardo Ardissone
4de18778a3 hedgewars: 1.0.0-beta2 -> 1.0.0 2019-10-26 13:52:18 +02:00
Aaron Andersen
2921e8a82a
Merge pull request #71789 from tomfitzhenry/openarena-server
openarena: add module and test
2019-10-26 07:48:19 -04:00
Francesco Gazzetta
882a960312 shattered-pixel-dungeon: 0.7.4c -> 0.7.5e 2019-10-26 11:10:18 +02:00
Francesco Gazzetta
7ff539d1d1 shattered-pixel-dungeon: init at 0.7.4c 2019-10-25 20:29:24 +02:00
Tom Fitzhenry
230fc22e61 openarena: add module for dedicated server 2019-10-26 00:57:54 +11:00
Kevin Cox
995fbac56f
openarena: oa_ded link. 2019-10-25 14:44:27 +01:00
lassulus
12b5da288c gzdoom: 4.2.1 -> 4.2.3 2019-10-25 13:50:41 +02:00
Aaron Andersen
6bdf8c09a9
Merge pull request #71879 from rardiol/widelands
widelands: 19 -> 20
2019-10-25 03:58:36 -04:00
Aaron Andersen
a6d5d5c871
Merge pull request #71686 from jonringer/fix-redeclipse
redeclipse: fix src url
2019-10-25 03:33:42 -04:00
R. RyanTM
ed57cd6147 tintin: 2.01.90 -> 2.01.91
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-10-24 20:14:09 -07:00
Ricardo Ardissone
94487d0e0a widelands: 19 -> 20 2019-10-23 20:48:28 -03:00
Puck Meerburg
9f52dabf79 frozen-bubble: init at 2.212 2019-10-23 18:50:06 +00:00
R. RyanTM
f45601d7d6 pioneer: 20190203 -> 20191009
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pioneer/versions
2019-10-22 22:44:00 -07:00
Jonathan Ringer
ec39360a7c
redeclipse: fix src url 2019-10-22 08:31:19 -07:00
Frederik Rietdijk
d7a921cad9
Merge pull request #71221 from NixOS/staging-next
Staging next
2019-10-22 09:15:19 +02:00
Carles Pagès
4ee309a68d
Merge pull request #71469 from sengaya/openxcom-1.0.0.2019.10.18
openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18
2019-10-21 22:46:27 +02:00
Franz Pletz
cf52cd402c
Merge pull request #71254 from MicrosoftTakeover/patch-1
minetest 5.0.1 -> 5.1.0
2019-10-21 10:32:26 +00:00
Frederik Rietdijk
b6ba25ce95 Merge master into staging-next 2019-10-21 09:55:24 +02:00
Karol Chmist
47f47b46bc devilutionx: unstable-2019-07-28 -> 0.5.0 (#70971)
devilutionx: unstable-2019-07-28 -> 0.5.0
2019-10-20 20:10:52 -04:00
Thilo Uttendorfer
b09794c3b2 openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18
- Updated repo owner
2019-10-20 22:40:18 +02:00
Frederik Rietdijk
ad8bd84fc9 Merge master into staging-next 2019-10-20 16:22:45 +02:00
worldofpeace
486a728b94 steam: don't use at-spi2-atk alias 2019-10-19 19:29:37 -04:00
worldofpeace
ed48341148
Merge pull request #67806 from rnhmjoj/arx
arx-libertatis: 2019-02-16 -> 2019-07-22
2019-10-19 23:25:54 +00:00
Martin Weinelt
648082e566 steam: add at_spi2_atk to chrootenv
This is required for the new Stellaris 2.4 series launcher
2019-10-19 10:58:09 -07:00
rnhmjoj
4af7f6321e
arx-libertatis: 2019-02-16 -> 2019-07-22 2019-10-19 10:41:36 +02:00
rnhmjoj
152402b528
arx-libertatis: use wrapQtAppsHook 2019-10-19 10:41:35 +02:00
R. RyanTM
2a0b29992a odamex: 0.7.0 -> 0.8.1 (#69718)
* odamex: 0.7.0 -> 0.8.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/odamex/versions

* odamex: revamp

+ use pname and version
+ not broken anymore
+ restrict to Linux (never built on Darwin)
+ add wxGTK to build odalaunch client
2019-10-18 18:27:05 +02:00
MicrosoftTakeover
8479d2b54d
minetest 5.0.1 -> 5.1.0 2019-10-16 13:41:14 -07:00
Frederik Rietdijk
12441bdf9f Merge staging-next into staging 2019-10-16 11:17:12 +02:00
Robin Gloster
e05e991514
Merge pull request #71054 from MicrosoftTakeover/patch-1
scummvm: 2.0.0 -> 2.1.0
2019-10-15 23:41:32 +02:00
Vladimír Čunát
4e6826a3b2
Merge branch 'staging-next'
It's not perfect, but I think we can deal with the rest of the
regressions directly on master, so that this process does not stall.
2019-10-13 16:10:58 +02:00
gnidorah
84c09b109e openxray: init at 510 2019-10-13 16:09:20 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00
MicrosoftTakeover
2753998d6f
scummvm: 2.0.0 -> 2.1.0
Needs curl for cloud saving support.

dontDisableStatic flag is added since the ./configure script didn't
recognize --disable-static flag added by default.
2019-10-12 13:13:08 -07:00
R. RyanTM
57f698434a crispyDoom: 5.6 -> 5.6.3 (#69496)
* crispyDoom: 5.6 -> 5.6.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/crispy-doom/versions

* crispy-doom: 5.6.2 -> 5.6.3
2019-10-12 15:58:46 +02:00
Herwig Hochleitner
f3366d27f5 sauerbraten: 5000 -> 5492
fixes https://github.com/NixOS/nixpkgs/issues/45088
cc @raskin
2019-10-12 14:57:28 +02:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
R. RyanTM
3269a58a1b wesnoth: 1.14.7 -> 1.14.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/wesnoth/versions
2019-10-11 12:04:04 +02:00
Renaud
a07a926c04
Merge pull request #69984 from r-ryantm/auto-update/tintin
tintin: 2.01.8 -> 2.01.90
2019-10-09 18:21:22 +02:00
Robin Gloster
356464388f
Merge pull request #69370 from chkno/no-extra-flags
makeWrapper: Remove unused extraFlagsArray feature
2019-10-09 01:32:28 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken
Refs:
e675498026
1e9cc5b984
793a2fe1e8
c19cf65261
f6544d618f
2019-10-08 17:14:26 +02:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Philipp Middendorf
4ec79e8c09 quake3e: init at 2019-09-09 2019-10-02 21:53:08 +02:00
Frederik Rietdijk
503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
Marek Mahut
bef773ed53
Merge pull request #69871 from freepotion/ivan-056-to-057
ivan: 056 -> 057
2019-09-29 10:27:14 +02:00
R. RyanTM
7a497fa762 tintin: 2.01.8 -> 2.01.90
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-09-29 00:42:08 -07:00
marius851000
afbb73ee71 system-syzygy: init at 1.0.1 2019-09-29 00:32:04 +02:00
Free Potion
b21ca3152b
ivan: 056 -> 057 2019-09-28 18:13:27 +03:00
Vladimír Čunát
217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Marek Mahut
cd02791368
Merge pull request #69532 from r-ryantm/auto-update/gcompris
gcompris: 0.96 -> 0.97
2019-09-27 22:08:49 +02:00
Joachim F
ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
2019-09-27 06:19:18 +00:00
R. RyanTM
6a9f695860 gzdoom: 4.2.0 -> 4.2.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/gzdoom/versions
2019-09-27 00:10:04 +02:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
R. RyanTM
631096f22a gcompris: 0.96 -> 0.97
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gcompris/versions
2019-09-26 07:32:45 -07:00
Dmitry Kalinkin
b3472597b7
Merge branch 'staging-next' into staging
Fixes eval on darwin after #69072

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:31:32 -04:00
Dmitry Kalinkin
c455adcc42
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
2019-09-25 19:21:46 -04:00
Chuck
a45b3ad89f
makeWrapper: Remove unused extraFlagsArray feature
There is a bug in this feature: It allows extra arguments to leak in
from the environment. For example:

  $ export extraFlagsArray=date
  $ man ls

Note that you get the man page for date rather than for ls. This happens
because 'man' happens to use a wrapper (to add groff to its PATH).

An attempt to fix this was made in 5ae18574fc in PR #19328 for
issue #2537, but 1. That change didn't actually fix the problem because
it addressed makeWrapper's environment during the build process, not the
constructed wrapper script's environment after installation, and 2. That
change was apparently accidentally lost when merged with 7ff6eec5fd.

Rather than trying to fix the bug again, we remove the extraFlagsArray
feature, since it has never been used in the public repo in the ten
years it has been available.

wrapAclocal continues to use its own, separate flavor of extraFlagsArray
in a more limited context. The analogous bug there was fixed in
4d7d10da6b in 2011.
2019-09-25 09:23:09 -07:00
Peter Hoeg
76e1ac4ee5
Merge pull request #69380 from peterhoeg/f/dxx_build
dxx-rebirth: build with gcc6 as gcc8 is not supported
2019-09-25 05:05:12 +08:00
Peter Hoeg
fe8b82f557 dxx-rebirth: build with gcc6 as gcc8 is not supported 2019-09-25 04:12:05 +08:00
Vladimír Čunát
192fb9d11b
Merge branch 'staging-next' into staging 2019-09-24 08:15:01 +02:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Peter Hoeg
91d7486703
Merge pull request #69097 from peterhoeg/u/hedgewars
hedgewars: 1.0.0-beta1 -> 1.0.0-beta2
2019-09-24 10:52:09 +08:00
Jan Tojnar
f80e55fc2e
gtk3.setupHook: clear icon-theme.cache in preFixup (#68552)
gtk3.setupHook: clear icon-theme.cache in preFixup
2019-09-22 16:30:42 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
Matthew Bauer
d8b7b95ac6 Merge remote-tracking branch 'origin/master' into staging 2019-09-20 23:25:24 -04:00
0x4A6F
1bcc7027d9
eidolon: init at 1.4.6 2019-09-20 23:34:12 +00:00
Silvan Mosberger
c545e85de8
minecraft: 2015-07-24 -> 2.1.5965 (closes #68123) (#68175)
minecraft: 2015-07-24 -> 2.1.5965 (closes #68123)
2019-09-20 21:54:30 +02:00
Frederik Rietdijk
0b12d44c06 Merge master into staging-next 2019-09-19 16:59:42 +02:00
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