mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
382998 commits 218 branches 122 tags 7.1 GiB
Commit graph

5821 commits

Author SHA1 Message Date
Sandro 6ffce07a36
Merge pull request #172334 from bb2020/gimx 2022-05-11 01:03:09 +02:00
D Anzorge 273e32f1aa minetest: use irrlichtmt from Nixpkgs, add optional touch support 
Touch support requires rebuilding irrlichtmt with touch support, which
upstream does not enable by default. Building Minetest with touch
support also disables the regular interface, so touch support defaults
to off.
 2022-05-10 19:26:25 +02:00
bb2020 fd8414512b gimx: fix build 2022-05-10 19:00:02 +03:00
Artturi 5074f16c7b
Merge pull request #172265 from otavio/topic/asc-ftbfs 
asc: force use of C++11 during build
 2022-05-10 06:22:03 +03:00
Nick Novitski fb7287e6d2 openmw: enable with glibc fix 2022-05-10 10:54:06 +08:00
Otavio Salvador c9078c5236 asc: force use of C++11 during build 
Log of error: https://hydra.nixos.org/log/f8yhxkg3zqqsz9ljbi98fsiibihvdbfd-asc-2.6.0.0.drv
Refs: ZHF: #172160
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 2022-05-09 21:57:04 -03:00
Sandro d82115927c
Merge pull request #168300 from dnaq/anki-2.1.50 
anki-bin: 2.1.49 -> 2.1.51
 2022-05-09 01:54:50 +02:00
Mustafa Çalışkan e4b550643c polymc: 1.2.1 -> 1.2.2 2022-05-09 00:57:46 +03:00
Artturi 841e6ae7cb
Merge pull request #171837 from trofi/update-opentyrian 
opentyrian: 2.1.20130907 -> 2.1.20220318
 2022-05-08 15:08:17 +03:00
R. Ryantm 6eab3568fa fheroes2: 0.9.14 -> 0.9.15 2022-05-08 02:07:39 +00:00
Sergei Trofimovich da840a3ba1 opentyrian: 2.1.20130907 -> 2.1.20220318 
Updated homepage url and download url to github.
Updated assets URL.
 2022-05-06 18:03:27 +01:00
Sandro 900a20ebc0
Merge pull request #170901 from NULLx76/papermc-update-1.18.2-313 
papermc: 1.18.1r132 -> 1.18.2r313
 2022-05-06 18:15:24 +02:00
Bernardo Meurer e6b94ad07e
Merge pull request #171602 from malob/treewide-mainProgram 
treewide: add meta.mainProgram to many packages
 2022-05-05 18:16:09 -07:00
Sandro d8443f9251
Merge pull request #170955 from SuperSandro2000/crossfire 
crossfire: fix version parsing for nix-env
 2022-05-05 23:10:28 +02:00
Malo Bourgon 16e15fa68f treewide: add meta.mainProgram to many packages 2022-05-04 18:08:19 -07:00
Sandro Jäckel b1950abfc1
crossfire: fix version parsing for nix-env 2022-05-04 19:15:52 +02:00
Sandro 2f900ae0ff
Merge pull request #170974 from SuperSandro2000/7kaa 2022-05-04 11:51:40 +02:00
Rick van Schijndel f02b987754
Merge pull request #171027 from trofi/fix-mindustry-runtime-depends 
mindustry: propagate more runtime depends
 2022-05-03 20:03:11 +02:00
Lassulus af887d87f1
Merge pull request #156360 from astro/yquake2 
yquake2: migrate from cmake to gnumake
 2022-05-03 18:30:39 +02:00
Sandro Jäckel c660b584ef
7kaa: fix nix-env version parsing 2022-05-03 17:49:34 +02:00
Ivar Scholten 4d46155835 osu-lazer: set dotnetFlags as an attribute 2022-05-02 20:22:21 +02:00
dnaq c9f742f7bc anki -> 2.1.51 
Since the previous version of anki no longer works on nixos-unstable
due to glibc changes the version was bumped to 2.1.51 which works.
Also adds support for aarch64 on apple silicon

Fixes #167765
 2022-05-01 17:54:06 +02:00
