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
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
Bobby Rong
1c46c8f7d8
gnonograms: fix build with meson 0.61
2022-03-25 10:50:53 +08:00
Artturin
33cce15e42
treewide: remove meta.repositories
...
there's no documentation for meta.repositories and its not widely used
2022-03-24 23:56:14 +02:00
Jonathan Ringer
96f1f99c05
steam: don't set XDG_DATA_DIR
2022-03-24 12:53:39 -07:00
Doron Behar
4a02c56a7d
Merge pull request #164746 from ncfavier/makeWrapper-chdir
2022-03-24 13:51:27 +02:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging
2022-03-23 06:01:55 +00:00
R. RyanTM
8e9b5c9f88
katago: 1.10.0 -> 1.11.0 ( #165090 )
...
Co-authored-by: OmnipotentEntity <OmnipotentEntity@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-23 05:52:43 +01:00
Sandro
b241232b6d
Merge pull request #163978 from muscaln/polymc-1.1.0
2022-03-23 04:25:30 +01:00
github-actions[bot]
9d35f2cd19
Merge staging-next into staging
2022-03-22 18:10:54 +00:00
Bobby Rong
f24e4ea387
Merge pull request #164768 from LegoLoverGo/master
...
lunar-client: 2.9.3 -> 2.10.0
2022-03-22 20:16:23 +08:00
github-actions[bot]
6ae26bb3c8
Merge staging-next into staging
2022-03-21 18:07:51 +00:00
Jonathan Ringer
23a6705050
steam: do not install mesa drivers
...
These should be found in /run/opengl-driver/lib/
on relevant system configurations.
2022-03-21 07:47:16 -07:00
Vladimír Čunát
a519740b4c
Merge branch 'staging-next' into staging
2022-03-21 11:57:43 +01:00
tgunnoe
c3612bf87c
openjk: add Jedi Outcast and split up into outputs
2022-03-20 20:04:44 -04:00
tgunnoe
f244256dfb
openjk: 2020-07-03 -> unstable-2022-01-30
2022-03-20 19:53:03 -04:00
Martin Weinelt
f4f3622cb1
Merge remote-tracking branch 'origin/staging-next' into staging
2022-03-20 00:00:32 +01:00
Naïm Favier
9160044f5f
treewide/makeWrapper: replace --run cd
with --chdir
...
Lay the groundwork for switching to binary wrappers by reducing uses
of `--run` (which is not supported by `makeBinaryWrapper`).
2022-03-19 09:46:31 +01:00
P. R. d. O
14b8c98e78
rare: init at 1.8.8
2022-03-18 22:03:14 -06:00
Pascal Bach
b8522e27a1
Merge pull request #164688 from peterhoeg/f/airshipper
...
airshipper: work around deprecated names
2022-03-18 22:29:17 +01:00
Paul Walker
5e801d82dd
lunar-client: 2.9.3 -> 2.10.0
2022-03-18 15:58:31 -04:00
Peter Hoeg
3320a62eb3
airshipper: work around deprecated names
2022-03-18 16:58:34 +08:00
github-actions[bot]
abc8ee49e5
Merge staging-next into staging
2022-03-17 06:01:51 +00:00
Peter Hoeg
9cfedd0589
gcompris: 2.1 -> 2.3
2022-03-17 09:52:51 +08:00
zowoq
6431086967
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Ryan Mulligan
99a9574518
Merge pull request #164251 from r-ryantm/auto-update/terraria-server
...
terraria-server: 1.4.3.5 -> 1.4.3.6
2022-03-15 07:27:22 -07:00
R. Ryantm
e5c209d965
terraria-server: 1.4.3.5 -> 1.4.3.6
2022-03-15 11:00:32 +00:00
davidak
3f51820f39
Merge pull request #129707 from dtzWill/update/klavaro-3.13
...
klavaro: 3.11 -> 3.13, espeak support
2022-03-14 16:53:24 +01:00
Jonathan Ringer
198f6c583e
steam: re-expose LD_LIBRARY_PATH
...
Was incorrectly altered after cherry-pick
2022-03-14 08:15:45 -07:00
R. Ryantm
aee602ac0e
airshipper: 0.6.0 -> 0.7.0
2022-03-14 21:44:42 +08:00
Alyssa Ross
674223e648
tuxpaint: enable parallel building
...
Tested at -j48.
2022-03-14 12:57:44 +00:00
Alyssa Ross
3d0e5c1227
tuxpaint: stamps: 2014-08-23 -> 2021-11-25
2022-03-14 12:57:44 +00:00
Alyssa Ross
d319a2b798
tuxpaint: 0.9.24 -> 0.9.27; clarify license
...
It's not right for everything to be in nativeBuildInputs, but most of
the dependencies will never cross-compile anyway, so I'm just going to
leave it alone.
2022-03-14 12:57:44 +00:00
Alyssa Ross
e1b23b90ce
xsnow: 3.3.6 -> 3.4.4
2022-03-14 12:57:11 +00:00
Will Dietz
5dd15bb54c
klavaro: another icon fix per PR feedback
2022-03-14 07:50:05 -05:00
Alyssa Ross
d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/compilers/ocaml/4.12.nix
pkgs/development/python-modules/oci/default.nix
pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
Anderson Torres
8590804259
Merge pull request #164046 from AndersonTorres/metalab-mirrors
...
Change metalab mirrors to ibiblioPubLinux ones
2022-03-14 08:26:42 -03:00
Artturi
ad02135fb2
Merge pull request #163750 from anund/fix_devilutionx_icons
2022-03-14 13:08:13 +02:00
Will Dietz
606eab00d0
klavaro: patch to use non-deprecated names for icons
...
Started just wanting to fix the "gtk-strikethrough" icon,
but kept finding items marked deprecated.
This change may be incomplete, but all changes were to deprecated
icons (that used to be "stock", I think).
Icon name candidates were identified by extracting all used icon-name
values and checking which existed in my system's copy of the 'breeze' theme.
If missing, these were checked online to find the new replacement.
(I couldn't find an authoritative list of the replacements,
but looking each up finds the right deprecation warning)
2022-03-13 22:39:36 -05:00
Will Dietz
09c7cf2f4e
klavaro: patch to fix invalid free
2022-03-13 22:39:35 -05:00
AndersonTorres
ae55f08023
bsdgames: ibiblioPubLinux mirror
2022-03-13 21:18:53 -03:00
Will Dietz
65eed885d6
klavaro: 3.11 -> 3.13, espeak support
...
* espeak fixup from #64488
* gtkdatabox
2022-03-13 13:06:56 -05:00
Mustafa Çalışkan
6bda8f8d5c
polymc: 1.0.6 -> 1.1.0
2022-03-13 12:29:36 +03:00
Sergei Trofimovich
71b07eaac3
freedroidrpg: add upstream fix for -fno-common toolchains
...
Without the upstream change build fails on toolchains that default to
`-fno-common` (like clang-13 or upstream gcc-10+):
$ nix build --impure --expr 'with import ./.{}; freedroidrpg.override { stdenv = clang13Stdenv; }' -L
...
freedroidrpg> ld: addon_crafting_ui.o:/build/freedroidrpg-0.16.1/src/./struct.h:1025:
multiple definition of `tux_rendering'; action.o:/build/freedroidrpg-0.16.1/src/./struct.h:1025: first defined here
...
2022-03-13 07:59:07 +00:00
Anund
ee7e17b540
devilutionx: fix invalid icon filename references
...
The .desktop entries for devilutionx and devilutionx-hellfire point to
icons with an *x* at the end of devilutionx. Added in that missing x and
included the 32x32 variant of those icons.
2022-03-12 04:23:31 +11:00
github-actions[bot]
eaea048b2a
Merge staging-next into staging
2022-03-11 00:02:48 +00:00
Artturi
2aec8ab333
Merge pull request #163218 from r-ryantm/auto-update/vintagestory
...
vintagestory: 1.16.3 -> 1.16.4
2022-03-11 01:29:12 +02:00
github-actions[bot]
03c9842a65
Merge staging-next into staging
2022-03-10 18:02:01 +00:00
Philipp Riegger
90aa1ce3cc
factorio-experimental: 1.1.53 -> 1.1.56
2022-03-09 20:32:11 +01:00
Francesco Gazzetta
997fa335c3
warzone2100: 4.2.6 -> 4.2.7
2022-03-09 19:34:40 +01:00
github-actions[bot]
b4fed0cbba
Merge staging-next into staging
2022-03-09 18:05:08 +00:00
Sandro
cef4c12411
Merge pull request #162985 from trofi/fix-ufoai-underlinking
2022-03-09 16:17:08 +01:00
github-actions[bot]
f6b4a4048a
Merge staging-next into staging
2022-03-09 12:01:59 +00:00
R. Ryantm
5b0df0234d
fheroes2: 0.9.12 -> 0.9.13
2022-03-08 06:23:40 +00:00
github-actions[bot]
40d2f7c54e
Merge staging-next into staging
2022-03-08 00:02:45 +00:00
R. Ryantm
705f2d7827
vintagestory: 1.16.3 -> 1.16.4
2022-03-07 23:06:10 +00:00
R. Ryantm
9b4a029461
terraria-server: 1.4.3.2 -> 1.4.3.5
2022-03-07 20:03:12 +00:00
R. Ryantm
b497963974
unciv: 3.19.12 -> 3.19.14
2022-03-07 18:51:35 +00:00
zowoq
c46399881b
Merge staging-next into staging
...
Conflicts:
pkgs/tools/security/cosign/default.nix
2022-03-06 22:06:04 +10:00
Sergei Trofimovich
e545a7796b
ufoai: fix underlinking against -lm
...
Without the change build fails as:
ld: release-linux-x86_64/testall/client/sound/s_mix.c.o: undefined reference to symbol 'acos@@GLIBC_2.2.5'
With change added I was able to start ufoai.
2022-03-06 08:52:54 +00:00
Artturi
c5a78fde9c
Merge pull request #161922 from jyooru/remove/steam-fonts
...
steam-fonts: remove
2022-03-06 10:16:11 +02:00
Artturi
6f24db2d94
Merge pull request #162015 from r-ryantm/auto-update/unciv
...
unciv: 3.19.8 -> 3.19.12
2022-03-06 09:49:36 +02:00
github-actions[bot]
90f82a2f9a
Merge staging-next into staging
2022-03-06 00:02:44 +00:00
Atemu
b4e2df2e10
remove networkmanager098 ( #162904 )
2022-03-05 22:19:36 +02:00
github-actions[bot]
fade30f7b2
Merge staging-next into staging
2022-03-05 12:01:44 +00:00
Brian Leung
19d4aedf71
vimgolf: init at 0.5.0 ( #157642 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-05 01:22:42 +01:00
Alyssa Ross
c010a19a56
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/hypothesmith/default.nix
2022-03-04 14:53:05 +00:00