mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-16 09:53:17 +00:00
Code Issues Wiki Activity
334758 commits 172 branches 125 tags 5.5 GiB
Commit graph

5120 commits

Author SHA1 Message Date
Artturi 740bccb9bf
Merge pull request #147838 from bflyblue/vintagestory-1.5.10 2021-11-29 22:01:59 +02:00
Sandro 0640d5a32d
Merge pull request #147556 from TredwellGit/steamPackages.steam-runtime 2021-11-29 20:30:46 +01:00
Sandro bf2e83c571
Merge pull request #147587 from atopuzov/bump-augustus 2021-11-29 20:26:32 +01:00
Shaun Sharples 6d3cfa53d6 vintagestory: 1.15.5 -> 1.15.10 2021-11-29 12:28:00 +02:00
Bobby Rong 7dcd2f54b8
Merge pull request #147735 from viric/fix-frogatto 
frogatto: 2021-05-24 -> 2021-11-23
 2021-11-29 12:12:32 +08:00
Lluís Batlle i Rossell 873042271a frogatto: 2021-05-24 -> 2021-11-23 
And fix build
 2021-11-28 18:02:36 +01:00
AndersonTorres d20dc69664 residualvm: remove 
Now ResidualVM lives inside ScummVM.
 2021-11-27 10:53:16 -03:00
Aleksandar Topuzović 592218648c
augustus: 3.0.1 -> 3.1.0 2021-11-27 11:31:57 +00:00
TredwellGit dbda557c64 steamPackages.steam-runtime: 0.20210906.1 -> 0.20211102.0 2021-11-27 01:15:42 +00:00
Thiago Kenji Okada c64e1f60ff
Merge pull request #147455 from ElXreno/package-ddnet-15.7 
ddnet: 15.6.2 -> 15.7
 2021-11-26 13:05:47 -03:00
Sandro 715d9c37f8
Merge pull request #146941 from oxzi/openrct2-0.3.5.1 2021-11-26 13:30:21 +01:00
Sandro caaf4bc95c
Merge pull request #147264 from lukegb/factorio 2021-11-26 12:00:37 +01:00
Luke Granger-Brown 62363f5e19 factorio: 1.1.46 -> 1.1.48 2021-11-26 09:31:44 +00:00
ElXreno 38a950b377
ddnet: 15.6.2 -> 15.7 2021-11-26 08:26:03 +03:00
Luke Granger-Brown 0d0763c951 factorio-experimental: 1.1.45 -> 1.1.48 2021-11-24 14:54:29 +00:00
Rick van Schijndel 4179df352b mindustry: fix eval error due to #119444 
The PR https://github.com/NixOS/nixpkgs/pull/119444 broke the build for mindustry
even further. This patch fixes that again so it evals and builds properly.
 2021-11-23 23:41:24 +01:00
Rick van Schijndel 7824302dd0 mindustry: mitigate issue with missing glew 
Fixes: https://github.com/NixOS/nixpkgs/issues/109798
 2021-11-23 23:41:15 +01:00
Rick van Schijndel 19c06baf6c mindustry: unbreak by building with jdk15 
Fixes: https://github.com/NixOS/nixpkgs/issues/128929
 2021-11-23 23:41:14 +01:00
Francesco Gazzetta e9f119566a warzone2100: 4.2.1 -> 4.2.2 2021-11-23 18:20:50 +01:00
Kevin Cox dc447918a0
Merge pull request #119444 from lorenzleutgeb/gradle-jdk 
gradle: Decouple from JDK 8 and support Java Toolchains
 2021-11-22 16:27:10 -05:00
Alvar Penning 1c8040364b openrct2: 0.3.5 -> 0.3.5.1 
Next to the bumping the version to the latest release, a comment was
reworded and the repository URL was added for the downloadPage.
 2021-11-22 00:02:47 +01:00
Jonathan Ringer 09e494f4c2
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
	pkgs/applications/window-managers/sway/default.nix
 2021-11-21 14:40:40 -08:00
Sergei Trofimovich 194310ce7c _2048-in-terminal: 2017-11-29 -> 2021-09-12 
While at it apply pending ncurses-6.3 fix. Otherwise build fails as:

    draw.c:232:9: error: format not a string literal and no format arguments [-Werror=format-security]
      232 |         mvwprintw(board_win, center, left+1, tile_str[val]);
          |         ^~~~~~~~~
 2021-11-21 15:40:38 +00:00
