swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 08:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
367782 commits 5 branches 0 tags 31 GiB
Commit graph

5611 commits

Author SHA1 Message Date
github-actions[bot] 3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
OPNA2608 b75018a789 bugdom: Enable on Darwin 2022-04-05 23:57:06 +02:00
Vladimír Čunát b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Lassulus 1eaa0a1212
Merge pull request #152454 from luxferresum/bugdom 
bugdom: init at 1.3.1
 2022-04-05 13:37:50 +01:00
github-actions[bot] c9154e5e14
Merge staging-next into staging 2022-04-04 00:02:45 +00:00
Martin Weinelt bb7e4b378e Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 00:46:44 +02:00
Martin Weinelt f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
Lassulus 6ca329b77e
Merge pull request #160602 from emilytrau/liberation-circuit-save 
liberation-circuit: 1.3 -> unstable-2022-01-02
 2022-04-03 20:15:14 +01:00
github-actions[bot] c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Stefan Frijters 6fc9e4b700
openttd-jgrpp: Add optional but recommended zstd dependency 
Fixes

```
CMake Warning at cmake/LinkPackage.cmake:23 (message):
  ZSTD not found; compiling OpenTTD without ZSTD is not recommended
  Call Stack (most recent call first):
    CMakeLists.txt:330 (link_package)
```
 2022-04-03 13:52:24 +02:00
Stefan Frijters 3d16e9db85
openttd-jgrpp: 0.44.0 -> 0.47.1 2022-04-03 13:43:24 +02:00
Stefan Frijters 98e1f0ba4e
openttd: 12.1 -> 12.2 2022-04-03 13:43:09 +02:00
github-actions[bot] fa7a0dbb82
Merge staging-next into staging 2022-04-03 00:03:35 +00:00
github-actions[bot] fc36f69a60
Merge master into staging-next 2022-04-03 00:02:50 +00:00
Ben Siraphob da2ff7edbc
Merge pull request #166807 from hqurve/space-cadet-pinball 2022-04-02 16:16:55 -05:00
Fabián Heredia Montiel 40a18fbf7c steam-fhs: remove unecessary symlink 2022-04-02 22:16:56 +02:00
Alyssa Ross 8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
 2022-04-02 16:45:48 +00:00
hqurve 7683eadc87 space-cadet-pinball: reimplement fix darwin build 
Darwin builds need a custom installPhase since it is excluded from the cmake install
0f88e43ba2/CMakeLists.txt (L221)
 2022-04-01 07:54:58 -04:00
hqurve 00bbc3f18e Revert "space-cadet-pinball: fix darwin build" 
This reverts commit d066c12298.
 2022-04-01 07:13:52 -04:00
github-actions[bot] be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00
Ben Siraphob 4c38fcb192
treewide: move cmake into nativeBuildInputs 2022-03-31 12:35:21 -05:00
github-actions[bot] 9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next 
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
 2022-03-31 11:46:46 +00:00
Alyssa Ross 22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
 2022-03-31 11:42:24 +00:00
Ben Siraphob 5187709ff7
Merge pull request #166508 from siraben/automake-buildinputs 2022-03-31 03:15:41 -05:00
Martin Weinelt d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Ben Siraphob 1f545f9900
Merge pull request #166506 from siraben/space-cadet-pinball-darwin 2022-03-30 20:36:33 -05:00
Ben Siraphob 21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
Ben Siraphob d066c12298
space-cadet-pinball: fix darwin build 2022-03-30 19:46:44 -05:00
Ben Siraphob 26fecc802f
Merge pull request #166365 from siraben/2048-expand-darwin 2022-03-29 23:52:05 -05:00
Ben Siraphob c9e8b42eca
2048-in-terminal: expand platforms to unix 2022-03-29 23:47:00 -05:00
Sandro 2c9380ddd0
Merge pull request #166171 from SquarePear/polymc-1.1.1 2022-03-30 01:41:20 +02:00
Martin Weinelt 630d5e1d0d Merge remote-tracking branch 'origin/master' into staging-next 2022-03-29 18:17:36 +02:00
Ben Siraphob ea35502fe4
xtris: fix darwin build 2022-03-29 09:36:30 -05:00
Jeffrey Harmon 1524abe689
polymc: 1.1.0 -> 1.1.1 2022-03-28 21:37:23 -04:00
github-actions[bot] 36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
github-actions[bot] e3d20dfaa5
Merge master into staging-next 2022-03-27 18:01:05 +00:00
7c6f434c 66be55b715
Merge pull request #165773 from kirillrdy/master 
flightgear: 2020.3.11 -> 2020.3.12
 2022-03-27 15:47:58 +00:00
Martin Weinelt d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
Sandro 91f05ba694
Merge pull request #163485 from fgaz/warzone2100/4.2.7 2022-03-27 12:02:34 +02:00
github-actions[bot] b2fc63a844
Merge staging-next into staging 2022-03-26 12:02:50 +00:00
Vladimír Čunát a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Artturi 72b0c4437b
Merge pull request #165729 from bobby285271/gnonograms 
gnonograms: fix build with meson 0.61
 2022-03-26 06:49:35 +02:00
Artturin 0f3e905834 dwarf-fortress.themes: add -theme suffix to name 2022-03-25 22:56:26 +02:00
Kirill Radzikhovskyy 5b9c33e764 flightgear: 2020.3.11 -> 2020.3.12 2022-03-26 04:32:53 +11:00
github-actions[bot] 8357b101a5
Merge staging-next into staging 2022-03-25 12:02:05 +00:00
github-actions[bot] a9efb8b792
Merge master into staging-next 2022-03-25 12:01:27 +00:00
Peter Hoeg 8d2df0f499 remove junk 2022-03-25 19:30:11 +08:00
Peter Hoeg 28a3079831 airshipper: add libGL to get gfx debug output 2022-03-25 19:30:11 +08:00
Vladimír Čunát 0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00