github-actions[bot] 5dce602f06
Merge master into haskell-updates 2022-05-01 00:16:25 +00:00
Sergei Trofimovich 26e02c1972 mindustry: propagate more runtime depends 
glew alone is not enough to propagate explicitly:

```
$ nix run nixpkgs#mindustry
[E] Failed to initialize discord. Enable debug logging for details.
[E] java.lang.ExceptionInInitializerError
        at arc.backend.sdl.SdlApplication.lambda$init$0(SdlApplication.java:73)
        at arc.backend.sdl.SdlApplication.check(SdlApplication.java:181)
        at arc.backend.sdl.SdlApplication.init(SdlApplication.java:73)
        at arc.backend.sdl.SdlApplication.<init>(SdlApplication.java:29)
        at mindustry.desktop.DesktopLauncher.main(DesktopLauncher.java:36)
Caused by: arc.util.ArcRuntimeException: Couldn't load shared library 'libsdl-arc64.so' for target: Linux, 64-bit
        at arc.util.SharedLibraryLoader.load(SharedLibraryLoader.java:85)
        at arc.backend.sdl.jni.SDL.<clinit>(SDL.java:142)
        ... 5 more
Caused by: arc.util.ArcRuntimeException: java.lang.UnsatisfiedLinkError: /tmp/arc/35a2b27b/libsdl-arc64.so: /nix/store/v8pdm5rd4f89ng08zgxryyil065g1dh2-SDL2-2.0.20/lib/libSDL2.so: cannot open shared object file: No such file or directory
        at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:288)
        at arc.util.SharedLibraryLoader.load(SharedLibraryLoader.java:81)
        ... 6 more
Caused by: java.lang.UnsatisfiedLinkError: /tmp/arc/35a2b27b/libsdl-arc64.so: /nix/store/v8pdm5rd4f89ng08zgxryyil065g1dh2-SDL2-2.0.20/lib/libSDL2.so: cannot open shared object file: No such file or directory
        at java.base/jdk.internal.loader.NativeLibraries.load(Native Method)
        at java.base/jdk.internal.loader.NativeLibraries$NativeLibraryImpl.open(NativeLibraries.java:383)
        at java.base/jdk.internal.loader.NativeLibraries.loadLibrary(NativeLibraries.java:227)
        at java.base/jdk.internal.loader.NativeLibraries.loadLibrary(NativeLibraries.java:169)
        at java.base/java.lang.ClassLoader.loadLibrary(ClassLoader.java:2407)
        at java.base/java.lang.Runtime.load0(Runtime.java:747)
        at java.base/java.lang.System.load(System.java:1857)
        at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:294)
        at arc.backend.sdl.jni.SDL$3.loadFile(SDL.java:140)
        at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:260)
        ... 7 more
```

Let's add all SDL and alsa-lib as well. Instead of using propagatedBuildInputs
let's embed store paths into a shell wrapper.
 2022-04-30 22:18:43 +01:00
Jonathan Ringer 075f25eb98 dwarf-fortress/dfhack: fix build with gcc 11 2022-04-30 11:00:41 -07:00
Pavol Rusnak 4b7a8ae947
treewide: refactor curlWithGnuTls into all-packages.nix 2022-04-30 18:56:59 +02:00
Jason O'Conal 58eae5a47e tintin: remove due to lack of maintainers 2022-04-30 15:44:03 +09:30
Dennis Gosnell f36e14d7cd
hedgewars: mark broken 2022-04-30 12:27:31 +09:00
Sandro 23be5cc043
Merge pull request #170833 from jonringer/bump-factorio-1.1.57 
factorio: 1.1.53 -> 1.1.57
 2022-04-29 18:26:02 +02:00
R. Ryantm 77edb0a28a vkquake: 1.12.2 -> 1.13.0 2022-04-29 09:36:52 -05:00
Victor 85f977180a papermc: 1.18.1r132 -> 1.18.2r313 2022-04-29 14:04:32 +02:00
Jonathan Ringer 442101e4f8
factorio: 1.1.53 -> 1.1.57 2022-04-28 18:34:16 -07:00
papojari de72347627
kabeljau: 1.1.0 → 1.2.0 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2022-04-27 22:16:03 +02:00
Sandro a65b7ef487
Merge pull request #169975 from DarkOnion0/aussault-cube 2022-04-26 16:48:00 +02:00
DarkOnion0 ab968d7dd0 assaultcube: 1.2.0.2 -> 1.3.0.2 
assaultcube: update meta field

