1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 00:54:11 +00:00
Commit graph

3051 commits

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