Shea Levy
2 years ago
commit
7456be85db
@ -0,0 +1,61 @@ |
||||
{ lib, config, options, ... }: |
||||
let |
||||
inherit (lib) types; |
||||
in |
||||
{ |
||||
imports = [ |
||||
|
||||
# fun.<function-body>.a |
||||
({ ... }: { |
||||
options = { |
||||
fun = lib.mkOption { |
||||
type = types.functionTo (types.submodule { |
||||
options.a = lib.mkOption { default = "a"; }; |
||||
}); |
||||
}; |
||||
}; |
||||
}) |
||||
|
||||
# fun.<function-body>.b |
||||
({ ... }: { |
||||
options = { |
||||
fun = lib.mkOption { |
||||
type = types.functionTo (types.submodule { |
||||
options.b = lib.mkOption { default = "b"; }; |
||||
}); |
||||
}; |
||||
}; |
||||
}) |
||||
]; |
||||
|
||||
options = { |
||||
result = lib.mkOption |
||||
{ |
||||
type = types.str; |
||||
default = lib.concatStringsSep " " (lib.attrValues (config.fun (throw "shouldn't use input param"))); |
||||
}; |
||||
|
||||
optionsResult = lib.mkOption |
||||
{ |
||||
type = types.str; |
||||
default = lib.concatStringsSep " " |
||||
(lib.concatLists |
||||
(lib.mapAttrsToList |
||||
(k: v: |
||||
if k == "_module" |
||||
then [ ] |
||||
else [ (lib.showOption v.loc) ] |
||||
) |
||||
( |
||||
(options.fun.type.getSubOptions [ "fun" ]) |
||||
) |
||||
) |
||||
); |
||||
}; |
||||
}; |
||||
|
||||
config.fun = lib.mkMerge |
||||
[ |
||||
(input: { b = "bee"; }) |
||||
]; |
||||
} |
||||
@ -1,20 +0,0 @@ |
||||
[ |
||||
{ |
||||
goPackagePath = "github.com/adammck/venv"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/adammck/venv"; |
||||
rev = "8a9c907a37d36a8f34fa1c5b81aaf80c2554a306"; |
||||
sha256 = "1fzk3j4q59kpd2ks2aw8rmic6b123p5mh981cjh0kzs716grc6y8"; |
||||
}; |
||||
} |
||||
{ |
||||
goPackagePath = "github.com/blang/vfs"; |
||||
fetch = { |
||||
type = "git"; |
||||
url = "https://github.com/blang/vfs"; |
||||
rev = "c14afcac17253ce7418da751ec6b1988790cdc8f"; |
||||
sha256 = "00q5qzxpn9n59nrmrljz4w9lljxvrr8i5j8i8b4iw86j0alcx53b"; |
||||
}; |
||||
} |
||||
] |
||||
@ -1 +1 @@ |
||||
WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' ) |
||||
WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' ) |
||||
|
||||
@ -0,0 +1,41 @@ |
||||
{ lib |
||||
, mkDerivation |
||||
, cmake |
||||
, extra-cmake-modules |
||||
, gst_all_1 |
||||
, kcoreaddons |
||||
, kdeclarative |
||||
, ki18n |
||||
, kirigami2 |
||||
, qtmultimedia |
||||
, qtquickcontrols2 |
||||
}: |
||||
|
||||
mkDerivation { |
||||
pname = "plasmatube"; |
||||
|
||||
nativeBuildInputs = [ |
||||
extra-cmake-modules |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
kcoreaddons |
||||
kdeclarative |
||||
ki18n |
||||
kirigami2 |
||||
qtmultimedia |
||||
qtquickcontrols2 |
||||
] ++ (with gst_all_1; [ |
||||
gst-plugins-bad |
||||
gst-plugins-base |
||||
gst-plugins-good |
||||
gstreamer |
||||
]); |
||||
|
||||
meta = { |
||||
description = "Youtube player powered by an invidious server"; |
||||
homepage = "https://invent.kde.org/plasma-mobile/plasmatube"; |
||||
license = lib.licenses.gpl3Plus; |
||||
maintainers = with lib.maintainers; [ dotlambda ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,50 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -54,21 +54,7 @@ endif()
|
||||
endif()
|
||||
|
||||
#Use c preprocessor with fortran
|
||||
-
|
||||
-if(UNIX AND NOT APPLE)
|
||||
- set(CMAKE_Fortran_FLAGS "-cpp -Wno-argument-mismatch")
|
||||
-endif()
|
||||
-
|
||||
-if(APPLE)
|
||||
- set(CMAKE_Fortran_FLAGS "-cpp -fallow-argument-mismatch")
|
||||
-endif()
|
||||
-
|
||||
-
|
||||
-if (CMAKE_MAJOR_VERSION VERSION_GREATER_EQUAL "3")
|
||||
-if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL "10")
|
||||
- set(CMAKE_Fortran_FLAGS "-cpp -fallow-argument-mismatch")
|
||||
-endif()
|
||||
-endif()
|
||||
+set(CMAKE_Fortran_FLAGS "-cpp")
|
||||
|
||||
|
||||
#For Fortran
|
||||
diff --git a/src/GetChisquare.f b/src/GetChisquare.f
|
||||
index b21413fe..28391bcb 100644
|
||||
--- a/src/GetChisquare.f
|
||||
+++ b/src/GetChisquare.f
|
||||
@@ -2418,8 +2418,8 @@ C> @Brief Interface to lapack, to dynamically allocate work arrays
|
||||
integer NCovar, NDimCovar
|
||||
double precision Covar(NDimCovar,NDimCovar), EigenValues(NCovar)
|
||||
integer IFail
|
||||
- double precision Work
|
||||
- integer IWork
|
||||
+ double precision Work(1)
|
||||
+ integer IWork(1)
|
||||
Character*80 msg
|
||||
C---------------------------------------------------------------
|
||||
C Determine optimal size of the work array:
|
||||
@@ -2432,7 +2432,7 @@ C Determine optimal size of the work array:
|
||||
$ int(work)+1, iwork
|
||||
call HF_ERRLOG(14121701,msg)
|
||||
call MyDSYEVD2(NCovar,Covar,NDimCovar, EigenValues,
|
||||
- $ int(work)+1,iwork,ifail)
|
||||
+ $ int(work(1))+1,iwork(1),ifail)
|
||||
|
||||
end
|
||||
|
||||
@ -1,133 +0,0 @@ |
||||
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,82 +1,107 @@ |
||||
{ lib, stdenv, fetchFromGitHub, readline, libedit, bc |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, bc |
||||
, libedit |
||||
, readline |
||||
, avxSupport ? stdenv.hostPlatform.avxSupport |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "j"; |
||||
version = "902"; |
||||
jtype = "release-b"; |
||||
version = "904-beta-c"; |
||||
|
||||
src = fetchFromGitHub { |
||||
name = "${pname}-source"; |
||||
owner = "jsoftware"; |
||||
repo = "jsource"; |
||||
rev = "j${version}-${jtype}"; |
||||
sha256 = "0j67vgikqflwjqacsdicasvyv1k54s2c8vjgwmf0ix7l41p4xqz0"; |
||||
name = "jsource"; |
||||
rev = "j${version}"; |
||||
hash = "sha256-MzEO/saHEBl1JwVlFC6P2UKm9RZnV7KVrNd9h4cPV/w="; |
||||
}; |
||||
|
||||
buildInputs = [ readline libedit bc ]; |
||||
bits = if stdenv.is64bit then "64" else "32"; |
||||
platform = |
||||
if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else |
||||
if stdenv.isLinux then "linux" else |
||||
if stdenv.isDarwin then "darwin" else |
||||
"unknown"; |
||||
variant = if stdenv.isx86_64 && avxSupport then "avx" else ""; |
||||
|
||||
j64x="j${bits}${variant}"; |
||||
|
||||
doCheck = true; |
||||
|
||||
# Causes build failure due to warning |
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; |
||||
|
||||
# Causes build failure due to warning |
||||
# https://github.com/jsoftware/jsource/issues/16 |
||||
NIX_CFLAGS_COMPILE = "-Wno-error=return-local-addr"; |
||||
buildInputs = [ |
||||
readline |
||||
libedit |
||||
bc |
||||
]; |
||||
|
||||
dontConfigure = true; |
||||
|
||||
# emulating build_all.sh configuration variables |
||||
jplatform = |
||||
if stdenv.isDarwin then "darwin" |
||||
else if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" |
||||
else if stdenv.isLinux then "linux" |
||||
else "unsupported"; |
||||
|
||||
j64x = |
||||
if stdenv.is32bit then "j32" |
||||
else if stdenv.isx86_64 then |
||||
if (stdenv.isLinux && avxSupport) then "j64avx" else "j64" |
||||
else if stdenv.isAarch64 then |
||||
if stdenv.isDarwin then "j64arm" else "j64" |
||||
else "unsupported"; |
||||
|
||||
buildPhase = '' |
||||
export SOURCE_DIR=$(pwd) |
||||
export HOME=$TMPDIR |
||||
export JLIB=$SOURCE_DIR/jlibrary |
||||
runHook preBuild |
||||
|
||||
echo $OUT_DIR |
||||
export SRCDIR=$(pwd) |
||||
export HOME=$TMPDIR |
||||
export JLIB=$SRCDIR/jlibrary |
||||
export CC=cc |
||||
|
||||
cd make2 |
||||
|
||||
patchShebangs . |
||||
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;" |
||||
|
||||
j64x="${j64x}" ./build_all.sh |
||||
j64x="${j64x}" jplatform="${jplatform}" ./build_all.sh |
||||
|
||||
cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin" |
||||
cp -v $SRCDIR/bin/${jplatform}/${j64x}/* "$JLIB/bin" |
||||
|
||||
runHook postBuild |
||||
''; |
||||
|
||||
doCheck = true; |
||||
|
||||
checkPhase = '' |
||||
runHook preCheck |
||||
|
||||
echo 'i. 5' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4" |
||||
echo "Smoke test" |
||||
echo 'i. 10' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4 5 6 7 8 9" |
||||
|
||||
# Now run the real tests |
||||
cd $SOURCE_DIR/test |
||||
pushd $SRCDIR/test |
||||
for f in *.ijs |
||||
do |
||||
echo $f |
||||
echo -n "test $f: " |
||||
$JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS |
||||
done |
||||
popd |
||||
|
||||
runHook postCheck |
||||
''; |
||||
|
||||
installPhase = '' |
||||
mkdir -p "$out" |
||||
runHook preInstall |
||||
|
||||
mkdir -p "$out/share/j" |
||||
mkdir -p "$out/share/j/" |
||||
cp -r $JLIB/{addons,system} "$out/share/j" |
||||
cp -r $JLIB/bin "$out" |
||||
|
||||
runHook postInstall |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://jsoftware.com/"; |
||||
description = "J programming language, an ASCII-based APL successor"; |
||||
maintainers = with maintainers; [ raskin synthetica ]; |
||||
platforms = with platforms; linux ++ darwin; |
||||
longDescription = '' |
||||
J is a high-level, general-purpose programming language that is |
||||
particularly suited to the mathematical, statistical, and logical analysis |
||||
of data. It is a powerful tool for developing algorithms and exploring |
||||
problems that are not already well understood. |
||||
''; |
||||
license = licenses.gpl3Plus; |
||||
homepage = "http://jsoftware.com/"; |
||||
maintainers = with maintainers; [ raskin synthetica AndersonTorres ]; |
||||
platforms = with platforms; unix; |
||||
}; |
||||
} |
||||
|
||||
@ -1,4 +0,0 @@ |
||||
import ./base.nix { |
||||
version = "59.1"; |
||||
sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki"; |
||||
} |
||||
@ -1,4 +0,0 @@ |
||||
import ./base.nix { |
||||
version = "65.1"; |
||||
sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk"; |
||||
} |
||||
@ -1,25 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, pkg-config, dbus, expat }: |
||||
|
||||
let version = "1.0.3"; in |
||||
|
||||
stdenv.mkDerivation { |
||||
pname = "libnih"; |
||||
inherit version; |
||||
|
||||
src = fetchurl { |
||||
url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz"; |
||||
sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ pkg-config ]; |
||||
buildInputs = [ dbus expat ]; |
||||
|
||||
doCheck = false; # fails 1 of 17 test |
||||
|
||||
meta = { |
||||
description = "A small library for C application development"; |
||||
homepage = "https://launchpad.net/libnih"; |
||||
license = lib.licenses.gpl2; |
||||
platforms = lib.platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,40 @@ |
||||
{ lib |
||||
, mkDerivation |
||||
, fetchFromGitHub |
||||
, qmake |
||||
, qtbase |
||||
}: |
||||
|
||||
mkDerivation rec { |
||||
pname = "qtmpris"; |
||||
version = "1.0.6"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "sailfishos"; |
||||
repo = "qtmpris"; |
||||
rev = version; |
||||
hash = "sha256-kuM8hUdsa7N+eLDbwYw3ay+PWxg35zcTBOvGow1NlzI="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace src/src.pro \ |
||||
--replace '$$[QT_INSTALL_LIBS]' "$out/lib" \ |
||||
--replace '$$[QT_INSTALL_HEADERS]' "$out/include" \ |
||||
--replace '$$[QMAKE_MKSPECS]' "$out/mkspecs" |
||||
''; |
||||
|
||||
nativeBuildInputs = [ |
||||
qmake |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
qtbase |
||||
]; |
||||
|
||||
meta = { |
||||
description = "Qt and QML MPRIS interface and adaptor"; |
||||
homepage = "https://github.com/sailfishos/qtmpris"; |
||||
license = lib.licenses.lgpl21Plus; |
||||
maintainers = with lib.maintainers; [ dotlambda ]; |
||||
}; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue