JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
236,011 Commits 2 Branches 0 Tags 13 GiB
194d749582
Commit Graph

3560 Commits

Author SHA1 Message Date
Jan Tojnar
2988feba8c
Merge branch 'master' into staging-next 2020-07-23 08:19:14 +02:00
worldofpeace
8b6e9818a5
Merge pull request #84873 from mnacamura/cdda-mods 
cataclysmDDA: add modding interface
 2020-07-22 16:18:32 -04:00
Vladimír Čunát
7a5c6fee0f
Merge branch 'master' into staging-next 
Some rebuilds, e.g. all of haskell.
Hydra nixpkgs: ?compare=1601713
 2020-07-22 08:37:19 +02:00
Justin Humm
7d1b94b4dc
Merge pull request #93525 from priegger/fix/factorio-update 
factorio{,-headless}-experimental: 0.18.34 -> 0.18.36
 2020-07-20 16:04:46 +02:00
Philipp Riegger
1814bebd82 factorio{,-headless}-experimental: 0.18.34 -> 0.18.36 2020-07-20 11:46:23 +02:00
Michael Raskin
23c93a5205
Merge pull request #85169 from prusnak/inkscape 
inkscape: 0.92.5 -> 1.0
 2020-07-20 08:45:05 +00:00
Jan Tojnar
83442a3533
Merge branch 'master' into staging-next 2020-07-20 02:16:21 +02:00
Pavol Rusnak
8402a74cce
treewide: replace inkscape with inkscape_0 
The Inkscape CLI interface has been changed with 1.x and packages
are not adjusted yet to this change. Let's use inkscape 0.x instead.
 2020-07-19 13:10:16 +02:00
Sarah Brofeldt
0bf47d487a
Merge pull request #93448 from euank/update-steamruntime 
steam-runtime: 0.20200417.0 -> 0.20200604.0
 2020-07-19 10:32:33 +02:00
Vladimír Čunát
4244b73917
Merge branch 'master' into staging 2020-07-18 17:50:23 +02:00
Michael Weiss
5b14758d31
Merge pull request #92920 from primeos/scons 
scons: 3.1.2 -> 4.0.0
 2020-07-18 13:36:29 +02:00
Michael Weiss
a838caa33a
tdm: Fix the build 
Was failing in the desktop-file validation stage [0]:
/nix/store/XXX-tdm.desktop/share/applications/tdm.desktop: error: value
"False" for boolean key "Terminal" in group "Desktop Entry" contains
invalid characters, boolean values must be "false" or "true"

[0]: https://hydra.nixos.org/build/123852137
 2020-07-18 11:41:47 +02:00
Michael Weiss
595a36d846
scons.py2: Replace with sconsPackages.scons_3_1_2 
Required since SCons 4.0.0 doesn't support Python 2.7 anymore.
 2020-07-18 10:48:20 +02:00
Mitsuhiro Nakamura
f2b2347b29 doc: add section for cataclysm-dda 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura
cf0e2d51ac cataclysmDDA: update mods 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura
fbf4b4f5ed cataclysmDDA: update README 
Add description about `useXdgDir` flag
 2020-07-18 14:23:24 +09:00
Mitsuhiro Nakamura
bbe7b86eea cataclysmDDA: launch the wrapped program 2020-07-18 14:23:24 +09:00
Mitsuhiro Nakamura
d472eed4b5 cataclysmDDA: add README 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura
633f211113 cataclysm-dda-git: make it overridable with git revision 
'cataclysm-dda-git.overrideAttrs (_: { version = ...; src = fetchFromGitHub { ... }; })'
did not update VERSION make flag correctly.

With this change, one can override 'cataclysm-dda-git' correctly and
more easily:

cataclysm-dda-git.override { version = ...; rev = ...; sha256 = ...; }
 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura
ecf7b57e12 cataclysm-dda{,-git}: support build with USE_XDG_DIR flag 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura
de56294e57 cataclysm-dda{,-git}: clean up 2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura
90c265275f cataclysmDDA: make pkgs extensible 
Example:

let
  customMods = self: super: lib.recursiveUpdate super {
    soundpack.AwesomeSounds = cataclysmDDA.buildSoundPack { ... };
  };
in
cataclysm-dda.withMods (mods: with mods.extend customMods; [
  tileset.UndeadPeople
  soundpack.AwesomeSounds
])
 2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura
bc88844e68 cataclysmDDA: add UndeadPeople tileset 2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura
ac8555486f cataclysmDDA: add very basic framework for packaging mods 
Add new namespace 'cataclysmDDA', in which package builders, games, and
mods are listed.
 2020-07-18 14:23:19 +09:00
Mitsuhiro Nakamura
bf71f12cb5 cataclysm-dda{,-git}: apply locale patch dynamically 
Each time src/translations.cpp is modified, we have to update the locale
patch. Using sed to patch dynamically should be handy.
 2020-07-18 14:21:12 +09:00