github-actions[bot] f515d91189
Merge master into staging-next 2021-11-20 18:01:07 +00:00
Guillaume Girol 3db958ab4c
Merge pull request #145052 from oxzi/openrct2-0.3.5 
openrct2: 0.3.4.1 -> 0.3.5
 2021-11-20 16:29:09 +00:00
Jonathan Ringer fadaef5aed
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
	pkgs/applications/networking/browsers/chromium/common.nix
 2021-11-19 14:31:57 -08:00
Robert Hensing 2441a7992d
Merge pull request #146610 from l0b0/fix-keen4-shellcheck-lints 
keen4: Fix ShellCheck lints
 2021-11-19 22:48:38 +01:00
Lorenz Leutgeb 01f4c7ec88 gradle: Decouple gradleGen and JDK 2021-11-19 18:54:25 +01:00
Jonathan Ringer 6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
 2021-11-19 08:44:33 -08:00
Sandro 5bea0fab63
Merge pull request #145391 from bb2020/gimx 2021-11-19 16:42:32 +01:00
bb2020 852a72a70b gimx: refactor 2021-11-19 17:46:16 +03:00
Victor Engmark 6f70a225f4 keen4: Fail script if variables are undefined 
ShellCheck SC2154.
 2021-11-19 23:57:52 +13:00
Victor Engmark 8737cb2cc4 keen4: Add shebang line 
ShellCheck SC2148.
 2021-11-19 23:57:51 +13:00
Victor Engmark 38094397d7 keen4: Mark sourced file as unknown 
ShellCheck SC1091.
 2021-11-19 23:57:51 +13:00
Victor Engmark f367033a87 keen4: Quote variable references 
ShellCheck SC2086.
 2021-11-19 23:57:51 +13:00
github-actions[bot] 91e24d05d7
Merge master into staging-next 2021-11-18 18:01:14 +00:00
Sergei Trofimovich 473ac28b80 pacvim: pull pending upstream inclusion fix for ncurses-6.3 
Without the fix build on ncurses-6.3 fails as:

    src/helperFns.cpp:103:17:
      error: format not a string literal and no format arguments [-Werror=format-security]
      103 |         mvprintw(TOP+5, 0, (x).c_str());
          |         ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
 2021-11-18 10:33:56 +00:00
github-actions[bot] f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Dmitry Kalinkin 922661273c
beret: remove 
Was broken for 6 years
 2021-11-16 17:22:36 -05:00
github-actions[bot] ca7a3ad2e8
Merge master into staging-next 2021-11-16 18:01:14 +00:00
Dusk Banks ab054f8fdb steamPackages: make customisable 
Keep in mind the note in `lib.makeScopeWithSplicing`'s source:

    # N.B. the other stages of the package set spliced in are *not*
    # overridden.

To globally override `pkgs.steamPackages`, overlay `pkgs` like:

    final: prev: { steamPackages = steamPackages.overrideScope …; }
 2021-11-16 08:40:10 -08:00
Jonathan Ringer a2e621d20d
Merge remote-tracking branch 'origin/master' into staging-next 2021-11-16 07:50:20 -08:00
Pavol Rusnak 1663708500
Merge pull request #142468 from prusnak/dotnet-update 
dotnet-sdk_3: 3.1.19 -> 3.1.21 + dotnet-sdk_5: 5.0.10 -> 5.0.12
 2021-11-16 16:27:23 +01:00
Claudio Bley f201ba1bbd
osu-lazer: Update dependencies 2021-11-16 15:54:32 +01:00
github-actions[bot] 69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
Janne Heß 0329e54453
Merge pull request #146106 from TredwellGit/steam 2021-11-15 20:58:48 +01:00
TredwellGit e682fd7c83 steam: 1.0.0.72 -> 1.0.0.73 2021-11-15 09:20:52 +00:00
github-actions[bot] 9f6360b7fb
Merge staging-next into staging 2021-11-14 18:01:49 +00:00
sternenseemann 2f78a2d3a3 Merge remote-tracking branch 'origin/master' into staging-next 2021-11-14 16:26:44 +01:00
Alyssa Ross 4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
 2021-11-14 14:17:46 +00:00