colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
261,399 Commits 125 Branches 0 Tags 3.4 GiB
3ae5e6ce03
Commit Graph

3895 Commits

Author SHA1 Message Date
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
zowoq
fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
github-actions[bot]
ec161d2240
Merge master into staging-next 2021-01-02 12:24:09 +00:00
Domen Kožar
77839b5a55
Merge pull request #108062 from siraben/spring-update 
spring: refactor
 2021-01-02 10:57:12 +00:00
github-actions[bot]
0eb369d907
Merge staging-next into staging 2021-01-01 18:39:12 +00:00
github-actions[bot]
c0a9361687
Merge master into staging-next 2021-01-01 18:39:09 +00:00
Pavol Rusnak
fe1151218c chiaki: cleanup package 2021-01-01 13:33:16 +01:00
github-actions[bot]
f1df516121
Merge staging-next into staging 2021-01-01 12:25:55 +00:00
github-actions[bot]
0fe33caad3
Merge master into staging-next 2021-01-01 12:25:52 +00:00
Pavol Rusnak
37c9f30f66
Merge pull request #107983 from Emantor/topic/chiaki_bump_touchpad 
chiaki: 1.3.0 -> 2.0.1 & touchpad support
 2021-01-01 13:21:17 +01:00
Frederik Rietdijk
3f08495212
Merge pull request #108022 from siraben/cmake-native-build-inputs 
[staging] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
 2021-01-01 10:54:25 +01:00
Rouven Czerwinski
b5a0c7466c chiaki: fix build on darwin 
Darwin requires qtmacextra in the buildInputs, otherwise compilation
fails with:

  CMake Error at /nix/store/05nmn6v1hrk56zqs61s2awvykha51fx9-qtbase-5.12.7-dev/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
    By not providing "FindQt5MacExtras.cmake" in CMAKE_MODULE_PATH this project
    has asked CMake to find a package configuration file provided by
    "Qt5MacExtras", but CMake did not find one.

    Could not find a package configuration file provided by "Qt5MacExtras" with
    any of the following names:

      Qt5MacExtrasConfig.cmake
      qt5macextras-config.cmake

    Add the installation prefix of "Qt5MacExtras" to CMAKE_PREFIX_PATH or set
    "Qt5MacExtras_DIR" to a directory containing one of the above files.  If
    "Qt5MacExtras" provides a separate development package or SDK, be sure it
    has been installed.
  Call Stack (most recent call first):
    gui/CMakeLists.txt:7 (find_package)

  -- Configuring incomplete, errors occurred!
  See also "/tmp/nix-build-chiaki-2.0.1.drv-0/chiaki/build/CMakeFiles/CMakeOutput.log".
 2021-01-01 09:53:27 +01:00
Rouven Czerwinski
4d461177a7 chiaki: add DualShock4 touchpad support 
Chiaki supports the touchpad on DualShock4 controllers when they are
connected via USB and requires libevdev & udev for this. Add both
libraries if chiaki is to be built for a Linux host.
 2021-01-01 09:52:42 +01:00
github-actions[bot]
8500f595a1
Merge master into staging-next 2021-01-01 06:22:40 +00:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Sandro
5ea718cb2d
Merge pull request #106674 from 0x4A6F/master-freenukum 2021-01-01 03:39:00 +01:00
0x4A6F
ac47ac9cb7
freenukum: init at 0.3.5 2021-01-01 01:37:12 +00:00
github-actions[bot]
5dffe03f30
Merge master into staging-next 2020-12-31 18:42:41 +00:00
Ben Siraphob
d55a9e23b6 spring: refactor 2021-01-01 00:20:18 +07:00
Ben Siraphob
88f3187df3 trackballs: 1.3.1 -> 1.3.2 2020-12-31 19:47:59 +07:00
Frederik Rietdijk
e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Niklas Hambüchen
a8f2b9f4d9
Merge pull request #67643 from MetaDark/clonehero 
clonehero: init at 0.23.2.2
 2020-12-31 01:53:46 +01:00
Rouven Czerwinski
536a40c3d7 chiaki: 1.3.0 -> 2.0.1 
Also switch the upstream repository from github to git.sr.ht, since the
project has been moved to sourcehut.

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
 2020-12-30 21:57:55 +01:00
github-actions[bot]
099a83caba
Merge master into staging-next 2020-12-30 12:24:47 +00:00
Doron Behar
f423aea36a
Merge pull request #103077 from freezeboy/add-colobot 2020-12-30 08:42:16 +02:00
github-actions[bot]
ff873c7c21
Merge master into staging-next 2020-12-29 18:40:52 +00:00
Sandro
4d8414cb92
Merge pull request #107867 from Atemu/update/anki-bin 
anki-bin: 2.1.36 -> 2.1.38
 2020-12-29 18:35:11 +01:00
freezeboy
80bff15d7b colobot: init at 0.1.12-alpha 
Initial integration without the game musics to reduce the size of the
game. It works without them

Data are in another derivation to let them live their live independently
as they are quite big.

Limited to linux platform only because physfs is currently broken on
darwin.
 2020-12-29 13:25:59 +01:00
github-actions[bot]
0984deb2b8
Merge master into staging-next 2020-12-29 06:22:28 +00:00
Sandro
ea3638a3fb
Merge pull request #107753 from freezeboy/update-cataclysm-dda 
cataclysm-dda: 0.E-2 -> 0.E-3
 2020-12-29 05:01:33 +01:00
github-actions[bot]
ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Francesco Gazzetta
6792a171e8
mindustry,mindustry-server: 121.4 -> 122 (#107646) 2020-12-28 17:03:31 +01:00
Atemu
cc7acd49ba anki-bin: 2.1.36 -> 2.1.38 2020-12-28 15:41:56 +01:00
Frederik Rietdijk
92cc19490e Merge staging into staging-next 2020-12-28 08:45:43 +01:00
freezeboy
e8cc6535cc cataclysm-dda: 0.E-2 -> 0.E-3 2020-12-27 21:41:39 +01:00
freezeboy
bf629416f0 banner: 1.3.4 -> 1.3.5 2020-12-27 16:12:44 +01:00
Sandro
81181e752a
Merge pull request #106377 from oxalica/osu-lazer 2020-12-26 20:10:50 +01:00
github-actions[bot]
309b7614e7
Merge staging-next into staging 2020-12-26 00:47:55 +00:00
Sandro
8dbd5276fe
Merge pull request #103826 from Thra11/augustus-2-0-0 2020-12-25 22:32:04 +01:00
Tom Hall
8992e8d5fc augustus: 1.4.1a -> 2.0.1 
Mark as broken on darwin.
 2020-12-25 18:47:54 +00:00
oxalica
58e72782e3
osu-lazer: 2020.1204.0 -> 2020.1225.0 2020-12-25 23:06:54 +08:00
oxalica
1f3cbd31b9
osu-lazer: fix runtime error 2020-12-25 23:06:54 +08:00
github-actions[bot]
09a970dcd2
Merge staging-next into staging 2020-12-25 12:23:40 +00:00
Timo Kaufmann
675660e2f3
Merge pull request #106638 from Atemu/anki-bin 
anki-bin: init at 2.1.36
 2020-12-25 11:41:42 +01:00
github-actions[bot]
8d42e46e8e
Merge staging-next into staging 2020-12-24 12:25:45 +00:00
Jonathan Ringer
9721604610 steamPackages.steam: add udev rules 2020-12-23 22:46:56 -08:00
Atemu
847b317a95 anki-bin: force x11 
Co-authored-by: Vika <vika@fireburn.ru>
 2020-12-24 07:02:43 +01:00
Atemu
0769fe2712 anki-bin: add darwin support 2020-12-24 07:02:43 +01:00
Atemu
18906f453e anki-bin: init at 2.1.36 
Works around https://github.com/NixOS/nixpkgs/issues/78449

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
 2020-12-24 07:02:24 +01:00
Frederik Rietdijk
736dd028ca Merge staging-next into staging 2020-12-22 19:43:32 +01:00