Mitsuhiro Nakamura
d6863de058 cataclysm-dda{,-git}: name -> pname and version 2020-07-18 14:21:09 +09:00
Alyssa Ross
5da2d61bd4 cataclysm-dda: 0.E -> 0.E-2 2020-07-18 05:16:04 +00:00
Euan Kemp
8c5c7d3aaf steam-runtime: 0.20200417.0 -> 0.20200604.0 2020-07-16 22:35:14 -07:00
Silvan Mosberger
2a740344cc
Merge pull request #85021 from oxalica/osu 
osu-lazer: init at 2020.714.0
 2020-07-17 01:45:04 +02:00
Derpford
951e2175c3
GZDoom 4.3.3 -> 4.4.2 
* Update to 4.4.2

4.4.0 increased the ZScript version number, GZDoom 4.4.1 and 4.4.2 have some bugfixes.

* Fix bad checksum

Old hash was done without `--unpack` option, resulting in a mismatch.

* Fetch submodules

This fixes the issue with `zmusic` not being brought in as a dependency.

* Add zmusic derivation

Since zmusic isn't actually a submodule, we have to derive it ourselves and pass it as a buildInput.

* Semicolon.

* Semicolon in the *right* place this time.

* Merge the zmusic source into the gzdoom source.

Apparently this is how they expect zmusic to be added. Why this isn't a submodule, I don't know.

* Fix bad path editing

Credit to Open Skies for fixing this. Turns out the paths edited in the `gzdoom` derivation were for zmusic, which needs these edits to be made so that it looks in nix-friendly places for its stuff.
 2020-07-16 23:45:10 +02:00
oxalica
11f986d3c8
osu-lazer: 2020.712.0 -> 2020.714.0 2020-07-16 19:23:44 +08:00
oxalica
4bbedffe50
osu-lazer: 2020.707.0 -> 2020.712.0 2020-07-14 03:15:49 +08:00
Daniël de Kok
0963cebfc5
Merge pull request #92897 from Moredread/chiaki 
chiaki: 1.1.3 -> 1.2.1
 2020-07-13 13:11:32 +02:00
Carles Pagès
d6c63c7bcd minecraft: 2.1.15166 -> 2.1.15852 2020-07-12 23:34:36 +02:00
André-Patrick Bubel
97da56664c
chiaki: 1.1.3 -> 1.2.1 2020-07-12 20:52:11 +02:00
freezeboy
bda43779f6 minetest: 5.2.0 -> 5.3.0 2020-07-11 15:33:23 +02:00
oxalica
a21ba99681
osu-lazer: init at 2020.707.0 2020-07-09 02:20:12 +08:00
Domen Kožar
2794ee0c06
Merge pull request #92584 from r-ryantm/auto-update/springlobby 
springLobby: 0.269 -> 0.270
 2020-07-07 16:37:14 +02:00
R. RyanTM
63bba7986a springLobby: 0.269 -> 0.270 2020-07-07 14:18:31 +00:00
Benjamin Hipple
1809db0ae1
Merge pull request #92381 from r-ryantm/auto-update/pentobi 
pentobi: 18.0 -> 18.1
 2020-07-05 19:22:01 -04:00
R. RyanTM
bfc1c1533c pentobi: 18.0 -> 18.1 2020-07-05 21:49:43 +00:00
Daniël de Kok
cfceaaec17
Merge pull request #92236 from neonfuz/crispy-doom 
crispy-doom: fixed CVE-2020-14983
 2020-07-05 20:24:11 +02:00
Sage Raflik
2d24b8b187 crispyDoom: fixed CVE-2020-14983 2020-07-05 20:09:32 +02:00
Ryan Mulligan
c09177d5dc
Merge pull request #92346 from fgaz/endgame-singularity/1.00 
Endgame singularity/1.00
 2020-07-05 09:44:19 -07:00
Francesco Gazzetta
c823b4c374 endgame-singularity: add option to disable the default music pack 
It's the heaviest part of the game. People may not want to have it take
space or may want to use their own music.
 2020-07-05 17:37:08 +02:00
Francesco Gazzetta
d80eeaea47 endgame-singularity: 0.30c -> 1.00 2020-07-05 17:29:17 +02:00
R. RyanTM
ea7fc409dd chocolateDoom: 3.0.0 -> 3.0.1 2020-07-03 04:23:16 +00:00
Manuel Bärenz
637fa6901f Rename flightgear-{base -> data} 2020-07-01 14:58:09 +02:00
Manuel Bärenz
2b88a4fd29 flightgear: 2019.1.1 -> 2020.1.2, simgear: 2020.1.{1 -> 2} 2020-07-01 14:58:09 +02:00
Benjamin Hipple
0e2d755231 anki: expression cleanup 2020-07-01 04:29:09 +02:00