forked from mirrors/nixpkgs
Merge branch 'master' into staging
Another couple thousand rebuilds.
This commit is contained in:
commit
304391b2f2
|
@ -16,7 +16,7 @@ let
|
|||
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
|
||||
|
||||
# Version to build.
|
||||
tag = "5.8";
|
||||
tag = "5.10";
|
||||
|
||||
in
|
||||
|
||||
|
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchgit {
|
||||
url = "git://git.ardour.org/ardour/ardour.git";
|
||||
rev = "e5c6f16126e0901654b09ecce990554b1ff73833";
|
||||
sha256 = "1lcvslrcw6g4kp9w0h1jx46x6ilz4nzz0k2yrw4gd545k1rwx0c1";
|
||||
rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6";
|
||||
sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "atom-${version}";
|
||||
version = "1.17.2";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
|
||||
sha256 = "05lf9f5c9l111prx7d76cr5h8h340vm7vb8hra5rdrqhjpdvwhhn";
|
||||
sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6";
|
||||
name = "${name}.deb";
|
||||
};
|
||||
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/usr/
|
||||
ar p $src data.tar.gz | tar -C $out -xz ./usr
|
||||
ar p $src data.tar.xz | tar -C $out -xJ ./usr
|
||||
substituteInPlace $out/usr/share/applications/atom.desktop \
|
||||
--replace /usr/share/atom $out/bin
|
||||
mv $out/usr/* $out/
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.2";
|
||||
version = "1.1.2-5";
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0kngyv5qjjpd93i1b8gn1vw6r8p52lfjrqa2f13nf06v9aqk0vfb";
|
||||
sha256 = "0whfnn7wf8nil9lb8hl9bccjrzwf9zpbf8pz607zg9x3q8g01p9d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
@ -65,6 +65,8 @@ stdenv.mkDerivation rec {
|
|||
--replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
|
||||
# The updater is needed for nixos env and it's tiny.
|
||||
moveToOutput bin/gtk-update-icon-cache "$out"
|
||||
# Launcher
|
||||
moveToOutput bin/gtk-launch "$out"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
14
pkgs/development/tools/build-managers/sbt/scala-native.nix
Normal file
14
pkgs/development/tools/build-managers/sbt/scala-native.nix
Normal file
|
@ -0,0 +1,14 @@
|
|||
{ lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }:
|
||||
|
||||
sbt.overrideDerivation(old: {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/sbt \
|
||||
--set CLANG_PATH "${llvmPackages.clang}/bin/clang" \
|
||||
--set CLANGPP_PATH "${llvmPackages.clang}/bin/clang" \
|
||||
--set CPATH "${lib.makeSearchPathOutput "dev" "include" [ re2 zlib boehmgc libunwind llvmPackages.libcxxabi llvmPackages.libcxx ]}/c++/v1" \
|
||||
--set LIBRARY_PATH "${lib.makeLibraryPath [ re2 zlib boehmgc libunwind llvmPackages.libcxxabi llvmPackages.libcxx ]}" \
|
||||
--set NIX_CFLAGS_LINK "-lc++abi -lc++"
|
||||
'';
|
||||
})
|
22
pkgs/games/ltris/default.nix
Normal file
22
pkgs/games/ltris/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchurl, SDL, SDL_mixer }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ltris-${version}";
|
||||
version = "1.0.19";
|
||||
buildInputs = [ SDL SDL_mixer ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lgames/${name}.tar.gz";
|
||||
sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
|
||||
};
|
||||
|
||||
patchPhase = "patch -p0 < ${./gcc5_compliance.diff}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tetris clone from the LGames series";
|
||||
homepage = http://lgames.sourceforge.net/LBreakout2/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.ciil ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
299
pkgs/games/ltris/gcc5_compliance.diff
Normal file
299
pkgs/games/ltris/gcc5_compliance.diff
Normal file
|
@ -0,0 +1,299 @@
|
|||
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 );
|
28
pkgs/os-specific/linux/ply/default.nix
Normal file
28
pkgs/os-specific/linux/ply/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison }:
|
||||
let
|
||||
version = "1.0.beta1-9e810b1";
|
||||
in stdenv.mkDerivation {
|
||||
name = "ply-${version}";
|
||||
nativeBuildInputs = [ autoreconfHook flex yacc ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "ply";
|
||||
rev = "9e810b157ba079c32c430a7d4c6034826982056e";
|
||||
sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50";
|
||||
};
|
||||
|
||||
preAutoreconf = ''
|
||||
# ply wants to install header fails to its build directory
|
||||
xz -d < ${kernel.src} | tar -xf -
|
||||
configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*))
|
||||
./autogen.sh --prefix=$out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "dynamic Tracing in Linux";
|
||||
homepage = https://wkz.github.io/ply/;
|
||||
license = [ licenses.gpl2 ];
|
||||
maintainers = with maintainers; [ mic92 mbbx6spp ];
|
||||
};
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
{fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clipster-unstable-${version}";
|
||||
version = "2017-02-27";
|
||||
name = "clipster-${version}";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrichar1";
|
||||
repo = "clipster";
|
||||
rev = "dfa75b52ee3a41fff7534aca165dc0e6a24a3680";
|
||||
sha256 = "0d7ak6wpvvgz7cwvfzy2shkfiw6gr8l703xyjpiayjbnr2s79k5j";
|
||||
rev = "${version}";
|
||||
sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2";
|
||||
};
|
||||
|
||||
pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
|
||||
|
|
|
@ -2967,6 +2967,8 @@ with pkgs;
|
|||
|
||||
lshw = callPackage ../tools/system/lshw { };
|
||||
|
||||
ltris = callPackage ../games/ltris { };
|
||||
|
||||
lxc = callPackage ../os-specific/linux/lxc { };
|
||||
lxcfs = callPackage ../os-specific/linux/lxcfs { };
|
||||
lxd = callPackage ../tools/admin/lxd { };
|
||||
|
@ -7064,6 +7066,7 @@ with pkgs;
|
|||
scons = callPackage ../development/tools/build-managers/scons { };
|
||||
|
||||
sbt = callPackage ../development/tools/build-managers/sbt { };
|
||||
sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
|
||||
simpleBuildTool = sbt;
|
||||
|
||||
shards = callPackage ../development/tools/build-managers/shards { };
|
||||
|
@ -12010,6 +12013,8 @@ with pkgs;
|
|||
nvidia_x11_beta = nvidiaPackages.beta;
|
||||
nvidia_x11 = nvidiaPackages.stable;
|
||||
|
||||
ply = callPackage ../os-specific/linux/ply { };
|
||||
|
||||
rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };
|
||||
|
||||
rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
|
||||
|
|
Loading…
Reference in a new issue