gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-04-19 06:01:14 +00:00
committed by GitHub
parent c3d0f84e4a 3637dc530d
commit ce600a5e64
20 changed files with 183 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -380,6 +380,12 @@
githubId = 209175;
name = "Alesya Huzik";
};
aidalgol = {
email = "aidalgol+nixpkgs@fastmail.net";
github = "aidalgol";
githubId = 2313201;
name = "Aidan Gauland";
};
aij = {
email = "aij+git@mrph.org";
github = "aij";
pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix
+30
View File
@@ -0,0 +1,30 @@
{ trivialBuild
, lib
, fetchFromGitHub
}:
trivialBuild {
pname = "header-file-mode";
version = "unstable-2022-04-19";
src = fetchFromGitHub {
owner = "0x4b";
repo = "header-file-mode";
rev = "fdf1930730e1b0c3f82490099a1325805491eff5";
sha256 = "sha256-FJgRI6RLQk9osh7d+YRfrV5CoGCDx2cZvsjAWlm969c=";
};
postUnpack = ''
sourceRoot="$sourceRoot/lisp"
'';
meta = {
description = ''
A major mode that, when associated with the .h file extension, will put
those file into the major mode of their corresponding implementation file.
'';
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.all;
maintainers = with maintainers; [ aidalgol ];
};
}
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+2
View File
@@ -178,6 +178,8 @@
git-undo = callPackage ./git-undo { };
header-file-mode = callPackage ./header-file-mode { };
helm-words = callPackage ./helm-words { };
isearch-plus = callPackage ./isearch-plus { };
pkgs/applications/misc/ablog/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "ablog";
version = "0.10.23";
version = "0.10.24";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-fqqB17dNzcDZmFw3nj85T5zvMzY6SN/JxbB3IASOas8=";
sha256 = "sha256-bLpINvEH7B/duSRrfzvq25se0mvbbcxaEcAs8xMw6Kc=";
};
propagatedBuildInputs = [
pkgs/applications/misc/skate/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "skate";
version = "0.1.4";
version = "0.2.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "skate";
rev = "v${version}";
sha256 = "sha256-vZps/VXNK+17quPyE1b56YXE2GsW3oB4vPi7sA8EPGE=";
sha256 = "sha256-glqBiwW87BwGRZGDSvvE/WeK4BKqXGmC6Q9qBk+ROuc=";
};
vendorSha256 = "sha256-7cf/ldBli/q7aNiCO7qIw8o09hVpwDxF2h/UelP86V4=";
vendorSha256 = "sha256-VQvumXQx5Q0gt51NI65kjSnzGRyScpli36vfCygtAjE=";
doCheck = false;
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+8
View File
@@ -82,6 +82,14 @@ env.mkDerivation rec {
sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq";
};
patches = [
# fix build with KWayland 5.94+
# cf. https://invent.kde.org/frameworks/kwayland/-/commit/de442e4a94e249a29cf2e005db8e0a5e4a6a13ed
# upstream bug: https://github.com/telegramdesktop/tdesktop/issues/24375
# FIXME remove when no longer necessary
./kf594.diff
];
postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
pkgs/applications/networking/instant-messengers/telegram/tdesktop/kf594.diff
+57
View File
@@ -0,0 +1,57 @@
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index 7641579aa..3c195e397 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/base_platform_info.h"
-#include <connection_thread.h>
-#include <registry.h>
-#include <surface.h>
-#include <plasmashell.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/surface.h>
+#include <KWayland/Client/plasmashell.h>
using namespace KWayland::Client;
Submodule Telegram/lib_base contains modified content
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
index 32f0de6..30a087f 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QPointer>
#include <QtGui/QWindow>
-#include <connection_thread.h>
-#include <registry.h>
-#include <surface.h>
-#include <xdgforeign.h>
-#include <idleinhibit.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/surface.h>
+#include <KWayland/Client/xdgforeign.h>
+#include <KWayland/Client/idleinhibit.h>
using namespace KWayland::Client;
Submodule Telegram/lib_ui contains modified content
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
index 01f1e80..163cb6a 100644
--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <private/qwaylandwindow_p.h>
#include <private/qwaylandshellsurface_p.h>
-#include <connection_thread.h>
-#include <registry.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
Q_DECLARE_METATYPE(QMargins);
pkgs/applications/virtualization/imgcrypt/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "imgcrypt";
version = "1.1.1";
version = "1.1.4";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k";
sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA=";
};
ldflags = [
pkgs/applications/window-managers/herbstluftwm/default.nix
+9 -4
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, freetype, asciidoc
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
, nixosTests }:
stdenv.mkDerivation rec {
pname = "herbstluftwm";
version = "0.9.3";
version = "0.9.4";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
sha256 = "01f1bv9axjhw1l2gwhdwahljssj0h8q7a1bqwbpnwvln0ayv39qb";
sha256 = "1k03rdr6irsgnjl4w0vac0kk9nsz46qhy74iflmaycxgfv8fxy7f";
};
outputs = [
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
libXrandr
libXft
libXrender
libXdmcp
libXfixes
freetype
];
@@ -75,7 +77,10 @@ stdenv.mkDerivation rec {
pytestFlagsArray = [ "../tests" ];
disabledTests = [
"test_title_different_letters_are_drawn"
"test_title_different_letters_are_drawn" # font problems
"test_completable_commands" # font problems
"test_autostart" # $PATH problems
"test_wmexec_to_other" # timeouts in sandbox
];
passthru = {
pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
+13 -59
View File
@@ -1,12 +1,12 @@
From 57bed86429db9d871f1442c94f14e94e38972ca3 Mon Sep 17 00:00:00 2001
From d68fcb793d70032e978ecf8e0577eea955a741cf Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 16 May 2019 21:15:15 -0400
Date: Sun, 10 Apr 2022 12:02:10 +0800
Subject: [PATCH] meson: add options for tests installation dirs
---
meson_options.txt | 6 ++++++
tests/meson.build | 23 ++++++++++++++++-------
2 files changed, 22 insertions(+), 7 deletions(-)
tests/meson.build | 13 +++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/meson_options.txt b/meson_options.txt
index b9a2fb5..4b8629f 100644
@@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644
+ value: '',
+ description: 'Installation directory for binary files in tests')
diff --git a/tests/meson.build b/tests/meson.build
index 77281f5..7522456 100644
index 2b925e7..3276849 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -21,8 +21,17 @@ unit_tests = [
@@ -32,66 +32,20 @@ index 77281f5..7522456 100644
-installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path)
-installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path)
+test_suffix = join_paths('installed-tests', graphene_api_path)
+installed_test_suffix = join_paths('installed-tests', graphene_api_path)
+
+test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix)
+if test_datadir == ''
+ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix)
+installed_test_datadir = join_paths(get_option('installed_test_datadir'), installed_test_suffix)
+if installed_test_datadir == ''
+ installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), installed_test_suffix)
+endif
+
+test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix)
+if test_bindir == ''
+ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix)
+installed_test_bindir = join_paths(get_option('installed_test_bindir'), installed_test_suffix)
+if installed_test_bindir == ''
+ installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), installed_test_suffix)
+endif
# Make tests conditional on having mutest-1 installed system-wide, or
# available as a subproject
@@ -40,13 +49,13 @@ if mutest_dep.found()
output: wrapper,
command: [
gen_installed_test,
- '--testdir=@0@'.format(installed_test_bindir),
+ '--testdir=@0@'.format(test_bindir),
'--testname=@0@'.format(unit),
'--outdir=@OUTDIR@',
'--outfile=@0@'.format(wrapper),
],
install: get_option('installed_tests'),
- install_dir: installed_test_datadir,
+ install_dir: test_datadir,
)
test(unit,
@@ -55,7 +64,7 @@ if mutest_dep.found()
include_directories: graphene_inc,
c_args: common_cflags,
install: get_option('installed_tests'),
- install_dir: installed_test_bindir,
+ install_dir: test_bindir,
),
env: ['MUTEST_OUTPUT=tap'],
protocol: 'tap',
@@ -66,17 +75,18 @@ endif
if build_gir and host_system == 'linux' and not meson.is_cross_build()
foreach unit: ['introspection.py']
wrapper = '@0@.test'.format(unit)
+ install_data(unit, install_dir: test_bindir)
custom_target(wrapper,
output: wrapper,
command: [
gen_installed_test,
- '--testdir=@0@'.format(installed_test_bindir),
+ '--testdir=@0@'.format(test_bindir),
'--testname=@0@'.format(unit),
'--outdir=@OUTDIR@',
'--outfile=@0@'.format(wrapper),
],
install: get_option('installed_tests'),
- install_dir: installed_test_datadir,
+ install_dir: test_datadir,
)
test(unit,
--
2.31.1
2.35.1
pkgs/development/libraries/graphene/default.nix
+14 -3
View File
@@ -1,5 +1,7 @@
{ lib, stdenv
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -17,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "graphene";
version = "1.10.6";
version = "1.10.8";
outputs = [ "out" ]
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ];
@@ -26,12 +28,21 @@ stdenv.mkDerivation rec {
owner = "ebassi";
repo = pname;
rev = version;
sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc=";
sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI=";
};
patches = [
# Add option for changing installation path of installed tests.
./0001-meson-add-options-for-tests-installation-dirs.patch
# Disable flaky simd_operators_reciprocal test
# https://github.com/ebassi/graphene/issues/246
(fetchpatch {
url = "https://github.com/ebassi/graphene/commit/4fbdd07ea3bcd0964cca3966010bf71cb6fa8209.patch";
sha256 = "uFkkH0u4HuQ/ua1mfO7sJZ7MPrQdV/JON7mTYB4DW80=";
includes = [ "tests/simd.c" ];
revert = true;
})
];
depsBuildBuild = [
pkgs/games/lbreakout2/default.nix → pkgs/games/lgames/lbreakout2/default.nix
View File
pkgs/games/lgames/ltris/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ lib, stdenv, fetchurl, SDL, SDL_mixer }:
stdenv.mkDerivation rec {
pname = "ltris";
version = "1.2.4";
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
hash = "sha256-1ut7MBAjJ4YE2SkqkvL9L1ED7kEqdaEm0lUOLsI2j4M=";
};
buildInputs = [
SDL
SDL_mixer
];
hardeningDisable = [ "format" ];
meta = with lib; {
homepage = "https://lgames.sourceforge.io/LTris/";
description = "Tetris clone from the LGames series";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ciil ];
inherit (SDL.meta) platforms;
};
}
pkgs/games/ltris/default.nix
-22
View File
@@ -1,22 +0,0 @@
{ lib, stdenv, fetchurl, SDL, SDL_mixer }:
stdenv.mkDerivation rec {
pname = "ltris";
version = "1.0.19";
buildInputs = [ SDL SDL_mixer ];
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
};
patchPhase = "patch -p0 < ${./gcc5_compliance.diff}";
meta = with lib; {
description = "Tetris clone from the LGames series";
homepage = "http://lgames.sourceforge.net/LBreakout2/";
license = licenses.gpl2;
maintainers = [ maintainers.ciil ];
platforms = platforms.linux;
};
}
pkgs/games/ltris/gcc5_compliance.diff
-299
View File
@@ -1,299 +0,0 @@
Index: ChangeLog
===================================================================
--- ChangeLog (revision 163)
+++ ChangeLog (revision 164)
@@ -1,3 +1,5 @@
+- removed all inline keywords to work with GCC 5 (2015/05/16 MS)
+
1.0.19:
- removed link to lib math as not needed (2013/10/29 MS)
- reset key states when unpausing to prevent unwanted movement (2013/10/29 MS)
Index: src/bowl.c
===================================================================
--- src/bowl.c (revision 163)
+++ src/bowl.c (revision 164)
@@ -333,7 +333,7 @@
Set a tile contents and pixel contents.
====================================================================
*/
-inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
+void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
{
int i, j = y * bowl->block_size;
bowl->contents[x][y] = tile_id;
Index: src/sdl.c
===================================================================
--- src/sdl.c (revision 163)
+++ src/sdl.c (revision 164)
@@ -244,7 +244,7 @@
#endif
/* return full path of bitmap */
-inline void get_full_bmp_path( char *full_path, char *file_name )
+void get_full_bmp_path( char *full_path, char *file_name )
{
sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name );
}
@@ -330,7 +330,7 @@
/*
lock surface
*/
-inline void lock_surf(SDL_Surface *sur)
+void lock_surf(SDL_Surface *sur)
{
if (SDL_MUSTLOCK(sur))
SDL_LockSurface(sur);
@@ -339,7 +339,7 @@
/*
unlock surface
*/
-inline void unlock_surf(SDL_Surface *sur)
+void unlock_surf(SDL_Surface *sur)
{
if (SDL_MUSTLOCK(sur))
SDL_UnlockSurface(sur);
@@ -666,7 +666,7 @@
/*
lock font surface
*/
-inline void lock_font(Font *fnt)
+void lock_font(Font *fnt)
{
if (SDL_MUSTLOCK(fnt->pic))
SDL_LockSurface(fnt->pic);
@@ -675,7 +675,7 @@
/*
unlock font surface
*/
-inline void unlock_font(Font *fnt)
+void unlock_font(Font *fnt)
{
if (SDL_MUSTLOCK(fnt->pic))
SDL_UnlockSurface(fnt->pic);
@@ -905,7 +905,7 @@
/*
update rectangle (0,0,0,0)->fullscreen
*/
-inline void refresh_screen(int x, int y, int w, int h)
+void refresh_screen(int x, int y, int w, int h)
{
SDL_UpdateRect(sdl.screen, x, y, w, h);
}
@@ -1055,7 +1055,7 @@
/*
lock surface
*/
-inline void lock_screen()
+void lock_screen()
{
if (SDL_MUSTLOCK(sdl.screen))
SDL_LockSurface(sdl.screen);
@@ -1064,7 +1064,7 @@
/*
unlock surface
*/
-inline void unlock_screen()
+void unlock_screen()
{
if (SDL_MUSTLOCK(sdl.screen))
SDL_UnlockSurface(sdl.screen);
@@ -1073,7 +1073,7 @@
/*
flip hardware screens (double buffer)
*/
-inline void flip_screen()
+void flip_screen()
{
SDL_Flip(sdl.screen);
}
@@ -1132,7 +1132,7 @@
/*
get milliseconds since last call
*/
-inline int get_time()
+int get_time()
{
int ms;
cur_time = SDL_GetTicks();
@@ -1148,7 +1148,7 @@
/*
reset timer
*/
-inline void reset_timer()
+void reset_timer()
{
last_time = SDL_GetTicks();
}
Index: src/sdl.h
===================================================================
--- src/sdl.h (revision 163)
+++ src/sdl.h (revision 164)
@@ -41,8 +41,8 @@
SDL_Surface* load_surf(char *fname, int f);
SDL_Surface* create_surf(int w, int h, int f);
void free_surf( SDL_Surface **surf );
-inline void lock_surf(SDL_Surface *sur);
-inline void unlock_surf(SDL_Surface *sur);
+void lock_surf(SDL_Surface *sur);
+void unlock_surf(SDL_Surface *sur);
void blit_surf(void);
void alpha_blit_surf(int alpha);
void fill_surf(int c);
@@ -86,8 +86,8 @@
Font* load_fixed_font(char *fname, int off, int len, int w);
void free_font(Font **sfnt);
int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha);
-inline void lock_font(Font *sfnt);
-inline void unlock_font(Font *sfnt);
+void lock_font(Font *sfnt);
+void unlock_font(Font *sfnt);
SDL_Rect last_write_rect(Font *fnt);
int text_width(Font *fnt, char *str);
@@ -132,14 +132,14 @@
char** get_mode_names( int *count );
int set_video_mode( Video_Mode mode );
void hardware_cap();
-inline void refresh_screen( int x, int y, int w, int h );
+void refresh_screen( int x, int y, int w, int h );
void refresh_rects();
void add_refresh_rect(int x, int y, int w, int h);
int wait_for_key();
void wait_for_click();
-inline void lock_screen();
-inline void unlock_screen();
-inline void flip_screen();
+void lock_screen();
+void unlock_screen();
+void flip_screen();
void fade_screen( int type, int ms );
void take_screenshot( int i );
@@ -148,8 +148,8 @@
SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source );
/* timer */
-inline int get_time();
-inline void reset_timer();
+int get_time();
+void reset_timer();
#ifdef __cplusplus
};
Index: src/tools.c
===================================================================
--- src/tools.c (revision 163)
+++ src/tools.c (revision 164)
@@ -23,7 +23,7 @@
#include "ltris.h"
/* compares to strings and returns true if their first strlen(str1) chars are equal */
-inline int strequal( char *str1, char *str2 )
+int strequal( char *str1, char *str2 )
{
if ( strlen( str1 ) != strlen( str2 ) ) return 0;
return ( !strncmp( str1, str2, strlen( str1 ) ) );
@@ -30,7 +30,7 @@
}
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms )
+void delay_set( Delay *delay, int ms )
{
delay->limit = ms;
delay->cur = 0;
@@ -37,13 +37,13 @@
}
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay )
+void delay_reset( Delay *delay )
{
delay->cur = 0;
}
/* check if times out and reset */
-inline int delay_timed_out( Delay *delay, int ms )
+int delay_timed_out( Delay *delay, int ms )
{
delay->cur += ms;
if ( delay->cur >= delay->limit ) {
@@ -56,12 +56,12 @@
}
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay )
+void delay_force_time_out( Delay *delay )
{
delay->cur = delay->limit;
}
-inline void goto_tile( int *x, int *y, int d )
+void goto_tile( int *x, int *y, int d )
{
/* 0 -up, clockwise, 5 - left up */
switch ( d ) {
@@ -326,24 +326,24 @@
the target value until reached when counter_update() is called.
====================================================================
*/
-inline void counter_set( Counter *counter, double value )
+void counter_set( Counter *counter, double value )
{
counter->value = value;
counter->approach = value;
}
-inline void counter_add( Counter *counter, double add )
+void counter_add( Counter *counter, double add )
{
counter->value += add;
}
-inline double counter_get_approach( Counter counter )
+double counter_get_approach( Counter counter )
{
return counter.approach;
}
-inline double counter_get( Counter counter )
+double counter_get( Counter counter )
{
return counter.value;
}
-inline void counter_update( Counter *counter, int ms )
+void counter_update( Counter *counter, int ms )
{
double change;
if ( counter->approach == counter->value ) return;
Index: src/tools.h
===================================================================
--- src/tools.h (revision 163)
+++ src/tools.h (revision 164)
@@ -33,7 +33,7 @@
#define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) )
/* compares to strings and returns true if their first strlen(str1) chars are equal */
-inline int strequal( char *str1, char *str2 );
+int strequal( char *str1, char *str2 );
/* delete lines */
void delete_lines( char **lines, int line_number );
@@ -45,16 +45,16 @@
} Delay;
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms );
+void delay_set( Delay *delay, int ms );
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay );
+void delay_reset( Delay *delay );
/* check if time's out ( add ms milliseconds )and reset */
-inline int delay_timed_out( Delay *delay, int ms );
+int delay_timed_out( Delay *delay, int ms );
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay );
+void delay_force_time_out( Delay *delay );
/* return distance betwteen to map positions */
int get_dist( int x1, int y1, int x2, int y2 );
pkgs/servers/radicale/3.x.nix
+2 -3
View File
@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "radicale";
version = "3.1.5";
version = "3.1.6";
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
rev = "v${version}";
hash = "sha256-PGPUV0oOWmzc7Lih6D0sCwIuUB8FOyOrYUEIvMpr4HE=";
hash = "sha256-qu3s/rx5649l7oeiumPtQ9zS9jorMwWMPfO7YdOeGfQ=";
};
postPatch = ''
@@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec {
passlib
vobject
python-dateutil
setuptools
];
checkInputs = with python3.pkgs; [
pkgs/tools/misc/edid-decode/default.nix
+3 -3
View File
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "edid-decode-unstable";
version = "unstable-2018-12-06";
pname = "edid-decode";
version = "unstable-2022-04-06";
src = fetchgit {
url = "git://linuxtv.org/edid-decode.git";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "EDID decoder and conformance tester";
homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/";
homepage = "https://git.linuxtv.org/edid-decode.git";
license = licenses.mit;
maintainers = with maintainers; [ Madouura ];
platforms = lib.platforms.all;
pkgs/tools/security/dalfox/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dalfox";
version = "2.7.1";
version = "2.7.4";
src = fetchFromGitHub {
owner = "hahwul";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+Jr2pWV3iImKVnXH8mQXauHOh3uJChUe22U4JzIotD0=";
sha256 = "sha256-wNoZ8bXPnYO3qQO+Is5IRGukLj+QfA+xalKC6NVc5+0=";
};
vendorSha256 = "sha256-4ot9qvTsUMxbcbu1y+5Tkvgo3t0MWA1EPSGqM0CM2DU=";
vendorSha256 = "sha256-qaRUlgxGqZu5T3GHONT4MyHfHr/L6cqP7o0dV4OCOLY=";
meta = with lib; {
description = "Tool for analysing parameter and XSS scanning";
pkgs/top-level/aliases.nix
+1
View File
@@ -987,6 +987,7 @@ mapAliases ({
pidginsipe = throw "'pidginsipe' has been renamed to/replaced by 'pidgin-sipe'"; # Converted to throw 2022-02-22
pidginwindowmerge = throw "'pidginwindowmerge' has been renamed to/replaced by 'pidgin-window-merge'"; # Converted to throw 2022-02-22
pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19
ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18
piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22
pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18
pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -31101,9 +31101,9 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { };
lbreakout2 = callPackage ../games/lbreakout2 { };
lbreakout2 = callPackage ../games/lgames/lbreakout2 { };
ltris = callPackage ../games/ltris { };
ltris = callPackage ../games/lgames/ltris { };
lunar-client = callPackage ../games/lunar-client { };