Compare commits
No commits in common. "b25ea0c29d6171ce1bd9af55459245a5f7c1739f" and "307eef242915824327e6a45e2065ffd6a5da507a" have entirely different histories.
b25ea0c29d
...
307eef2429
|
@ -84,9 +84,8 @@
|
||||||
direnv
|
direnv
|
||||||
rainbow-delimiters
|
rainbow-delimiters
|
||||||
aggressive-indent
|
aggressive-indent
|
||||||
python-docstring
|
|
||||||
nix-mode
|
nix-mode
|
||||||
lua-mode
|
python-docstring
|
||||||
|
|
||||||
# Media
|
# Media
|
||||||
emms
|
emms
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
(luajit.withPackages (ps: [
|
(lua.withPackages (ps: [
|
||||||
(ps.callPackage ./luarocks/scilua.nix {})
|
(ps.callPackage ./luarocks/scilua.nix {})
|
||||||
]))
|
]))
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
{
|
{
|
||||||
buildLuarocksPackage,
|
buildLuarocksPackage,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
|
lua,
|
||||||
luaAtLeast,
|
luaAtLeast,
|
||||||
luaOlder,
|
luaOlder,
|
||||||
callPackage,
|
luaPackages,
|
||||||
luajit,
|
|
||||||
openblas,
|
|
||||||
}: let
|
}: let
|
||||||
xsys = callPackage ./xsys.nix {};
|
xsys = luaPackages.callPackage ./xsys.nix {};
|
||||||
in
|
in
|
||||||
buildLuarocksPackage {
|
buildLuarocksPackage {
|
||||||
pname = "sci";
|
pname = "sci";
|
||||||
|
@ -24,7 +23,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
||||||
propagatedBuildInputs = [luajit xsys openblas];
|
propagatedBuildInputs = [lua xsys];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/stepelu/lua-sci";
|
homepage = "https://github.com/stepelu/lua-sci";
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
buildLuarocksPackage,
|
buildLuarocksPackage,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
|
lua,
|
||||||
luaAtLeast,
|
luaAtLeast,
|
||||||
luaOlder,
|
luaOlder,
|
||||||
luajit,
|
|
||||||
}:
|
}:
|
||||||
buildLuarocksPackage {
|
buildLuarocksPackage {
|
||||||
pname = "xsys";
|
pname = "xsys";
|
||||||
|
@ -20,7 +20,7 @@ buildLuarocksPackage {
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
|
||||||
propagatedBuildInputs = [luajit];
|
propagatedBuildInputs = [lua];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://scilua.org/xsys.html";
|
homepage = "http://scilua.org/xsys.html";
|
||||||
|
|
Reference in a new issue