diff --git a/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh index 994adbd91dae..3fdfa7e0d11a 100755 --- a/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh @@ -1,7 +1,7 @@ #!/bin/sh # The file from which to extract *.ico files or a particular *.ico file. -# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). +# (e.g.: './KeePass.exe', './myLibrary.dll', './my/path/to/app.ico'). # As you notived, the utility can extract icons from a windows executable or # dll. rscFile=$1 @@ -28,7 +28,7 @@ nameRegex=$4 # fancy, it will usually be '\1'. nameReplaceExp=$5 -# The +# The # out=./myOut out=$6 @@ -52,7 +52,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/by-name/il/ilbc/extract-cfile.awk b/pkgs/by-name/il/ilbc/extract-cfile.awk index e4b07bc08963..54fd2bbf7651 100644 --- a/pkgs/by-name/il/ilbc/extract-cfile.awk +++ b/pkgs/by-name/il/ilbc/extract-cfile.awk @@ -5,7 +5,7 @@ BEGIN { srcname = "nothing"; } srcname = $2; printf("creating source file %s\n", srcname); }else if (srcname != "nothing") { - if (/Andersen,* *et* *al\./) + if (/Andersen,* *et* *al\./) printf("skipping %s\n", $0); else if (/ /) printf("skipping2 %s\n", $0); diff --git a/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in index 13b62a8829da..e5848dcb28ad 100644 --- a/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in +++ b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in @@ -1,7 +1,7 @@ #! @shell@ parse_opts () { - while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do + while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do case "$1" in --store-dir) shift; @@ -76,7 +76,7 @@ workingdir="$(@coreutils@/mktemp -d)" cd "$workingdir" PORT=8080 -(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" +(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" ) > nix-binary-cache.conf || exit . "$workingdir/nix-binary-cache.conf" @@ -94,8 +94,8 @@ server.use-ipv6 = \"enable\" } " >> lighttpd.conf -cp @out@/nix-binary-cache.cgi . -cp @out@/nix-binary-cache.cgi ./nix-bc.cgi +cp @out@/nix-binary-cache.cgi . +cp @out@/nix-binary-cache.cgi ./nix-bc.cgi ip="$(@iproute@/ip a | @gnugrep@/grep 'inet .* scope global' | @coreutils@/head -n 1)" ip="${ip%%/*}" diff --git a/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh b/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh index 996cb92e6958..3a7cf13c26f8 100755 --- a/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh +++ b/pkgs/development/perl-modules/expression-generator/make-clean-dir.sh @@ -1,5 +1,5 @@ #! /bin/sh rm -rf test; -mkdir test; +mkdir test; for i in *.sh; do ln -s ../$i test; done; diff --git a/pkgs/development/perl-modules/expression-generator/usage.txt b/pkgs/development/perl-modules/expression-generator/usage.txt index 1aa0737afdbd..c875c1059411 100644 --- a/pkgs/development/perl-modules/expression-generator/usage.txt +++ b/pkgs/development/perl-modules/expression-generator/usage.txt @@ -1,10 +1,10 @@ /path/to/write-nix-expression.sh Group::Module::Submodule -It will output Nix assignment formatted for placing into +It will output Nix assignment formatted for placing into all-packages.nix amongst all the perl packages, like perlAlgorithmDiff. Actually it will grab distribution unit Group-Module-Submodule via search.cpan.org, and make some effort to write correct dependencies. -If among requirements there are some that have empty META.yml, or if +If among requirements there are some that have empty META.yml, or if any of requirements acannot be installed by just getting distribution unit whose name can be guessed by replacing :: with -, manual editing -will be needed. +will be needed. diff --git a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt b/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt index 42df14c40960..5b5a9a911f45 100644 --- a/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt +++ b/pkgs/development/perl-modules/perl-opengl-gl-extensions.txt @@ -1,5 +1,5 @@ GLUT=20801 VERSION=3.0 Mesa 10.2.6 VENDOR=Intel Open Source Technology Center -RENDERER=Mesa DRI Intel(R) Ivybridge Mobile -EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query +RENDERER=Mesa DRI Intel(R) Ivybridge Mobile +EXTENSIONS=GL_ARB_multisample GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_copy_texture GL_EXT_polygon_offset GL_EXT_subtexture GL_EXT_texture_object GL_EXT_vertex_array GL_EXT_compiled_vertex_array GL_EXT_texture GL_EXT_texture3D GL_IBM_rasterpos_clip GL_ARB_point_parameters GL_EXT_draw_range_elements GL_EXT_packed_pixels GL_EXT_point_parameters GL_EXT_rescale_normal GL_EXT_separate_specular_color GL_EXT_texture_edge_clamp GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_ARB_framebuffer_sRGB GL_ARB_multitexture GL_EXT_framebuffer_sRGB GL_IBM_multimode_draw_arrays GL_IBM_texture_mirrored_repeat GL_3DFX_texture_compression_FXT1 GL_ARB_texture_cube_map GL_ARB_texture_env_add GL_ARB_transpose_matrix GL_EXT_blend_func_separate GL_EXT_fog_coord GL_EXT_multi_draw_arrays GL_EXT_secondary_color GL_EXT_texture_env_add GL_EXT_texture_filter_anisotropic GL_EXT_texture_lod_bias GL_INGR_blend_func_separate GL_NV_blend_square GL_NV_light_max_exponent GL_NV_texgen_reflection GL_NV_texture_env_combine4 GL_S3_s3tc GL_SUN_multi_draw_arrays GL_ARB_texture_border_clamp GL_ARB_texture_compression GL_EXT_framebuffer_object GL_EXT_texture_compression_s3tc GL_EXT_texture_env_combine GL_EXT_texture_env_dot3 GL_MESA_window_pos GL_NV_packed_depth_stencil GL_NV_texture_rectangle GL_ARB_depth_texture GL_ARB_occlusion_query GL_ARB_shadow GL_ARB_texture_env_combine GL_ARB_texture_env_crossbar GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat GL_ARB_window_pos GL_ATI_envmap_bumpmap GL_EXT_stencil_two_side GL_EXT_texture_cube_map GL_NV_depth_clamp GL_APPLE_packed_pixels GL_APPLE_vertex_array_object GL_ARB_draw_buffers GL_ARB_fragment_program GL_ARB_fragment_shader GL_ARB_shader_objects GL_ARB_vertex_program GL_ARB_vertex_shader GL_ATI_draw_buffers GL_ATI_texture_env_combine3 GL_ATI_texture_float GL_EXT_shadow_funcs GL_EXT_stencil_wrap GL_MESA_pack_invert GL_NV_primitive_restart GL_ARB_depth_clamp GL_ARB_fragment_program_shadow GL_ARB_half_float_pixel GL_ARB_occlusion_query2 GL_ARB_point_sprite GL_ARB_shading_language_100 GL_ARB_sync GL_ARB_texture_non_power_of_two GL_ARB_vertex_buffer_object GL_ATI_blend_equation_separate GL_EXT_blend_equation_separate GL_OES_read_format GL_ARB_color_buffer_float GL_ARB_pixel_buffer_object GL_ARB_texture_compression_rgtc GL_ARB_texture_float GL_ARB_texture_rectangle GL_EXT_packed_float GL_EXT_pixel_buffer_object GL_EXT_texture_compression_dxt1 GL_EXT_texture_compression_rgtc GL_EXT_texture_rectangle GL_EXT_texture_sRGB GL_EXT_texture_shared_exponent GL_ARB_framebuffer_object GL_EXT_framebuffer_blit GL_EXT_framebuffer_multisample GL_EXT_packed_depth_stencil GL_APPLE_object_purgeable GL_ARB_vertex_array_object GL_ATI_separate_stencil GL_EXT_draw_buffers2 GL_EXT_draw_instanced GL_EXT_gpu_program_parameters GL_EXT_texture_array GL_EXT_texture_integer GL_EXT_texture_sRGB_decode GL_EXT_timer_query GL_OES_EGL_image GL_AMD_performance_monitor GL_ARB_copy_buffer GL_ARB_depth_buffer_float GL_ARB_draw_instanced GL_ARB_half_float_vertex GL_ARB_instanced_arrays GL_ARB_map_buffer_range GL_ARB_texture_rg GL_ARB_texture_swizzle GL_ARB_vertex_array_bgra GL_EXT_texture_swizzle GL_EXT_vertex_array_bgra GL_NV_conditional_render GL_AMD_conservative_depth GL_AMD_draw_buffers_blend GL_AMD_seamless_cubemap_per_texture GL_ARB_ES2_compatibility GL_ARB_blend_func_extended GL_ARB_debug_output GL_ARB_draw_buffers_blend GL_ARB_draw_elements_base_vertex GL_ARB_explicit_attrib_location GL_ARB_fragment_coord_conventions GL_ARB_provoking_vertex GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_seamless_cube_map GL_ARB_shader_texture_lod GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_multisample GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_uniform_buffer_object GL_ARB_vertex_type_2_10_10_10_rev GL_EXT_provoking_vertex GL_EXT_texture_snorm GL_MESA_texture_signed_rgba GL_ARB_get_program_binary GL_ARB_robustness GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ANGLE_texture_compression_dxt3 GL_ANGLE_texture_compression_dxt5 GL_ARB_conservative_depth GL_ARB_internalformat_query GL_ARB_map_buffer_alignment GL_ARB_shader_atomic_counters GL_ARB_shading_language_420pack GL_ARB_shading_language_packing GL_ARB_texture_storage GL_ARB_transform_feedback_instanced GL_EXT_framebuffer_multisample_blit_scaled GL_EXT_transform_feedback GL_AMD_shader_trinary_minmax GL_ARB_ES3_compatibility GL_ARB_clear_buffer_object GL_ARB_invalidate_subdata GL_ARB_texture_query_levels GL_ARB_texture_storage_multisample GL_ARB_texture_view GL_ARB_vertex_attrib_binding GL_KHR_debug GL_ARB_buffer_storage GL_ARB_multi_bind GL_ARB_texture_mirror_clamp_to_edge GL_ARB_vertex_type_10f_11f_11f_rev GL_EXT_shader_integer_mix GL_INTEL_performance_query diff --git a/pkgs/tools/typesetting/tex/nix/copy-includes.pl b/pkgs/tools/typesetting/tex/nix/copy-includes.pl index 2cec62fc7cb6..7d7846d2a7f1 100644 --- a/pkgs/tools/typesetting/tex/nix/copy-includes.pl +++ b/pkgs/tools/typesetting/tex/nix/copy-includes.pl @@ -18,7 +18,7 @@ for (my $n = 0; $n < @ARGV; $n += 2) { my $relPath = $ARGV[$n + 1]; my $parents = 0; foreach my $comp (split /\//, $relPath) { - $parents++ if ($comp eq "..") + $parents++ if ($comp eq "..") } $maxParents = $parents if $parents > $maxParents; } @@ -36,7 +36,7 @@ for (my $n = 0; $n < @ARGV; $n += 2) { my $relPath = $ARGV[$n + 1]; createDirs $relPath; - + symlink $fullPath, $relPath or die "cannot create symlink `$relPath'"; } diff --git a/pkgs/tools/typesetting/tex/nix/find-includes.pl b/pkgs/tools/typesetting/tex/nix/find-includes.pl index 41675e939f60..c8cb033f4a69 100644 --- a/pkgs/tools/typesetting/tex/nix/find-includes.pl +++ b/pkgs/tools/typesetting/tex/nix/find-includes.pl @@ -14,7 +14,7 @@ sub addName { my ($type, $name) = @_; print OUT "{ type = \"$type\"; name = \"$name\"; }\n"; } - + while () { if (/\\input\{(.*)\}/) { my $fn2 = $1;