assaultcube: update nix expression

assaultcube: reformat expression

assaultcube: add hooks and update desktop item
 2022-04-26 14:42:25 +02:00
Alvar Penning 6f5f386a6c openrct2: 0.3.5.1 -> 0.4.0 
https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.0
 2022-04-25 21:38:53 +02:00
Ivv 88dd6033ee
Merge pull request #168486 from mdarocha/dotnet-6.0.4-update 
dotnet-sdk: 6.0.201 -> 6.0.202
 2022-04-25 17:50:32 +02:00
papojari 2d928b6c61
kabeljau: init at 1.0.1 (#168930) 
* kabeljau: init at 1.0.1

* Update pkgs/games/kabeljau/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update pkgs/games/kabeljau/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2022-04-25 12:02:42 +02:00
mdarocha 4dd38e1b45 osu-lazer: update dependencies 2022-04-25 07:59:35 +02:00
mdarocha 58c8e4c8c0 osu-lazer: fix update.sh script 
Use the currently checked out nixpkgs, not the system one.
Also add a CLI flag to not update the app, but dependencies only.
 2022-04-25 07:58:44 +02:00
Sandro 550162327f
Merge pull request #166379 from atemp/master 
ddnet: 15.9.1 -> 16.0.3
 2022-04-25 04:40:50 +02:00
Ivv 41b500b737
Merge pull request #170092 from kira64xyz/master 
prboom-plus: init at 2.6.2
 2022-04-24 20:51:27 +02:00
Rick van Schijndel 14c59df2d2
Merge pull request #148113 from GRBurst/runescape3 
runescape-launcher: Use package from archive.org + add myself as maintainer
 2022-04-24 20:31:18 +02:00
Ashley Chiara dbf443827d prboom: remove 
PrBoom has not seen a release since 2008 and is essentially superseded
by PrBoom+
 2022-04-24 19:04:56 +02:00
Ashley Chiara ded34c9cb0 prboom-plus: init at 2.6.2 2022-04-24 18:10:08 +02:00
Dee Anzorge a3c605936a
xonotic: fix compiling with GCC11 (#170036) 
Upstream issue: https://gitlab.com/xonotic/darkplaces/-/issues/361
 2022-04-24 17:40:56 +02:00
Lassulus 4441cd9c54
Merge pull request #169902 from icelimetea/polymc-1.2.1 
polymc: 1.1.1 -> 1.2.1
 2022-04-23 20:46:30 +01:00
Michael Raskin c72d40e573 xconq: fix build by pinning C++ standard version 2022-04-23 12:08:50 +02:00
icelimetea c8577c92b8 polymc: 1.1.1 -> 1.2.1 2022-04-23 06:58:16 +01:00
Artturi 62866bc352
Merge pull request #169449 from Artturin/movetesting1 
testers.testVersion: move from trivial-builders.nix
 2022-04-23 06:06:16 +03:00
Anderson Torres 114bfa7d5c
Merge pull request #169267 from AndersonTorres/lgames 
Add lgames
 2022-04-22 13:18:55 -03:00
AndersonTorres ae841fd9ab barrage: init at 1.0.5 2022-04-22 12:18:57 -03:00
AndersonTorres 34158db516 lbreakouthd: init at 1.0.9 2022-04-22 12:18:57 -03:00
Bobby Rong 32e217d0e4
Merge pull request #169540 from trofi/fix-rili-on-gcc-11 
rili: fix build on gcc-11
 2022-04-22 23:08:29 +08:00
Artturin f1c7f19e49 treewide: testVersion -> testers.testVersion 2022-04-22 16:24:27 +03:00
AndersonTorres 6b841f4d89 lpairs2: init at 2.1 2022-04-22 10:05:53 -03:00
AndersonTorres c174731004 lbreakout2: rewrite 2022-04-22 10:05:53 -03:00
Ryan Mulligan 187764481b
Merge pull request #163758 from r-ryantm/auto-update/bzflag 
bzflag: 2.4.22 -> 2.4.24
 2022-04-21 11:39:12 -07:00
Bobby Rong bfc7dcbe6b
Merge pull request #169325 from WolfangAukang/heroic-2.2.6 
heroic: 2.2.1 -> 2.2.6
 2022-04-21 19:15:03 +08:00
Sergei Trofimovich 9acfaa8c61 rili: fix build on gcc-11 
Without the change the build fails on `master` as:

```
tableau.cc:90:9: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int')
   90 |   if(Buf<=0) return false;
      |      ~~~^~~
```
 2022-04-21 07:59:42 +01:00
Sandro eb004259d6
Merge pull request #169005 from SuperSandro2000/devilutionX 2022-04-20 22:00:07 +02:00
Sandro Jäckel db4a2977da
devilutionx: 1.3.0 -> 1.4.0 2022-04-20 20:13:06 +02:00
Lassulus a9f838bd82
Merge pull request #163192 from r-ryantm/auto-update/unciv 
unciv: 3.19.12 -> 3.19.14
 2022-04-20 13:53:22 +01:00
Serge K d924de58be
cudaPackages.cudnn: migrate to redist cuda, fix missing zlib (#168748) 
* cudaPackages.cudnn: migrate to redist cudaPackages

* cudaPackages.cudnn: fix missing zlib in rpath

* cudaPackages.cudnn: remove the propagated cudatoolkit

* cudaPackages.cudnn: use autoPatchelfHook

instead of custom find ... -exec ldd | grep routine
mark libcudnn_cnn_infer.so as needed for libcudnn.so on cudnn>=8.0.5
- a hint for autoPatchelf, as an alternative to manually adding $ORIGIN

* cudaPackages.cudnn: use automatic hooks for rpath

as a more common way to use addOpenGLRunpath and autoPatchelf with cudaPackages

* cudaPackages.cudnn: consume individual cuda packages

...since cudnn is part of the cuda package set

- introduces the scary useCudatoolkitRunfile function argument
  to discourage usage of the runfile-based cudatoolkit
- instead of the rather hidden useRedist term in let ... in
- repeats cudatoolkit_root pattern after cuda_joined in pytorch &c
  (the "toolchain view")
- redist packages are marked optional to support cuda<11.4 where the
  attributes for redist packages do not exist

* cudaPackages.cudnn: update to pname+version

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2022-04-19 20:52:52 +02:00
P. R. d. O 0e17b3643c
heroic: 2.2.1 -> 2.2.6 2022-04-19 07:01:44 -06:00
Anderson Torres 8c8d328086
Merge pull request #169158 from AndersonTorres/lgames 
ltris: 1.0.19 -> 1.2.4
 2022-04-18 23:28:11 -03:00
Anderson Torres bf4f8578ac
Merge pull request #168338 from MultisampledNight/bump-rare 
rare: 1.8.8 -> 1.8.9
 2022-04-18 20:15:18 -03:00
Lassulus 899fa4d162
Merge pull request #167007 from drperceptron/quake3e 
quake3e: 2020-04-04 -> 2022-04-01-dev
 2022-04-18 21:24:35 +01:00
AndersonTorres edc25332f4 ltris: 1.0.19 -> 1.2.4 2022-04-18 01:03:24 -03:00
AndersonTorres fd1492cdf7 ltris: move to lgames/ subdir 2022-04-18 01:03:24 -03:00
AndersonTorres 35ea9f1a6f lbreakout2: move to lgames/ subdir 2022-04-18 01:03:24 -03:00
Fabián Heredia Montiel a8b50d73b2 deliantra: refactor and override stdenv 2022-04-16 11:11:28 -05:00
Martin Weinelt a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Lassulus 92734ac395
Merge pull request #166865 from malob/treewide-mainProgram 
treewide: add meta.mainProgram to many packages
 2022-04-15 09:28:00 +01:00
github-actions[bot] 1c0229dbfd
Merge staging-next into staging 2022-04-15 00:03:21 +00:00
Pascal Bach 00e178b597
Merge pull request #168559 from astro/frogatto 
frogatto: unstable-2021-05-24 -> unstable-2022-04-13
 2022-04-14 21:47:03 +02:00
Artturi 0388bba624
Merge pull request #168004 from leiserfg/patch-2 2022-04-14 22:37:11 +03:00
github-actions[bot] 795332a20e
Merge staging-next into staging 2022-04-14 18:01:48 +00:00
Malo Bourgon 0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
Ryan Mulligan 4b01c99e18
Merge pull request #167961 from izik1/osu-lazer-bump-2022405 
osu-lazer: 2022.205.0 -> 2022.409.0
 2022-04-14 08:22:12 -07:00
Vladimír Čunát d5d94127fd
Merge branch 'staging-next' into staging 
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
 2022-04-14 09:53:21 +02:00
Astro d7bd0d2fd7 frogatto: unstable-2021-05-24 -> unstable-2022-04-13 2022-04-14 01:42:17 +02:00
Skyler Rain Ross d8e5afd783
osu-lazer: 2022.205.0 -> 2022.409.0 2022-04-11 16:02:07 -07:00
MultisampledNight 8adfdcb746
rare: 1.8.8 -> 1.8.9 
https://github.com/Dummerle/Rare/releases/tag/1.8.9
 2022-04-12 00:30:51 +02:00
Thiago Kenji Okada b1cdb609b0
Merge pull request #168035 from r-ryantm/auto-update/fheroes2 
fheroes2: 0.9.13 -> 0.9.14
 2022-04-11 21:22:25 +01:00
GRBurst abe8ff56e2
update remote package hash 
Signed-off-by: GRBurst <GRBurst@protonmail.com>
 2022-04-11 11:43:55 +02:00
GRBurst 2f444f12c8
runescape-launcher: use package from archive.org 
Signed-off-by: GRBurst <GRBurst@protonmail.com>
 2022-04-11 11:43:55 +02:00
GRBurst 14f36b6f87
Update hash + add myself as maintainer 
Signed-off-by: GRBurst <GRBurst@protonmail.com>
 2022-04-11 11:43:55 +02:00
ajs124 5949b253ad
Merge pull request #165037 from tgunnoe/openjk-updates 
openjk: update and add Jedi Outcast output
 2022-04-10 22:36:09 +01:00
Artturi 5be8702e8b
Merge pull request #166951 from iblech/patch-jumpnbump1.30 
enigma: 1.30-alpha -> 1.30
 2022-04-10 14:33:51 +03:00
Leiser Fernández Gallo 6a54835299 mindustry: Set ALSA_PLUGIN_DIR environment variable 
Without it, there is no audio.
 2022-04-10 00:01:30 +02:00
R. Ryantm 9de6fad194 fheroes2: 0.9.13 -> 0.9.14 2022-04-09 19:33:52 +00:00
github-actions[bot] f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Frederik Rietdijk 1d63f89caa cudaPackages: overhaul of how we package cuda packages 
There are many different versions of the `cudatoolkit` and related
cuda packages, and it can be tricky to ensure they remain compatible.

- `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist");
- expressions should now use `cudaPackages` as parameter instead of the individual cuda packages;
- `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version;
- `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
 2022-04-09 08:50:22 +02:00
github-actions[bot] 62fec6748f
Merge staging-next into staging 2022-04-08 06:02:02 +00:00
Anderson Torres c804ddb129
Merge pull request #108990 from iblech/patch-bb 
koules: init at 1.4
 2022-04-07 21:59:33 -03:00
Ingo Blechschmidt 03b659b9b2 koules: init at 1.4 2022-04-07 09:04:00 +02:00
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
Heinz Deinhart 104d8c8f80 ddnet: 16.0.2 -> 16.0.3 2022-04-04 22:49:39 +02: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
Dr Perceptron 4565febba8
quake3e: 2020-04-04 -> 2022-04-01-dev 2022-04-03 17:13:52 +10: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
Heinz Deinhart 70f50a9dfb ddnet: 16.0.1 -> 16.0.2 2022-04-02 21:04:10 +02:00
Ingo Blechschmidt ba46176d4e enigma: 1.30-alpha -> 1.30 2022-04-02 19:56:17 +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
Heinz Deinhart 6fabd819a0 ddnet: 16.0 -> 16.0.1 2022-03-30 20:45:06 +02:00
Heinz Deinhart 7212c1acd9 ddnet: 15.9.1 -> 16.0 2022-03-30 09:58:14 +02: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
R. Ryantm 47be0b370a black-hole-solver: 1.10.1 -> 1.12.0 2022-03-29 09:48:54 +00: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