Commit Graph

2962 Commits

Author SHA1 Message Date
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
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
Frederik Rietdijk
98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02: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 e00c03101f8d052473fee17e5f7a6a975dc5edb4 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
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