Commit Graph

3080 Commits

Author SHA1 Message Date
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