ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity
332,877 Commits 96 Branches 102 Tags 4.5 GiB
83e4222bb6
Commit Graph

5098 Commits

Author SHA1 Message Date
Vladimír Čunát
83e4222bb6
Merge branch 'staging-next' into staging 2021-11-20 00:06:34 +01: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
github-actions[bot]
e9cc89e77e
Merge staging-next into staging 2021-11-19 18:01:56 +00: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]
93d09085ea
Merge staging-next into staging 2021-11-18 18:01:51 +00: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
Robert Hensing
9005cb8835
Merge pull request #145841 from l0b0/fix-indentation 
Fix indentation
 2021-11-18 00:38:59 +01: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
Mario Rodas
b329156118
Merge pull request #145464 from kurnevsky/wesnoth 
wesnoth: 1.16.0 -> 1.16.1
 2021-11-14 09:11:24 -05:00
figsoda
08d371f041
Merge pull request #145868 from r-ryantm/auto-update/osu-lazer 
osu-lazer: 2021.1105.0 -> 2021.1113.0
 2021-11-14 09:08:35 -05:00
R. Ryantm
2a6b6b2a3c osu-lazer: 2021.1105.0 -> 2021.1113.0 2021-11-14 06:26:18 +00:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces 
I've tried to be consistent, using four or eight spaces to line up
with existing code.
 2021-11-14 16:04:46 +13:00
Thiago Kenji Okada
7d83f50e80
Merge pull request #141997 from flexagoon/openrw-update 
openrw: 2018-10-26 -> 2021-10-14
 2021-11-13 21:47:29 -03:00
github-actions[bot]
9b5a105856
Merge master into staging-next 2021-11-14 00:01:47 +00:00
Thiago Kenji Okada
beff4b8178
Merge pull request #145802 from fgaz/domination/1.2.4 
domination: 1.2.3 -> 1.2.4, add nixos test
 2021-11-13 19:12:28 -03:00
Francesco Gazzetta
df99f2326e nixosTests.domination: init 2021-11-13 23:00:20 +01:00
github-actions[bot]
914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot]
4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
sternenseemann
4e50d99934 soldat-unstable: build using CMake 
This will be the build system going forward, so it seems sensible to
support it right away. There's no neat way to use the system
GameNetworkingSockets upstream yet, so we add a hack for now.

Proactively decrease platforms to Linux only since the CMake doesn't
quite use GNUInstallDirs on Darwin and Windows unfortunately.
 2021-11-13 18:49:45 +01:00
sternenseemann
d37d84bdca soldat-unstable: 2021-04-27 -> 2021-11-01 
Now builds with GameNetworkingSockets 1.3.0.
 2021-11-13 18:49:45 +01:00
Francesco Gazzetta
df177cf39b domination: 1.2.3 -> 1.2.4 2021-11-13 17:49:46 +01:00
github-actions[bot]
65356b24bf
Merge staging-next into staging 2021-11-12 18:01:48 +00:00
github-actions[bot]
699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
Ben Siraphob
8f39ad3da1
Merge pull request #145514 from legendofmiracles/stockfish 2021-11-12 11:23:37 -06:00
github-actions[bot]
a4e03b8977
Merge staging-next into staging 2021-11-11 18:01:50 +00:00
github-actions[bot]
f2d7271432
Merge master into staging-next 2021-11-11 18:01:13 +00:00
Sandro
4fefd155f0
Merge pull request #142262 from astro/yquake2 2021-11-11 17:53:47 +01:00
legendofmiracles
479899c085
stockfish: 14 -> 14.1; fix license 2021-11-11 10:42:33 -06:00
Thiago Kenji Okada
fced082cc6
Merge pull request #144798 from marius851000/openmw047 
openmw: 0.46 -> 0.47
 2021-11-11 12:06:25 -03:00