github-actions[bot]
2 years ago
committed by
GitHub
commit
a41870fcba
@ -1,14 +1,31 @@ |
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 2421399..ba39254 100644
|
||||
index 3ad4d9a..fb02365 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -147,6 +147,9 @@ def create_base_env(vars):
|
||||
@@ -94,11 +94,8 @@ def CheckWiX(context):
|
||||
return result
|
||||
|
||||
def get_spd_module_dir():
|
||||
- env = Environment()
|
||||
- try:
|
||||
- return env.ParseConfig("pkg-config speech-dispatcher --variable=modulebindir", passthru)
|
||||
- except:
|
||||
- return False
|
||||
+ # cannot write to ${speechd}/libexec/speech-dispatcher-modules
|
||||
+ return os.path.join(os.environ["out"], "libexec/speech-dispatcher-modules")
|
||||
|
||||
def validate_spd_version(key,val,env):
|
||||
m=re.match(r"^\d+\.\d+",val)
|
||||
@@ -208,9 +205,9 @@ def create_base_env(user_vars):
|
||||
env_args["package_name"]="RHVoice"
|
||||
env_args["CPPDEFINES"]=[("RHVOICE","1")]
|
||||
env=Environment(**env_args)
|
||||
- if env["dev"]:
|
||||
- env["prefix"]=os.path.abspath("local")
|
||||
- env["RPATH"]=env.Dir("$libdir").abspath
|
||||
+ env.PrependENVPath("PATH", os.environ["PATH"])
|
||||
+ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
|
||||
+ env["RPATH"]=env["libdir"]
|
||||
+ env["RPATH"]=env.Dir("$libdir").abspath
|
||||
env["package_version"]=get_version(env["release"])
|
||||
env.Append(CPPDEFINES=("PACKAGE",env.subst(r'\"$package_name\"')))
|
||||
env.Append(CPPDEFINES=("VERSION",env.subst(r'\"$package_version\"')))
|
||||
if env["PLATFORM"]=="win32":
|
||||
|
||||
@ -1,14 +0,0 @@ |
||||
diff -Naur source-old/src/CMakeLists.txt source-new/src/CMakeLists.txt
|
||||
--- source-old/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ source-new/src/CMakeLists.txt 2021-10-29 12:03:06.461399341 -0300
|
||||
@@ -317,9 +317,7 @@
|
||||
find_package(BZip2 REQUIRED QUIET)
|
||||
pkg_check_modules(HARFBUZZ REQUIRED QUIET harfbuzz)
|
||||
ExternalProject_Add(Freetype
|
||||
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/freetype"
|
||||
- UPDATE_COMMAND ""
|
||||
- GIT_REPOSITORY "${EXTERNAL_SRC_DIR}/git/freetype"
|
||||
+ SOURCE_DIR "${EXTERNAL_SRC_DIR}/git/freetype"
|
||||
${EXTERNAL_DEFS}
|
||||
${CMAKE_EXTERNAL_DEFS}
|
||||
-DWITH_ZLIB=OFF
|
||||
@ -0,0 +1,133 @@ |
||||
diff --git a/cmd/tools/vcreate_test.v b/cmd/tools/vcreate_test.v
|
||||
index 3d07f4773..de8a202df 100644
|
||||
--- a/cmd/tools/vcreate_test.v
|
||||
+++ b/cmd/tools/vcreate_test.v
|
||||
@@ -2,127 +2,6 @@ import os
|
||||
|
||||
const test_path = 'vcreate_test'
|
||||
|
||||
-fn init_and_check() ? {
|
||||
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
|
||||
-
|
||||
- assert os.read_file('vcreate_test.v') ? == [
|
||||
- 'module main\n',
|
||||
- 'fn main() {',
|
||||
- " println('Hello World!')",
|
||||
- '}',
|
||||
- '',
|
||||
- ].join_lines()
|
||||
-
|
||||
- assert os.read_file('v.mod') ? == [
|
||||
- 'Module {',
|
||||
- " name: 'vcreate_test'",
|
||||
- " description: ''",
|
||||
- " version: ''",
|
||||
- " license: ''",
|
||||
- ' dependencies: []',
|
||||
- '}',
|
||||
- '',
|
||||
- ].join_lines()
|
||||
-
|
||||
- assert os.read_file('.gitignore') ? == [
|
||||
- '# Binaries for programs and plugins',
|
||||
- 'main',
|
||||
- 'vcreate_test',
|
||||
- '*.exe',
|
||||
- '*.exe~',
|
||||
- '*.so',
|
||||
- '*.dylib',
|
||||
- '*.dll',
|
||||
- 'vls.log',
|
||||
- '',
|
||||
- ].join_lines()
|
||||
-
|
||||
- assert os.read_file('.gitattributes') ? == [
|
||||
- '*.v linguist-language=V text=auto eol=lf',
|
||||
- '*.vv linguist-language=V text=auto eol=lf',
|
||||
- '*.vsh linguist-language=V text=auto eol=lf',
|
||||
- '**/v.mod linguist-language=V text=auto eol=lf',
|
||||
- '',
|
||||
- ].join_lines()
|
||||
-
|
||||
- assert os.read_file('.editorconfig') ? == [
|
||||
- '[*]',
|
||||
- 'charset = utf-8',
|
||||
- 'end_of_line = lf',
|
||||
- 'insert_final_newline = true',
|
||||
- 'trim_trailing_whitespace = true',
|
||||
- '',
|
||||
- '[*.v]',
|
||||
- 'indent_style = tab',
|
||||
- 'indent_size = 4',
|
||||
- '',
|
||||
- ].join_lines()
|
||||
-}
|
||||
-
|
||||
fn test_v_init() ? {
|
||||
- dir := os.join_path(os.temp_dir(), test_path)
|
||||
- os.rmdir_all(dir) or {}
|
||||
- os.mkdir(dir) or {}
|
||||
- defer {
|
||||
- os.rmdir_all(dir) or {}
|
||||
- }
|
||||
- os.chdir(dir) ?
|
||||
-
|
||||
- init_and_check() ?
|
||||
-}
|
||||
-
|
||||
-fn test_v_init_in_git_dir() ? {
|
||||
- dir := os.join_path(os.temp_dir(), test_path)
|
||||
- os.rmdir_all(dir) or {}
|
||||
- os.mkdir(dir) or {}
|
||||
- defer {
|
||||
- os.rmdir_all(dir) or {}
|
||||
- }
|
||||
- os.chdir(dir) ?
|
||||
- os.execute_or_exit('git init .')
|
||||
- init_and_check() ?
|
||||
-}
|
||||
-
|
||||
-fn test_v_init_no_overwrite_gitignore() ? {
|
||||
- dir := os.join_path(os.temp_dir(), test_path)
|
||||
- os.rmdir_all(dir) or {}
|
||||
- os.mkdir(dir) or {}
|
||||
- os.write_file('$dir/.gitignore', 'blah') ?
|
||||
- defer {
|
||||
- os.rmdir_all(dir) or {}
|
||||
- }
|
||||
- os.chdir(dir) ?
|
||||
-
|
||||
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
|
||||
-
|
||||
- assert os.read_file('.gitignore') ? == 'blah'
|
||||
-}
|
||||
-
|
||||
-fn test_v_init_no_overwrite_gitattributes_and_editorconfig() ? {
|
||||
- git_attributes_content := '*.v linguist-language=V text=auto eol=lf'
|
||||
- editor_config_content := '[*]
|
||||
-charset = utf-8
|
||||
-end_of_line = lf
|
||||
-insert_final_newline = true
|
||||
-trim_trailing_whitespace = true
|
||||
-
|
||||
-[*.v]
|
||||
-indent_style = tab
|
||||
-indent_size = 4
|
||||
-'
|
||||
-
|
||||
- dir := os.join_path(os.temp_dir(), test_path)
|
||||
- os.rmdir_all(dir) or {}
|
||||
- os.mkdir(dir) or {}
|
||||
- os.write_file('$dir/.gitattributes', git_attributes_content) ?
|
||||
- os.write_file('$dir/.editorconfig', editor_config_content) ?
|
||||
- defer {
|
||||
- os.rmdir_all(dir) or {}
|
||||
- }
|
||||
- os.chdir(dir) ?
|
||||
-
|
||||
- os.execute_or_exit('${os.quoted_path(@VEXE)} init')
|
||||
-
|
||||
- assert os.read_file('.gitattributes') ? == git_attributes_content
|
||||
- assert os.read_file('.editorconfig') ? == editor_config_content
|
||||
+ println('vcreate_test disabled')
|
||||
}
|
||||
@ -1,35 +1,51 @@ |
||||
{ buildGoModule, fetchFromGitHub, lib }: |
||||
{ buildGoModule, fetchFromGitHub, lib, installShellFiles, testers, cue }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "cue"; |
||||
version = "0.4.2"; |
||||
version = "0.4.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "cue-lang"; |
||||
repo = "cue"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-6HD3wcBo21Dep4ckx+oDWAC4nuTvCzlp0bwQxZox2b4="; |
||||
sha256 = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; |
||||
}; |
||||
|
||||
vendorSha256 = "sha256-tY9iwQW6cB1FgLAmkDNMrvIxR+i4aGYhNs4tepI654o="; |
||||
postPatch = '' |
||||
# Disable script tests |
||||
rm -f cmd/cue/cmd/script_test.go |
||||
''; |
||||
|
||||
vendorSha256 = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; |
||||
|
||||
excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; |
||||
|
||||
checkPhase = "go test ./..."; |
||||
nativeBuildInputs = [ installShellFiles ]; |
||||
|
||||
subPackages = [ "cmd/cue" ]; |
||||
ldflags = [ "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; |
||||
|
||||
ldflags = [ |
||||
"-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" |
||||
]; |
||||
postInstall = '' |
||||
# Completions |
||||
installShellCompletion --cmd cue \ |
||||
--bash <($out/bin/cue completion bash) \ |
||||
--fish <($out/bin/cue completion fish) \ |
||||
--zsh <($out/bin/cue completion zsh) |
||||
''; |
||||
|
||||
doInstallCheck = true; |
||||
installCheckPhase = '' |
||||
$out/bin/cue eval - <<<'a: "all good"' > /dev/null |
||||
''; |
||||
|
||||
meta = { |
||||
passthru.tests.version = testers.testVersion { |
||||
package = cue; |
||||
command = "cue version"; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "A data constraint language which aims to simplify tasks involving defining and using data"; |
||||
homepage = "https://cuelang.org/"; |
||||
maintainers = []; |
||||
license = lib.licenses.asl20; |
||||
maintainers = with maintainers; [ aaronjheng ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,52 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, pkg-config |
||||
, fftw |
||||
, zita-convolver |
||||
, fftwFloat |
||||
, libsndfile |
||||
, ffmpeg |
||||
, alsa-lib |
||||
, libao |
||||
, libmad |
||||
, ladspaH |
||||
, libtool |
||||
, libpulseaudio |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "dsp"; |
||||
version = "1.8"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "bmc0"; |
||||
repo = "dsp"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-LTgjpzAGi3oL8l5NcJj1ortKFd3vWDfXHr8YyedAxEE="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ pkg-config ]; |
||||
|
||||
buildInputs = [ |
||||
fftw |
||||
zita-convolver |
||||
fftwFloat |
||||
libsndfile |
||||
ffmpeg |
||||
alsa-lib |
||||
libao |
||||
libmad |
||||
ladspaH |
||||
libtool |
||||
libpulseaudio |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/bmc0/dsp"; |
||||
description = "An audio processing program with an interactive mode"; |
||||
license = licenses.isc; |
||||
maintainers = with maintainers; [ aaronjheng ]; |
||||
platforms = platforms.linux ++ platforms.darwin; |
||||
}; |
||||
} |
||||
@ -1,48 +0,0 @@ |
||||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) |
||||
[ |
||||
{ |
||||
goPackagePath = "github.com/dop251/spgz"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/dop251/spgz"; |
||||
rev = "b86304a2b188"; |
||||
sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/crypto"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/crypto"; |
||||
rev = "9756ffdc2472"; |
||||
sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/net"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/net"; |
||||
rev = "eb5bcb51f2a3"; |
||||
sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/sys"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/sys"; |
||||
rev = "97732733099d"; |
||||
sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/text"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/text"; |
||||
rev = "v0.3.0"; |
||||
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; |
||||
}; |
||||
} |
||||
] |
||||
@ -1,20 +1,29 @@ |
||||
{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }: |
||||
{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }: |
||||
|
||||
buildGoPackage rec { |
||||
buildGoModule rec { |
||||
pname = "go-mtpfs"; |
||||
version = "unstable-2018-02-09"; |
||||
|
||||
goPackagePath = "github.com/hanwen/go-mtpfs"; |
||||
version = "1.0.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "hanwen"; |
||||
repo = "go-mtpfs"; |
||||
rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; |
||||
sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg="; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; |
||||
}; |
||||
|
||||
vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; |
||||
|
||||
ldflags = [ "-s" "-w" ]; |
||||
|
||||
nativeBuildInputs = [ pkg-config ]; |
||||
buildInputs = [ libusb1 ]; |
||||
|
||||
goDeps = ./deps.nix; |
||||
checkFlags = [ "-short" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; |
||||
homepage = "https://github.com/hanwen/go-mtpfs"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ aaronjheng ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,30 +0,0 @@ |
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 |
||||
[ |
||||
{ |
||||
goPackagePath = "github.com/hanwen/go-fuse"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/hanwen/go-fuse"; |
||||
rev = "d1c826d19ad0c8d0c7e5b4eb34ee0f2ae09f6cef"; |
||||
sha256 = "0hn2iqsb6rip2b05fvcngyh0sazln2h3fx18khq4fv41n1iy11dc"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/hanwen/usb"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/hanwen/usb"; |
||||
rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; |
||||
sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "golang.org/x/sys"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://go.googlesource.com/sys"; |
||||
rev = "48ac38b7c8cbedd50b1613c0fccacfc7d88dfcdf"; |
||||
sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; |
||||
}; |
||||
} |
||||
] |
||||
Loading…
Reference in new issue